resolve-pkglock 0.0.1 → 0.0.2

package/dist/index.js

@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs';
 import { createRequire, registerHooks, isBuiltin, findPackageJSON } from 'node:module';
 import { join, isAbsolute, dirname } from 'node:path';
 import { platform } from 'node:process';
-import { fileURLToPath, pathToFileURL } from 'node:url';
+import { pathToFileURL, fileURLToPath } from 'node:url';
 import require$$0 from 'crypto';
 import require$$0$3 from 'fs';
 import require$$4 from 'util';
@@ -17899,7 +17899,7 @@ function requireLib () {
 
 var libExports = requireLib();
 
-const PACKAGE_REGEX = /([a-z\d][-.\w]*|@[a-z\d][-.\w]+\/[a-z\d][-.\w]*)(.*)/;
+const PACKAGE_REGEX = /^([a-z\d][-.\w]*|@[a-z\d][-.\w]+\/[a-z\d][-.\w]*)(\/.*)?$/;
 function addToRegistry(registry, pkg) {
     const { name, version } = pkg;
     let versions = registry.get(name);
@@ -17917,7 +17917,7 @@ async function init(workspaceRoot) {
     if (lockfile == null) {
         throw new Error('no lockfile found');
     }
-    const defaultResolve = createRequire(workspaceRoot).resolve, virtualStoreDir = './node_modules/.pnpm', virtualStoreDirMaxLength = platform === 'win32' ? 60 : 120, dirToPackage = {}, packageRegistry = new Map();
+    const defaultResolve = createRequire(workspaceRoot).resolve, virtualStoreDir = join(workspaceRoot, './node_modules/.pnpm'), virtualStoreDirUrlPath = pathToFileURL(virtualStoreDir).toString(), virtualStoreDirMaxLength = platform === 'win32' ? 60 : 120, dirToPackage = {}, packageRegistry = new Map();
     for (const [relDepPath, { dependencies, devDependencies, optionalDependencies }] of Object.entries(lockfile.importers)) {
         const packageLocation = join(workspaceRoot, relDepPath), { name, version } = JSON.parse(readFileSync(join(packageLocation, 'package.json')).toString()), pkgInfo = {
             dependencies,
@@ -17932,7 +17932,7 @@ async function init(workspaceRoot) {
     }
     if (lockfile.packages) {
         for (const [relDepPath, pkg] of Object.entries(lockfile.packages)) {
-            const { dependencies, optionalDependencies } = pkg, packageLocation = join(workspaceRoot, virtualStoreDir, libExports$2.depPathToFilename(relDepPath, virtualStoreDirMaxLength)), { name, version } = libExports.nameVerFromPkgSnapshot(relDepPath, pkg), pkgInfo = {
+            const { dependencies, optionalDependencies } = pkg, packageLocation = join(virtualStoreDir, libExports$2.depPathToFilename(relDepPath, virtualStoreDirMaxLength)), { name, version } = libExports.nameVerFromPkgSnapshot(relDepPath, pkg), pkgInfo = {
                 dependencies,
                 name,
                 optionalDependencies,
@@ -17956,12 +17956,25 @@ async function init(workspaceRoot) {
                 if (context.parentURL == null) {
                     throw new Error('No parentURL!');
                 }
-                const pkg = dirToPackage[dirname(findPackageJSON(context.parentURL))];
-                if (pkg == null) {
+                let pkg;
+                // bottom-up first, because there are packages that introduce multiple package.json in their hierarchy
+                if (context.parentURL.startsWith(virtualStoreDirUrlPath)) {
+                    const subpath = context.parentURL.substring(0, context.parentURL.indexOf('/node_modules/', virtualStoreDirUrlPath.length + 1) + 14), // '/node_modules/'.length = 14
+                    match = context.parentURL.substring(subpath.length).match(PACKAGE_REGEX);
+                    if (match == null) {
+                        throw new Error('can\'t parse path');
+                    }
+                    const [, name] = match;
+                    pkg = dirToPackage[join(fileURLToPath(subpath), name)];
+                }
+                else {
+                    pkg = dirToPackage[dirname(findPackageJSON(context.parentURL))];
+                }
+                if (pkg == null || pkg.name == null || pkg.version == null) {
                     throw new Error('unknown package');
                 }
                 const { name: parentName, version: parentVersion } = pkg;
-                parent = packageRegistry.get(parentName)?.get(parentVersion);
+                parent = packageRegistry.get(parentName ?? null)?.get(parentVersion ?? null);
             }
             const match = specifier.match(PACKAGE_REGEX);
             if (match == null) {
@@ -17978,7 +17991,7 @@ async function init(workspaceRoot) {
                 packageLocation = join(parent.packageLocation, version.substring(5));
             }
             else {
-                packageLocation = join(workspaceRoot, virtualStoreDir, libExports$2.depPathToFilename(`${name}@${version}`, virtualStoreDirMaxLength), 'node_modules', name);
+                packageLocation = join(virtualStoreDir, libExports$2.depPathToFilename(`${name}@${version}`, virtualStoreDirMaxLength), 'node_modules', name);
             }
             if (packageLocation[packageLocation.length - 1] === '/') {
                 packageLocation = packageLocation.substring(0, packageLocation.length - 1);