syncpack 8.0.0 → 8.2.5

package/README.md

@@ -16,7 +16,10 @@ npm install --global syncpack
 
 ## 🤖 GitHub Action
 
-As of May 2022 there is now a [Syncpack GitHub Action](https://github.com/marketplace/actions/syncpack-synchronise-monorepo-dependency-versions). It is new and less stable than syncpack itself, but please give it a try and [give your feedback](https://github.com/JamieMason/syncpack-github-action/issues/new).
+As of May 2022 there is now a
+[Syncpack GitHub Action](https://github.com/marketplace/actions/syncpack-synchronise-monorepo-dependency-versions).
+It is new and less stable than syncpack itself, but please give it a try and
+[give your feedback](https://github.com/JamieMason/syncpack-github-action/issues/new).
 
 ## 📝 Commands
 
@@ -457,6 +460,49 @@ to apply to an entire package:
 
 See [`semverGroups`](#semverGroups) for more examples, they work the same way.
 
+#### `versionGroup.dependencies`
+
+Required. An array of minimatch glob patterns which should match the key of
+dependencies defined in your package.json files.
+
+| Pattern                  | Matches                                  |
+| ------------------------ | ---------------------------------------- |
+| `["**"]`                 | Any dependency                           |
+| `["@aws-sdk/**"]`        | Any dependency with the scope `@aws-sdk` |
+| `["react", "react-dom"]` | Specific dependencies by name            |
+
+#### `versionGroup.packages`
+
+Required. An array of minimatch glob patterns which should match the `name`
+property of packages developed within your monorepo.
+
+| Pattern                      | Matches                               |
+| ---------------------------- | ------------------------------------- |
+| `["**"]`                     | Any package                           |
+| `["@my-repo/**"]`            | Any package with the scope `@my-repo` |
+| `["my-server", "my-client"]` | Specific packages by name             |
+
+#### `versionGroup.dependencyTypes`
+
+Optional. If set, will result in only the dependency types included in that
+array being considered a match for this version group.
+
+In this example we define that all dependencies within `peerDependencies` in the
+repo must match, regardless of what versions of the same dependencies might be
+used in `dependencies` or `devDependencies`.
+
+```json
+{
+  "versionGroups": [
+    {
+      "dependencies": ["**"],
+      "dependencyTypes": ["peerDependencies"],
+      "packages": ["**"]
+    }
+  ]
+}
+```
+
 #### `versionGroup.isBanned`
 
 Remove dependencies which you've decided should never be allowed.
@@ -465,8 +511,8 @@ Remove dependencies which you've decided should never be allowed.
 {
   "versionGroups": [
     {
-      "isBanned": true,
       "dependencies": ["never-gonna"],
+      "isBanned": true,
       "packages": ["**"]
     }
   ]
@@ -482,9 +528,9 @@ you've defined.
 {
   "versionGroups": [
     {
-      "pinVersion": "3.55.0",
       "dependencies": ["@aws-sdk/**"],
-      "packages": ["**"]
+      "packages": ["**"],
+      "pinVersion": "3.55.0"
     }
   ]
 }
@@ -544,6 +590,56 @@ semver range of `~`, regardless of what the rest of the monorepo uses:
 }
 ```
 
+3: Production dependencies should have fixed version numbers, but development
+and peer dependencies can be broader.
+
+```json
+{
+  "semverGroups": [
+    {
+      "range": "",
+      "dependencyTypes": [
+        "prod",
+        "resolutions",
+        "overrides",
+        "pnpmOverrides",
+        "workspace"
+      ],
+      "dependencies": ["**"],
+      "packages": ["**"]
+    },
+    {
+      "range": "~",
+      "dependencyTypes": ["dev"],
+      "dependencies": ["**"],
+      "packages": ["**"]
+    },
+    {
+      "range": "^",
+      "dependencyTypes": ["peer"],
+      "dependencies": ["**"],
+      "packages": ["**"]
+    }
+  ]
+}
+```
+
+#### `semverGroup.range`
+
+Which of the [Supported Ranges](#supported-ranges) this group should use.
+
+#### `semverGroup.dependencies`
+
+Works the same as [`semverGroup.dependencies`](#semvergroupdependencies).
+
+#### `semverGroup.packages`
+
+Works the same as [`semverGroup.packages`](#semvergrouppackages).
+
+#### `semverGroup.dependencyTypes`
+
+Works the same as [`semverGroup.dependencyTypes`](#semvergroupdependencytypes).
+
 ## 🕵🏾‍♀️ Resolving Packages
 
 package.json files are resolved in this order of precendence:

package/dist/bin-format/format.js

@@ -6,20 +6,21 @@ var write_if_changed_1 = require("../lib/write-if-changed");
 function format(input, disk) {
     var indent = input.indent, sortAz = input.sortAz, sortFirst = input.sortFirst, wrappers = input.wrappers;
     wrappers.forEach(function (_a) {
-        var _b, _c;
+        var _b, _c, _d;
         var contents = _a.contents, filePath = _a.filePath, json = _a.json;
         var sortedKeys = Object.keys(contents).sort();
         var keys = new Set(sortFirst.concat(sortedKeys));
         var optionalChaining = contents;
         var bugsUrl = (_b = optionalChaining === null || optionalChaining === void 0 ? void 0 : optionalChaining.bugs) === null || _b === void 0 ? void 0 : _b.url;
-        var repositoryUrl = (_c = optionalChaining === null || optionalChaining === void 0 ? void 0 : optionalChaining.repository) === null || _c === void 0 ? void 0 : _c.url;
+        var repoUrl = (_c = optionalChaining === null || optionalChaining === void 0 ? void 0 : optionalChaining.repository) === null || _c === void 0 ? void 0 : _c.url;
+        var repoDir = (_d = optionalChaining === null || optionalChaining === void 0 ? void 0 : optionalChaining.repository) === null || _d === void 0 ? void 0 : _d.directory;
         if (bugsUrl) {
             contents.bugs = bugsUrl;
         }
-        if (repositoryUrl) {
-            contents.repository = repositoryUrl.includes('github.com')
-                ? repositoryUrl.replace(/^.+github\.com\//, '')
-                : repositoryUrl;
+        if ((0, expect_more_1.isNonEmptyString)(repoUrl) && !(0, expect_more_1.isNonEmptyString)(repoDir)) {
+            contents.repository = repoUrl.includes('github.com')
+                ? repoUrl.replace(/^.+github\.com\//, '')
+                : repoUrl;
         }
         sortAz.forEach(function (key) { return sortAlphabetically(contents[key]); });
         sortObject(keys, contents);

package/dist/bin-list/list.js

@@ -9,6 +9,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.list = void 0;
 var chalk_1 = __importDefault(require("chalk"));
+var get_expected_version_1 = require("../bin-fix-mismatches/get-expected-version");
+var constants_1 = require("../constants");
 var list_version_groups_1 = require("./list-version-groups");
 function list(input, disk) {
     var isInvalid = false;
@@ -25,10 +27,17 @@ function list(input, disk) {
         }
         groups.forEach(function (_a) {
             var hasMismatches = _a.hasMismatches, isBanned = _a.isBanned, name = _a.name, uniques = _a.uniques;
-            var versionList = uniques.sort().join(', ');
+            var versionList = uniques.sort();
+            var expected = (0, get_expected_version_1.getExpectedVersion)(name, versionGroup, input);
             console.log(isBanned
-                ? (0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{red \u2715 ", "} {dim.red remove this dependency}"], ["{red \u2715 ", "} {dim.red remove this dependency}"])), name) : hasMismatches
-                ? (0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{red \u2715 ", "} {dim.red ", "}"], ["{red \u2715 ", "} {dim.red ", "}"])), name, versionList) : (0, chalk_1["default"])(templateObject_4 || (templateObject_4 = __makeTemplateObject(["{dim -} {white ", "} {dim ", "}"], ["{dim -} {white ", "} {dim ", "}"])), name, versionList));
+                ? (0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{red ", " ", "} {dim.red is defined in this version group as banned from use}"], ["{red ", " ", "} {dim.red is defined in this version group as banned from use}"])), constants_1.ICON.cross, name) : hasMismatches
+                ? (0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{red ", " ", "} ", ""], ["{red ", " ", "} ", ""])), constants_1.ICON.cross, name, versionList
+                    .map(function (version) {
+                    return version === expected
+                        ? chalk_1["default"].green(version)
+                        : chalk_1["default"].red(version);
+                })
+                    .join(chalk_1["default"].dim(', '))) : (0, chalk_1["default"])(templateObject_4 || (templateObject_4 = __makeTemplateObject(["{dim -} {white ", "} {dim ", "}"], ["{dim -} {white ", "} {dim ", "}"])), name, versionList));
         });
         if (groups.some(function (_a) {
             var hasMismatches = _a.hasMismatches;

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

@@ -3,6 +3,17 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
     if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
     return cooked;
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -33,18 +44,50 @@ function listMismatches(input, disk) {
             }
         }
         groups.forEach(function (_a) {
+            var e_1, _b;
             var instances = _a.instances, isBanned = _a.isBanned, name = _a.name;
-            var expectedVersion = (0, get_expected_version_1.getExpectedVersion)(name, versionGroup, input);
-            console.log(isBanned
-                ? (0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{red \u2715 ", "} {dim.red remove this dependency}"], ["{red \u2715 ", "} {dim.red remove this dependency}"])), name) : (0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{dim -} ", " {green.dim ", "}"], ["{dim -} ", " {green.dim ", "}"])), name, expectedVersion));
+            var workspaceMatch = null;
+            var expected = (0, get_expected_version_1.getExpectedVersion)(name, versionGroup, input);
+            try {
+                for (var instances_1 = __values(instances), instances_1_1 = instances_1.next(); !instances_1_1.done; instances_1_1 = instances_1.next()) {
+                    var instance = instances_1_1.value;
+                    var isMatch = instance.version === expected;
+                    var isWorkspace = instance.dependencyType === 'workspace';
+                    if (isMatch && isWorkspace) {
+                        workspaceMatch = instance;
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (instances_1_1 && !instances_1_1.done && (_b = instances_1["return"])) _b.call(instances_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            if (isBanned) {
+                console.log((0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{red ", " ", "} {dim.red is defined in this version group as banned from use}"], ["{red ", " ", "} {dim.red is defined in this version group as banned from use}"])), constants_1.ICON.cross, name));
+            }
+            else if (workspaceMatch) {
+                var shortPath = (0, path_1.relative)(constants_1.CWD, workspaceMatch.wrapper.filePath);
+                var reason = (0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{dim : ", " is developed in this repo at ", "}"], ["{dim : ", " is developed in this repo at ", "}"])), expected, shortPath);
+                console.log((0, chalk_1["default"])(templateObject_4 || (templateObject_4 = __makeTemplateObject(["{dim -} ", "", ""], ["{dim -} ", "", ""])), name, reason));
+            }
+            else {
+                var reason = (0, chalk_1["default"])(templateObject_5 || (templateObject_5 = __makeTemplateObject(["{dim : ", " is the highest valid semver version in use}"], ["{dim : ", " is the highest valid semver version in use}"])), expected);
+                console.log((0, chalk_1["default"])(templateObject_6 || (templateObject_6 = __makeTemplateObject(["{dim -} ", "", ""], ["{dim -} ", "", ""])), name, reason));
+            }
             instances.forEach(function (_a) {
                 var dependencyType = _a.dependencyType, version = _a.version, wrapper = _a.wrapper;
-                if (dependencyType === 'workspace') {
-                    var shortPath = (0, path_1.relative)(constants_1.CWD, wrapper.filePath);
-                    console.log((0, chalk_1["default"])(templateObject_4 || (templateObject_4 = __makeTemplateObject(["{red   ", " {dim at ", "}}"], ["{red   ", " {dim at ", "}}"])), version, shortPath));
+                var isMatch = version === expected;
+                var isLocal = dependencyType === 'workspace';
+                var shortPath = (0, path_1.relative)(constants_1.CWD, wrapper.filePath);
+                var loc = isLocal ? 'version' : dependencyType;
+                if (isMatch) {
+                    console.log((0, chalk_1["default"])(templateObject_7 || (templateObject_7 = __makeTemplateObject(["{green   ", " in ", " of ", "}"], ["{green   ", " in ", " of ", "}"])), version, loc, shortPath));
                 }
                 else {
-                    console.log((0, chalk_1["default"])(templateObject_5 || (templateObject_5 = __makeTemplateObject(["{red   ", " {dim in ", " of ", "}}"], ["{red   ", " {dim in ", " of ", "}}"])), version, dependencyType, wrapper.contents.name));
+                    console.log((0, chalk_1["default"])(templateObject_8 || (templateObject_8 = __makeTemplateObject(["{red   ", " in ", " of ", "}"], ["{red   ", " in ", " of ", "}"])), version, loc, shortPath));
                 }
             });
         });
@@ -54,4 +97,4 @@ function listMismatches(input, disk) {
     }
 }
 exports.listMismatches = listMismatches;
-var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5;
+var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5, templateObject_6, templateObject_7, templateObject_8;

package/dist/constants.d.ts

@@ -43,7 +43,7 @@ export interface VersionGroup {
      */
     dependencyTypes?: DependencyType[];
 }
-export declare type SyncpackConfig = Readonly<{
+export interface SyncpackConfig {
     /**
      * which dependency properties to search within
      */
@@ -113,7 +113,7 @@ export declare type SyncpackConfig = Readonly<{
      * your workspace/monorepo as part of the search for versions to sync
      */
     workspace: boolean;
-}>;
+}
 export declare const ALL_PATTERNS: string[];
 export declare const DEPENDENCY_TYPES: DependencyType[];
 export declare const CWD: string;
@@ -130,4 +130,10 @@ export declare const RANGE_LTE = "<=";
 export declare const RANGE_MINOR = "^";
 export declare const RANGE_PATCH = "~";
 export declare const SEMVER_ORDER: ValidRange[];
+export declare const ICON: {
+    cross: string;
+    debug: string;
+    skip: string;
+    tick: string;
+};
 export declare const DEFAULT_CONFIG: SyncpackConfig;

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.DEFAULT_CONFIG = exports.SEMVER_ORDER = exports.RANGE_PATCH = exports.RANGE_MINOR = exports.RANGE_LTE = exports.RANGE_LT = exports.RANGE_LOOSE = exports.RANGE_GTE = exports.RANGE_GT = exports.RANGE_EXACT = exports.RANGE_ANY = exports.SAME = exports.LESSER = exports.GREATER = exports.CWD = exports.DEPENDENCY_TYPES = exports.ALL_PATTERNS = void 0;
+exports.DEFAULT_CONFIG = exports.ICON = exports.SEMVER_ORDER = exports.RANGE_PATCH = exports.RANGE_MINOR = exports.RANGE_LTE = exports.RANGE_LT = exports.RANGE_LOOSE = exports.RANGE_GTE = exports.RANGE_GT = exports.RANGE_EXACT = exports.RANGE_ANY = exports.SAME = exports.LESSER = exports.GREATER = exports.CWD = exports.DEPENDENCY_TYPES = exports.ALL_PATTERNS = void 0;
 exports.ALL_PATTERNS = ['package.json', 'packages/*/package.json'];
 exports.DEPENDENCY_TYPES = [
     'dependencies',
@@ -34,6 +34,12 @@ exports.SEMVER_ORDER = [
     exports.RANGE_GT,
     exports.RANGE_ANY,
 ];
+exports.ICON = {
+    cross: '✘',
+    debug: '?',
+    skip: '-',
+    tick: '✓'
+};
 exports.DEFAULT_CONFIG = {
     dependencyTypes: [],
     dev: true,

package/dist/lib/disk.d.ts

@@ -5,7 +5,7 @@ export declare const disk: {
         readonly exit: (code: number) => void;
     };
     readonly globSync: (pattern: string) => string[];
-    readonly readConfigFileSync: (configPath?: string | undefined) => Partial<SyncpackConfig>;
+    readonly readConfigFileSync: (configPath?: string) => Partial<SyncpackConfig>;
     readonly readFileSync: (filePath: string) => string;
     readonly readYamlFileSync: <T = unknown>(filePath: string) => T;
     readonly removeSync: (filePath: string) => void;

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

@@ -16,18 +16,15 @@ var getConfig = function (disk, program) {
     (0, log_1.verbose)('cli arguments:', program);
     var rcFile = disk.readConfigFileSync(program.configPath);
     var hasTypeOverride = (0, expect_more_1.isBoolean)(program.dev) ||
-        (0, expect_more_1.isBoolean)(program.workspace) ||
         (0, expect_more_1.isBoolean)(program.overrides) ||
         (0, expect_more_1.isBoolean)(program.peer) ||
         (0, expect_more_1.isBoolean)(program.pnpmOverrides) ||
         (0, expect_more_1.isBoolean)(program.prod) ||
-        (0, expect_more_1.isBoolean)(program.resolutions);
+        (0, expect_more_1.isBoolean)(program.resolutions) ||
+        (0, expect_more_1.isBoolean)(program.workspace);
     var dev = hasTypeOverride
         ? Boolean(program.dev)
         : getOption('dev', expect_more_1.isBoolean);
-    var workspace = hasTypeOverride
-        ? Boolean(program.workspace)
-        : getOption('workspace', expect_more_1.isBoolean);
     var overrides = hasTypeOverride
         ? Boolean(program.overrides)
         : getOption('overrides', expect_more_1.isBoolean);
@@ -43,6 +40,9 @@ var getConfig = function (disk, program) {
     var resolutions = hasTypeOverride
         ? Boolean(program.resolutions)
         : getOption('resolutions', expect_more_1.isBoolean);
+    var workspace = hasTypeOverride
+        ? Boolean(program.workspace)
+        : getOption('workspace', expect_more_1.isBoolean);
     var dependencyTypes = dev ||
         overrides ||
         peer ||
@@ -51,12 +51,13 @@ var getConfig = function (disk, program) {
         resolutions ||
         workspace
         ? constants_1.DEPENDENCY_TYPES.filter(function (type) {
-            return (type === 'dependencies' && prod) ||
-                (type === 'devDependencies' && dev) ||
+            return (type === 'devDependencies' && dev) ||
                 (type === 'overrides' && overrides) ||
                 (type === 'peerDependencies' && peer) ||
                 (type === 'pnpmOverrides' && pnpmOverrides) ||
-                (type === 'resolutions' && resolutions);
+                (type === 'dependencies' && prod) ||
+                (type === 'resolutions' && resolutions) ||
+                (type === 'workspace' && workspace);
         })
         : constants_1.DEPENDENCY_TYPES;
     var filter = getOption('filter', expect_more_1.isNonEmptyString);

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

@@ -44,6 +44,7 @@ exports.__esModule = true;
 exports.getInstances = void 0;
 var expect_more_1 = require("expect-more");
 var minimatch_1 = __importDefault(require("minimatch"));
+var log_1 = require("../log");
 function getInstances(options, wrappers) {
     var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
     var _e, _f, _g, _h, _j;
@@ -62,7 +63,7 @@ function getInstances(options, wrappers) {
                     if (dependencyType === 'workspace') {
                         var name = (_e = wrapper.contents) === null || _e === void 0 ? void 0 : _e.name;
                         var version = (_f = wrapper.contents) === null || _f === void 0 ? void 0 : _f.version;
-                        addInstance(wrapper, dependencyType, pkgName, name, version);
+                        addInstance({ dependencyType: dependencyType, name: name, pkgName: pkgName, version: version, wrapper: wrapper });
                     }
                     else if (dependencyType === 'pnpmOverrides') {
                         var versionsByName = (_h = (_g = wrapper.contents) === null || _g === void 0 ? void 0 : _g.pnpm) === null || _h === void 0 ? void 0 : _h.overrides;
@@ -72,7 +73,7 @@ function getInstances(options, wrappers) {
                         try {
                             for (var pkgs_1 = (e_3 = void 0, __values(pkgs)), pkgs_1_1 = pkgs_1.next(); !pkgs_1_1.done; pkgs_1_1 = pkgs_1.next()) {
                                 var _m = __read(pkgs_1_1.value, 2), name = _m[0], version = _m[1];
-                                addInstance(wrapper, dependencyType, pkgName, name, version);
+                                addInstance({ dependencyType: dependencyType, name: name, pkgName: pkgName, version: version, wrapper: wrapper });
                             }
                         }
                         catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -91,7 +92,7 @@ function getInstances(options, wrappers) {
                         try {
                             for (var pkgs_2 = (e_4 = void 0, __values(pkgs)), pkgs_2_1 = pkgs_2.next(); !pkgs_2_1.done; pkgs_2_1 = pkgs_2.next()) {
                                 var _o = __read(pkgs_2_1.value, 2), name = _o[0], version = _o[1];
-                                addInstance(wrapper, dependencyType, pkgName, name, version);
+                                addInstance({ dependencyType: dependencyType, name: name, pkgName: pkgName, version: version, wrapper: wrapper });
                             }
                         }
                         catch (e_4_1) { e_4 = { error: e_4_1 }; }
@@ -121,14 +122,19 @@ function getInstances(options, wrappers) {
         finally { if (e_1) throw e_1.error; }
     }
     return allInstances;
-    function addInstance(wrapper, dependencyType, pkgName, name, version) {
-        if (!(0, expect_more_1.isNonEmptyString)(name))
-            return;
-        if (name.search(new RegExp(options.filter)) === -1)
-            return;
-        if (!(0, expect_more_1.isNonEmptyString)(version))
-            return;
+    function addInstance(input) {
+        var dependencyType = input.dependencyType, name = input.name, pkgName = input.pkgName, version = input.version, wrapper = input.wrapper;
+        if (!(0, expect_more_1.isNonEmptyString)(name)) {
+            return (0, log_1.verbose)('skip instance, no name', input);
+        }
+        if (name.search(new RegExp(options.filter)) === -1) {
+            return (0, log_1.verbose)('skip instance, name does not match filter', input);
+        }
+        if (!(0, expect_more_1.isNonEmptyString)(version)) {
+            return (0, log_1.verbose)('skip instance, no version', input);
+        }
         var instance = { dependencyType: dependencyType, name: name, version: version, wrapper: wrapper };
+        (0, log_1.verbose)("add ".concat(name, "@").concat(version, " to ").concat(dependencyType, " ").concat(wrapper.filePath));
         allInstances.all.push(instance);
         groupInstancesBy('semverGroups', dependencyType, pkgName, instance);
         groupInstancesBy('versionGroups', dependencyType, pkgName, instance);

package/dist/lib/get-input/get-wrappers/get-file-paths.d.ts

@@ -2,8 +2,6 @@ import * as E from 'fp-ts/lib/Either';
 import * as O from 'fp-ts/lib/Option';
 import type { SyncpackConfig } from '../../../constants';
 import type { Disk } from '../../../lib/disk';
-declare type MaybeFilePaths = O.Option<string[]>;
-declare type EitherMaybeFilePaths = E.Either<Error, MaybeFilePaths>;
 /**
  * Using --source options and/or config files on disk from npm/pnpm/yarn/lerna,
  * return an array of absolute paths to every package.json file the user is
@@ -11,5 +9,4 @@ declare type EitherMaybeFilePaths = E.Either<Error, MaybeFilePaths>;
  *
  * @returns Array of absolute file paths to package.json files
  */
-export declare function getFilePaths(disk: Disk, program: SyncpackConfig): EitherMaybeFilePaths;
-export {};
+export declare function getFilePaths(disk: Disk, program: SyncpackConfig): E.Either<Error, O.Option<string[]>>;

package/dist/lib/get-input/get-wrappers/get-file-paths.js

@@ -25,9 +25,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 exports.__esModule = true;
 exports.getFilePaths = void 0;
 var expect_more_1 = require("expect-more");
+var A = __importStar(require("fp-ts/lib/Array"));
 var E = __importStar(require("fp-ts/lib/Either"));
 var function_1 = require("fp-ts/lib/function");
 var O = __importStar(require("fp-ts/lib/Option"));
+var S = __importStar(require("fp-ts/lib/string"));
 var get_patterns_1 = require("./get-patterns");
 var readonly_1 = require("./readonly");
 var tap_1 = require("./tap");
@@ -40,13 +42,9 @@ var try_catch_1 = require("./try-catch");
  * @returns Array of absolute file paths to package.json files
  */
 function getFilePaths(disk, program) {
-    return (0, function_1.pipe)((0, get_patterns_1.getPatterns)(disk, program), E.traverseArray(resolvePattern), E.map((0, function_1.flow)(readonly_1.removeReadonlyType, mergeArrayOfOptionsIntoOne, O.filter(expect_more_1.isArrayOfStrings))));
+    return (0, function_1.pipe)(program, (0, get_patterns_1.getPatterns)(disk), O.getOrElse(function () { return []; }), E.traverseArray(resolvePattern), E.map(readonly_1.removeReadonlyType), E.map((0, function_1.flow)(A.flatten, A.uniq(S.Eq))), E.map(O.fromPredicate(expect_more_1.isArrayOfStrings)), E.map((0, tap_1.tapOption)('package.json files found')));
     function resolvePattern(pattern) {
-        return (0, function_1.pipe)(E.tryCatch(function () { return disk.globSync(pattern); }, (0, try_catch_1.getErrorOrElse)("npm package \"glob\" threw on pattern \"".concat(pattern, "\""))), E.map((0, function_1.flow)(O.of, O.filter(expect_more_1.isArrayOfStrings), (0, tap_1.tapNone)("found 0 files matching pattern \"".concat(pattern, "\"")))));
-    }
-    function mergeArrayOfOptionsIntoOne(options) {
-        var unwrap = O.getOrElse(function () { return []; });
-        return O.of(options.reduce(function (values, option) { return values.concat(unwrap(option)); }, []));
+        return (0, function_1.pipe)(E.tryCatch(function () { return disk.globSync(pattern); }, (0, try_catch_1.getErrorOrElse)("npm package \"glob\" threw on pattern \"".concat(pattern, "\""))), E.map((0, function_1.flow)(O.fromPredicate(expect_more_1.isArrayOfStrings), (0, tap_1.tapOption)("files found matching pattern \"".concat(pattern, "\"")), O.getOrElse(function () { return []; }))));
     }
 }
 exports.getFilePaths = getFilePaths;

package/dist/lib/get-input/get-wrappers/get-patterns/get-lerna-patterns.d.ts

@@ -1,3 +1,3 @@
-import type { MaybePatterns } from '.';
+import * as O from 'fp-ts/lib/Option';
 import type { Disk } from '../../../../lib/disk';
-export declare function getLernaPatterns(disk: Disk): () => MaybePatterns;
+export declare function getLernaPatterns(disk: Disk): () => O.Option<string[]>;

package/dist/lib/get-input/get-wrappers/get-patterns/get-pnpm-patterns.d.ts

@@ -1,3 +1,3 @@
-import type { MaybePatterns } from '.';
+import * as O from 'fp-ts/lib/Option';
 import type { Disk } from '../../../../lib/disk';
-export declare function getPnpmPatterns(disk: Disk): () => MaybePatterns;
+export declare function getPnpmPatterns(disk: Disk): () => O.Option<string[]>;

package/dist/lib/get-input/get-wrappers/get-patterns/get-yarn-patterns.d.ts

@@ -1,3 +1,3 @@
-import type { MaybePatterns } from '.';
+import * as O from 'fp-ts/lib/Option';
 import type { Disk } from '../../../../lib/disk';
-export declare function getYarnPatterns(disk: Disk): () => MaybePatterns;
+export declare function getYarnPatterns(disk: Disk): () => O.Option<string[]>;

package/dist/lib/get-input/get-wrappers/get-patterns/index.d.ts

@@ -1,13 +1,10 @@
 import * as O from 'fp-ts/lib/Option';
 import type { SyncpackConfig } from '../../../../constants';
 import type { Disk } from '../../../../lib/disk';
-declare type Patterns = string[];
-export declare type MaybePatterns = O.Option<Patterns>;
 /**
  * Find every glob pattern which should be used to find package.json files for
  * this monorepo.
  *
  * @returns `['./package.json', './packages/* /package.json']`
  */
-export declare function getPatterns(disk: Disk, program: SyncpackConfig): Patterns;
-export {};
+export declare function getPatterns(disk: Disk): (program: SyncpackConfig) => O.Option<string[]>;

package/dist/lib/get-input/get-wrappers/get-patterns/index.js

@@ -63,8 +63,10 @@ var get_yarn_patterns_1 = require("./get-yarn-patterns");
  *
  * @returns `['./package.json', './packages/* /package.json']`
  */
-function getPatterns(disk, program) {
-    return (0, function_1.pipe)(O.of(program.source), O.filter(expect_more_1.isArrayOfStrings), (0, tap_1.tapNone)('no --source patterns found'), O.fold((0, function_1.flow)((0, get_yarn_patterns_1.getYarnPatterns)(disk), (0, tap_1.tapNone)('no yarn workspaces found'), O.fold((0, get_pnpm_patterns_1.getPnpmPatterns)(disk), O.of), (0, tap_1.tapNone)('no pnpm workspaces found'), O.fold((0, get_lerna_patterns_1.getLernaPatterns)(disk), O.of), (0, tap_1.tapNone)('no lerna packages found'), O.map((0, function_1.flow)(addRootDir, limitToPackageJson))), O.of), (0, tap_1.tapNone)('no patterns found, using defaults'), O.getOrElse(function () { return constants_1.ALL_PATTERNS; }));
+function getPatterns(disk) {
+    return function (program) {
+        return (0, function_1.pipe)(O.of(program.source), O.filter(expect_more_1.isArrayOfStrings), (0, tap_1.tapOption)('--source patterns found'), O.fold((0, function_1.flow)((0, get_yarn_patterns_1.getYarnPatterns)(disk), O.map(addRootDir)), O.of), (0, tap_1.tapOption)('yarn workspaces found'), O.fold((0, function_1.flow)((0, get_pnpm_patterns_1.getPnpmPatterns)(disk), O.map(addRootDir)), O.of), (0, tap_1.tapOption)('pnpm workspaces found'), O.fold((0, function_1.flow)((0, get_lerna_patterns_1.getLernaPatterns)(disk), O.map(addRootDir)), O.of), (0, tap_1.tapOption)('lerna packages found'), O.map(limitToPackageJson), (0, tap_1.tapNone)('no patterns found, using defaults'), O.fold(function () { return O.some(constants_1.ALL_PATTERNS); }, O.of));
+    };
     function addRootDir(patterns) {
         return __spreadArray(['.'], __read(patterns), false);
     }

package/dist/lib/get-input/get-wrappers/index.d.ts

@@ -14,6 +14,7 @@ export interface Source {
         overrides?: Record<string, string>;
     };
     repository?: {
+        directory?: string;
         type: string;
         url: string;
     } | string;

package/dist/lib/get-input/get-wrappers/tap.d.ts

@@ -1,5 +1,15 @@
 import * as O from 'fp-ts/lib/Option';
+declare type Fn<T> = (ma: O.Option<T>) => O.Option<T>;
 /**
  * Log a message when a pipeline contains `None` and let it continue unchanged.
  */
-export declare function tapNone<T>(message: string): (ma: O.Option<T>) => O.Option<T>;
+export declare function tapNone<T>(message: string): Fn<T>;
+/**
+ * Log a message when a pipeline contains `Some` and let it continue unchanged.
+ */
+export declare function tapSome<T>(message: string): Fn<T>;
+/**
+ * Log both possibilities of an `Option` and let it continue unchanged.
+ */
+export declare function tapOption<T>(message: string): Fn<T>;
+export {};

package/dist/lib/get-input/get-wrappers/tap.js

@@ -23,7 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 exports.__esModule = true;
-exports.tapNone = void 0;
+exports.tapOption = exports.tapSome = exports.tapNone = void 0;
+var function_1 = require("fp-ts/lib/function");
 var O = __importStar(require("fp-ts/lib/Option"));
 var log_1 = require("../../log");
 /**
@@ -36,3 +37,20 @@ function tapNone(message) {
     }, O.of);
 }
 exports.tapNone = tapNone;
+/**
+ * Log a message when a pipeline contains `Some` and let it continue unchanged.
+ */
+function tapSome(message) {
+    return O.map(function logSomeValue(value) {
+        (0, log_1.verbose)(message, value);
+        return value;
+    });
+}
+exports.tapSome = tapSome;
+/**
+ * Log both possibilities of an `Option` and let it continue unchanged.
+ */
+function tapOption(message) {
+    return (0, function_1.flow)(tapSome(message), tapNone("no ".concat(message)));
+}
+exports.tapOption = tapOption;

package/dist/lib/log.d.ts

@@ -1 +1 @@
-export declare function verbose(...values: any[]): void;
+export declare function verbose(...values: unknown[]): void;

package/dist/lib/log.js

@@ -32,13 +32,14 @@ exports.verbose = void 0;
 var chalk_1 = __importDefault(require("chalk"));
 var expect_more_1 = require("expect-more");
 var util_1 = require("util");
+var constants_1 = require("../constants");
 function verbose() {
     var values = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         values[_i] = arguments[_i];
     }
     if (process.env.SYNCPACK_VERBOSE) {
-        console.info.apply(console, __spreadArray([chalk_1["default"].yellow('?')], __read(values.map(function (value) {
+        console.info.apply(console, __spreadArray([chalk_1["default"].yellow(constants_1.ICON.debug)], __read(values.map(function (value) {
             return (0, expect_more_1.isString)(value)
                 ? chalk_1["default"].yellow(value)
                 : (0, util_1.inspect)(value, false, null, true);

package/dist/lib/{write-if-changed.d.ts → write-if-changed/index.d.ts}

@@ -1,5 +1,5 @@
-import type { Source } from '../lib/get-input/get-wrappers';
-import type { Disk } from './disk';
+import type { Disk } from '../disk';
+import type { Source } from '../get-input/get-wrappers';
 interface FileData {
     contents: Source;
     filePath: string;

package/dist/lib/{write-if-changed.js → write-if-changed/index.js}

@@ -5,19 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.writeIfChanged = void 0;
 var chalk_1 = __importDefault(require("chalk"));
-var os_1 = require("os");
 var path_1 = require("path");
-var constants_1 = require("../constants");
+var constants_1 = require("../../constants");
+var set_newlines_1 = require("./set-newlines");
 function writeIfChanged(disk, fileData) {
     var contents = fileData.contents, filePath = fileData.filePath, indent = fileData.indent, json = fileData.json;
+    var EOL = (0, set_newlines_1.detectNewlines)(json);
     var shortPath = (0, path_1.relative)(constants_1.CWD, filePath);
-    var after = "".concat(JSON.stringify(contents, null, indent)).concat(os_1.EOL);
+    var source = "".concat(JSON.stringify(contents, null, indent)).concat(EOL);
+    var after = (0, set_newlines_1.setNewlines)(source, EOL);
     if (json !== after) {
         disk.writeFileSync(filePath, after);
-        console.log(chalk_1["default"].green('✓'), shortPath);
+        console.log(chalk_1["default"].green(constants_1.ICON.tick), shortPath);
     }
     else {
-        console.log(chalk_1["default"].dim('-'), chalk_1["default"].dim(shortPath));
+        console.log(chalk_1["default"].dim(constants_1.ICON.skip), chalk_1["default"].dim(shortPath));
     }
 }
 exports.writeIfChanged = writeIfChanged;

package/dist/lib/write-if-changed/set-newlines.d.ts

@@ -0,0 +1,4 @@
+declare type Ending = '\n' | '\r' | '\r\n' | string;
+export declare function setNewlines(source: string, lineEnding: Ending): string;
+export declare function detectNewlines(source: string): Ending;
+export {};

package/dist/lib/write-if-changed/set-newlines.js

@@ -0,0 +1,24 @@
+"use strict";
+exports.__esModule = true;
+exports.detectNewlines = exports.setNewlines = void 0;
+var os_1 = require("os");
+var LF = '\n';
+var CR = '\r';
+var CRLF = '\r\n';
+function setNewlines(source, lineEnding) {
+    return source.replace(/\r\n|\n|\r/g, lineEnding);
+}
+exports.setNewlines = setNewlines;
+function detectNewlines(source) {
+    var cr = source.split(CR).length;
+    var lf = source.split(LF).length;
+    var crlf = source.split(CRLF).length;
+    if (cr + lf === 0)
+        return os_1.EOL;
+    if (crlf === cr && crlf === lf)
+        return CRLF;
+    if (cr > lf)
+        return CR;
+    return LF;
+}
+exports.detectNewlines = detectNewlines;

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": "8.0.0",
+  "version": "8.2.5",
   "author": "Jamie Mason <jamie@foldleft.io> (https://github.com/JamieMason)",
   "bin": {
     "syncpack": "dist/bin.js",
@@ -17,7 +17,9 @@
     "Alex Hayton (https://github.com/AlexHayton)",
     "Aparajita Fishman (https://github.com/aparajita)",
     "Artur Wierzbicki (https://github.com/ArturWierzbicki)",
+    "Daniel Silva (https://github.com/dsilvasc)",
     "Jamie Mason (https://github.com/JamieMason)",
+    "Jody Heavener (https://github.com/jodyheavener)",
     "Luis Vieira (https://github.com/luisvieiragmr)",
     "Marais Rossouw (https://github.com/maraisr)",
     "Matt Sprague (https://github.com/uforic)",
@@ -25,32 +27,32 @@
   ],
   "dependencies": {
     "chalk": "4.1.2",
-    "commander": "9.2.0",
+    "commander": "9.3.0",
     "cosmiconfig": "7.0.1",
     "expect-more": "1.2.0",
     "fp-ts": "2.12.1",
     "fs-extra": "10.1.0",
-    "glob": "8.0.1",
-    "minimatch": "5.0.1",
+    "glob": "8.0.3",
+    "minimatch": "5.1.0",
     "read-yaml-file": "2.1.0",
     "semver": "7.3.7"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.13",
     "@types/glob": "7.2.0",
-    "@types/jest": "27.4.1",
-    "@types/node": "17.0.31",
-    "@types/semver": "7.3.9",
-    "@typescript-eslint/eslint-plugin": "5.21.0",
-    "@typescript-eslint/parser": "5.21.0",
-    "eslint": "8.14.0",
+    "@types/jest": "28.1.3",
+    "@types/node": "18.0.0",
+    "@types/semver": "7.3.10",
+    "@typescript-eslint/eslint-plugin": "5.29.0",
+    "@typescript-eslint/parser": "5.29.0",
+    "eslint": "8.18.0",
     "eslint-plugin-import": "2.26.0",
-    "expect-more-jest": "5.4.0",
-    "jest": "27.5.1",
-    "prettier": "2.6.2",
+    "expect-more-jest": "5.4.1",
+    "jest": "28.1.1",
+    "prettier": "2.7.1",
     "rimraf": "3.0.2",
-    "ts-jest": "27.1.4",
-    "typescript": "4.6.4"
+    "ts-jest": "28.0.5",
+    "typescript": "4.7.4"
   },
   "engines": {
     "node": ">=10"