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

…ctory pattern ends with a slash (#1062) Co-authored-by: tj-actions[bot] <[email protected]> Co-authored-by: GitHub Action <[email protected]>
tj-actions · Jan 18, 2024 · d9dadb0 · d9dadb0
1 parent d9b22df
commit d9dadb0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 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,10 +81,7 @@ export async function run(): Promise<void> {
 
   const gitignorePath = path.join(workingDirectory, '.gitignore')
 
-  let filePatterns = files
-    .split(filesSeparator)
-    .filter(p => p !== '')
-    .join('\n')
+  let filePatterns = files.split(filesSeparator).filter(Boolean).join('\n')
 
   core.debug(`file patterns: ${filePatterns}`)
 
@@ -97,11 +94,14 @@ export async function run(): Promise<void> {
   if (excludedFiles !== '') {
     const excludedFilePatterns = excludedFiles
       .split(excludedFilesSeparator)
-      .filter(p => p !== '')
+      .filter(Boolean)
       .map(p => {
         if (!p.startsWith('!')) {
           p = `!${p}`
         }
+        if (p.endsWith(path.sep)) {
+          p = `${p}${path.sep}**`
+        }
         return p
       })
       .join('\n')

diff --git a/src/utils.ts b/src/utils.ts
@@ -165,14 +165,15 @@ async function* lineOfFileGenerator({
     input: fileStream,
     crlfDelay: Infinity
   })
-  for await (const line of rl) {
+  for await (let line of rl) {
     if (!line.startsWith('#') && line !== '') {
       if (excludedFiles) {
-        if (line.startsWith('!')) {
-          yield line
-        } else {
-          yield `!${line}`
+        line = line.startsWith('!') ? line : `!${line}`
+        if (line.endsWith(path.sep)) {
+          line = `${line}${path.sep}**`
         }
+
+        yield line
       } else {
         yield line
       }