syncpack 6.0.0 → 6.2.1

package/dist/bin-fix-mismatches/fix-mismatches.js

@@ -10,10 +10,8 @@ exports.__esModule = true;
 exports.fixMismatches = void 0;
 var chalk_1 = __importDefault(require("chalk"));
 var list_version_groups_1 = require("../bin-list/list-version-groups");
-var matches_filter_1 = require("../lib/matches-filter");
 var write_if_changed_1 = require("../lib/write-if-changed");
-var get_highest_version_1 = require("./get-highest-version");
-var get_workspace_version_1 = require("./get-workspace-version");
+var get_expected_version_1 = require("./get-expected-version");
 function fixMismatches(input, disk) {
     /**
      * Reverse the list so the default/ungrouped version group is rendered first
@@ -22,19 +20,14 @@ function fixMismatches(input, disk) {
      */
     input.instances.versionGroups.reverse().forEach(function (versionGroup, i) {
         var isVersionGroup = i > 0;
-        var filtered = versionGroup.instances.filter((0, matches_filter_1.matchesFilter)(input));
-        var groups = (0, list_version_groups_1.listVersionGroups)(filtered);
+        var groups = (0, list_version_groups_1.listVersionGroups)(versionGroup);
         if (isVersionGroup) {
             console.log((0, chalk_1["default"])(templateObject_1 || (templateObject_1 = __makeTemplateObject(["{dim = Version Group ", " ", "}"], ["{dim = Version Group ", " ", "}"])), i, '='.repeat(63)));
         }
         groups.forEach(function (_a) {
             var hasMismatches = _a.hasMismatches, instances = _a.instances, name = _a.name;
             if (hasMismatches) {
-                var nextVersion_1 = (0, get_workspace_version_1.getWorkspaceVersion)(name, input.wrappers) ||
-                    (0, get_highest_version_1.getHighestVersion)(instances.map(function (_a) {
-                        var version = _a.version;
-                        return version;
-                    }));
+                var nextVersion_1 = (0, get_expected_version_1.getExpectedVersion)(name, versionGroup, input);
                 instances.forEach(function (_a) {
                     var dependencyType = _a.dependencyType, version = _a.version, wrapper = _a.wrapper;
                     var root = wrapper.contents;

package/dist/bin-fix-mismatches/{get-highest-version.d.ts → get-expected-version/get-highest-version.d.ts}

@@ -1 +1 @@
-export declare function getHighestVersion(versions: string[]): string | null;
+export declare function getHighestVersion(versions: string[]): string;

package/dist/bin-fix-mismatches/{get-highest-version.js → get-expected-version/get-highest-version.js}

@@ -2,13 +2,28 @@
 exports.__esModule = true;
 exports.getHighestVersion = void 0;
 var semver_1 = require("semver");
-var constants_1 = require("../constants");
-var is_semver_1 = require("../lib/is-semver");
-function getRange(version) {
-    return version.slice(0, version.search(/[0-9]/));
+var constants_1 = require("../../constants");
+var is_semver_1 = require("../../lib/is-semver");
+function getHighestVersion(versions) {
+    return versions.reduce(function (rawHighest, raw) {
+        var version = (0, semver_1.valid)((0, semver_1.coerce)(raw)) || '';
+        var highest = (0, semver_1.valid)((0, semver_1.coerce)(rawHighest)) || '';
+        if (raw === '*' || rawHighest === '*')
+            return '*';
+        if (!(0, is_semver_1.isSemver)(raw) || version === '')
+            return rawHighest;
+        if (highest === '')
+            return raw;
+        if ((0, semver_1.gt)(version, highest))
+            return raw;
+        if ((0, semver_1.eq)(version, highest) && getRangeScore(raw) > getRangeScore(rawHighest))
+            return raw;
+        return rawHighest;
+    }, '');
 }
+exports.getHighestVersion = getHighestVersion;
 function getRangeScore(version) {
-    if (version === null)
+    if (version === '')
         return 0;
     if (version === constants_1.RANGE_ANY)
         return 8;
@@ -31,21 +46,6 @@ function getRangeScore(version) {
         return 0;
     return 0;
 }
-function getHighestVersion(versions) {
-    return versions.reduce(function (rawHighest, raw) {
-        var version = (0, semver_1.valid)((0, semver_1.coerce)(raw));
-        var highest = (0, semver_1.valid)((0, semver_1.coerce)(rawHighest));
-        if (raw === '*' || rawHighest === '*')
-            return '*';
-        if (!(0, is_semver_1.isSemver)(raw) || version === null)
-            return rawHighest;
-        if (highest === null)
-            return raw;
-        if ((0, semver_1.gt)(version, highest))
-            return raw;
-        if ((0, semver_1.eq)(version, highest) && getRangeScore(raw) > getRangeScore(rawHighest))
-            return raw;
-        return rawHighest;
-    }, null);
+function getRange(version) {
+    return version.slice(0, version.search(/[0-9]/));
 }
-exports.getHighestVersion = getHighestVersion;

package/dist/bin-fix-mismatches/get-expected-version/get-pinned-version.d.ts

@@ -0,0 +1,2 @@
+import type { IndexedVersionGroup } from '../../lib/get-input/get-instances';
+export declare function getPinnedVersion(versionGroup: Pick<IndexedVersionGroup, 'pinVersion'>): string;

package/dist/bin-fix-mismatches/get-expected-version/get-pinned-version.js

@@ -0,0 +1,7 @@
+"use strict";
+exports.__esModule = true;
+exports.getPinnedVersion = void 0;
+function getPinnedVersion(versionGroup) {
+    return versionGroup.pinVersion || '';
+}
+exports.getPinnedVersion = getPinnedVersion;

package/dist/bin-fix-mismatches/{get-workspace-version.d.ts → get-expected-version/get-workspace-version.d.ts}

@@ -1,4 +1,4 @@
-import type { SourceWrapper } from '../lib/get-input/get-wrappers';
+import type { SourceWrapper } from '../../lib/get-input/get-wrappers';
 /**
  * If the dependency `name` is a package developed locally in this monorepo, we
  * should use its version as the source of truth.

package/dist/bin-fix-mismatches/get-expected-version/index.d.ts

@@ -0,0 +1,3 @@
+import type { ProgramInput } from '../../lib/get-input';
+import type { IndexedVersionGroup } from '../../lib/get-input/get-instances';
+export declare function getExpectedVersion(name: string, versionGroup: Pick<IndexedVersionGroup, 'instances' | 'pinVersion'>, input: Pick<ProgramInput, 'wrappers'>): string;

package/dist/bin-fix-mismatches/get-expected-version/index.js

@@ -0,0 +1,17 @@
+"use strict";
+exports.__esModule = true;
+exports.getExpectedVersion = void 0;
+var get_highest_version_1 = require("./get-highest-version");
+var get_pinned_version_1 = require("./get-pinned-version");
+var get_workspace_version_1 = require("./get-workspace-version");
+function getExpectedVersion(name, versionGroup, input) {
+    return ((0, get_pinned_version_1.getPinnedVersion)(versionGroup) ||
+        (0, get_workspace_version_1.getWorkspaceVersion)(name, input.wrappers) ||
+        (0, get_highest_version_1.getHighestVersion)(versionGroup.instances
+            .filter(function (instance) { return instance.name === name; })
+            .map(function (_a) {
+            var version = _a.version;
+            return version;
+        })));
+}
+exports.getExpectedVersion = getExpectedVersion;

package/dist/bin-lint-semver-ranges/lint-semver-ranges.js

@@ -3,24 +3,12 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
     if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
     return cooked;
 };
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
 exports.lintSemverRanges = void 0;
 var chalk_1 = __importDefault(require("chalk"));
-var matches_filter_1 = require("../lib/matches-filter");
 var set_semver_range_1 = require("../lib/set-semver-range");
 var list_semver_group_mismatches_1 = require("./list-semver-group-mismatches");
 function lintSemverRanges(input) {
@@ -32,7 +20,7 @@ function lintSemverRanges(input) {
      */
     input.instances.semverGroups.reverse().forEach(function (semverGroup, i) {
         var isSemverGroup = i > 0;
-        var mismatches = (0, list_semver_group_mismatches_1.listSemverGroupMismatches)(__assign(__assign({}, semverGroup), { instances: semverGroup.instances.filter((0, matches_filter_1.matchesFilter)(input)) }));
+        var mismatches = (0, list_semver_group_mismatches_1.listSemverGroupMismatches)(semverGroup);
         if (isSemverGroup) {
             console.log((0, chalk_1["default"])(templateObject_1 || (templateObject_1 = __makeTemplateObject(["{dim = Semver Group ", " ", "}"], ["{dim = Semver Group ", " ", "}"])), i, '='.repeat(63)));
         }

package/dist/bin-list/list-version-groups.d.ts

@@ -1,3 +1,9 @@
-import type { Instance } from '../lib/get-input/get-instances';
-import type { ListItem } from './list';
-export declare function listVersionGroups(instances: Instance[]): ListItem[];
+import type { IndexedVersionGroup, Instance } from '../lib/get-input/get-instances';
+interface ListItem {
+    hasMismatches: boolean;
+    instances: Instance[];
+    name: string;
+    uniques: string[];
+}
+export declare function listVersionGroups(versionGroup: IndexedVersionGroup): ListItem[];
+export {};

package/dist/bin-list/list-version-groups.js

@@ -17,18 +17,24 @@ var __read = (this && this.__read) || function (o, n) {
 };
 exports.__esModule = true;
 exports.listVersionGroups = void 0;
+var expect_more_1 = require("expect-more");
 var group_by_1 = require("../lib/group-by");
 var sort_by_name_1 = require("../lib/sort-by-name");
-function listVersionGroups(instances) {
-    var instancesByName = (0, group_by_1.groupBy)('name', instances.sort(sort_by_name_1.sortByName));
+function listVersionGroups(versionGroup) {
+    var instancesByName = (0, group_by_1.groupBy)('name', versionGroup.instances.sort(sort_by_name_1.sortByName));
     return Object.entries(instancesByName).map(function (_a) {
         var _b = __read(_a, 2), name = _b[0], instances = _b[1];
+        var pinnedVersion = versionGroup.pinVersion;
+        var hasPinnedVersion = (0, expect_more_1.isNonEmptyString)(pinnedVersion);
         var versions = instances.map(function (_a) {
             var version = _a.version;
             return version;
         });
         var uniques = Array.from(new Set(versions));
-        var hasMismatches = uniques.length > 1;
+        var hasMismatches = versions.some(function (version, i) {
+            return (hasPinnedVersion && version !== pinnedVersion) ||
+                (i > 0 && version !== versions[i - 1]);
+        });
         return {
             hasMismatches: hasMismatches,
             instances: instances,

package/dist/bin-list/list.d.ts

@@ -1,9 +1,2 @@
 import type { ProgramInput } from '../lib/get-input';
-import type { Instance } from '../lib/get-input/get-instances';
-export interface ListItem {
-    hasMismatches: boolean;
-    instances: Instance[];
-    name: string;
-    uniques: string[];
-}
 export declare function list(input: ProgramInput): void;

package/dist/bin-list/list.js

@@ -9,7 +9,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.list = void 0;
 var chalk_1 = __importDefault(require("chalk"));
-var matches_filter_1 = require("../lib/matches-filter");
 var list_version_groups_1 = require("./list-version-groups");
 function list(input) {
     var isInvalid = false;
@@ -20,18 +19,17 @@ function list(input) {
      */
     input.instances.versionGroups.reverse().forEach(function (versionGroup, i) {
         var isVersionGroup = i > 0;
-        var filtered = versionGroup.instances.filter((0, matches_filter_1.matchesFilter)(input));
-        var ungrouped = (0, list_version_groups_1.listVersionGroups)(filtered);
+        var groups = (0, list_version_groups_1.listVersionGroups)(versionGroup);
         if (isVersionGroup) {
             console.log((0, chalk_1["default"])(templateObject_1 || (templateObject_1 = __makeTemplateObject(["{dim = Version Group ", " ", "}"], ["{dim = Version Group ", " ", "}"])), i, '='.repeat(63)));
         }
-        ungrouped.forEach(function (_a) {
+        groups.forEach(function (_a) {
             var hasMismatches = _a.hasMismatches, name = _a.name, uniques = _a.uniques;
             var versionList = uniques.sort().join(', ');
             console.log(hasMismatches
                 ? (0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{red \u2715 ", "} {dim.red ", "}"], ["{red \u2715 ", "} {dim.red ", "}"])), name, versionList) : (0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{dim -} {white ", "} {dim ", "}"], ["{dim -} {white ", "} {dim ", "}"])), name, versionList));
         });
-        if (ungrouped.some(function (_a) {
+        if (groups.some(function (_a) {
             var hasMismatches = _a.hasMismatches;
             return hasMismatches;
         })) {

package/dist/bin-list-mismatches/list-mismatches.js

@@ -9,8 +9,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.listMismatches = void 0;
 var chalk_1 = __importDefault(require("chalk"));
+var get_expected_version_1 = require("../bin-fix-mismatches/get-expected-version");
 var list_version_groups_1 = require("../bin-list/list-version-groups");
-var matches_filter_1 = require("../lib/matches-filter");
 function listMismatches(input) {
     var isInvalid = false;
     /**
@@ -20,20 +20,24 @@ function listMismatches(input) {
      */
     input.instances.versionGroups.reverse().forEach(function (versionGroup, i) {
         var isVersionGroup = i > 0;
-        var filtered = versionGroup.instances.filter((0, matches_filter_1.matchesFilter)(input));
-        var ungrouped = (0, list_version_groups_1.listVersionGroups)(filtered);
-        if (isVersionGroup) {
-            console.log((0, chalk_1["default"])(templateObject_1 || (templateObject_1 = __makeTemplateObject(["{dim = Version Group ", " ", "}"], ["{dim = Version Group ", " ", "}"])), i, '='.repeat(63)));
-        }
-        ungrouped.forEach(function (_a) {
-            var hasMismatches = _a.hasMismatches, instances = _a.instances, name = _a.name;
-            if (hasMismatches) {
-                console.log((0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{red \u2715 ", "}"], ["{red \u2715 ", "}"])), name));
-                instances.forEach(function (_a) {
-                    var dependencyType = _a.dependencyType, version = _a.version, wrapper = _a.wrapper;
-                    console.log((0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{dim -} ", " {dim in ", " of} ", ""], ["{dim -} ", " {dim in ", " of} ", ""])), version, dependencyType, wrapper.contents.name));
-                });
+        var groups = (0, list_version_groups_1.listVersionGroups)(versionGroup).filter(function (_a) {
+            var hasMismatches = _a.hasMismatches;
+            return hasMismatches;
+        });
+        if (groups.length > 0) {
+            isInvalid = true;
+            if (isVersionGroup) {
+                console.log((0, chalk_1["default"])(templateObject_1 || (templateObject_1 = __makeTemplateObject(["{dim = Version Group ", " ", "}"], ["{dim = Version Group ", " ", "}"])), i, '='.repeat(63)));
             }
+        }
+        groups.forEach(function (_a) {
+            var instances = _a.instances, name = _a.name;
+            var expectedVersion = (0, get_expected_version_1.getExpectedVersion)(name, versionGroup, input);
+            console.log((0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{dim -} ", " {green.dim ", "}"], ["{dim -} ", " {green.dim ", "}"])), name, expectedVersion));
+            instances.forEach(function (_a) {
+                var dependencyType = _a.dependencyType, version = _a.version, wrapper = _a.wrapper;
+                console.log((0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{red   ", " {dim in ", " of ", "}}"], ["{red   ", " {dim in ", " of ", "}}"])), version, dependencyType, wrapper.contents.name));
+            });
         });
     });
     if (isInvalid) {

package/dist/bin-set-semver-ranges/set-semver-ranges.js

@@ -1,24 +1,12 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 exports.__esModule = true;
 exports.setSemverRanges = void 0;
 var list_semver_group_mismatches_1 = require("../bin-lint-semver-ranges/list-semver-group-mismatches");
-var matches_filter_1 = require("../lib/matches-filter");
 var set_semver_range_1 = require("../lib/set-semver-range");
 var write_if_changed_1 = require("../lib/write-if-changed");
 var setSemverRanges = function (input, disk) {
     input.instances.semverGroups.reverse().forEach(function (semverGroup) {
-        var mismatches = (0, list_semver_group_mismatches_1.listSemverGroupMismatches)(__assign(__assign({}, semverGroup), { instances: semverGroup.instances.filter((0, matches_filter_1.matchesFilter)(input)) }));
+        var mismatches = (0, list_semver_group_mismatches_1.listSemverGroupMismatches)(semverGroup);
         mismatches.forEach(function (_a) {
             var dependencyType = _a.dependencyType, name = _a.name, version = _a.version, wrapper = _a.wrapper;
             var root = wrapper.contents;

package/dist/constants.d.ts

@@ -15,6 +15,10 @@ export interface SemverGroup {
      * the semver range which dependencies in this group should use
      */
     range: ValidRange;
+    /**
+     * optionally only apply this group to dependencies of the provided types
+     */
+    dependencyTypes?: DependencyType[];
 }
 export interface VersionGroup {
     /**
@@ -26,6 +30,14 @@ export interface VersionGroup {
      * the names of the dependencies (eg. "lodash") which belong to this group
      */
     dependencies: string[];
+    /**
+     * optionally force all dependencies in this group to have this version
+     */
+    pinVersion?: string;
+    /**
+     * optionally only apply this group to dependencies of the provided types
+     */
+    dependencyTypes?: DependencyType[];
 }
 export declare type SyncpackConfig = Readonly<{
     /**

package/dist/lib/disk.js

@@ -9,7 +9,7 @@ var read_yaml_file_1 = require("read-yaml-file");
 var constants_1 = require("../constants");
 exports.disk = {
     globSync: function (pattern) {
-        return (0, glob_1.sync)(pattern, { absolute: true, cwd: constants_1.CWD });
+        return (0, glob_1.sync)(pattern, { ignore: '**/node_modules/**', absolute: true, cwd: constants_1.CWD });
     },
     readConfigFileSync: function () {
         var rcSearch = (0, cosmiconfig_1.cosmiconfigSync)('syncpack').search();

package/dist/lib/get-input/get-instances.js

@@ -68,12 +68,14 @@ function getInstances(options, wrappers) {
                             var _g = __read(pkgs_1_1.value, 2), name = _g[0], version = _g[1];
                             if (!(0, expect_more_1.isNonEmptyString)(name))
                                 continue;
+                            if (name.search(new RegExp(options.filter)) === -1)
+                                continue;
                             if (!(0, expect_more_1.isNonEmptyString)(version))
                                 continue;
                             var instance = { dependencyType: dependencyType, name: name, version: version, wrapper: wrapper };
                             allInstances.all.push(instance);
-                            groupInstancesBy('semverGroups', pkgName, instance);
-                            groupInstancesBy('versionGroups', pkgName, instance);
+                            groupInstancesBy('semverGroups', dependencyType, pkgName, instance);
+                            groupInstancesBy('versionGroups', dependencyType, pkgName, instance);
                         }
                     }
                     catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -107,14 +109,14 @@ function getInstances(options, wrappers) {
         var instancesByName = {};
         return __assign(__assign({}, group), { instances: instances, instancesByName: instancesByName });
     }
-    function groupInstancesBy(groupName, pkgName, instance) {
+    function groupInstancesBy(groupName, dependencyType, pkgName, instance) {
         var name = instance.name;
         var groups = allInstances[groupName];
         if (!groups.length)
             return;
         for (var i in groups) {
             var group = groups[i];
-            if (matchesGroup(pkgName, name, group)) {
+            if (matchesGroup(dependencyType, pkgName, name, group)) {
                 if (!group.instancesByName[name]) {
                     group.instancesByName[name] = [];
                 }
@@ -125,8 +127,10 @@ function getInstances(options, wrappers) {
         }
         throw new Error("".concat(name, " in ").concat(pkgName, " did not match any ").concat(groupName));
     }
-    function matchesGroup(pkgName, dependencyName, group) {
-        return (group.packages.some(function (pattern) { return (0, minimatch_1["default"])(pkgName, pattern); }) &&
+    function matchesGroup(dependencyType, pkgName, dependencyName, group) {
+        return ((!(0, expect_more_1.isNonEmptyArray)(group.dependencyTypes) ||
+            group.dependencyTypes.includes(dependencyType)) &&
+            group.packages.some(function (pattern) { return (0, minimatch_1["default"])(pkgName, pattern); }) &&
             group.dependencies.some(function (pattern) { return (0, minimatch_1["default"])(dependencyName, pattern); }));
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "syncpack",
   "description": "Manage multiple package.json files, such as in Lerna Monorepos and Yarn/Pnpm Workspaces",
-  "version": "6.0.0",
+  "version": "6.2.1",
   "author": "Jamie Mason <jamie@foldleft.io> (https://github.com/JamieMason)",
   "bin": {
     "syncpack": "dist/bin.js",
@@ -20,7 +20,8 @@
     "Jamie Mason (https://github.com/JamieMason)",
     "Luis Vieira (https://github.com/luisvieiragmr)",
     "Marais Rossouw (https://github.com/maraisr)",
-    "Matt Sprague (https://github.com/uforic)"
+    "Matt Sprague (https://github.com/uforic)",
+    "Tom Fletcher (https://github.com/tom-fletcher)"
   ],
   "dependencies": {
     "chalk": "4.1.2",

package/dist/lib/matches-filter.d.ts

@@ -1,3 +0,0 @@
-import type { ProgramInput } from '../lib/get-input';
-import type { Instance } from '../lib/get-input/get-instances';
-export declare function matchesFilter(input: ProgramInput): ({ name }: Instance) => boolean;

package/dist/lib/matches-filter.js

@@ -1,10 +0,0 @@
-"use strict";
-exports.__esModule = true;
-exports.matchesFilter = void 0;
-function matchesFilter(input) {
-    return function hasNameMatchingFilter(_a) {
-        var name = _a.name;
-        return name.search(new RegExp(input.filter)) !== -1;
-    };
-}
-exports.matchesFilter = matchesFilter;