fix(workspace): find missed mismatches against workspace versions

Closes #66
JamieMason · Jun 3, 2022 · 25c1836 · 25c1836
1 parent 89a5a56
commit 25c1836
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 40 deletions.
diff --git a/src/bin-list-mismatches/list-mismatches.spec.ts b/src/bin-list-mismatches/list-mismatches.spec.ts
@@ -11,17 +11,19 @@ describe('listMismatches', () => {
 
   describe('when dependencies are installed with different versions', () => {
     describe('when the dependency is a package maintained in this workspace', () => {
-      const variants: [string, () => TestScenario][] = [
+      const variants: [string, () => TestScenario, string][] = [
         [
           'when using a typical workspace',
           scenarios.dependentDoesNotMatchWorkspaceVersion,
+          'packages/c/package.json',
         ],
         [
           'when using nested workspaces',
           scenarios.dependentDoesNotMatchNestedWorkspaceVersion,
+          'workspaces/b/packages/c/package.json',
         ],
       ];
-      variants.forEach(([context, getScenario]) => {
+      variants.forEach(([context, getScenario, originPath]) => {
         describe(context, () => {
           it('warns about the workspace version', () => {
             const scenario = getScenario();
@@ -33,6 +35,7 @@ describe('listMismatches', () => {
               ['- c 0.0.1'],
               ['  0.1.0 in dependencies of a'],
               ['  0.2.0 in devDependencies of b'],
+              [`  0.0.1 at ${originPath}`],
             ]);
             expect(scenario.disk.process.exit).toHaveBeenCalledWith(1);
           });

diff --git a/src/bin-list/list.spec.ts b/src/bin-list/list.spec.ts
@@ -26,7 +26,9 @@ describe('list', () => {
           it('warns about the workspace version', () => {
             const scenario = getScenario();
             list(getInput(scenario.disk, scenario.config), scenario.disk);
-            expect(scenario.log.mock.calls).toEqual([['✕ c 0.1.0, 0.2.0']]);
+            expect(scenario.log.mock.calls).toEqual([
+              ['✕ c 0.0.1, 0.1.0, 0.2.0'],
+            ]);
             expect(scenario.disk.process.exit).toHaveBeenCalledWith(1);
           });
         });

diff --git a/src/lib/get-input/get-config.ts b/src/lib/get-input/get-config.ts
@@ -37,19 +37,16 @@ export const getConfig = (
 
   const hasTypeOverride =
     isBoolean(program.dev) ||
-    isBoolean(program.workspace) ||
     isBoolean(program.overrides) ||
     isBoolean(program.peer) ||
     isBoolean(program.pnpmOverrides) ||
     isBoolean(program.prod) ||
-    isBoolean(program.resolutions);
+    isBoolean(program.resolutions) ||
+    isBoolean(program.workspace);
 
   const dev = hasTypeOverride
     ? Boolean(program.dev)
     : getOption<boolean>('dev', isBoolean);
-  const workspace = hasTypeOverride
-    ? Boolean(program.workspace)
-    : getOption<boolean>('workspace', isBoolean);
   const overrides = hasTypeOverride
     ? Boolean(program.overrides)
     : getOption<boolean>('overrides', isBoolean);
@@ -65,6 +62,9 @@ export const getConfig = (
   const resolutions = hasTypeOverride
     ? Boolean(program.resolutions)
     : getOption<boolean>('resolutions', isBoolean);
+  const workspace = hasTypeOverride
+    ? Boolean(program.workspace)
+    : getOption<boolean>('workspace', isBoolean);
 
   const dependencyTypes =
     dev ||
@@ -76,12 +76,13 @@ export const getConfig = (
     workspace
       ? DEPENDENCY_TYPES.filter(
           (type) =>
-            (type === 'dependencies' && prod) ||
             (type === 'devDependencies' && dev) ||
             (type === 'overrides' && overrides) ||
             (type === 'peerDependencies' && peer) ||
             (type === 'pnpmOverrides' && pnpmOverrides) ||
-            (type === 'resolutions' && resolutions),
+            (type === 'dependencies' && prod) ||
+            (type === 'resolutions' && resolutions) ||
+            (type === 'workspace' && workspace),
         )
       : DEPENDENCY_TYPES;
 

diff --git a/src/lib/get-input/get-input.spec.ts b/src/lib/get-input/get-input.spec.ts
@@ -14,44 +14,47 @@ describe('getInput', () => {
     const prod = 'dependencies';
     const resolutions = 'resolutions';
     const workspace = 'workspace';
+    const allTypes = [
+      dev,
+      overrides,
+      peer,
+      pnpmOverrides,
+      prod,
+      resolutions,
+      workspace,
+    ];
+    const ix = {
+      dev: 'devDependencies',
+      overrides: 'overrides',
+      peer: 'peerDependencies',
+      pnpmOverrides: 'pnpmOverrides',
+      prod: 'dependencies',
+      resolutions: 'resolutions',
+      workspace: 'workspace',
+    };
 
-    it('includes all except workspace (which is a not a property of package.json) if none are set', () => {
+    it('includes all if none are set', () => {
       expect(getInput(disk, {})).toHaveProperty(
         'dependencyTypes',
-        expect.arrayContaining([prod, dev, peer, overrides, resolutions]),
+        expect.toBeArrayIncludingOnly(allTypes),
       );
     });
     it('enables one if it is the only one set', () => {
-      expect(getInput(disk, { prod: true })).toHaveProperty('dependencyTypes', [
-        prod,
-      ]);
-      expect(getInput(disk, { dev: true })).toHaveProperty('dependencyTypes', [
-        dev,
-      ]);
-      expect(getInput(disk, { peer: true })).toHaveProperty('dependencyTypes', [
-        peer,
-      ]);
-      expect(getInput(disk, { workspace: true })).toHaveProperty(
-        'dependencyTypes',
-        [],
-      );
-      expect(getInput(disk, { overrides: true })).toHaveProperty(
-        'dependencyTypes',
-        [overrides],
-      );
-      expect(getInput(disk, { pnpmOverrides: true })).toHaveProperty(
-        'dependencyTypes',
-        [pnpmOverrides],
-      );
-      expect(getInput(disk, { resolutions: true })).toHaveProperty(
-        'dependencyTypes',
-        [resolutions],
-      );
+      expect.assertions(allTypes.length);
+      Object.entries(ix).forEach(([optionName, typeName]) => {
+        expect(getInput(disk, { [optionName]: true })).toHaveProperty(
+          'dependencyTypes',
+          expect.toBeArrayIncludingOnly([typeName]),
+        );
+      });
     });
     it('enables some if only those are set', () => {
       expect(
-        getInput(disk, { dev: true, workspace: true, prod: true }),
-      ).toHaveProperty('dependencyTypes', expect.arrayContaining([prod, dev]));
+        getInput(disk, { dev: true, prod: true, workspace: true }),
+      ).toHaveProperty(
+        'dependencyTypes',
+        expect.toBeArrayIncludingOnly([dev, prod, workspace]),
+      );
     });
   });
   describe('source', () => {

diff --git a/test/scenarios/index.ts b/test/scenarios/index.ts
@@ -70,7 +70,8 @@ export const scenarios = {
   /**
    * C is developed in this monorepo, its version is `0.0.1`
    * C's version is the single source of truth and should never be changed
-   * A and B depend on C incorrectly and should be fixed
+   * A depends on C incorrectly and should be fixed
+   * B depends on C incorrectly and should be fixed
    */
   dependentDoesNotMatchWorkspaceVersion() {
     return createScenario(