@pnpm/local-resolver - npm Package Compare versions

Comparing version 0.1.2 to 0.2.0

lib/index.js

@@ -12,3 +12,2 @@ "use strict";
 const fs = require("graceful-fs");
-const normalize = require("normalize-path");
 const path = require("path");
@@ -28,11 +27,9 @@ const readPackageJsonCB = require("read-package-json");
             return null;
-        const dependencyPath = normalize(path.relative(opts.prefix, spec.fetchSpec));
-        const id = `file:${dependencyPath}`;
         if (spec.type === 'file') {
             return {
-                id,
+                id: spec.id,
                 normalizedPref: spec.normalizedPref,
                 resolution: {
                     integrity: yield getFileIntegrity(spec.fetchSpec),
-                    tarball: id,
+                    tarball: spec.id,
                 },
@@ -43,7 +40,7 @@ };
         return {
-            id,
+            id: spec.id,
             normalizedPref: spec.normalizedPref,
             package: localPkg,
             resolution: {
-                directory: dependencyPath,
+                directory: spec.dependencyPath,
                 type: 'directory',
@@ -50,0 +47,0 @@ },

lib/parsePref.d.ts

 export interface LocalPackageSpec {
+    dependencyPath: string;
     fetchSpec: string;
+    id: string;
     type: 'directory' | 'file';
@@ -4,0 +6,0 @@ normalizedPref: string;

lib/parsePref.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const normalize = require("normalize-path");
 const osenv = require("osenv");
@@ -11,2 +12,5 @@ const path = require("path");
 function parsePref(pref, where) {
+    if (pref.startsWith('link:')) {
+        return fromLocal(pref, where, 'directory');
+    }
     if (pref.endsWith('.tgz')
@@ -18,33 +22,48 @@ || pref.endsWith('.tar.gz')
         || isFilespec.test(pref)) {
-        return fromFile(pref, where);
+        const type = isFilename.test(pref) ? 'file' : 'directory';
+        return fromLocal(pref, where, type);
     }
+    if (pref.startsWith('path:')) {
+        const err = new Error('Local dependencies via `path:` prefix are not supported. ' +
+            'Use the `link:` prefix for folder dependencies and `file:` for local tarballs');
+        // tslint:disable:no-string-literal
+        err['code'] = 'INVALID_PREF';
+        err['pref'] = pref;
+        // tslint:enable:no-string-literal
+        throw err;
+    }
     return null;
 }
 exports.default = parsePref;
-function fromFile(pref, where) {
+function fromLocal(pref, where, type) {
     if (!where)
         where = process.cwd();
-    const type = isFilename.test(pref) ? 'file' : 'directory';
     const spec = pref.replace(/\\/g, '/')
-        .replace(/^file:[/]*([A-Za-z]:)/, '$1') // drive name paths on windows
-        .replace(/^file:(?:[/]*([~./]))?/, '$1');
+        .replace(/^(file|link):[/]*([A-Za-z]:)/, '$2') // drive name paths on windows
+        .replace(/^(file|link):(?:[/]*([~./]))?/, '$2');
+    // TODO: always use link: for directory dependencies
+    const prefPrefix = pref.startsWith('link:') ? 'link:' : 'file:';
+    let fetchSpec;
+    let normalizedPref;
     if (/^~[/]/.test(spec)) {
         // this is needed for windows and for file:~/foo/bar
-        return {
-            fetchSpec: resolvePath(osenv.home(), spec.slice(2)),
-            normalizedPref: `file:${spec}`,
-            type,
-        };
+        fetchSpec = resolvePath(osenv.home(), spec.slice(2));
+        normalizedPref = `${prefPrefix}${spec}`;
     }
-    const fetchSpec = resolvePath(where, spec);
-    if (isAbsolute(spec)) {
-        return {
-            fetchSpec,
-            normalizedPref: `file:${spec}`,
-            type,
-        };
+    else {
+        fetchSpec = resolvePath(where, spec);
+        if (isAbsolute(spec)) {
+            normalizedPref = `${prefPrefix}${spec}`;
+        }
+        else {
+            normalizedPref = `${prefPrefix}${path.relative(where, fetchSpec)}`;
+        }
     }
+    const dependencyPath = normalize(path.relative(where, fetchSpec));
+    const id = `${prefPrefix}${dependencyPath}`;
     return {
+        dependencyPath,
         fetchSpec,
-        normalizedPref: `file:${path.relative(where, fetchSpec)}`,
+        id,
+        normalizedPref,
         type,
@@ -51,0 +70,0 @@ };

package.json

 {
   "name": "@pnpm/local-resolver",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Resolver for local packages",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

13430

increased by12.22%

Lines of code

165

increased by12.24%

No dependency changes