Bugfix 3306: Check top level patterns during integrity check

__tests__/commands/check.js

@@ -340,3 +340,13 @@ test.concurrent('should ignore bundled dependencies', async (): Promise<void> =>
     },
   );
 });
+
+test.concurrent('--integrity should throw an error if top level patterns do not match', async (): Promise<void> => {
+  let integrityError = false;
+  try {
+    await runCheck([], {integrity: true}, 'integrity-top-level-patters');
+  } catch (err) {
+    integrityError = true;
+  }
+  expect(integrityError).toEqual(true);
+});

__tests__/commands/install/integration.js

@@ -892,3 +892,15 @@ test.skip('unbound transitive dependencies should not conflict with top level de
     );
   });
 });
+
+test.concurrent('top level patterns should match after install', (): Promise<void> => {
+  return runInstall({}, 'top-level-pattern-check', async (config, reporter) => {
+    let integrityError = false;
+    try {
+      await check(config, reporter, {integrity: true}, []);
+    } catch (err) {
+      integrityError = true;
+    }
+    expect(integrityError).toBe(false);
+  });
+});

__tests__/fixtures/check/integrity-top-level-patterns/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "left-pad": "^1.1.3"
+  }
+}

__tests__/fixtures/check/integrity-top-level-patterns/yarn.lock

@@ -0,0 +1,11 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+foo@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/foo/-/foo-1.0.0.tgz#943e0ec03df00ebeb6273a5b94b916ba54b47581"
+
+left-pad@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a"

__tests__/fixtures/install/top-level-pattern-check/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "left-pad": "^1.1.3"
+  }
+}

__tests__/fixtures/install/top-level-pattern-check/yarn.lock

@@ -0,0 +1,11 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+foo@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/foo/-/foo-1.0.0.tgz#943e0ec03df00ebeb6273a5b94b916ba54b47581"
+
+left-pad@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a"

src/cli/commands/install.js

@@ -682,12 +682,21 @@ export class Install {
     }
 
     const lockFileHasAllPatterns = patterns.every(p => this.lockfile.getLocked(p));
+    const lockfilePatternsMatch = Object.keys(this.lockfile.cache || {}).every(p => {
+      return lockfileBasedOnResolver[p];
+    });
     const resolverPatternsAreSameAsInLockfile = Object.keys(lockfileBasedOnResolver).every(pattern => {
       const manifest = this.lockfile.getLocked(pattern);
       return manifest && manifest.resolved === lockfileBasedOnResolver[pattern].resolved;
     });
     // remove command is followed by install with force, lockfile will be rewritten in any case then
-    if (lockFileHasAllPatterns && resolverPatternsAreSameAsInLockfile && patterns.length && !this.flags.force) {
+    if (
+      lockFileHasAllPatterns &&
+      lockfilePatternsMatch &&
+      resolverPatternsAreSameAsInLockfile &&
+      patterns.length &&
+      !this.flags.force
+    ) {
       return;
     }
 

src/integrity-checker.js

@@ -19,6 +19,7 @@ export const integrityErrors = {
   LOCKFILE_DONT_MATCH: 'integrityLockfilesDontMatch',
   FLAGS_DONT_MATCH: 'integrityFlagsDontMatch',
   LINKED_MODULES_DONT_MATCH: 'integrityCheckLinkedModulesDontMatch',
+  PATTERNS_DONT_MATCH: 'integrityPatternsDontMatch',
 };
 
 type IntegrityError = $Keys<typeof integrityErrors>;
@@ -200,6 +201,7 @@ export default class InstallationIntegrityChecker {
     expected: ?IntegrityFile,
     checkFiles: boolean,
     locationFolder: string,
+    workspaceLayout: ?WorkspaceLayout,
   ): Promise<'OK' | IntegrityError> {
     if (!expected) {
       return 'EXPECTED_IS_NOT_A_JSON';
@@ -210,6 +212,12 @@ export default class InstallationIntegrityChecker {
     if (!compareSortedArrays(actual.flags, expected.flags)) {
       return 'FLAGS_DONT_MATCH';
     }
+    const actualPatterns = actual.topLevelPatterns.filter(p => {
+      return !workspaceLayout || !workspaceLayout.getManifestByPattern(p);
+    });
+    if (!compareSortedArrays(actualPatterns, expected.topLevelPatterns || [])) {
+      return 'PATTERNS_DONT_MATCH';
+    }
     for (const key of Object.keys(actual.lockfileEntries)) {
       if (actual.lockfileEntries[key] !== expected.lockfileEntries[key]) {
         return 'LOCKFILE_DONT_MATCH';
@@ -266,7 +274,13 @@ export default class InstallationIntegrityChecker {
       await this._getModuleLocation(),
     );
     const expected = await this._getIntegrityFile(loc.locationPath);
-    const integrityMatches = await this._compareIntegrityFiles(actual, expected, flags.checkFiles, loc.locationFolder);
+    const integrityMatches = await this._compareIntegrityFiles(
+      actual,
+      expected,
+      flags.checkFiles,
+      loc.locationFolder,
+      workspaceLayout,
+    );
 
     return {
       integrityFileMissing: false,

src/reporters/lang/en.js

@@ -305,6 +305,7 @@ const messages = {
   integrityFlagsDontMatch: "Integrity check: Flags don't match",
   integrityLockfilesDontMatch: "Integrity check: Lock files don't match",
   integrityFailedFilesMissing: 'Integrity check: Files are missing',
+  integrityPatternsDontMatch: "Integrity check: Top level patterns don't match",
   packageNotInstalled: '$0 not installed',
   optionalDepNotInstalled: 'Optional dependency $0 not installed',
   packageWrongVersion: '$0 is wrong version: expected $1, got $2',