workspace-tools 0.18.0 → 0.18.3

package/lib/workspaces/getWorkspacePackageInfo.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWorkspacePackageInfo = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 function getWorkspacePackageInfo(workspacePaths) {

package/lib/workspaces/getWorkspaceRoot.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWorkspaceRoot = void 0;
 const implementations_1 = require("./implementations");
 const preferred = process.env.PREFERRED_WORKSPACE_MANAGER;
 function getWorkspaceRoot(cwd) {
-    const workspaceImplementation = preferred || implementations_1.getWorkspaceImplementation(cwd);
+    const workspaceImplementation = preferred || (0, implementations_1.getWorkspaceImplementation)(cwd);
     if (!workspaceImplementation) {
         return;
     }

package/lib/workspaces/getWorkspaces.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWorkspaces = void 0;
 const implementations_1 = require("./implementations");
 const preferred = process.env.PREFERRED_WORKSPACE_MANAGER;
 function getWorkspaces(cwd) {
-    const workspaceImplementation = preferred || implementations_1.getWorkspaceImplementation(cwd);
+    const workspaceImplementation = preferred || (0, implementations_1.getWorkspaceImplementation)(cwd);
     if (!workspaceImplementation) {
         return [];
     }

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

@@ -3,8 +3,12 @@ export interface ImplementationAndLockFile {
     implementation: WorkspaceImplementations | undefined;
     lockFile: string;
 }
-export declare function getWorkspaceImplementationAndLockFile(cwd: string): {
+export declare function getWorkspaceImplementationAndLockFile(cwd: string, cache?: {
+    [cwd: string]: ImplementationAndLockFile;
+}): {
     implementation: WorkspaceImplementations | undefined;
     lockFile: string;
 } | undefined;
-export declare function getWorkspaceImplementation(cwd: string): WorkspaceImplementations | undefined;
+export declare function getWorkspaceImplementation(cwd: string, cache?: {
+    [cwd: string]: ImplementationAndLockFile;
+}): WorkspaceImplementations | undefined;

package/lib/workspaces/implementations/index.js

@@ -3,14 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWorkspaceImplementation = exports.getWorkspaceImplementationAndLockFile = void 0;
 const find_up_1 = __importDefault(require("find-up"));
 const path_1 = __importDefault(require("path"));
-const cache = {};
-function getWorkspaceImplementationAndLockFile(cwd) {
+const workspaceCache = {};
+function getWorkspaceImplementationAndLockFile(cwd, cache = workspaceCache) {
     if (cache[cwd]) {
         return cache[cwd];
     }
-    const lockFile = find_up_1.default.sync(["lerna.json", "yarn.lock", "pnpm-workspace.yaml", "rush.json", "package-lock.json"], {
+    const lockFile = find_up_1.default.sync(["lerna.json", "rush.json", "yarn.lock", "pnpm-workspace.yaml", "package-lock.json"], {
         cwd,
     });
     if (!lockFile) {
@@ -51,8 +52,8 @@ function getWorkspaceImplementationAndLockFile(cwd) {
     return cache[cwd];
 }
 exports.getWorkspaceImplementationAndLockFile = getWorkspaceImplementationAndLockFile;
-function getWorkspaceImplementation(cwd) {
+function getWorkspaceImplementation(cwd, cache = workspaceCache) {
     var _a;
-    return (_a = getWorkspaceImplementationAndLockFile(cwd)) === null || _a === void 0 ? void 0 : _a.implementation;
+    return (_a = getWorkspaceImplementationAndLockFile(cwd, cache)) === null || _a === void 0 ? void 0 : _a.implementation;
 }
 exports.getWorkspaceImplementation = getWorkspaceImplementation;

package/lib/workspaces/implementations/lerna.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLernaWorkspaces = exports.getLernaWorkspaceRoot = void 0;
 const find_up_1 = __importDefault(require("find-up"));
 const fs_1 = __importDefault(require("fs"));
 const jju_1 = __importDefault(require("jju"));
@@ -22,8 +23,8 @@ function getLernaWorkspaces(cwd) {
         const lernaWorkspaceRoot = getLernaWorkspaceRoot(cwd);
         const lernaJsonPath = path_1.default.join(lernaWorkspaceRoot, "lerna.json");
         const lernaConfig = jju_1.default.parse(fs_1.default.readFileSync(lernaJsonPath, "utf-8"));
-        const packagePaths = getPackagePaths_1.getPackagePaths(lernaWorkspaceRoot, lernaConfig.packages);
-        const workspaceInfo = getWorkspacePackageInfo_1.getWorkspacePackageInfo(packagePaths);
+        const packagePaths = (0, getPackagePaths_1.getPackagePaths)(lernaWorkspaceRoot, lernaConfig.packages);
+        const workspaceInfo = (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
         return workspaceInfo;
     }
     catch (_a) {

package/lib/workspaces/implementations/npm.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNpmWorkspaces = exports.getNpmWorkspaceRoot = void 0;
 const packageJsonWorkspaces_1 = require("./packageJsonWorkspaces");
 function getNpmWorkspaceRoot(cwd) {
-    const npmWorkspacesRoot = packageJsonWorkspaces_1.getPackageJsonWorkspaceRoot(cwd);
+    const npmWorkspacesRoot = (0, packageJsonWorkspaces_1.getPackageJsonWorkspaceRoot)(cwd);
     if (!npmWorkspacesRoot) {
         throw new Error("Could not find NPM workspaces root");
     }
@@ -11,6 +12,6 @@ function getNpmWorkspaceRoot(cwd) {
 exports.getNpmWorkspaceRoot = getNpmWorkspaceRoot;
 function getNpmWorkspaces(cwd) {
     const npmWorkspacesRoot = getNpmWorkspaceRoot(cwd);
-    return packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot(npmWorkspacesRoot);
+    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot)(npmWorkspacesRoot);
 }
 exports.getNpmWorkspaces = getNpmWorkspaces;

package/lib/workspaces/implementations/packageJsonWorkspaces.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWorkspaceInfoFromWorkspaceRoot = exports.getPackageJsonWorkspaceRoot = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const _1 = require(".");
@@ -10,7 +11,7 @@ const getPackagePaths_1 = require("../../getPackagePaths");
 const getWorkspacePackageInfo_1 = require("../getWorkspacePackageInfo");
 function getPackageJsonWorkspaceRoot(cwd) {
     var _a;
-    const lockFile = (_a = _1.getWorkspaceImplementationAndLockFile(cwd)) === null || _a === void 0 ? void 0 : _a.lockFile;
+    const lockFile = (_a = (0, _1.getWorkspaceImplementationAndLockFile)(cwd)) === null || _a === void 0 ? void 0 : _a.lockFile;
     const packageJsonWorkspacesRoot = lockFile ? path_1.default.dirname(lockFile) : cwd;
     return packageJsonWorkspacesRoot;
 }
@@ -39,8 +40,8 @@ function getWorkspaceInfoFromWorkspaceRoot(packageJsonWorkspacesRoot) {
     try {
         const rootPackageJson = getRootPackageJson(packageJsonWorkspacesRoot);
         const packages = getPackages(rootPackageJson);
-        const packagePaths = getPackagePaths_1.getPackagePaths(packageJsonWorkspacesRoot, packages);
-        const workspaceInfo = getWorkspacePackageInfo_1.getWorkspacePackageInfo(packagePaths);
+        const packagePaths = (0, getPackagePaths_1.getPackagePaths)(packageJsonWorkspacesRoot, packages);
+        const workspaceInfo = (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
         return workspaceInfo;
     }
     catch (_a) {

package/lib/workspaces/implementations/pnpm.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPnpmWorkspaces = exports.getPnpmWorkspaceRoot = void 0;
 const path_1 = __importDefault(require("path"));
 const find_up_1 = __importDefault(require("find-up"));
 const getPackagePaths_1 = require("../../getPackagePaths");
@@ -21,8 +22,8 @@ function getPnpmWorkspaces(cwd) {
         const pnpmWorkspacesFile = path_1.default.join(pnpmWorkspacesRoot, "pnpm-workspace.yaml");
         const readYaml = require("read-yaml-file").sync;
         const pnpmWorkspaces = readYaml(pnpmWorkspacesFile);
-        const packagePaths = getPackagePaths_1.getPackagePaths(pnpmWorkspacesRoot, pnpmWorkspaces.packages);
-        const workspaceInfo = getWorkspacePackageInfo_1.getWorkspacePackageInfo(packagePaths);
+        const packagePaths = (0, getPackagePaths_1.getPackagePaths)(pnpmWorkspacesRoot, pnpmWorkspaces.packages);
+        const workspaceInfo = (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
         return workspaceInfo;
     }
     catch (_a) {

package/lib/workspaces/implementations/rush.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRushWorkspaces = exports.getRushWorkspaceRoot = void 0;
 const find_up_1 = __importDefault(require("find-up"));
 const path_1 = __importDefault(require("path"));
 const jju_1 = __importDefault(require("jju"));
@@ -22,7 +23,7 @@ function getRushWorkspaces(cwd) {
         const rushJsonPath = path_1.default.join(rushWorkspaceRoot, "rush.json");
         const rushConfig = jju_1.default.parse(fs_1.default.readFileSync(rushJsonPath, "utf-8"));
         const root = path_1.default.dirname(rushJsonPath);
-        return getWorkspacePackageInfo_1.getWorkspacePackageInfo(rushConfig.projects.map((project) => path_1.default.join(root, project.projectFolder)));
+        return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(rushConfig.projects.map((project) => path_1.default.join(root, project.projectFolder)));
     }
     catch (_a) {
         return [];

package/lib/workspaces/implementations/yarn.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getYarnWorkspaces = exports.getYarnWorkspaceRoot = void 0;
 const packageJsonWorkspaces_1 = require("./packageJsonWorkspaces");
 function getYarnWorkspaceRoot(cwd) {
-    const yarnWorkspacesRoot = packageJsonWorkspaces_1.getPackageJsonWorkspaceRoot(cwd);
+    const yarnWorkspacesRoot = (0, packageJsonWorkspaces_1.getPackageJsonWorkspaceRoot)(cwd);
     if (!yarnWorkspacesRoot) {
         throw new Error("Could not find yarn workspaces root");
     }
@@ -11,6 +12,6 @@ function getYarnWorkspaceRoot(cwd) {
 exports.getYarnWorkspaceRoot = getYarnWorkspaceRoot;
 function getYarnWorkspaces(cwd) {
     const yarnWorkspacesRoot = getYarnWorkspaceRoot(cwd);
-    return packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot(yarnWorkspacesRoot);
+    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot)(yarnWorkspacesRoot);
 }
 exports.getYarnWorkspaces = getYarnWorkspaces;

package/lib/workspaces/listOfWorkspacePackageNames.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.listOfWorkspacePackageNames = void 0;
 function listOfWorkspacePackageNames(workspaces) {
     return workspaces.map(({ name }) => name);
 }

package/lib/workspaces/workspaces.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports._resetCache = exports.getAllPackageJsonFiles = void 0;
 const getWorkspaces_1 = require("./getWorkspaces");
 const cache = new Map();
 /**
@@ -10,7 +11,7 @@ function getAllPackageJsonFiles(cwd) {
     if (cache.has(cwd)) {
         return cache.get(cwd);
     }
-    const workspaces = getWorkspaces_1.getWorkspaces(cwd);
+    const workspaces = (0, getWorkspaces_1.getWorkspaces)(cwd);
     const packageJsonFiles = workspaces.map((workspace) => workspace.packageJson.packageJsonPath);
     cache.set(cwd, packageJsonFiles);
     return packageJsonFiles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workspace-tools",
-  "version": "0.18.0",
+  "version": "0.18.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -38,6 +38,6 @@
     "jest": "^25.0.0",
     "tmp": "^0.2.1",
     "ts-jest": "^25.5.1",
-    "typescript": "3.8.3"
+    "typescript": "^4.5.4"
   }
 }