fix multi pattern file filtering

romansky · Jul 31, 2024 · dc6a9dc · dc6a9dc
1 parent 195c8e4
commit dc6a9dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -4,9 +4,7 @@
   "description": "CoPa: Copy File Sources For Prompting",
   "type": "commonjs",
   "main": "./dist/copa.js",
-  "bin": {
-    "copa": "./dist/copa.js"
-  },
+  "bin": "./dist/copa.js",
   "scripts": {
     "build": "tsc",
     "start": "node dist/copa.js"
@@ -23,7 +21,7 @@
     "axios": "^1.7.2",
     "clipboardy": "^4.0.0",
     "commander": "^12.1.0",
-    "dom-to-semantic-markdown": "1.1.1",
+    "dom-to-semantic-markdown": "1.1.2",
     "glob": "^11.0.0",
     "jsdom": "^24.1.1",
     "simple-git": "^3.25.0",

diff --git a/src/copa.ts b/src/copa.ts
@@ -81,13 +81,14 @@ async function copyFilesToClipboard(directory: string, options: Options): Promis
 
             if (excludePatterns.length > 0) {
                 files = files.filter(file => !excludePatterns.some(pattern =>
-                    glob.hasMagic(pattern)
-                        ? glob.sync(pattern, {cwd: directory}).includes(file)
-                        : !file.endsWith(pattern)));
+                    file.endsWith(pattern) ||
+                        glob.hasMagic(pattern)
+                            ? glob.sync(pattern, {cwd: directory}).includes(file)
+                            : false));
             }
         } else {
             const globPattern = path.join(directory, '**/*');
-            files = await glob(globPattern, { nodir: true, ignore: excludePatterns });
+            files = await glob(globPattern, {nodir: true, ignore: excludePatterns});
         }
     } catch (error) {
         console.error('Error listing files:', error);
@@ -132,7 +133,7 @@ program
         if (options.file) {
             readSingleFile(options.file);
         } else if (directory) {
-        copyFilesToClipboard(directory, options);
+            copyFilesToClipboard(directory, options);
         } else {
             console.error('Error: Please provide either a directory or use the --file option.');
             process.exit(1);