workspace-tools 0.41.0 → 0.41.1

package/lib/workspaces/implementations/pnpm.js

@@ -1,23 +1,35 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pnpmUtilities = void 0;
-const path_1 = __importDefault(require("path"));
-const readYaml_1 = require("../../lockfile/readYaml");
-const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "pnpmUtilities", {
+    enumerable: true,
+    get: function() {
+        return pnpmUtilities;
+    }
+});
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _readYaml = require("../../lockfile/readYaml.js");
+const _getWorkspaceManagerAndRoot = require("./getWorkspaceManagerAndRoot.js");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function getPnpmWorkspaceYaml(params) {
-    const pnpmWorkspacesFile = path_1.default.join(params.root, getWorkspaceManagerAndRoot_1.managerFiles.pnpm);
-    return (0, readYaml_1.readYaml)(pnpmWorkspacesFile);
+    const pnpmWorkspacesFile = _path.default.join(params.root, _getWorkspaceManagerAndRoot.managerFiles.pnpm);
+    return (0, _readYaml.readYaml)(pnpmWorkspacesFile);
 }
-exports.pnpmUtilities = {
-    getWorkspacePatterns: (params) => {
+const pnpmUtilities = {
+    getWorkspacePatterns: (params)=>{
         const { packages } = getPnpmWorkspaceYaml(params);
-        return packages ? { patterns: packages, type: "pattern" } : undefined;
+        return packages ? {
+            patterns: packages,
+            type: "pattern"
+        } : undefined;
     },
     // See https://pnpm.io/catalogs
-    getCatalogs: (params) => {
+    getCatalogs: (params)=>{
         const workspaceYaml = getPnpmWorkspaceYaml(params);
         if (!workspaceYaml.catalog && !workspaceYaml.catalogs) {
             return undefined;
@@ -27,8 +39,7 @@ exports.pnpmUtilities = {
         const { default: namedDefaultCatalog, ...namedCatalogs } = workspaceYaml.catalogs || {};
         return {
             default: workspaceYaml.catalog || namedDefaultCatalog,
-            named: Object.keys(namedCatalogs).length ? namedCatalogs : undefined,
+            named: Object.keys(namedCatalogs).length ? namedCatalogs : undefined
         };
-    },
+    }
 };
-//# sourceMappingURL=pnpm.js.map

package/lib/workspaces/implementations/pnpm.js.map

@@ -1 +1 @@
-{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/pnpm.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,sDAAmD;AAEnD,6EAA4D;AAU5D,SAAS,oBAAoB,CAAC,MAAwB;IACpD,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,yCAAY,CAAC,IAAI,CAAC,CAAC;IACrE,OAAO,IAAA,mBAAQ,EAAoB,kBAAkB,CAAC,CAAC;AACzD,CAAC;AAEY,QAAA,aAAa,GAAuB;IAC/C,oBAAoB,EAAE,CAAC,MAAM,EAAE,EAAE;QAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAClD,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,CAAC;IAED,+BAA+B;IAC/B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE;QACtB,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,CAAC,aAAa,CAAC,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;YACrD,OAAO,SAAS,CAAC;SAClB;QACD,yFAAyF;QACzF,kEAAkE;QAClE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,aAAa,EAAE,GAAG,aAAa,CAAC,QAAQ,IAAI,EAAE,CAAC;QACxF,OAAO;YACL,OAAO,EAAE,aAAa,CAAC,OAAO,IAAI,mBAAmB;YACrD,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS;SACrE,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"sources":["../../../src/workspaces/implementations/pnpm.ts"],"sourcesContent":["import path from \"path\";\nimport { readYaml } from \"../../lockfile/readYaml.js\";\nimport type { Catalog, NamedCatalogs } from \"../../types/Catalogs.js\";\nimport { managerFiles } from \"./getWorkspaceManagerAndRoot.js\";\nimport type { WorkspaceUtilities } from \"./WorkspaceUtilities.js\";\n\ntype PnpmWorkspaceYaml = {\n  packages: string[];\n  // Format per https://pnpm.io/catalogs\n  catalog?: Catalog;\n  catalogs?: NamedCatalogs;\n};\n\nfunction getPnpmWorkspaceYaml(params: { root: string }) {\n  const pnpmWorkspacesFile = path.join(params.root, managerFiles.pnpm);\n  return readYaml<PnpmWorkspaceYaml>(pnpmWorkspacesFile);\n}\n\nexport const pnpmUtilities: WorkspaceUtilities = {\n  getWorkspacePatterns: (params) => {\n    const { packages } = getPnpmWorkspaceYaml(params);\n    return packages ? { patterns: packages, type: \"pattern\" } : undefined;\n  },\n\n  // See https://pnpm.io/catalogs\n  getCatalogs: (params) => {\n    const workspaceYaml = getPnpmWorkspaceYaml(params);\n    if (!workspaceYaml.catalog && !workspaceYaml.catalogs) {\n      return undefined;\n    }\n    // pnpm treats catalog: and catalog:default as the same (and errors if both are defined),\n    // so treat the catalog named \"default\" as the default if present.\n    const { default: namedDefaultCatalog, ...namedCatalogs } = workspaceYaml.catalogs || {};\n    return {\n      default: workspaceYaml.catalog || namedDefaultCatalog,\n      named: Object.keys(namedCatalogs).length ? namedCatalogs : undefined,\n    };\n  },\n};\n"],"names":["pnpmUtilities","getPnpmWorkspaceYaml","params","pnpmWorkspacesFile","path","join","root","managerFiles","pnpm","readYaml","getWorkspacePatterns","packages","patterns","type","undefined","getCatalogs","workspaceYaml","catalog","catalogs","default","namedDefaultCatalog","namedCatalogs","named","Object","keys","length"],"mappings":";;;;+BAkBaA;;;eAAAA;;;6DAlBI;0BACQ;4CAEI;;;;;;AAU7B,SAASC,qBAAqBC,MAAwB;IACpD,MAAMC,qBAAqBC,aAAI,CAACC,IAAI,CAACH,OAAOI,IAAI,EAAEC,wCAAY,CAACC,IAAI;IACnE,OAAOC,IAAAA,kBAAQ,EAAoBN;AACrC;AAEO,MAAMH,gBAAoC;IAC/CU,sBAAsB,CAACR;QACrB,MAAM,EAAES,QAAQ,EAAE,GAAGV,qBAAqBC;QAC1C,OAAOS,WAAW;YAAEC,UAAUD;YAAUE,MAAM;QAAU,IAAIC;IAC9D;IAEA,+BAA+B;IAC/BC,aAAa,CAACb;QACZ,MAAMc,gBAAgBf,qBAAqBC;QAC3C,IAAI,CAACc,cAAcC,OAAO,IAAI,CAACD,cAAcE,QAAQ,EAAE;YACrD,OAAOJ;QACT;QACA,yFAAyF;QACzF,kEAAkE;QAClE,MAAM,EAAEK,SAASC,mBAAmB,EAAE,GAAGC,eAAe,GAAGL,cAAcE,QAAQ,IAAI,CAAC;QACtF,OAAO;YACLC,SAASH,cAAcC,OAAO,IAAIG;YAClCE,OAAOC,OAAOC,IAAI,CAACH,eAAeI,MAAM,GAAGJ,gBAAgBP;QAC7D;IACF;AACF"}

package/lib/workspaces/implementations/rush.d.ts

@@ -1,2 +1,2 @@
-import type { WorkspaceUtilities } from "./WorkspaceUtilities";
+import type { WorkspaceUtilities } from "./WorkspaceUtilities.js";
 export declare const rushUtilities: WorkspaceUtilities;

package/lib/workspaces/implementations/rush.js

@@ -1,19 +1,30 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rushUtilities = void 0;
-const fs_1 = __importDefault(require("fs"));
-const jju_1 = __importDefault(require("jju"));
-const path_1 = __importDefault(require("path"));
-const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
-exports.rushUtilities = {
-    getWorkspacePatterns: ({ root }) => {
-        const rushConfig = jju_1.default.parse(fs_1.default.readFileSync(path_1.default.join(root, getWorkspaceManagerAndRoot_1.managerFiles.rush), "utf-8"));
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "rushUtilities", {
+    enumerable: true,
+    get: function() {
+        return rushUtilities;
+    }
+});
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _jju = /*#__PURE__*/ _interop_require_default(require("jju"));
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _getWorkspaceManagerAndRoot = require("./getWorkspaceManagerAndRoot.js");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const rushUtilities = {
+    getWorkspacePatterns: ({ root })=>{
+        const rushConfig = _jju.default.parse(_fs.default.readFileSync(_path.default.join(root, _getWorkspaceManagerAndRoot.managerFiles.rush), "utf-8"));
         // The rush config "projects" are single folder paths
-        const patterns = rushConfig.projects.map((p) => p.projectFolder);
-        return { patterns, type: "path" };
-    },
+        const patterns = rushConfig.projects.map((p)=>p.projectFolder);
+        return {
+            patterns,
+            type: "path"
+        };
+    }
 };
-//# sourceMappingURL=rush.js.map

package/lib/workspaces/implementations/rush.js.map

@@ -1 +1 @@
-{"version":3,"file":"rush.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/rush.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,8CAAsB;AACtB,gDAAwB;AACxB,6EAA4D;AAG/C,QAAA,aAAa,GAAuB;IAC/C,oBAAoB,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACjC,MAAM,UAAU,GAAG,aAAG,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,yCAAY,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAExF,CAAC;QACF,qDAAqD;QACrD,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QACjE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACpC,CAAC;CACF,CAAC"}
+{"version":3,"sources":["../../../src/workspaces/implementations/rush.ts"],"sourcesContent":["import fs from \"fs\";\nimport jju from \"jju\";\nimport path from \"path\";\nimport { managerFiles } from \"./getWorkspaceManagerAndRoot.js\";\nimport type { WorkspaceUtilities } from \"./WorkspaceUtilities.js\";\n\nexport const rushUtilities: WorkspaceUtilities = {\n  getWorkspacePatterns: ({ root }) => {\n    const rushConfig = jju.parse(fs.readFileSync(path.join(root, managerFiles.rush), \"utf-8\")) as {\n      projects: Array<{ projectFolder: string }>;\n    };\n    // The rush config \"projects\" are single folder paths\n    const patterns = rushConfig.projects.map((p) => p.projectFolder);\n    return { patterns, type: \"path\" };\n  },\n};\n"],"names":["rushUtilities","getWorkspacePatterns","root","rushConfig","jju","parse","fs","readFileSync","path","join","managerFiles","rush","patterns","projects","map","p","projectFolder","type"],"mappings":";;;;+BAMaA;;;eAAAA;;;2DANE;4DACC;6DACC;4CACY;;;;;;AAGtB,MAAMA,gBAAoC;IAC/CC,sBAAsB,CAAC,EAAEC,IAAI,EAAE;QAC7B,MAAMC,aAAaC,YAAG,CAACC,KAAK,CAACC,WAAE,CAACC,YAAY,CAACC,aAAI,CAACC,IAAI,CAACP,MAAMQ,wCAAY,CAACC,IAAI,GAAG;QAGjF,qDAAqD;QACrD,MAAMC,WAAWT,WAAWU,QAAQ,CAACC,GAAG,CAAC,CAACC,IAAMA,EAAEC,aAAa;QAC/D,OAAO;YAAEJ;YAAUK,MAAM;QAAO;IAClC;AACF"}

package/lib/workspaces/implementations/yarn.d.ts

@@ -1,2 +1,2 @@
-import type { WorkspaceUtilities } from "./WorkspaceUtilities";
+import type { WorkspaceUtilities } from "./WorkspaceUtilities.js";
 export declare const yarnUtilities: WorkspaceUtilities;

package/lib/workspaces/implementations/yarn.js

@@ -1,41 +1,49 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.yarnUtilities = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const getPackageInfo_1 = require("../../getPackageInfo");
-const readYaml_1 = require("../../lockfile/readYaml");
-const getPackageJsonWorkspacePatterns_1 = require("./getPackageJsonWorkspacePatterns");
-exports.yarnUtilities = {
-    getWorkspacePatterns: getPackageJsonWorkspacePatterns_1.getPackageJsonWorkspacePatterns,
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "yarnUtilities", {
+    enumerable: true,
+    get: function() {
+        return yarnUtilities;
+    }
+});
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _getPackageInfo = require("../../getPackageInfo.js");
+const _readYaml = require("../../lockfile/readYaml.js");
+const _getPackageJsonWorkspacePatterns = require("./getPackageJsonWorkspacePatterns.js");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const yarnUtilities = {
+    getWorkspacePatterns: _getPackageJsonWorkspacePatterns.getPackageJsonWorkspacePatterns,
     // See https://yarnpkg.com/features/catalogs
-    getCatalogs: ({ root }) => {
-        const yarnrcYmlPath = path_1.default.join(root, ".yarnrc.yml");
-        if (fs_1.default.existsSync(yarnrcYmlPath)) {
-            const yarnrcYml = (0, readYaml_1.readYaml)(yarnrcYmlPath);
+    getCatalogs: ({ root })=>{
+        const yarnrcYmlPath = _path.default.join(root, ".yarnrc.yml");
+        if (_fs.default.existsSync(yarnrcYmlPath)) {
+            const yarnrcYml = (0, _readYaml.readYaml)(yarnrcYmlPath);
             if (yarnrcYml?.catalog || yarnrcYml?.catalogs) {
                 // Yarn v4+ format
-                return { default: yarnrcYml.catalog, named: yarnrcYml.catalogs };
+                return {
+                    default: yarnrcYml.catalog,
+                    named: yarnrcYml.catalogs
+                };
             }
-        }
-        else {
+        } else {
             // Check for midgard-yarn-strict definition of catalogs in package.json
-            const workspaceSettings = (0, getPackageInfo_1.getPackageInfo)(root)?.workspaces;
-            if (workspaceSettings &&
-                !Array.isArray(workspaceSettings) &&
-                (workspaceSettings?.catalog || workspaceSettings?.catalogs)) {
+            const workspaceSettings = (0, _getPackageInfo.getPackageInfo)(root)?.workspaces;
+            if (workspaceSettings && !Array.isArray(workspaceSettings) && (workspaceSettings?.catalog || workspaceSettings?.catalogs)) {
                 // This probably handles a catalog named "default" as the default catalog
                 const { default: namedDefaultCatalog, ...namedCatalogs } = workspaceSettings.catalogs || {};
                 return {
                     default: workspaceSettings.catalog || namedDefaultCatalog,
-                    named: Object.keys(namedCatalogs).length ? namedCatalogs : undefined,
+                    named: Object.keys(namedCatalogs).length ? namedCatalogs : undefined
                 };
             }
         }
         return undefined;
-    },
+    }
 };
-//# sourceMappingURL=yarn.js.map

package/lib/workspaces/implementations/yarn.js.map

@@ -1 +1 @@
-{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/yarn.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,yDAAsD;AAEtD,sDAAmD;AAEnD,uFAAoF;AAEvE,QAAA,aAAa,GAAuB;IAC/C,oBAAoB,EAAE,iEAA+B;IAErD,4CAA4C;IAC5C,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACxB,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACrD,IAAI,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;YAChC,MAAM,SAAS,GAAG,IAAA,mBAAQ,EAAkD,aAAa,CAAC,CAAC;YAC3F,IAAI,SAAS,EAAE,OAAO,IAAI,SAAS,EAAE,QAAQ,EAAE;gBAC7C,kBAAkB;gBAClB,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC;aAClE;SACF;aAAM;YACL,uEAAuE;YACvE,MAAM,iBAAiB,GAAG,IAAA,+BAAc,EAAC,IAAI,CAAC,EAAE,UAAU,CAAC;YAC3D,IACE,iBAAiB;gBACjB,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC;gBACjC,CAAC,iBAAiB,EAAE,OAAO,IAAI,iBAAiB,EAAE,QAAQ,CAAC,EAC3D;gBACA,yEAAyE;gBACzE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,aAAa,EAAE,GAAG,iBAAiB,CAAC,QAAQ,IAAI,EAAE,CAAC;gBAC5F,OAAO;oBACL,OAAO,EAAE,iBAAiB,CAAC,OAAO,IAAI,mBAAmB;oBACzD,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS;iBACrE,CAAC;aACH;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAC"}
+{"version":3,"sources":["../../../src/workspaces/implementations/yarn.ts"],"sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\nimport { getPackageInfo } from \"../../getPackageInfo.js\";\nimport type { Catalog, NamedCatalogs } from \"../../types/Catalogs.js\";\nimport { readYaml } from \"../../lockfile/readYaml.js\";\nimport type { WorkspaceUtilities } from \"./WorkspaceUtilities.js\";\nimport { getPackageJsonWorkspacePatterns } from \"./getPackageJsonWorkspacePatterns.js\";\n\nexport const yarnUtilities: WorkspaceUtilities = {\n  getWorkspacePatterns: getPackageJsonWorkspacePatterns,\n\n  // See https://yarnpkg.com/features/catalogs\n  getCatalogs: ({ root }) => {\n    const yarnrcYmlPath = path.join(root, \".yarnrc.yml\");\n    if (fs.existsSync(yarnrcYmlPath)) {\n      const yarnrcYml = readYaml<{ catalog?: Catalog; catalogs?: NamedCatalogs }>(yarnrcYmlPath);\n      if (yarnrcYml?.catalog || yarnrcYml?.catalogs) {\n        // Yarn v4+ format\n        return { default: yarnrcYml.catalog, named: yarnrcYml.catalogs };\n      }\n    } else {\n      // Check for midgard-yarn-strict definition of catalogs in package.json\n      const workspaceSettings = getPackageInfo(root)?.workspaces;\n      if (\n        workspaceSettings &&\n        !Array.isArray(workspaceSettings) &&\n        (workspaceSettings?.catalog || workspaceSettings?.catalogs)\n      ) {\n        // This probably handles a catalog named \"default\" as the default catalog\n        const { default: namedDefaultCatalog, ...namedCatalogs } = workspaceSettings.catalogs || {};\n        return {\n          default: workspaceSettings.catalog || namedDefaultCatalog,\n          named: Object.keys(namedCatalogs).length ? namedCatalogs : undefined,\n        };\n      }\n    }\n    return undefined;\n  },\n};\n"],"names":["yarnUtilities","getWorkspacePatterns","getPackageJsonWorkspacePatterns","getCatalogs","root","yarnrcYmlPath","path","join","fs","existsSync","yarnrcYml","readYaml","catalog","catalogs","default","named","workspaceSettings","getPackageInfo","workspaces","Array","isArray","namedDefaultCatalog","namedCatalogs","Object","keys","length","undefined"],"mappings":";;;;+BAQaA;;;eAAAA;;;2DARE;6DACE;gCACc;0BAEN;iDAEuB;;;;;;AAEzC,MAAMA,gBAAoC;IAC/CC,sBAAsBC,gEAA+B;IAErD,4CAA4C;IAC5CC,aAAa,CAAC,EAAEC,IAAI,EAAE;QACpB,MAAMC,gBAAgBC,aAAI,CAACC,IAAI,CAACH,MAAM;QACtC,IAAII,WAAE,CAACC,UAAU,CAACJ,gBAAgB;YAChC,MAAMK,YAAYC,IAAAA,kBAAQ,EAAkDN;YAC5E,IAAIK,WAAWE,WAAWF,WAAWG,UAAU;gBAC7C,kBAAkB;gBAClB,OAAO;oBAAEC,SAASJ,UAAUE,OAAO;oBAAEG,OAAOL,UAAUG,QAAQ;gBAAC;YACjE;QACF,OAAO;YACL,uEAAuE;YACvE,MAAMG,oBAAoBC,IAAAA,8BAAc,EAACb,OAAOc;YAChD,IACEF,qBACA,CAACG,MAAMC,OAAO,CAACJ,sBACdA,CAAAA,mBAAmBJ,WAAWI,mBAAmBH,QAAO,GACzD;gBACA,yEAAyE;gBACzE,MAAM,EAAEC,SAASO,mBAAmB,EAAE,GAAGC,eAAe,GAAGN,kBAAkBH,QAAQ,IAAI,CAAC;gBAC1F,OAAO;oBACLC,SAASE,kBAAkBJ,OAAO,IAAIS;oBACtCN,OAAOQ,OAAOC,IAAI,CAACF,eAAeG,MAAM,GAAGH,gBAAgBI;gBAC7D;YACF;QACF;QACA,OAAOA;IACT;AACF"}

package/lib/workspaces/wrapWorkspaceUtility.d.ts

@@ -1,4 +1,4 @@
-import type { WorkspaceManager } from "../types/WorkspaceManager";
+import type { WorkspaceManager } from "../types/WorkspaceManager.js";
 import { type WorkspaceManagerAndRoot } from "./implementations";
 interface WrappedUtilityParams {
     /** Search for the root from here */

package/lib/workspaces/wrapWorkspaceUtility.js

@@ -1,49 +1,47 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapAsyncWorkspaceUtility = exports.wrapWorkspaceUtility = void 0;
-const logging_1 = require("../logging");
-const implementations_1 = require("./implementations");
-/**
- * Wrap a workspace utility function with common error handling and messaging.
- * Also handle getting the manager and root.
- *
- * @returns The utility's return value, or undefined on error (will verbose log on error)
- */
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get wrapAsyncWorkspaceUtility () {
+        return wrapAsyncWorkspaceUtility;
+    },
+    get wrapWorkspaceUtility () {
+        return wrapWorkspaceUtility;
+    }
+});
+const _logging = require("../logging.js");
+const _implementations = require("./implementations");
 function wrapWorkspaceUtility(params) {
     const { cwd, description, impl } = params;
     let managerInfo;
     try {
-        managerInfo = (0, implementations_1.getWorkspaceManagerAndRoot)(cwd, undefined, params.managerOverride);
+        managerInfo = (0, _implementations.getWorkspaceManagerAndRoot)(cwd, undefined, params.managerOverride);
         if (managerInfo) {
             return impl(managerInfo);
         }
-    }
-    catch (err) {
+    } catch (err) {
         const manager = params.managerOverride || managerInfo?.manager || "unknown manager";
-        (0, logging_1.logVerboseWarning)(`Error getting ${manager} ${description} for ${cwd}:`, err);
+        (0, _logging.logVerboseWarning)(`Error getting ${manager} ${description} for ${cwd}:`, err);
     }
 }
-exports.wrapWorkspaceUtility = wrapWorkspaceUtility;
-/**
- * Wrap a workspace utility function with common error handling and messaging.
- * Also handle getting the manager and root.
- *
- * @returns The utility's return value, or undefined on error (will verbose log on error)
- */
 async function wrapAsyncWorkspaceUtility(params) {
     const { cwd, description, impl } = params;
     let managerInfo;
     try {
-        managerInfo = (0, implementations_1.getWorkspaceManagerAndRoot)(cwd, undefined, params.managerOverride);
+        managerInfo = (0, _implementations.getWorkspaceManagerAndRoot)(cwd, undefined, params.managerOverride);
         if (managerInfo) {
             return await impl(managerInfo);
         }
-    }
-    catch (err) {
+    } catch (err) {
         const manager = params.managerOverride || managerInfo?.manager || "unknown manager";
-        (0, logging_1.logVerboseWarning)(`Error getting ${manager} ${description} for ${cwd}:`, err);
+        (0, _logging.logVerboseWarning)(`Error getting ${manager} ${description} for ${cwd}:`, err);
     }
     return undefined;
 }
-exports.wrapAsyncWorkspaceUtility = wrapAsyncWorkspaceUtility;
-//# sourceMappingURL=wrapWorkspaceUtility.js.map

package/lib/workspaces/wrapWorkspaceUtility.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapWorkspaceUtility.js","sourceRoot":"","sources":["../../src/workspaces/wrapWorkspaceUtility.ts"],"names":[],"mappings":";;;AAAA,wCAA+C;AAE/C,uDAA6F;AAW7F;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,MAGC;IAED,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAC1C,IAAI,WAAgD,CAAC;IACrD,IAAI;QACF,WAAW,GAAG,IAAA,4CAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;QACjF,IAAI,WAAW,EAAE;YACf,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;SAC1B;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,OAAO,GAAG,MAAM,CAAC,eAAe,IAAI,WAAW,EAAE,OAAO,IAAI,iBAAiB,CAAC;QACpF,IAAA,2BAAiB,EAAC,iBAAiB,OAAO,IAAI,WAAW,QAAQ,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;KAC/E;AACH,CAAC;AAjBD,oDAiBC;AAED;;;;;GAKG;AACI,KAAK,UAAU,yBAAyB,CAC7C,MAGC;IAED,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAC1C,IAAI,WAAgD,CAAC;IACrD,IAAI;QACF,WAAW,GAAG,IAAA,4CAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;QACjF,IAAI,WAAW,EAAE;YACf,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,CAAC;SAChC;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,OAAO,GAAG,MAAM,CAAC,eAAe,IAAI,WAAW,EAAE,OAAO,IAAI,iBAAiB,CAAC;QACpF,IAAA,2BAAiB,EAAC,iBAAiB,OAAO,IAAI,WAAW,QAAQ,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;KAC/E;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAlBD,8DAkBC"}
+{"version":3,"sources":["../../src/workspaces/wrapWorkspaceUtility.ts"],"sourcesContent":["import { logVerboseWarning } from \"../logging.js\";\nimport type { WorkspaceManager } from \"../types/WorkspaceManager.js\";\nimport { getWorkspaceManagerAndRoot, type WorkspaceManagerAndRoot } from \"./implementations\";\n\ninterface WrappedUtilityParams {\n  /** Search for the root from here */\n  cwd: string;\n  /** Optional manager to use instead of auto-detecting */\n  managerOverride: WorkspaceManager | undefined;\n  /** What the utility is getting (for logging) */\n  description: string;\n}\n\n/**\n * Wrap a workspace utility function with common error handling and messaging.\n * Also handle getting the manager and root.\n *\n * @returns The utility's return value, or undefined on error (will verbose log on error)\n */\nexport function wrapWorkspaceUtility<TReturn>(\n  params: WrappedUtilityParams & {\n    /** Implementation of the utility, which receives the detected manager and root */\n    impl: (params: WorkspaceManagerAndRoot) => TReturn | undefined;\n  }\n): TReturn | undefined {\n  const { cwd, description, impl } = params;\n  let managerInfo: WorkspaceManagerAndRoot | undefined;\n  try {\n    managerInfo = getWorkspaceManagerAndRoot(cwd, undefined, params.managerOverride);\n    if (managerInfo) {\n      return impl(managerInfo);\n    }\n  } catch (err) {\n    const manager = params.managerOverride || managerInfo?.manager || \"unknown manager\";\n    logVerboseWarning(`Error getting ${manager} ${description} for ${cwd}:`, err);\n  }\n}\n\n/**\n * Wrap a workspace utility function with common error handling and messaging.\n * Also handle getting the manager and root.\n *\n * @returns The utility's return value, or undefined on error (will verbose log on error)\n */\nexport async function wrapAsyncWorkspaceUtility<TReturn>(\n  params: WrappedUtilityParams & {\n    /** Implementation of the utility, which receives the detected manager and root */\n    impl: (params: WorkspaceManagerAndRoot) => Promise<TReturn | undefined>;\n  }\n): Promise<TReturn | undefined> {\n  const { cwd, description, impl } = params;\n  let managerInfo: WorkspaceManagerAndRoot | undefined;\n  try {\n    managerInfo = getWorkspaceManagerAndRoot(cwd, undefined, params.managerOverride);\n    if (managerInfo) {\n      return await impl(managerInfo);\n    }\n  } catch (err) {\n    const manager = params.managerOverride || managerInfo?.manager || \"unknown manager\";\n    logVerboseWarning(`Error getting ${manager} ${description} for ${cwd}:`, err);\n  }\n  return undefined;\n}\n"],"names":["wrapAsyncWorkspaceUtility","wrapWorkspaceUtility","params","cwd","description","impl","managerInfo","getWorkspaceManagerAndRoot","undefined","managerOverride","err","manager","logVerboseWarning"],"mappings":";;;;;;;;;;;QA4CsBA;eAAAA;;QAzBNC;eAAAA;;;yBAnBkB;iCAEuC;AAiBlE,SAASA,qBACdC,MAGC;IAED,MAAM,EAAEC,GAAG,EAAEC,WAAW,EAAEC,IAAI,EAAE,GAAGH;IACnC,IAAII;IACJ,IAAI;QACFA,cAAcC,IAAAA,2CAA0B,EAACJ,KAAKK,WAAWN,OAAOO,eAAe;QAC/E,IAAIH,aAAa;YACf,OAAOD,KAAKC;QACd;IACF,EAAE,OAAOI,KAAK;QACZ,MAAMC,UAAUT,OAAOO,eAAe,IAAIH,aAAaK,WAAW;QAClEC,IAAAA,0BAAiB,EAAC,CAAC,cAAc,EAAED,QAAQ,CAAC,EAAEP,YAAY,KAAK,EAAED,IAAI,CAAC,CAAC,EAAEO;IAC3E;AACF;AAQO,eAAeV,0BACpBE,MAGC;IAED,MAAM,EAAEC,GAAG,EAAEC,WAAW,EAAEC,IAAI,EAAE,GAAGH;IACnC,IAAII;IACJ,IAAI;QACFA,cAAcC,IAAAA,2CAA0B,EAACJ,KAAKK,WAAWN,OAAOO,eAAe;QAC/E,IAAIH,aAAa;YACf,OAAO,MAAMD,KAAKC;QACpB;IACF,EAAE,OAAOI,KAAK;QACZ,MAAMC,UAAUT,OAAOO,eAAe,IAAIH,aAAaK,WAAW;QAClEC,IAAAA,0BAAiB,EAAC,CAAC,cAAc,EAAED,QAAQ,CAAC,EAAEP,YAAY,KAAK,EAAED,IAAI,CAAC,CAAC,EAAEO;IAC3E;IACA,OAAOF;AACT"}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "workspace-tools",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/microsoft/workspace-tools"
+    "url": "https://github.com/microsoft/lage",
+    "directory": "packages/workspace-tools"
   },
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -13,21 +14,29 @@
     "lib/!(__*)/**/*"
   ],
   "scripts": {
-    "api": "ws-tools-scripts api",
-    "build": "tsc --pretty",
-    "start": "tsc -w --preserveWatchOutput",
-    "test": "jest"
+    "api": "monorepo-scripts api",
+    "build": "yarn types && yarn transpile",
+    "transpile": "monorepo-scripts transpile",
+    "types": "yarn run -T tsc",
+    "test": "yarn run -T jest",
+    "lint": "monorepo-scripts lint"
   },
   "dependencies": {
     "@yarnpkg/lockfile": "^1.1.0",
-    "fast-glob": "^3.3.1",
-    "git-url-parse": "^16.0.0",
-    "globby": "^11.0.0",
+    "fast-glob": "^3.3.3",
+    "git-url-parse": "^16.1.0",
     "jju": "^1.4.0",
-    "js-yaml": "^4.1.0",
-    "micromatch": "^4.0.0"
+    "js-yaml": "^4.1.1",
+    "micromatch": "^4.0.8"
   },
   "devDependencies": {
-    "@ws-tools/scripts": "*"
+    "@lage-run/monorepo-scripts": "^1.0.0",
+    "@lage-run/test-utilities": "^0.1.0",
+    "@types/git-url-parse": "^16.0.0",
+    "@types/jju": "^1.4.2",
+    "@types/js-yaml": "^4.0.5",
+    "@types/micromatch": "^4.0.0",
+    "@types/yarnpkg__lockfile": "^1.1.5",
+    "ts-dedent": "^2.2.0"
   }
 }

package/lib/lockfile/index.d.ts

@@ -1,6 +0,0 @@
-import { ParsedLock } from "./types";
-import { nameAtVersion } from "./nameAtVersion";
-export declare function parseLockFile(packageRoot: string): Promise<ParsedLock>;
-export { nameAtVersion };
-export { queryLockFile } from "./queryLockFile";
-export * from "./types";

package/lib/lockfile/index.js

@@ -1,105 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.queryLockFile = exports.nameAtVersion = exports.parseLockFile = void 0;
-// NOTE: never place the import of lockfile implementation here, as it slows down the library as a whole
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const nameAtVersion_1 = require("./nameAtVersion");
-Object.defineProperty(exports, "nameAtVersion", { enumerable: true, get: function () { return nameAtVersion_1.nameAtVersion; } });
-const paths_1 = require("../paths");
-const parsePnpmLock_1 = require("./parsePnpmLock");
-const parseNpmLock_1 = require("./parseNpmLock");
-const readYaml_1 = require("./readYaml");
-const parseBerryLock_1 = require("./parseBerryLock");
-const memoization = {};
-async function parseLockFile(packageRoot) {
-    const yarnLockPath = (0, paths_1.searchUp)(["yarn.lock", "common/config/rush/yarn.lock"], packageRoot);
-    // First, test out whether this works for yarn
-    if (yarnLockPath) {
-        if (memoization[yarnLockPath]) {
-            return memoization[yarnLockPath];
-        }
-        const yarnLock = fs_1.default.readFileSync(yarnLockPath, "utf-8");
-        const isBerry = yarnLock.includes("__metadata") || fs_1.default.existsSync(path_1.default.resolve(yarnLock.replace("yarn.lock", ".yarnrc.yml")));
-        let parsed = {
-            type: "success",
-            object: {},
-        };
-        if (isBerry) {
-            const yaml = (0, readYaml_1.readYaml)(yarnLockPath);
-            parsed = (0, parseBerryLock_1.parseBerryLock)(yaml);
-        }
-        else {
-            const parseYarnLock = (await Promise.resolve().then(() => __importStar(require("@yarnpkg/lockfile")))).parse;
-            parsed = parseYarnLock(yarnLock);
-        }
-        memoization[yarnLockPath] = parsed;
-        return parsed;
-    }
-    // Second, test out whether this works for pnpm
-    let pnpmLockPath = (0, paths_1.searchUp)(["pnpm-lock.yaml", "common/config/rush/pnpm-lock.yaml"], packageRoot);
-    if (pnpmLockPath) {
-        if (memoization[pnpmLockPath]) {
-            return memoization[pnpmLockPath];
-        }
-        const yaml = (0, readYaml_1.readYaml)(pnpmLockPath);
-        const parsed = (0, parsePnpmLock_1.parsePnpmLock)(yaml);
-        memoization[pnpmLockPath] = parsed;
-        return memoization[pnpmLockPath];
-    }
-    // Third, try for npm workspaces
-    let npmLockPath = (0, paths_1.searchUp)("package-lock.json", packageRoot);
-    if (npmLockPath) {
-        if (memoization[npmLockPath]) {
-            return memoization[npmLockPath];
-        }
-        let npmLockJson;
-        try {
-            npmLockJson = fs_1.default.readFileSync(npmLockPath, "utf-8");
-        }
-        catch {
-            throw new Error("Couldn't read package-lock.json");
-        }
-        const npmLock = JSON.parse(npmLockJson.toString());
-        if (!npmLock?.lockfileVersion || npmLock.lockfileVersion < 2) {
-            throw new Error(`Your package-lock.json version is not supported: lockfileVersion is ${npmLock.lockfileVersion}. You need npm version 7 or above and package-lock version 2 or above. Please, upgrade npm or choose a different package manager.`);
-        }
-        memoization[npmLockPath] = (0, parseNpmLock_1.parseNpmLock)(npmLock);
-        return memoization[npmLockPath];
-    }
-    throw new Error("You do not have yarn.lock, pnpm-lock.yaml or package-lock.json. Please use one of these package managers.");
-}
-exports.parseLockFile = parseLockFile;
-var queryLockFile_1 = require("./queryLockFile");
-Object.defineProperty(exports, "queryLockFile", { enumerable: true, get: function () { return queryLockFile_1.queryLockFile; } });
-__exportStar(require("./types"), exports);
-//# sourceMappingURL=index.js.map

package/lib/lockfile/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lockfile/index.ts"],"names":[],"mappings":"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"}