fix(pack): handle excluding from included parent directory (#4317)

Author: merceyz

.yarn/versions/06e43b84.yml

@@ -0,0 +1,24 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-pack": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

packages/acceptance-tests/pkg-tests-specs/sources/commands/pack.test.js

@@ -142,6 +142,25 @@ describe(`Commands`, () => {
       }),
     );
 
+    test(
+      `it should support excluding patterns in included parent directory from the "files" field`,
+      makeTemporaryEnv({
+        files: [
+          `/lib`,
+          `!/lib/b.js`,
+        ],
+      }, async ({path, run, source}) => {
+        await fsUtils.writeFile(`${path}/lib/a.js`, `module.exports = 42;\n`);
+        await fsUtils.writeFile(`${path}/lib/b.js`, `module.exports = 42;\n`);
+
+        await run(`install`);
+
+        const {stdout} = await run(`pack`, `--dry-run`);
+        expect(stdout).toContain(`lib/a.js`);
+        expect(stdout).not.toContain(`lib/b.js`);
+      }),
+    );
+
     test(
       `it should support excluding patterns from the "files" field`,
       makeTemporaryEnv({

packages/plugin-pack/sources/packUtils.ts

@@ -334,27 +334,38 @@ function addIgnorePattern(target: Array<string>, pattern: string, {cwd}: {cwd: P
   target.push(normalizePattern(trimed, {cwd}));
 }
 
+enum MatchType {
+  None,
+  Match,
+  NegatedMatch,
+}
+
 function isIgnored(cwd: string, {globalList, ignoreLists}: {globalList: IgnoreList, ignoreLists: Array<IgnoreList> | null}) {
-  if (isMatch(cwd, globalList.accept))
-    return false;
-  if (isMatch(cwd, globalList.reject))
-    return true;
+  const globalAcceptMatchType = matchPatternType(cwd, globalList.accept);
+  if (globalAcceptMatchType !== MatchType.None)
+    return globalAcceptMatchType === MatchType.NegatedMatch;
+
+  const globalRejectMatchType = matchPatternType(cwd, globalList.reject);
+  if (globalRejectMatchType !== MatchType.None)
+    return globalRejectMatchType === MatchType.Match;
 
   if (ignoreLists !== null) {
     for (const ignoreList of ignoreLists) {
-      if (isMatch(cwd, ignoreList.accept))
-        return false;
+      const acceptMatchType = matchPatternType(cwd, ignoreList.accept);
+      if (acceptMatchType !== MatchType.None)
+        return acceptMatchType === MatchType.NegatedMatch;
 
-      if (isMatch(cwd, ignoreList.reject)) {
-        return true;
+      const rejectMatchType = matchPatternType(cwd, ignoreList.reject);
+      if (rejectMatchType !== MatchType.None) {
+        return rejectMatchType === MatchType.Match;
       }
     }
   }
 
   return false;
 }
 
-function isMatch(path: string, patterns: Array<string>) {
+function matchPatternType(path: string, patterns: Array<string>) {
   let inclusives = patterns;
   const exclusives = [];
 
@@ -372,11 +383,11 @@ function isMatch(path: string, patterns: Array<string>) {
   }
 
   if (isMatchBasename(path, exclusives))
-    return false;
+    return MatchType.NegatedMatch;
   if (isMatchBasename(path, inclusives))
-    return true;
+    return MatchType.Match;
 
-  return false;
+  return MatchType.None;
 }
 
 function isMatchBasename(path: string, patterns: Array<string>) {