syncpack 9.7.4 → 9.8.6

package/dist/get-context/get-package-json-files/index.js

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackageJsonFiles = void 0;
-const ts_belt_1 = require("@mobily/ts-belt");
+const flow_1 = require("tightrope/fn/flow");
+const pipe_1 = require("tightrope/fn/pipe");
+const result_1 = require("tightrope/result");
+const and_then_1 = require("tightrope/result/and-then");
+const map_1 = require("tightrope/result/map");
+const or_1 = require("tightrope/result/or");
 const _R_1 = require("../$R");
 const get_file_paths_1 = require("./get-file-paths");
 const read_json_safe_1 = require("./get-patterns/read-json-safe");
 const package_json_file_1 = require("./package-json-file");
 /** Create an API for every package.json file needed. */
 function getPackageJsonFiles(disk, config) {
-    return (0, ts_belt_1.pipe)((0, get_file_paths_1.getFilePaths)(disk, config), ts_belt_1.R.flatMap(_R_1.$R.onlyOk(resolvePackageJson(disk))), ts_belt_1.R.getWithDefault([]));
-    function resolvePackageJson(disk) {
-        return (0, ts_belt_1.flow)((0, read_json_safe_1.readJsonSafe)(disk), ts_belt_1.R.map((jsonFile) => new package_json_file_1.PackageJsonFile(jsonFile, config, disk)));
-    }
+    return (0, pipe_1.pipe)((0, get_file_paths_1.getFilePaths)(disk, config), (0, and_then_1.andThen)(_R_1.$R.onlyOk((0, flow_1.flow)((0, read_json_safe_1.readJsonSafe)(disk), (0, map_1.map)((jsonFile) => new package_json_file_1.PackageJsonFile(jsonFile, config, disk)), _R_1.$R.tapErrVerbose))), (0, or_1.or)(new result_1.Ok([])));
 }
 exports.getPackageJsonFiles = getPackageJsonFiles;

package/dist/get-context/get-package-json-files/package-json-file/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageJsonFile = void 0;
-const ts_belt_1 = require("@mobily/ts-belt");
 const path_1 = require("path");
+const pipe_1 = require("tightrope/fn/pipe");
+const result_1 = require("tightrope/result");
+const unwrap_or_1 = require("tightrope/result/unwrap-or");
 const constants_1 = require("../../../constants");
 const log_1 = require("../../../lib/log");
 const newlines_1 = require("../../../lib/newlines");
@@ -48,13 +50,13 @@ class PackageJsonFile {
         const strategyName = pathDef.strategy;
         switch (strategyName) {
             case 'name@version':
-                return (0, ts_belt_1.pipe)(path_strategy_1.strategyByName[strategyName].read(file, pathDef), ts_belt_1.R.getWithDefault([]));
+                return (0, pipe_1.pipe)(path_strategy_1.strategyByName[strategyName].read(file, pathDef), (0, unwrap_or_1.unwrapOr)(new result_1.Ok([])));
             case 'name~version':
-                return (0, ts_belt_1.pipe)(path_strategy_1.strategyByName[strategyName].read(file, pathDef), ts_belt_1.R.getWithDefault([]));
+                return (0, pipe_1.pipe)(path_strategy_1.strategyByName[strategyName].read(file, pathDef), (0, unwrap_or_1.unwrapOr)(new result_1.Ok([])));
             case 'version':
-                return (0, ts_belt_1.pipe)(path_strategy_1.strategyByName[strategyName].read(file, pathDef), ts_belt_1.R.getWithDefault([]));
+                return (0, pipe_1.pipe)(path_strategy_1.strategyByName[strategyName].read(file, pathDef), (0, unwrap_or_1.unwrapOr)(new result_1.Ok([])));
             case 'versionsByName':
-                return (0, ts_belt_1.pipe)(path_strategy_1.strategyByName[strategyName].read(file, pathDef), ts_belt_1.R.getWithDefault([]));
+                return (0, pipe_1.pipe)(path_strategy_1.strategyByName[strategyName].read(file, pathDef), (0, unwrap_or_1.unwrapOr)(new result_1.Ok([])));
             default:
                 return (0, path_strategy_1.exhaustiveCheck)(strategyName);
         }

package/dist/get-context/get-package-json-files/package-json-file/instance.d.ts

@@ -1,5 +1,6 @@
 import type { PackageJsonFile } from '.';
 import type { Syncpack } from '../../../types';
+import type { Delete } from '../../get-groups/version-group/instance-group';
 export declare class Instance {
     /** the name of this dependency */
     name: string;
@@ -18,5 +19,5 @@ export declare class Instance {
      * In the case of banned dependencies, their version is set to `undefined`,
      * which causes them to be removed by `JSON.stringify`.
      */
-    setVersion(version: string | undefined): void;
+    setVersion(version: string | Delete): void;
 }

package/dist/get-context/get-package-json-files/package-json-file/instance.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Instance = void 0;
-const ts_belt_1 = require("@mobily/ts-belt");
+const pipe_1 = require("tightrope/fn/pipe");
 const _R_1 = require("../../$R");
 const path_strategy_1 = require("../../get-config/path-strategy");
+const instance_group_1 = require("../../get-groups/version-group/instance-group");
 class Instance {
     constructor(pathDef, name, packageJsonFile, version) {
         this.pathDef = pathDef;
@@ -22,20 +23,20 @@ class Instance {
      */
     setVersion(version) {
         const strategyName = this.pathDef.strategy;
-        const entry = [this.name, version];
+        const entry = [this.name, version === instance_group_1.DELETE ? undefined : version];
         const file = this.packageJsonFile;
         switch (strategyName) {
             case 'name@version':
-                (0, ts_belt_1.pipe)(path_strategy_1.strategyByName[strategyName].write(file, this.pathDef, entry), _R_1.$R.tapErrVerbose);
+                (0, pipe_1.pipe)(path_strategy_1.strategyByName[strategyName].write(file, this.pathDef, entry), _R_1.$R.tapErrVerbose);
                 break;
             case 'name~version':
-                (0, ts_belt_1.pipe)(path_strategy_1.strategyByName[strategyName].write(file, this.pathDef, entry), _R_1.$R.tapErrVerbose);
+                (0, pipe_1.pipe)(path_strategy_1.strategyByName[strategyName].write(file, this.pathDef, entry), _R_1.$R.tapErrVerbose);
                 break;
             case 'version':
-                (0, ts_belt_1.pipe)(path_strategy_1.strategyByName[strategyName].write(file, this.pathDef, entry), _R_1.$R.tapErrVerbose);
+                (0, pipe_1.pipe)(path_strategy_1.strategyByName[strategyName].write(file, this.pathDef, entry), _R_1.$R.tapErrVerbose);
                 break;
             case 'versionsByName':
-                (0, ts_belt_1.pipe)(path_strategy_1.strategyByName[strategyName].write(file, this.pathDef, entry), _R_1.$R.tapErrVerbose);
+                (0, pipe_1.pipe)(path_strategy_1.strategyByName[strategyName].write(file, this.pathDef, entry), _R_1.$R.tapErrVerbose);
                 break;
             default:
                 return (0, path_strategy_1.exhaustiveCheck)(strategyName);

package/dist/get-context/index.d.ts

@@ -3,13 +3,14 @@ import type { Syncpack } from '../types';
 import type { SemverGroup } from './get-groups/semver-group';
 import type { VersionGroup } from './get-groups/version-group';
 import type { PackageJsonFile } from './get-package-json-files/package-json-file';
-export type Context = Omit<Syncpack.Config.Private, 'semverGroups' | 'versionGroups'> & {
+export interface Context {
+    config: Syncpack.Config.Private;
     disk: Disk;
     isInvalid: boolean;
     packageJsonFiles: PackageJsonFile[];
     semverGroups: SemverGroup[];
     versionGroups: VersionGroup[];
-};
+}
 /**
  * Every command in syncpack should accept the return value of this function as
  * its input.

package/dist/get-context/index.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContext = void 0;
+const pipe_1 = require("tightrope/fn/pipe");
+const and_then_1 = require("tightrope/result/and-then");
+const map_1 = require("tightrope/result/map");
+const unwrap_1 = require("tightrope/result/unwrap");
 const disk_1 = require("../lib/disk");
-const get_all_instances_1 = require("./get-all-instances");
+const _R_1 = require("./$R");
 const get_config_1 = require("./get-config");
 const get_groups_1 = require("./get-groups");
 const get_package_json_files_1 = require("./get-package-json-files");
@@ -15,17 +19,25 @@ const get_package_json_files_1 = require("./get-package-json-files");
  * system and can focus solely on transformation logic.
  */
 function getContext(program, disk = disk_1.disk) {
-    const config = (0, get_config_1.getConfig)(disk, program);
-    const packageJsonFiles = (0, get_package_json_files_1.getPackageJsonFiles)(disk, config);
-    const instances = (0, get_all_instances_1.getAllInstances)(packageJsonFiles);
-    const groups = (0, get_groups_1.getGroups)(config, instances, packageJsonFiles);
-    return {
-        ...config,
+    return (0, pipe_1.pipe)(
+    // merge CLI options, .syncpackrc contents, and default config
+    (0, get_config_1.getConfig)(disk, program), (0, and_then_1.andThen)((config) => (0, pipe_1.pipe)(
+    // get the package.json file which match the globs in config
+    (0, get_package_json_files_1.getPackageJsonFiles)(disk, config), (0, and_then_1.andThen)((packageJsonFiles) => (0, pipe_1.pipe)(
+    // allocate dependencies into semver and version groups
+    (0, get_groups_1.getGroups)(config, packageJsonFiles), 
+    // combine everything into the final config
+    (0, map_1.map)(({ semverGroups, versionGroups }) => ({
+        config,
         disk,
         isInvalid: false,
         packageJsonFiles,
-        semverGroups: groups.semverGroups,
-        versionGroups: groups.versionGroups,
-    };
+        semverGroups,
+        versionGroups,
+    })))))), 
+    // if anything errored at any stage, log it when in verbose mode
+    _R_1.$R.tapErrVerbose, 
+    // throw if anything errored, can't do anything without this data
+    unwrap_1.unwrap);
 }
 exports.getContext = getContext;

package/dist/lib/disk.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.disk = void 0;
 const cosmiconfig_1 = require("cosmiconfig");
-const is_non_empty_object_1 = require("expect-more/dist/is-non-empty-object");
 const fs_extra_1 = require("fs-extra");
 const glob_1 = require("glob");
 const path_1 = require("path");
 const read_yaml_file_1 = require("read-yaml-file");
+const is_non_empty_object_1 = require("tightrope/guard/is-non-empty-object");
 const constants_1 = require("../constants");
 const log_1 = require("./log");
 const client = (0, cosmiconfig_1.cosmiconfigSync)('syncpack');

package/dist/lib/is-semver.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isLooseSemver = exports.isSemver = exports.isValidSemverRange = void 0;
-const is_string_1 = require("expect-more/dist/is-string");
+const is_string_1 = require("tightrope/guard/is-string");
 const constants_1 = require("../constants");
 function isValidSemverRange(value) {
     return (value === constants_1.RANGE.ANY ||

package/dist/lib/log.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.versionGroupHeader = exports.semverGroupHeader = exports.invalid = exports.valid = exports.skip = exports.fixed = exports.verbose = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const is_string_1 = require("expect-more/dist/is-string");
+const is_string_1 = require("tightrope/guard/is-string");
 const util_1 = require("util");
 const constants_1 = require("../constants");
 function verbose(...values) {
@@ -13,7 +13,12 @@ function verbose(...values) {
     if (process.env.SYNCPACK_VERBOSE) {
         console.info(chalk_1.default.yellow(constants_1.ICON.debug), ...values.map((value) => (0, is_string_1.isString)(value)
             ? chalk_1.default.yellow(value)
-            : (0, util_1.inspect)(value, { showHidden: false, colors: true, depth: 20 })));
+            : (0, util_1.inspect)(value, {
+                colors: true,
+                compact: true,
+                depth: 20,
+                showHidden: false,
+            })));
     }
 }
 exports.verbose = verbose;

package/dist/types.d.ts

@@ -81,7 +81,7 @@ export declare namespace Syncpack {
             /** Use these named packages as the source of truth for versions */
             export type SnappedTo = z.infer<T['snappedTo']>;
             /** @private */
-            export type Default = z.infer<T['base']>;
+            export type Default = z.infer<T['defaultGroup']>;
             /** Every valid type of VersionGroup */
             export type Any = z.infer<T['any']>;
             export {};

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": "9.7.4",
+  "description": "Consistent dependency versions in large JavaScript Monorepos",
+  "version": "9.8.6",
   "author": "Jamie Mason <jamie@foldleft.io> (https://github.com/JamieMason)",
   "bin": {
     "syncpack": "dist/bin.js",
@@ -26,35 +26,34 @@
     "Tom Fletcher (https://github.com/tom-fletcher)"
   ],
   "dependencies": {
-    "@mobily/ts-belt": "3.13.1",
     "chalk": "4.1.2",
-    "commander": "10.0.0",
-    "cosmiconfig": "8.0.0",
-    "expect-more": "1.3.0",
-    "fs-extra": "11.1.0",
+    "commander": "10.0.1",
+    "cosmiconfig": "8.1.3",
+    "fs-extra": "11.1.1",
     "glob": "8.1.0",
     "minimatch": "6.2.0",
     "read-yaml-file": "2.1.0",
-    "semver": "7.3.8",
-    "zod": "3.20.6"
+    "semver": "7.5.0",
+    "tightrope": "0.1.0",
+    "zod": "3.21.4"
   },
   "devDependencies": {
     "@tsconfig/node14": "1.0.3",
     "@types/fs-extra": "11.0.1",
-    "@types/glob": "8.0.1",
-    "@types/jest": "29.4.0",
+    "@types/glob": "8.1.0",
+    "@types/jest": "29.5.1",
     "@types/node": "14.18.36",
     "@types/semver": "7.3.13",
-    "@typescript-eslint/eslint-plugin": "5.52.0",
-    "@typescript-eslint/parser": "5.52.0",
-    "eslint": "8.34.0",
+    "@typescript-eslint/eslint-plugin": "5.59.0",
+    "@typescript-eslint/parser": "5.59.0",
+    "eslint": "8.39.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-jest": "27.2.1",
     "expect-more-jest": "5.5.0",
-    "jest": "29.4.3",
-    "prettier": "2.8.4",
-    "rimraf": "4.1.2",
-    "ts-jest": "29.0.5",
+    "jest": "29.5.0",
+    "prettier": "2.8.8",
+    "rimraf": "4.4.1",
+    "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
     "typescript": "4.9.5"
   },

package/dist/get-context/get-all-instances.d.ts

@@ -1,3 +0,0 @@
-import type { PackageJsonFile } from './get-package-json-files/package-json-file';
-import type { Instance } from './get-package-json-files/package-json-file/instance';
-export declare function getAllInstances(packageJsonFiles: PackageJsonFile[]): Instance[];

package/dist/get-context/get-all-instances.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllInstances = void 0;
-const sort_by_name_1 = require("../lib/sort-by-name");
-function getAllInstances(packageJsonFiles) {
-    return packageJsonFiles.flatMap((pkg) => pkg.getInstances()).sort(sort_by_name_1.sortByName);
-}
-exports.getAllInstances = getAllInstances;

package/dist/get-context/get-package-json-files/get-patterns/lib/get-array-of-strings.d.ts

@@ -1 +0,0 @@
-export declare const getArrayOfStrings: (path: string) => (obj: unknown) => import("@mobily/ts-belt").Option<string[]>;

package/dist/get-context/get-package-json-files/get-patterns/lib/get-array-of-strings.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getArrayOfStrings = void 0;
-const is_array_of_strings_1 = require("expect-more/dist/is-array-of-strings");
-const props_1 = require("../props");
-// Yarn's config for this can be in more than one place
-const getArrayOfStrings = (path) => (0, props_1.props)(path, is_array_of_strings_1.isArrayOfStrings);
-exports.getArrayOfStrings = getArrayOfStrings;

package/dist/get-context/get-package-json-files/get-patterns/props.d.ts

@@ -1,6 +0,0 @@
-import { O } from '@mobily/ts-belt';
-/**
- * Safely read nested properties of any value.
- * @param keys 'child.grandChild.greatGrandChild'
- */
-export declare function props<T>(keys: string, predicate: (value: unknown) => value is T): (obj: unknown) => O.Option<T>;

package/dist/get-context/get-package-json-files/get-patterns/props.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.props = void 0;
-const ts_belt_1 = require("@mobily/ts-belt");
-const isWalkable = (value) => value !== null && typeof value !== 'undefined';
-/**
- * Safely read nested properties of any value.
- * @param keys 'child.grandChild.greatGrandChild'
- */
-function props(keys, predicate) {
-    return function getNestedProp(obj) {
-        let next = obj;
-        for (const key of keys.split('.')) {
-            if (isWalkable(next) && key in next) {
-                next = next[key];
-            }
-            else {
-                return ts_belt_1.O.None;
-            }
-        }
-        return ts_belt_1.O.fromPredicate(next, predicate);
-    };
-}
-exports.props = props;