workspace-tools 0.24.0 → 0.25.2

package/CHANGELOG.json

@@ -2,7 +2,229 @@
   "name": "workspace-tools",
   "entries": [
     {
-      "date": "Wed, 20 Jul 2022 22:31:28 GMT",
+      "date": "Tue, 02 Aug 2022 23:03:07 GMT",
+      "tag": "workspace-tools_v0.25.2",
+      "version": "0.25.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "elcraig@microsoft.com",
+            "package": "workspace-tools",
+            "commit": "476b210fe32e5ebfc5ab6ac0fc3c209e17767f0b",
+            "comment": "Add fs-extra to devDependencies and remove non-dev usage"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 26 Jul 2022 05:21:19 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "none": [
+          {
+            "author": "email not defined",
+            "package": "workspace-tools",
+            "commit": "not available",
+            "comment": "Update devDependency @types/tmp to v0.2.3"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 26 Jul 2022 05:20:52 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "none": [
+          {
+            "author": "email not defined",
+            "package": "workspace-tools",
+            "commit": "b1541150f96f183fdc2ec1c07eba08316494ad38",
+            "comment": "Update devDependency @types/tmp to v0.2.3"
+          },
+          {
+            "author": "renovate@whitesourcesoftware.com",
+            "package": "workspace-tools",
+            "commit": "not available",
+            "comment": "Update jest monorepo to v28"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 26 Jul 2022 05:20:33 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "none": [
+          {
+            "author": "renovate@whitesourcesoftware.com",
+            "package": "workspace-tools",
+            "commit": "ceb72cdb72daff7d8e303ba61fec567ae880a35e",
+            "comment": "Update jest monorepo to v28"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 26 Jul 2022 03:54:05 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "none": [
+          {
+            "author": "renovate@whitesourcesoftware.com",
+            "package": "workspace-tools",
+            "commit": "not available",
+            "comment": "Update devDependency @types/yarnpkg__lockfile to v1.1.5"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 26 Jul 2022 03:53:33 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "none": [
+          {
+            "author": "renovate@whitesourcesoftware.com",
+            "package": "workspace-tools",
+            "commit": "215d005bda9685bfd53131078e13aa00fb27f291",
+            "comment": "Update devDependency @types/yarnpkg__lockfile to v1.1.5"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 26 Jul 2022 02:20:08 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "none": [
+          {
+            "author": "renovate@whitesourcesoftware.com",
+            "package": "workspace-tools",
+            "commit": "beb806b17f64ce3d5babf13621e6e3b63bd16f90",
+            "comment": "Update devDependency beachball to v2.26.0"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 26 Jul 2022 02:16:55 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "none": [
+          {
+            "author": "email not defined",
+            "package": "workspace-tools",
+            "comment": "Update devDependency @types/jest to v25.2.3",
+            "commit": "a4ea3510cab1d33efa55e2644cec7e0d543a6ef2"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 26 Jul 2022 01:37:45 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "none": [
+          {
+            "author": "renovate@whitesourcesoftware.com",
+            "package": "workspace-tools",
+            "comment": "Update devDependency @types/jju to v1.4.2",
+            "commit": "f5b7af07f4bcbecb5db1d47589ac7e66f4bae21f"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 26 Jul 2022 01:37:23 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "none": [
+          {
+            "author": "renovate@whitesourcesoftware.com",
+            "package": "workspace-tools",
+            "comment": "Update devDependency @types/jju to v1.4.2",
+            "commit": "763800ee9cdb0f39e9748e601cd6fdc8997de64b"
+          },
+          {
+            "author": "email not defined",
+            "package": "workspace-tools",
+            "comment": "Update devDependency @types/git-url-parse to v9.0.1",
+            "commit": "763800ee9cdb0f39e9748e601cd6fdc8997de64b"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 26 Jul 2022 01:36:52 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "none": [
+          {
+            "author": "email not defined",
+            "package": "workspace-tools",
+            "comment": "Update devDependency @types/git-url-parse to v9.0.1",
+            "commit": "51be1586f27bd2029028e9c2f035d809f3ce07cb"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 26 Jul 2022 01:31:27 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "none": [
+          {
+            "author": "email not defined",
+            "package": "workspace-tools",
+            "comment": "Pin devDependencies",
+            "commit": "fd4e4d468c26f7ea6003b590cdabf0eac1acec9a"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 21 Jul 2022 21:21:48 GMT",
+      "tag": "workspace-tools_v0.25.1",
+      "version": "0.25.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "dannyfritz@gmail.com",
+            "package": "workspace-tools",
+            "comment": "Use git ls-files for checkUntrackedFiles",
+            "commit": "f19c194e3636c08c2c3367daff9510efc07559da"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 21 Jul 2022 21:11:11 GMT",
+      "tag": "workspace-tools_v0.25.0",
+      "version": "0.25.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "dlannoye@microsoft.com",
+            "package": "workspace-tools",
+            "comment": "BREAKING CHANGE: Improve detection of git root and throw if not found",
+            "commit": "5a18b0d43f1a434b8ee7b03f7b5e273e2aee8330"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 20 Jul 2022 22:31:31 GMT",
       "tag": "workspace-tools_v0.24.0",
       "version": "0.24.0",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,36 @@
 # Change Log - workspace-tools
 
-This log was last generated on Wed, 20 Jul 2022 22:31:28 GMT and should not be manually modified.
+This log was last generated on Tue, 02 Aug 2022 23:03:07 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.25.2
+
+Tue, 02 Aug 2022 23:03:07 GMT
+
+### Patches
+
+- Add fs-extra to devDependencies and remove non-dev usage (elcraig@microsoft.com)
+
+## 0.25.1
+
+Thu, 21 Jul 2022 21:21:48 GMT
+
+### Patches
+
+- Use git ls-files for checkUntrackedFiles (dannyfritz@gmail.com)
+
+## 0.25.0
+
+Thu, 21 Jul 2022 21:11:11 GMT
+
+### Minor changes
+
+- BREAKING CHANGE: Improve detection of git root and throw if not found (dlannoye@microsoft.com)
+
 ## 0.24.0
 
-Wed, 20 Jul 2022 22:31:28 GMT
+Wed, 20 Jul 2022 22:31:31 GMT
 
 ### Minor changes
 

package/lib/git/getDefaultRemote.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultRemote = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
+const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const paths_1 = require("../paths");
 const getRepositoryName_1 = require("./getRepositoryName");
@@ -20,13 +20,10 @@ function getDefaultRemote(cwdOrOptions) {
         log(message);
     };
     const gitRoot = (0, paths_1.findGitRoot)(cwd);
-    if (!gitRoot) {
-        throw new Error(`Directory "${cwd}" does not appear to be in a git repository`);
-    }
     let packageJson = {};
     const packageJsonPath = path_1.default.join(gitRoot, "package.json");
     try {
-        packageJson = fs_extra_1.default.readJSONSync(packageJsonPath);
+        packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, "utf8").trim());
     }
     catch (e) {
         throw new Error(`Could not read "${packageJsonPath}"`);

package/lib/git/gitUtilities.js

@@ -8,22 +8,7 @@ exports.listAllTrackedFiles = exports.getDefaultBranch = exports.parseRemoteBran
 const git_1 = require("./git");
 function getUntrackedChanges(cwd) {
     try {
-        const results = (0, git_1.git)(["status", "--short"], { cwd });
-        if (!results.success || !results.stdout) {
-            return [];
-        }
-        const lines = results.stdout.split(/[\r\n]+/).filter((line) => line);
-        const untracked = [];
-        for (let i = 0; i < lines.length; i++) {
-            const line = lines[i];
-            if (line[0] === " " || line[0] === "?") {
-                untracked.push(line.substring(3));
-            }
-            else if (line[0] === "R") {
-                i++;
-            }
-        }
-        return untracked;
+        return processGitOutput((0, git_1.git)(["ls-files", "--others", "--exclude-standard"], { cwd }));
     }
     catch (e) {
         throw new git_1.GitError(`Cannot gather information about untracked changes`, e);

package/lib/graph/createDependencyMap.d.ts

@@ -1,7 +1,9 @@
 import { PackageDependenciesOptions } from "./getPackageDependencies";
 import { PackageInfos } from "../types/PackageInfo";
+/** @internal */
 export interface DependencyMap {
     dependencies: Map<string, Set<string>>;
     dependents: Map<string, Set<string>>;
 }
+/** @internal */
 export declare function createDependencyMap(packages: PackageInfos, options?: PackageDependenciesOptions): DependencyMap;

package/lib/graph/createDependencyMap.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDependencyMap = void 0;
 const getPackageDependencies_1 = require("./getPackageDependencies");
-// @internal
+/** @internal */
 function createDependencyMap(packages, options = { withDevDependencies: true, withPeerDependencies: false }) {
     const map = {
         dependencies: new Map(),

package/lib/graph/createPackageGraph.js

@@ -7,16 +7,15 @@ exports.createPackageGraph = void 0;
 const createDependencyMap_1 = require("./createDependencyMap");
 const multimatch_1 = __importDefault(require("multimatch"));
 function createPackageGraph(packages, filters) {
-    /** packageSet is the set of packages being accumulated as the graph is filtered */
+    /** set of packages being accumulated as the graph is filtered */
     const packageSet = new Set();
-    /** edges is the array of package names & its dependency being accumulated as the graph is filtered */
+    /** array of package names & its dependency being accumulated as the graph is filtered */
     const edges = [];
     const edgeKeys = new Set();
     let dependencyMapWithPeerDevDeps = undefined;
     let dependencyMapWithPeerDeps = undefined;
     let dependencyMapWithDevDeps = undefined;
     let dependencyMapWithoutPeerDevDeps = undefined;
-    /** a visitor for a single filter,  */
     function visitorForFilter(filter, pkg, dependencies, dependents) {
         packageSet.add(pkg);
         if (!filter || (filter.includeDependencies && dependencies)) {
@@ -41,17 +40,10 @@ function createPackageGraph(packages, filters) {
         }
     }
     if (filters) {
-        if (Array.isArray(filters)) {
-            for (const filter of filters) {
-                const dependencyMap = getDependencyMapForFilter(packages, filter);
-                const visitor = visitorForFilter.bind(undefined, filter);
-                visitPackageGraph(packages, dependencyMap, visitor, filter);
-            }
-        }
-        else {
-            const filter = filters;
-            const dependencyMap = getDependencyMapForFilter(packages, filter);
+        filters = Array.isArray(filters) ? filters : [filters];
+        for (const filter of filters) {
             const visitor = visitorForFilter.bind(undefined, filter);
+            const dependencyMap = getDependencyMapForFilter(packages, filter);
             visitPackageGraph(packages, dependencyMap, visitor, filter);
         }
     }
@@ -70,19 +62,20 @@ function createPackageGraph(packages, filters) {
         if (!filter) {
             return (0, createDependencyMap_1.createDependencyMap)(packages);
         }
-        if (filter.withDevDependencies && filter.withPeerDependencies && !dependencyMapWithPeerDevDeps) {
-            dependencyMapWithPeerDevDeps = (0, createDependencyMap_1.createDependencyMap)(packages, { withDevDependencies: true, withPeerDependencies: true });
-        }
-        else if (filter.withDevDependencies && !filter.withPeerDependencies && !dependencyMapWithDevDeps) {
-            dependencyMapWithDevDeps = (0, createDependencyMap_1.createDependencyMap)(packages, { withDevDependencies: true, withPeerDependencies: false });
+        if (filter.withDevDependencies && filter.withPeerDependencies) {
+            dependencyMapWithPeerDevDeps !== null && dependencyMapWithPeerDevDeps !== void 0 ? dependencyMapWithPeerDevDeps : (dependencyMapWithPeerDevDeps = (0, createDependencyMap_1.createDependencyMap)(packages, filter));
+            return dependencyMapWithPeerDevDeps;
         }
-        else if (!filter.withDevDependencies && filter.withPeerDependencies && !dependencyMapWithPeerDeps) {
-            dependencyMapWithPeerDeps = (0, createDependencyMap_1.createDependencyMap)(packages, { withDevDependencies: false, withPeerDependencies: true });
+        if (filter.withDevDependencies && !filter.withPeerDependencies) {
+            dependencyMapWithDevDeps !== null && dependencyMapWithDevDeps !== void 0 ? dependencyMapWithDevDeps : (dependencyMapWithDevDeps = (0, createDependencyMap_1.createDependencyMap)(packages, filter));
+            return dependencyMapWithDevDeps;
         }
-        else {
-            dependencyMapWithoutPeerDevDeps = (0, createDependencyMap_1.createDependencyMap)(packages, { withDevDependencies: false, withPeerDependencies: false });
+        if (!filter.withDevDependencies && filter.withPeerDependencies) {
+            dependencyMapWithPeerDeps !== null && dependencyMapWithPeerDeps !== void 0 ? dependencyMapWithPeerDeps : (dependencyMapWithPeerDeps = (0, createDependencyMap_1.createDependencyMap)(packages, filter));
+            return dependencyMapWithPeerDeps;
         }
-        return ((filter.withDevDependencies && filter.withPeerDependencies) ? dependencyMapWithPeerDevDeps : (filter.withDevDependencies ? dependencyMapWithDevDeps : (filter.withPeerDependencies ? dependencyMapWithPeerDeps : dependencyMapWithoutPeerDevDeps)));
+        dependencyMapWithoutPeerDevDeps !== null && dependencyMapWithoutPeerDevDeps !== void 0 ? dependencyMapWithoutPeerDevDeps : (dependencyMapWithoutPeerDevDeps = (0, createDependencyMap_1.createDependencyMap)(packages, filter));
+        return dependencyMapWithoutPeerDevDeps;
     }
 }
 exports.createPackageGraph = createPackageGraph;

package/lib/graph/getPackageDependencies.js

@@ -2,19 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackageDependencies = void 0;
 function getPackageDependencies(info, packages, options = { withDevDependencies: true }) {
-    let deps = [];
-    if (options.withDevDependencies && options.withPeerDependencies) {
-        deps = Object.keys(Object.assign(Object.assign(Object.assign({}, info.dependencies), info.devDependencies), info.peerDependencies));
-    }
-    else if (options.withDevDependencies) {
-        deps = Object.keys(Object.assign(Object.assign({}, info.dependencies), info.devDependencies));
-    }
-    else if (options.withPeerDependencies) {
-        deps = Object.keys(Object.assign(Object.assign({}, info.dependencies), info.peerDependencies));
-    }
-    else {
-        deps = Object.keys(Object.assign({}, info.dependencies));
-    }
-    return Object.keys(packages).filter((pkg) => deps.includes(pkg));
+    const deps = Object.assign(Object.assign(Object.assign({}, info.dependencies), (options.withDevDependencies && info.devDependencies)), (options.withPeerDependencies && info.peerDependencies));
+    return Object.keys(packages).filter((pkg) => !!deps[pkg]);
 }
 exports.getPackageDependencies = getPackageDependencies;

package/lib/lockfile/parsePnpmLock.js

@@ -18,7 +18,7 @@ function parsePnpmLock(yaml) {
     }
     return {
         object,
-        type: "success"
+        type: "success",
     };
 }
 exports.parsePnpmLock = parsePnpmLock;

package/lib/paths.d.ts

@@ -1,11 +1,15 @@
 /**
  * Starting from `cwd`, searches up the directory hierarchy for `pathName`.
+ * @param pathName Path to look for
+ * @param cwd Directory to start from
+ * @param type If specified, look for only files or only directories. Otherwise accept either.
  */
-export declare function searchUp(pathName: string, cwd: string): string | null;
+export declare function searchUp(pathName: string, cwd: string, type?: "file" | "directory"): string | null;
 /**
- * Starting from `cwd`, searches up the directory hierarchy for `.git`.
+ * Starting from `cwd`, uses `git rev-parse --show-toplevel` to find the root of the git repo.
+ * Throws if `cwd` is not in a Git repository.
  */
-export declare function findGitRoot(cwd: string): string | null;
+export declare function findGitRoot(cwd: string): string;
 /**
  * Starting from `cwd`, searches up the directory hierarchy for `package.json`.
  */
@@ -14,5 +18,5 @@ export declare function findPackageRoot(cwd: string): string | null;
  * Starting from `cwd`, searches up the directory hierarchy for the workspace root,
  * falling back to the git root if no workspace is detected.
  */
-export declare function findProjectRoot(cwd: string): string | null;
+export declare function findProjectRoot(cwd: string): string;
 export declare function isChildOf(child: string, parent: string): boolean;

package/lib/paths.js

@@ -7,16 +7,24 @@ exports.isChildOf = exports.findProjectRoot = exports.findPackageRoot = exports.
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const getWorkspaceRoot_1 = require("./workspaces/getWorkspaceRoot");
+const git_1 = require("./git");
 /**
  * Starting from `cwd`, searches up the directory hierarchy for `pathName`.
+ * @param pathName Path to look for
+ * @param cwd Directory to start from
+ * @param type If specified, look for only files or only directories. Otherwise accept either.
  */
-function searchUp(pathName, cwd) {
+function searchUp(pathName, cwd, type) {
     const root = path_1.default.parse(cwd).root;
     let found = false;
     while (!found && cwd !== root) {
-        if (fs_1.default.existsSync(path_1.default.join(cwd, pathName))) {
-            found = true;
-            break;
+        const current = path_1.default.join(cwd, pathName);
+        if (fs_1.default.existsSync(current)) {
+            const isDir = fs_1.default.statSync(current).isDirectory();
+            if (!((type === "file" && isDir) || (type === "directory" && !isDir))) {
+                found = true;
+                break;
+            }
         }
         cwd = path_1.default.dirname(cwd);
     }
@@ -27,10 +35,15 @@ function searchUp(pathName, cwd) {
 }
 exports.searchUp = searchUp;
 /**
- * Starting from `cwd`, searches up the directory hierarchy for `.git`.
+ * Starting from `cwd`, uses `git rev-parse --show-toplevel` to find the root of the git repo.
+ * Throws if `cwd` is not in a Git repository.
  */
 function findGitRoot(cwd) {
-    return searchUp(".git", cwd);
+    const output = (0, git_1.git)(["rev-parse", "--show-toplevel"], { cwd });
+    if (!output.success) {
+        throw new Error(`Directory "${cwd}" is not in a git repository`);
+    }
+    return path_1.default.normalize(output.stdout);
 }
 exports.findGitRoot = findGitRoot;
 /**

package/lib/scope.js

@@ -12,9 +12,7 @@ const multimatch_1 = __importDefault(require("multimatch"));
  * @param packages
  */
 function getScopedPackages(search, packages) {
-    const packageNames = Array.isArray(packages)
-        ? packages
-        : Object.keys(packages);
+    const packageNames = Array.isArray(packages) ? packages : Object.keys(packages);
     const results = new Set();
     // perform a package-scoped search (e.g. search is @scope/foo*)
     const scopedSearch = search.filter((needle) => needle.startsWith("@") || needle.startsWith("!@"));

package/lib/types/PackageGraph.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workspace-tools",
-  "version": "0.24.0",
+  "version": "0.25.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -17,6 +17,7 @@
     "release:docs": "typedoc src/index.ts && gh-pages -d docs",
     "change": "beachball change",
     "checkchange": "beachball check",
+    "format": "prettier --write .",
     "release": "beachball publish -y",
     "start": "tsc -w --preserveWatchOutput",
     "test": "jest"
@@ -31,20 +32,21 @@
     "read-yaml-file": "^2.0.0"
   },
   "devDependencies": {
-    "@types/git-url-parse": "^9.0.0",
-    "@types/jest": "^25.2.2",
-    "@types/jju": "^1.4.1",
-    "@types/multimatch": "^4.0.0",
-    "@types/node": ">=12.0.0",
-    "@types/tmp": "^0.2.0",
-    "@types/yarnpkg__lockfile": "^1.1.3",
-    "beachball": "^2.17.0",
-    "jest": "^25.0.0",
-    "prettier": "^2.7.1",
-    "tmp": "^0.2.1",
-    "ts-jest": "^25.5.1",
-    "typedoc": "^0.22.15",
-    "typescript": "^4.5.4",
-    "gh-pages": "^3.2.3"
+    "@types/git-url-parse": "9.0.1",
+    "@types/jest": "28.1.6",
+    "@types/jju": "1.4.2",
+    "@types/multimatch": "4.0.0",
+    "@types/node": "13.13.5",
+    "@types/tmp": "0.2.3",
+    "@types/yarnpkg__lockfile": "1.1.5",
+    "beachball": "2.26.0",
+    "fs-extra": "10.1.0",
+    "jest": "28.1.3",
+    "prettier": "2.7.1",
+    "tmp": "0.2.1",
+    "ts-jest": "28.0.7",
+    "typedoc": "0.22.15",
+    "typescript": "4.5.4",
+    "gh-pages": "3.2.3"
   }
 }