v1.0.16

Author: samestrin

.defaultignore

@@ -3,6 +3,7 @@
 .env
 .git
 .gitignore
+.gitattributes
 vendor
 node_modules
 *.lock

package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-prepare",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "llm-prepare converts complex project directory structures and files into a single flat file or a set of flat files, facilitating processing using In-Context Learning (ICL) prompts.",
   "author": "Sam Estrin",
   "license": "MIT",

src/index.js

@@ -101,7 +101,7 @@ async function main(argv) {
   let layoutIncluded = false;
 
   if ("show-default-ignore" in argv) {
-    await showDefaultIgnore();
+    await showDefaultIgnore(argv);
     return;
   } else if ("show-prompts" in argv) {
     const open = (await import("open")).default;
@@ -116,7 +116,6 @@ async function main(argv) {
   );
 
   const ig = await readIgnoreFiles(argv["path"], argv["default-ignore"], argv);
-
   const {
     layout: updatedLayout,
     singleFileOutput,

src/utils/errorHandler.js

@@ -9,8 +9,8 @@ function handleError(error) {
   if (!process.env.ENV && false) {
     console.error(`Unhandled error: ${error.message}`);
   } else {
-    console.log(`${error.message}`);
-    console.log(`  at ${error.stack}`);
+    console.error(`${error.message}`);
+    console.error(`  at ${error.stack}`);
   }
 }
 

src/utils/ignoreUtils.js

@@ -1,3 +1,5 @@
+// utils/ignoreUtils.js
+
 const ignore = require("ignore");
 const fs = require("fs-extra");
 const path = require("path");
@@ -17,8 +19,8 @@ async function readIgnoreFiles(dir, defaultIgnorePath = false, argv) {
   const ig = ignore();
 
   if (!defaultIgnorePath)
-    defaultIgnorePath = path.join(__dirname, ".defaultignore");
-
+    defaultIgnorePath = path.join(__dirname, "../../.defaultignore");
+  console.log(defaultIgnorePath);
   // Attempt to load .defaultignore with specific error handling
   try {
     if (await fileExists(defaultIgnorePath)) {
@@ -86,6 +88,9 @@ async function readIgnoreFiles(dir, defaultIgnorePath = false, argv) {
     }
   }
 
+  // Debugging: Log the ignore patterns
+  //console.log("Ignore patterns loaded:", ig._rules);
+
   return ig;
 }
 
@@ -107,10 +112,11 @@ function filterIgnoreContent(content) {
  * Shows the contents of the default ignore file configured in the system.
  * This function reads the content of the specified default ignore file and prints it to the console.
  *
+ * @param {object} argv - Command-line arguments that might affect ignore rules.
  * @returns {Promise<void>} A promise that resolves when the operation is complete.
  * @throws {Error} If there is an error reading the default ignore file.
  */
-async function showDefaultIgnore() {
+async function showDefaultIgnore(argv) {
   const defaultIgnorePath =
     argv["default-ignore"] || path.join(__dirname, ".defaultignore");
   try {

src/utils/processDirectory.js

@@ -34,27 +34,31 @@ async function processDirectory(
   let layout = depth === 0 && !layoutIncluded ? `/${baseDir}\n` : "";
   let singleFileOutput = [];
   const entries = await fs.readdir(dir);
-  const notIgnoredEntries = ig.filter(entries).sort();
 
-  for (let i = 0; i < notIgnoredEntries.length; i++) {
-    const entry = notIgnoredEntries[i];
+  // Map entries to their relative paths for filtering
+  const relativePaths = entries.map((entry) =>
+    path.relative(baseDir, path.join(dir, entry)),
+  );
+
+  // Filter entries using ignore rules
+  const filteredEntries = entries
+    .filter((entry, index) => !ig.ignores(relativePaths[index]))
+    .sort();
+
+  for (let i = 0; i < filteredEntries.length; i++) {
+    const entry = filteredEntries[i];
     const entryPath = path.join(dir, entry);
     const stats = await fs.stat(entryPath);
 
-    let prefix = computePrefix(
-      depth,
-      lastItemStack,
-      i,
-      notIgnoredEntries.length,
-    );
+    let prefix = computePrefix(depth, lastItemStack, i, filteredEntries.length);
 
     if (stats.isDirectory()) {
       const childResult = await processDirectory(
         entryPath,
         baseDir,
         ig,
         depth + 1,
-        lastItemStack.concat(i === notIgnoredEntries.length - 1),
+        lastItemStack.concat(i === filteredEntries.length - 1),
         filePattern,
         layoutIncluded,
         argv,