@pnpm/link-bins - npm Package Compare versions

Comparing version 3.0.3 to 4.0.0

lib/getPkgDirs.js

 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -15,38 +7,34 @@ const flatten = require("arr-flatten");
 const path = require("path");
-function default_1(modules, warn) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const dirs = yield getDirectories(modules, warn);
-        const subdirs = yield Promise.all(dirs.map((dir) => {
-            return isScopedPkgsDir(dir) ? getDirectories(dir, warn) : Promise.resolve([dir]);
-        }));
-        return flatten(subdirs);
-    });
+async function default_1(modules, warn) {
+    const dirs = await getDirectories(modules, warn);
+    const subdirs = await Promise.all(dirs.map((dir) => {
+        return isScopedPkgsDir(dir) ? getDirectories(dir, warn) : Promise.resolve([dir]);
+    }));
+    return flatten(subdirs);
 }
 exports.default = default_1;
-function getDirectories(srcPath, warn) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let dirs;
+async function getDirectories(srcPath, warn) {
+    let dirs;
+    try {
+        dirs = await fs.readdir(srcPath);
+    }
+    catch (err) {
+        if (err.code !== 'ENOENT') {
+            throw err;
+        }
+        dirs = [];
+    }
+    return pFilter(dirs
+        .filter((relativePath) => relativePath[0] !== '.') // ignore directories like .bin, .store, etc
+        .map((relativePath) => path.join(srcPath, relativePath)), async (absolutePath) => {
         try {
-            dirs = yield fs.readdir(srcPath);
+            const stats = await fs.stat(absolutePath);
+            return stats.isDirectory();
         }
         catch (err) {
-            if (err.code !== 'ENOENT') {
+            if (err.code !== 'ENOENT')
                 throw err;
-            }
-            dirs = [];
+            warn(`Cannot find file at ${absolutePath} although it was listed by readdir`);
+            return false;
         }
-        return pFilter(dirs
-            .filter((relativePath) => relativePath[0] !== '.') // ignore directories like .bin, .store, etc
-            .map((relativePath) => path.join(srcPath, relativePath)), (absolutePath) => __awaiter(this, void 0, void 0, function* () {
-            try {
-                const stats = yield fs.stat(absolutePath);
-                return stats.isDirectory();
-            }
-            catch (err) {
-                if (err.code !== 'ENOENT')
-                    throw err;
-                warn(`Cannot find file at ${absolutePath} although it was listed by readdir`);
-                return false;
-            }
-        }));
     });
@@ -53,0 +41,0 @@ }

lib/index.js

 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -25,5 +17,5 @@ const package_bins_1 = require("@pnpm/package-bins");
 const POWER_SHELL_IS_SUPPORTED = IS_WINDOWS;
-exports.default = (modules, binPath, opts) => __awaiter(this, void 0, void 0, function* () {
-    const pkgDirs = yield getPkgDirs_1.default(modules, opts.warn);
-    const allCmds = R.unnest((yield Promise.all(pkgDirs
+exports.default = async (modules, binPath, opts) => {
+    const pkgDirs = await getPkgDirs_1.default(modules, opts.warn);
+    const allCmds = R.unnest((await Promise.all(pkgDirs
         .map(normalizePath)
@@ -33,80 +25,66 @@ .map((target) => getPackageBins(target, opts.warn))))
     return linkBins(allCmds, binPath, opts);
-});
-function linkBinsOfPackages(pkgs, binsTarget, opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!pkgs.length)
-            return;
-        const allCmds = R.unnest((yield Promise.all(pkgs
-            .map((pkg) => getPackageBinsFromPackageJson(pkg.manifest, pkg.location))))
-            .filter((cmds) => cmds.length));
-        return linkBins(allCmds, binsTarget, opts);
-    });
+};
+async function linkBinsOfPackages(pkgs, binsTarget, opts) {
+    if (!pkgs.length)
+        return;
+    const allCmds = R.unnest((await Promise.all(pkgs
+        .map((pkg) => getPackageBinsFromPackageJson(pkg.manifest, pkg.location))))
+        .filter((cmds) => cmds.length));
+    return linkBins(allCmds, binsTarget, opts);
 }
 exports.linkBinsOfPackages = linkBinsOfPackages;
-function linkBins(allCmds, binPath, opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!allCmds.length)
+async function linkBins(allCmds, binPath, opts) {
+    if (!allCmds.length)
+        return;
+    await mkdirp(binPath);
+    const [cmdsWithOwnName, cmdsWithOtherNames] = R.partition((cmd) => cmd.ownName, allCmds);
+    await Promise.all(cmdsWithOwnName.map((cmd) => linkBin(cmd, binPath)));
+    const usedNames = R.fromPairs(cmdsWithOwnName.map((cmd) => [cmd.name, cmd.name]));
+    await Promise.all(cmdsWithOtherNames.map((cmd) => {
+        if (usedNames[cmd.name]) {
+            opts.warn(`Cannot link bin "${cmd.name}" of "${cmd.pkgName}" to "${binPath}". A package called "${usedNames[cmd.name]}" already has its bin linked.`);
             return;
-        yield mkdirp(binPath);
-        const [cmdsWithOwnName, cmdsWithOtherNames] = R.partition((cmd) => cmd.ownName, allCmds);
-        yield Promise.all(cmdsWithOwnName.map((cmd) => linkBin(cmd, binPath)));
-        const usedNames = R.fromPairs(cmdsWithOwnName.map((cmd) => [cmd.name, cmd.name]));
-        yield Promise.all(cmdsWithOtherNames.map((cmd) => {
-            if (usedNames[cmd.name]) {
-                opts.warn(`Cannot link bin "${cmd.name}" of "${cmd.pkgName}" to "${binPath}". A package called "${usedNames[cmd.name]}" already has its bin linked.`);
-                return;
-            }
-            usedNames[cmd.name] = cmd.pkgName;
-            return linkBin(cmd, binPath);
-        }));
-    });
-}
-function getPackageBins(target, warn) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const pkg = yield safeReadPkg(target);
-        if (!pkg) {
-            warn(`There's a directory in node_modules without package.json: ${target}`);
-            return [];
         }
-        return getPackageBinsFromPackageJson(pkg, target);
-    });
+        usedNames[cmd.name] = cmd.pkgName;
+        return linkBin(cmd, binPath);
+    }));
 }
-function getPackageBinsFromPackageJson(pkgJson, pkgPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const cmds = yield package_bins_1.default(pkgJson, pkgPath);
-        return cmds.map((cmd) => (Object.assign({}, cmd, { ownName: cmd.name === pkgJson.name, pkgName: pkgJson.name })));
-    });
+async function getPackageBins(target, warn) {
+    const pkg = await safeReadPkg(target);
+    if (!pkg) {
+        warn(`There's a directory in node_modules without package.json: ${target}`);
+        return [];
+    }
+    return getPackageBinsFromPackageJson(pkg, target);
 }
-function linkBin(cmd, binPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const externalBinPath = path.join(binPath, cmd.name);
-        if (EXECUTABLE_SHEBANG_SUPPORTED) {
-            yield fs.chmod(cmd.path, 0o755);
-        }
-        const nodePath = yield getBinNodePaths(cmd.path);
-        return cmdShim(cmd.path, externalBinPath, {
-            createPwshFile: POWER_SHELL_IS_SUPPORTED,
-            nodePath,
-        });
-    });
+async function getPackageBinsFromPackageJson(pkgJson, pkgPath) {
+    const cmds = await package_bins_1.default(pkgJson, pkgPath);
+    return cmds.map((cmd) => (Object.assign({}, cmd, { ownName: cmd.name === pkgJson.name, pkgName: pkgJson.name })));
 }
-function getBinNodePaths(target) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const targetRealPath = yield fs.realpath(target);
-        return R.union(Module._nodeModulePaths(targetRealPath), Module._nodeModulePaths(target));
+async function linkBin(cmd, binPath) {
+    const externalBinPath = path.join(binPath, cmd.name);
+    if (EXECUTABLE_SHEBANG_SUPPORTED) {
+        await fs.chmod(cmd.path, 0o755);
+    }
+    const nodePath = await getBinNodePaths(cmd.path);
+    return cmdShim(cmd.path, externalBinPath, {
+        createPwshFile: POWER_SHELL_IS_SUPPORTED,
+        nodePath,
     });
 }
-function safeReadPkg(pkgPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            return yield read_package_json_1.fromDir(pkgPath);
+async function getBinNodePaths(target) {
+    const targetRealPath = await fs.realpath(target);
+    return R.union(Module._nodeModulePaths(targetRealPath), Module._nodeModulePaths(target));
+}
+async function safeReadPkg(pkgPath) {
+    try {
+        return await read_package_json_1.fromDir(pkgPath);
+    }
+    catch (err) {
+        if (err.code === 'ENOENT') {
+            return null;
         }
-        catch (err) {
-            if (err.code === 'ENOENT') {
-                return null;
-            }
-            throw err;
-        }
-    });
+        throw err;
+    }
 }
 //# sourceMappingURL=index.js.map

package.json

 {
   "name": "@pnpm/link-bins",
-  "version": "3.0.3",
+  "version": "4.0.0",
   "description": "Link bins to node_modules/.bin",
@@ -11,3 +11,3 @@ "main": "lib/index.js",
   "engines": {
-    "node": ">=6"
+    "node": ">=8"
   },
@@ -37,5 +37,5 @@ "scripts": {
   "dependencies": {
-    "@pnpm/package-bins": "^2.0.0",
-    "@pnpm/read-package-json": "^1.0.0",
-    "@pnpm/types": "^2.0.0",
+    "@pnpm/package-bins": "^3.0.0",
+    "@pnpm/read-package-json": "^2.0.0",
+    "@pnpm/types": "^3.0.0",
     "@types/mz": "^0.0.32",
@@ -67,3 +67,3 @@ "@types/node": "^9.6.5 || 10",
     "tempy": "^0.2.1",
-    "ts-node": "^7.0.0",
+    "ts-node": "^8.0.0",
     "tslint": "^5.8.0",
@@ -70,0 +70,0 @@ "typescript": "^3.0.0"

No alert changes

Worsened metrics

Total package byte prevSize

14207

-13.22%

Lines of code

142

-19.32%

Dependency changes

• + Added

  @pnpm/package-bins@3.1.1
  (transitive)

• + Added

  @pnpm/read-package-json@2.0.3
  (transitive)

• + Added

  @pnpm/types@3.2.0
  (transitive)

• + Added

  p-filter@2.1.0
  (transitive)

• + Added

  p-map@2.1.0
  (transitive)

• + Added

  read-package-json@2.1.0
  (transitive)

• - Removed

  @pnpm/package-bins@2.0.0
  (transitive)

• - Removed

  @pnpm/read-package-json@1.1.1
  (transitive)

• - Removed

  @pnpm/types@2.0.0
  (transitive)

• - Removed

  array-buffer-byte-length@1.0.2
  (transitive)

• - Removed

  array.prototype.reduce@1.0.8
  (transitive)

• - Removed

  arraybuffer.prototype.slice@1.0.4
  (transitive)

• - Removed

  async-function@1.0.0
  (transitive)

• - Removed

  available-typed-arrays@1.0.7
  (transitive)

• - Removed

  call-bind@1.0.8
  (transitive)

• - Removed

  call-bind-apply-helpers@1.0.2
  (transitive)

• - Removed

  call-bound@1.0.4
  (transitive)

• - Removed

  data-view-buffer@1.0.2
  (transitive)

• - Removed

  data-view-byte-length@1.0.2
  (transitive)

• - Removed

  data-view-byte-offset@1.0.1
  (transitive)

• - Removed

  define-data-property@1.1.4
  (transitive)

• - Removed

  define-properties@1.2.1
  (transitive)

• - Removed

  dunder-proto@1.0.1
  (transitive)

• - Removed

  es-abstract@1.24.0
  (transitive)

• - Removed

  es-array-method-boxes-properly@1.0.0
  (transitive)

• - Removed

  es-define-property@1.0.1
  (transitive)

• - Removed

  es-errors@1.3.0
  (transitive)

• - Removed

  es-object-atoms@1.1.1
  (transitive)

• - Removed

  es-set-tostringtag@2.1.0
  (transitive)

• - Removed

  es-to-primitive@1.3.0
  (transitive)

• - Removed

  for-each@0.3.5
  (transitive)

• - Removed

  function.prototype.name@1.1.8
  (transitive)

• - Removed

  functions-have-names@1.2.3
  (transitive)

• - Removed

  get-intrinsic@1.3.0
  (transitive)

• - Removed

  get-proto@1.0.1
  (transitive)

• - Removed

  get-symbol-description@1.1.0
  (transitive)

• - Removed

  globalthis@1.0.4
  (transitive)

• - Removed

  gopd@1.2.0
  (transitive)

• - Removed

  has-bigints@1.1.0
  (transitive)

• - Removed

  has-property-descriptors@1.0.2
  (transitive)

• - Removed

  has-proto@1.2.0
  (transitive)

• - Removed

  has-symbols@1.1.0
  (transitive)

• - Removed

  has-tostringtag@1.0.2
  (transitive)

• - Removed

  internal-slot@1.1.0
  (transitive)

• - Removed

  is-array-buffer@3.0.5
  (transitive)

• - Removed

  is-async-function@2.1.1
  (transitive)

• - Removed

  is-bigint@1.1.0
  (transitive)

• - Removed

  is-boolean-object@1.2.2
  (transitive)

• - Removed

  is-callable@1.2.7
  (transitive)

• - Removed

  is-data-view@1.0.2
  (transitive)

• - Removed

  is-date-object@1.1.0
  (transitive)

• - Removed

  is-finalizationregistry@1.1.1
  (transitive)

• - Removed

  is-generator-function@1.1.0
  (transitive)

• - Removed

  is-map@2.0.3
  (transitive)

• - Removed

  is-negative-zero@2.0.3
  (transitive)

• - Removed

  is-number-object@1.1.1
  (transitive)

• - Removed

  is-regex@1.2.1
  (transitive)

• - Removed

  is-set@2.0.3
  (transitive)

• - Removed

  is-shared-array-buffer@1.0.4
  (transitive)

• - Removed

  is-string@1.1.1
  (transitive)

• - Removed

  is-symbol@1.1.1
  (transitive)

• - Removed

  is-typed-array@1.1.15
  (transitive)

• - Removed

  is-weakmap@2.0.2
  (transitive)

• - Removed

  is-weakref@1.1.1
  (transitive)

• - Removed

  is-weakset@2.0.4
  (transitive)

• - Removed

  isarray@2.0.5
  (transitive)

• - Removed

  math-intrinsics@1.1.0
  (transitive)

• - Removed

  object-inspect@1.13.4
  (transitive)

• - Removed

  object-keys@1.1.1
  (transitive)

• - Removed

  object.assign@4.1.7
  (transitive)

• - Removed

  object.getownpropertydescriptors@2.1.8
  (transitive)

• - Removed

  own-keys@1.0.1
  (transitive)

• - Removed

  possible-typed-array-names@1.1.0
  (transitive)

• - Removed

  read-package-json@2.0.13
  (transitive)

• - Removed

  reflect.getprototypeof@1.0.10
  (transitive)

• - Removed

  regexp.prototype.flags@1.5.4
  (transitive)

• - Removed

  safe-array-concat@1.1.3
  (transitive)

• - Removed

  safe-push-apply@1.0.0
  (transitive)

• - Removed

  safe-regex-test@1.1.0
  (transitive)

• - Removed

  set-function-length@1.2.2
  (transitive)

• - Removed

  set-function-name@2.0.2
  (transitive)

• - Removed

  set-proto@1.0.0
  (transitive)

• - Removed

  side-channel@1.1.0
  (transitive)

• - Removed

  side-channel-list@1.0.0
  (transitive)

• - Removed

  side-channel-map@1.0.1
  (transitive)

• - Removed

  side-channel-weakmap@1.0.2
  (transitive)

• - Removed

  stop-iteration-iterator@1.1.0
  (transitive)

• - Removed

  string.prototype.trim@1.2.10
  (transitive)

• - Removed

  string.prototype.trimend@1.0.9
  (transitive)

• - Removed

  string.prototype.trimstart@1.0.8
  (transitive)

• - Removed

  typed-array-buffer@1.0.3
  (transitive)

• - Removed

  typed-array-byte-length@1.0.3
  (transitive)

• - Removed

  typed-array-byte-offset@1.0.4
  (transitive)

• - Removed

  typed-array-length@1.0.7
  (transitive)

• - Removed

  unbox-primitive@1.1.0
  (transitive)

• - Removed

  util.promisify@1.1.3
  (transitive)

• - Removed

  which-boxed-primitive@1.1.1
  (transitive)

• - Removed

  which-builtin-type@1.2.1
  (transitive)

• - Removed

  which-collection@1.0.2
  (transitive)

• - Removed

  which-typed-array@1.1.19
  (transitive)

• Updated

  @pnpm/package-bins@^3.0.0

• Updated

  @pnpm/read-package-json@^2.0.0

• Updated

  @pnpm/types@^3.0.0