feat: add support for excluding a nested directory files using a slas…

…h (2) (#1063) Co-authored-by: GitHub Action <[email protected]>
tj-actions · Jan 18, 2024 · dc0d0cd · dc0d0cd
1 parent d9dadb0
commit dc0d0cd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -81,7 +81,11 @@ export async function run(): Promise<void> {
 
   const gitignorePath = path.join(workingDirectory, '.gitignore')
 
-  let filePatterns = files.split(filesSeparator).filter(Boolean).join('\n')
+  let filePatterns = files
+    .split(filesSeparator)
+    .filter(Boolean)
+    .map(p => (p.endsWith(path.sep) ? `${p}**` : p))
+    .join('\n')
 
   core.debug(`file patterns: ${filePatterns}`)
 
@@ -96,11 +100,9 @@ export async function run(): Promise<void> {
       .split(excludedFilesSeparator)
       .filter(Boolean)
       .map(p => {
-        if (!p.startsWith('!')) {
-          p = `!${p}`
-        }
+        p = p.startsWith('!') ? p : `!${p}`
         if (p.endsWith(path.sep)) {
-          p = `${p}${path.sep}**`
+          p = `${p}**`
         }
         return p
       })

diff --git a/src/utils.ts b/src/utils.ts
@@ -170,11 +170,11 @@ async function* lineOfFileGenerator({
       if (excludedFiles) {
         line = line.startsWith('!') ? line : `!${line}`
         if (line.endsWith(path.sep)) {
-          line = `${line}${path.sep}**`
+          line = `${line}**`
         }
-
         yield line
       } else {
+        line = line.endsWith(path.sep) ? `${line}**` : line
         yield line
       }
     }