Merge pull request #342 from tj-actions/fix/bug-with-excludes

tj-actions · Aug 22, 2022 · f3aadad · f3aadad
2 parents 24813da + 11fbde6
commit f3aadad
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 24 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
           yarn install
 
       - name: Run eslint on changed files
-        uses: tj-actions/eslint-changed-files@v13
+        uses: tj-actions/eslint-changed-files@v13.2
         with:
           token: ${{ secrets.PAT_TOKEN }}
           config_path: ".eslintrc.json"

diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
@@ -1,11 +1,7 @@
-import * as core from '@actions/core'
-import * as path from 'path'
-import {promises as fs} from 'fs'
+import * as core from "@actions/core";
+import { run } from "../src/main";
 
-import {normalizeSeparators, tempfile} from '../src/utils'
-import {run} from '../src/main'
-
-const {GITHUB_WORKSPACE} = process.env
+import { normalizeSeparators, tempfile } from "../src/utils";
 
 const defaultEnv = {
   'INPUT_FILES-SEPARATOR': '\n',
@@ -59,6 +55,32 @@ test('returns the paths of the filtered files (input files, input source files)'
   expect(core.setOutput).toHaveBeenNthCalledWith(1, 'paths', EXPECTED_FILENAMES)
 })
 
+test('returns the paths of the all other files (input files)', async () => {
+  mockedEnv({
+    ...defaultEnv,
+    INPUT_FILES: '!__tests__\n!*.md\n!dist\n!jest\n!.*\n!src\n!lib',
+  })
+
+  const EXPECTED_FILENAMES = [
+    'LICENSE',
+    'action.yml',
+    'jest.config.js',
+    'package.json',
+    'renovate.json',
+    'tsconfig.json',
+    'yarn.lock'
+  ]
+    .map(fName => normalizeSeparators(fName))
+    .join(process.env.INPUT_SEPARATOR)
+
+  // @ts-ignore
+  core.setOutput = jest.fn()
+
+  await run()
+
+  expect(core.setOutput).toHaveBeenNthCalledWith(1, 'paths', EXPECTED_FILENAMES)
+})
+
 test('returns the paths of the filtered files (input files)', async () => {
   mockedEnv({
     ...defaultEnv,

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
@@ -71,7 +71,6 @@ export async function run(): Promise<void> {
   let filePatterns = files
     .split(filesSeparator)
     .filter(p => p !== '')
-    .map(p => path.join(workingDirectory, p))
     .join('\n')
 
   core.debug(`file patterns: ${filePatterns}`)
@@ -86,7 +85,6 @@ export async function run(): Promise<void> {
         }
         return p
       })
-      .map(p => `!${path.join(workingDirectory, p.replace(/^!/, ''))}`)
       .join('\n')
 
     core.debug(`excluded file patterns: ${excludedFilePatterns}`)
@@ -137,9 +135,20 @@ export async function run(): Promise<void> {
     }
   }
 
-  filePatterns += `\n${DEFAULT_EXCLUDED_FILES.map(
-    p => `!${path.join(workingDirectory, p.replace(/^!/, ''))}`
-  ).join('\n')}`
+  filePatterns += `\n${DEFAULT_EXCLUDED_FILES.join('\n')}`
+
+  filePatterns = [...new Set(filePatterns.split('\n').filter(p => p !== ''))]
+    .map(p => {
+      if (p.startsWith('!')) {
+        return `!${workingDirectory}${path.sep}${p.substring(1)}`
+      }
+      return path.join(workingDirectory, p)
+    })
+    .join('\n')
+
+  if (filePatterns.split('\n').filter(p => !p.startsWith('!')).length === 0) {
+    filePatterns = `**\n${filePatterns}`
+  }
 
   const globOptions = {followSymbolicLinks}
   const globber = await glob.create(filePatterns, globOptions)

diff --git a/src/utils.ts b/src/utils.ts
@@ -173,9 +173,5 @@ export function tempfile(extension = ''): string {
 }
 
 export function escapeString(value: string): string {
-  if (typeof value !== 'string') {
-    throw new TypeError(`Expected a string instead got: ${typeof value}`)
-  }
-
   return value.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
 }