feat: add support for include/exclude all nested files when a directo…

…ry is specified and ends with a slash (#1873) Co-authored-by: GitHub Action <action@github.com>
tj-actions · Jan 18, 2024 · ae82ed4 · ae82ed4
1 parent cbd5907
commit ae82ed4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 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/utils.ts b/src/utils.ts
@@ -171,15 +171,16 @@ 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}**`
         }
+        yield line
       } else {
+        line = line.endsWith(path.sep) ? `${line}**` : line
         yield line
       }
     }
@@ -998,6 +999,7 @@ export const getFilePatterns = async ({
   if (inputs.files) {
     const filesPatterns = inputs.files
       .split(inputs.filesSeparator)
+      .map(p => (p.endsWith(path.sep) ? `${p}**` : p))
       .filter(Boolean)
 
     cleanedFilePatterns.push(...filesPatterns)
@@ -1029,8 +1031,9 @@ export const getFilePatterns = async ({
       .split(inputs.filesIgnoreSeparator)
       .filter(Boolean)
       .map(p => {
-        if (!p.startsWith('!')) {
-          p = `!${p}`
+        p = p.startsWith('!') ? p : `!${p}`
+        if (p.endsWith(path.sep)) {
+          p = `${p}**`
         }
         return p
       })