@nimbus-sh/worker 0.1.5 → 0.1.6

package/dist/npm/installer.js

@@ -39,7 +39,7 @@ import { fetchEsbuildWasmBytes } from '../runtime/esbuild-wasm-bytes.js';
 import { CHUNK_SIZE } from '../constants.js';
 import { waitForLowAllocPressure } from '../observability/heavy-alloc-coord.js';
 import { countPackageFiles, BARREL_PKG_FILE_THRESHOLD, packageNameFromSpecifier } from '../runtime/barrel-detect.js';
-import { scanNamedImports, buildSyntheticEntry, buildScopedSliceForSynthetic, syntheticEntryPath, } from '../runtime/barrel-synthesizer.js';
+import { scanNamedImports, namedImportSignature, buildSyntheticEntry, buildScopedSliceForSynthetic, syntheticEntryPath, } from '../runtime/barrel-synthesizer.js';
 import { enc } from '../_shared/bytes.js';
 // ── NpmInstaller ────────────────────────────────────────────────────────
 export class NpmInstaller {
@@ -914,17 +914,8 @@ export class NpmInstaller {
         if (explicitPackages && explicitPackages.length > 0) {
             // Explicit packages: npm install react react-dom@18.2.0
             for (const pkg of explicitPackages) {
-                const atIdx = pkg.lastIndexOf('@');
-                if (atIdx > 0 && !pkg.startsWith('@')) {
-                    specs[pkg.substring(0, atIdx)] = pkg.substring(atIdx + 1);
-                }
-                else if (pkg.startsWith('@') && pkg.indexOf('@', 1) > 0) {
-                    const idx = pkg.indexOf('@', 1);
-                    specs[pkg.substring(0, idx)] = pkg.substring(idx + 1);
-                }
-                else {
-                    specs[pkg] = 'latest';
-                }
+                const parsed = parseExplicitPackageSpec(pkg);
+                specs[parsed.name] = parsed.range;
             }
             return this.applyW6Registry(specs);
         }
@@ -1135,17 +1126,7 @@ export class NpmInstaller {
                 pkgJson.dependencies = {};
             for (const spec of explicitPackages) {
                 // Find the resolved package matching this spec
-                const atIdx = spec.lastIndexOf('@');
-                let name;
-                if (spec.startsWith('@') && spec.indexOf('@', 1) > 0) {
-                    name = spec.substring(0, spec.indexOf('@', 1));
-                }
-                else if (atIdx > 0 && !spec.startsWith('@')) {
-                    name = spec.substring(0, atIdx);
-                }
-                else {
-                    name = spec;
-                }
+                const { name } = parseExplicitPackageSpec(spec);
                 // W6: if a swap fired, the user typed `name` but `resolved` is
                 // keyed by the swap target (e.g. user typed 'esbuild', resolved
                 // has 'esbuild-wasm'). Look up via lookupSwap to bridge the
@@ -1248,8 +1229,6 @@ export class NpmInstaller {
         const namedImports = scanNamedImports(this.vfs, projDir);
         for (const specifier of toBuild) {
             const existing = this.cache.getEsmBundle(specifier);
-            if (existing && existing.bundleHash === BUNDLER_VERSION)
-                continue;
             const entryPath = this.resolvePackageEntryPath(specifier, nmDir);
             if (!entryPath)
                 continue;
@@ -1266,6 +1245,7 @@ export class NpmInstaller {
             if (isBarrel && specifier === pkgName) {
                 // Top-level barrel import. Synthesize.
                 const names = namedImports.get(pkgName);
+                const inputHash = namedImportSignature(pkgName, names);
                 if (!names || names.size === 0) {
                     // No statically-resolvable imports. We refuse to bundle the
                     // whole barrel (would OOM) AND we refuse to CDN-fallback
@@ -1277,6 +1257,11 @@ export class NpmInstaller {
                         `with no static named imports detected. Add explicit imports to enable bundling.`);
                     continue;
                 }
+                if (existing &&
+                    existing.bundleHash === BUNDLER_VERSION &&
+                    existing.inputHash === inputHash) {
+                    continue;
+                }
                 const synth = buildSyntheticEntry(this.vfs, nmDir, pkgName, names);
                 if (!synth)
                     continue;
@@ -1291,9 +1276,17 @@ export class NpmInstaller {
                 }
                 this.onProgress?.(`  synthesized entry for ${specifier} (barrel: ${fileCount} files; ` +
                     `${names.size} static imports → tree-shaken bundle)`);
-                pending.push({ specifier, entryPath, synthetic: true, syntheticReferencedFiles: synth.referencedFiles });
+                pending.push({
+                    specifier,
+                    entryPath,
+                    synthetic: true,
+                    syntheticReferencedFiles: synth.referencedFiles,
+                    inputHash: inputHash ?? '',
+                });
                 continue;
             }
+            if (existing && existing.bundleHash === BUNDLER_VERSION && existing.inputHash === '')
+                continue;
             pending.push({ specifier, entryPath });
         }
         if (pending.length === 0)
@@ -1611,7 +1604,7 @@ export class NpmInstaller {
                         bundleHash: BUNDLER_VERSION,
                         esmCode: result.esmCode,
                         builtAt: Date.now(),
-                        inputHash: '',
+                        inputHash: next.inputHash ?? '',
                     });
                     okCount++;
                 }
@@ -1898,6 +1891,33 @@ export class NpmInstaller {
 function parentOf(path) {
     return path.includes('/') ? path.substring(0, path.lastIndexOf('/')) : '';
 }
+function parseExplicitPackageSpec(spec) {
+    const aliasMarker = spec.indexOf('@npm:');
+    if (aliasMarker > 0) {
+        return {
+            name: spec.slice(0, aliasMarker),
+            range: 'npm:' + spec.slice(aliasMarker + '@npm:'.length),
+        };
+    }
+    const rangeAt = findPackageRangeSeparator(spec);
+    if (rangeAt >= 0) {
+        return {
+            name: spec.slice(0, rangeAt),
+            range: spec.slice(rangeAt + 1) || 'latest',
+        };
+    }
+    return { name: spec, range: 'latest' };
+}
+function findPackageRangeSeparator(spec) {
+    if (!spec)
+        return -1;
+    if (spec[0] !== '@')
+        return spec.indexOf('@');
+    const slash = spec.indexOf('/');
+    if (slash < 0)
+        return -1;
+    return spec.indexOf('@', slash + 1);
+}
 function safeJsonParse(json, fallback) {
     try {
         return JSON.parse(json);

package/dist/npm/pre-bundle-facet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pre-bundle-facet.d.ts","sourceRoot":"","sources":["../../src/npm/pre-bundle-facet.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAA6B,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAgB3F;;;;;;;;;GASG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;CACd;AACD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,IAAI,CAAC;CACb;AACD,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;AAEhD,yDAAyD;AACzD,MAAM,WAAW,aAAa;IAC5B,iFAAiF;IACjF,SAAS,EAAE,MAAM,CAAC;IAClB,uGAAuG;IACvG,SAAS,EAAE,MAAM,CAAC;IAClB,4DAA4D;IAC5D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB;;;;;;OAMG;IACH,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,+EAA+E;IAC/E,cAAc,EAAE,MAAM,CAAC;IACvB;;;8DAG0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,8BAA8B;AAC9B,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,OAAO,CAAC;IACZ,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAChB,4DAA4D;IAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,OAAO,EAAE,MAAM,CAAC;IAChB,wDAAwD;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAID;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GACZ;IAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAEpD;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf;IAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CA4GpD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAEjE;AAmBD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,GACvB,MAAM,aAAa,EACnB,MAAM;IACJ,UAAU,EAAE;QAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;KAAE,CAAC;CAC7D,KACA,OAAO,CAAC,eAAe,CAgazB,CAAC;AAGF,OAAO,EAAE,eAAe,EAAE,CAAC;AAE3B,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC"}
+{"version":3,"file":"pre-bundle-facet.d.ts","sourceRoot":"","sources":["../../src/npm/pre-bundle-facet.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAA6B,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAgB3F;;;;;;;;;GASG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;CACd;AACD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,IAAI,CAAC;CACb;AACD,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;AAEhD,yDAAyD;AACzD,MAAM,WAAW,aAAa;IAC5B,iFAAiF;IACjF,SAAS,EAAE,MAAM,CAAC;IAClB,uGAAuG;IACvG,SAAS,EAAE,MAAM,CAAC;IAClB,4DAA4D;IAC5D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB;;;;;;OAMG;IACH,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,+EAA+E;IAC/E,cAAc,EAAE,MAAM,CAAC;IACvB;;;8DAG0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,8BAA8B;AAC9B,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,OAAO,CAAC;IACZ,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAChB,4DAA4D;IAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,OAAO,EAAE,MAAM,CAAC;IAChB,wDAAwD;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAID;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GACZ;IAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAEpD;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf;IAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CA4GpD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAEjE;AAmBD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,GACvB,MAAM,aAAa,EACnB,MAAM;IACJ,UAAU,EAAE;QAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAA;KAAE,CAAC;CAC7D,KACA,OAAO,CAAC,eAAe,CAiazB,CAAC;AAGF,OAAO,EAAE,eAAe,EAAE,CAAC;AAE3B,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC"}

package/dist/npm/pre-bundle-facet.js

@@ -315,7 +315,8 @@ export const prebundleOne = async function prebundleOne(spec, _env) {
     const stripLeadingSlash = (p) => p.replace(/^\/+/, '');
     const normalizePath = (p) => {
         // Resolve any `..` segments to keep tryResolve's exists() lookups
-        // canonical; mirrors src/vfs-path.ts behaviour without importing.
+        // canonical. This helper runs inside the serialized facet function,
+        // so it mirrors src/vfs/path.ts instead of importing it.
         const parts = p.split('/');
         const out = [];
         for (const seg of parts) {

package/dist/npm/resolve-one-facet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-one-facet.d.ts","sourceRoot":"","sources":["../../src/npm/resolve-one-facet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve-one-facet.d.ts","sourceRoot":"","sources":["../../src/npm/resolve-one-facet.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2DG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE/E;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,aAAa,EAAE,gBAAgB,EAAE,CAAC;IAClC;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB,mDAAmD;IACnD,UAAU,EAAE,OAAO,CAAC;IACpB,gCAAgC;IAChC,cAAc,EAAE,OAAO,CAAC;IACxB,8CAA8C;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,iDAAiD;IACjD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,sEAAsE;IACtE,GAAG,EAAE,eAAe,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C;;;;;OAKG;IACH,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,oDAAoD;IACpD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,sDAAsD;IACtD,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAC7B;;;OAGG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAC9B,eAAe,EAAE,WAAW,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;IAClE;;;;;;;;;;;;;;OAcG;IACH,eAAe,CAAC,EAAE,KAAK,CACnB;QAAE,IAAI,EAAE,KAAK,CAAC;QAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;QAAC,SAAS,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAChF;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;QAAC,SAAS,EAAE,WAAW,CAAA;KAAE,CACrE,CAAC;IACF;;;OAGG;IACH,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,WAAW,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,iBAAiB,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9H;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,0BAA0B,GACrC,MAAM,cAAc,EACpB,KAAK;IACH,UAAU,EAAE;QAIV,kBAAkB,CAAC,EAAE,CACnB,IAAI,EAAE,MAAM,KACT,OAAO,CACR;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,OAAO,CAAA;SAAE,GACjD,IAAI,GACJ;YACE,MAAM,EAAE;gBAAE,IAAI,EAAE,MAAM,CAAC;gBAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,OAAO,EAAE,OAAO,CAAA;aAAE,GAAG,IAAI,CAAC;YACjE,MAAM,EAAE,KAAK,CACT;gBAAE,IAAI,EAAE,KAAK,CAAC;gBAAC,IAAI,EAAE,MAAM,CAAC;gBAAC,SAAS,EAAE,MAAM,CAAC;gBAAC,KAAK,EAAE,MAAM,CAAA;aAAE,GAC/D;gBAAE,IAAI,EAAE,MAAM,CAAC;gBAAC,IAAI,EAAE,MAAM,CAAC;gBAAC,SAAS,EAAE,MAAM,CAAA;aAAE,CACpD,CAAC;SACH,CACJ,CAAC;QACF,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;KACvE,CAAC;CACH,KACA,OAAO,CAAC,gBAAgB,CA4W1B,CAAC"}

package/dist/npm/resolve-one-facet.js

@@ -74,6 +74,33 @@ export const resolveOnePackumentInFacet = async function resolveOnePackumentInFa
     const messages = [];
     const events = [];
     const cacheWrites = [];
+    const parseRegistryRequest = (name, range) => {
+        const text = String(range || 'latest');
+        if (!text.startsWith('npm:')) {
+            return { installName: name, registryName: name, range: text, alias: false };
+        }
+        const target = text.slice(4);
+        const findSeparator = (specText) => {
+            if (!specText)
+                return -1;
+            if (specText[0] !== '@')
+                return specText.indexOf('@');
+            const slash = specText.indexOf('/');
+            if (slash < 0)
+                return -1;
+            return specText.indexOf('@', slash + 1);
+        };
+        const splitAt = findSeparator(target);
+        const registryName = splitAt >= 0 ? target.slice(0, splitAt) : target;
+        const targetRange = splitAt >= 0 ? target.slice(splitAt + 1) : 'latest';
+        return {
+            installName: name,
+            registryName: registryName || name,
+            range: targetRange || 'latest',
+            alias: true,
+        };
+    };
+    const request = parseRegistryRequest(spec.name, spec.range);
     // cache-obs-2: per-resolve cache events. Filled by the L2/L3 path
     // (spliced from supervisor RPC return.events) and the L4 path
     // (post-network-fetch). Threaded through `out()` into the result.
@@ -98,7 +125,7 @@ export const resolveOnePackumentInFacet = async function resolveOnePackumentInFa
         return out(null, 0, 'skipped');
     }
     // 2. Registry policy.
-    let effName = spec.name;
+    let effName = request.registryName;
     // @ts-ignore — preamble.
     const __swap = SHOULD_SWAP(spec.name);
     if (__swap) {
@@ -137,18 +164,18 @@ export const resolveOnePackumentInFacet = async function resolveOnePackumentInFa
         const entries = spec.cachedEntries || [];
         if (entries.length === 0)
             return null;
-        const cleanRange = (spec.range || '').replace(/^[~^>=<\s]+/, '');
+        const cleanRange = (request.range || '').replace(/^[~^>=<\s]+/, '');
         if (/^\d+\.\d+\.\d+$/.test(cleanRange)) {
-            const exact = entries.find((e) => e.name === effName && e.version === cleanRange);
+            const exact = entries.find((e) => e.name === request.installName && e.version === cleanRange);
             if (exact)
                 return exact;
         }
-        const candidates = entries.filter((e) => e.name === effName);
+        const candidates = entries.filter((e) => e.name === request.installName);
         if (candidates.length === 0)
             return null;
         const versions = candidates.map((e) => e.version);
         // @ts-ignore — preamble.
-        const picked = RESOLVE_VERSION(versions, spec.range);
+        const picked = RESOLVE_VERSION(versions, request.range);
         if (!picked)
             return null;
         return candidates.find((e) => e.version === picked) || null;
@@ -320,26 +347,27 @@ export const resolveOnePackumentInFacet = async function resolveOnePackumentInFa
     }
     // 6. Pick version.
     let version = null;
-    if (spec.range && data.versions[spec.range])
-        version = spec.range;
-    if (!version && spec.range && spec.range !== 'latest') {
+    if (request.range && data.versions[request.range])
+        version = request.range;
+    if (!version && request.range && request.range !== 'latest') {
         const allVersions = Object.keys(data.versions);
         // @ts-ignore — preamble.
-        version = RESOLVE_VERSION(allVersions, spec.range);
+        version = RESOLVE_VERSION(allVersions, request.range);
     }
     if (!version) {
-        version = data['dist-tags']?.[spec.range] || data['dist-tags']?.latest || null;
+        version = data['dist-tags']?.[request.range] || data['dist-tags']?.latest || null;
     }
     if (!version || !data.versions[version]) {
-        messages.push(`[resolve-one] ${effName}: no version satisfies ${spec.range}`);
+        messages.push(`[resolve-one] ${effName}: no version satisfies ${request.range}`);
         return out(null, bytes, packumentSource);
     }
     // 7. Materialise ResolvedPackage.
     const vData = data.versions[version];
     const versionToResolved = (v) => {
+        const packageName = request.installName || v.name;
         const binField = v.bin || {};
         const bin = typeof binField === 'string'
-            ? { [String(v.name).split('/').pop()]: binField }
+            ? { [String(packageName).split('/').pop()]: binField }
             : binField;
         let peerDependencies;
         let allPeers;
@@ -365,7 +393,7 @@ export const resolveOnePackumentInFacet = async function resolveOnePackumentInFa
             ? Object.fromEntries(Object.entries(v.optionalDependencies).filter(([, r]) => typeof r === 'string'))
             : undefined;
         const resolvedOut = {
-            name: v.name,
+            name: packageName,
             version: v.version,
             tarballUrl: v.dist?.tarball || '',
             integrity: v.dist?.integrity || v.dist?.shasum || '',

package/dist/npm/resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/npm/resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/npm/resolver.ts"],"names":[],"mappings":"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"}

package/dist/npm/resolver.js

@@ -169,26 +169,56 @@ export function resolveVersion(versions, range) {
     });
     return matching[0];
 }
+function parseRegistryRequest(name, range) {
+    const text = String(range || 'latest');
+    if (!text.startsWith('npm:')) {
+        return { installName: name, registryName: name, range: text, alias: false };
+    }
+    const target = text.slice(4);
+    const splitAt = findPackageRangeSeparator(target);
+    const registryName = splitAt >= 0 ? target.slice(0, splitAt) : target;
+    const targetRange = splitAt >= 0 ? target.slice(splitAt + 1) : 'latest';
+    return {
+        installName: name,
+        registryName: registryName || name,
+        range: targetRange || 'latest',
+        alias: true,
+    };
+}
+function findPackageRangeSeparator(spec) {
+    if (!spec)
+        return -1;
+    if (spec[0] !== '@')
+        return spec.indexOf('@');
+    const slash = spec.indexOf('/');
+    if (slash < 0)
+        return -1;
+    return spec.indexOf('@', slash + 1);
+}
 // ── Package resolution ──────────────────────────────────────────────────
 /**
  * Resolve a single package from the registry.
  * Checks cache first, then fetches from npm.
  */
 export async function resolvePackage(name, versionRange, cache, fetchFn, log) {
+    const request = parseRegistryRequest(name, versionRange);
+    const cacheName = request.installName;
+    const registryName = request.registryName;
+    const requestedRange = request.range;
     // 1. Check for exact version in registry cache
     try {
-        const cleanRange = versionRange.replace(/^[~^>=<\s]+/, '');
+        const cleanRange = requestedRange.replace(/^[~^>=<\s]+/, '');
         if (cleanRange.match(/^\d+\.\d+\.\d+$/)) {
-            const cached = cache.getRegistryEntry(name, cleanRange);
+            const cached = cache.getRegistryEntry(cacheName, cleanRange);
             if (cached) {
-                log?.(`  ${name}: found exact ${cleanRange} in cache`);
+                log?.(`  ${cacheName}: found exact ${cleanRange} in cache`);
                 return registryCacheToResolved(cached);
             }
         }
         // 2. Check if we have cached versions to resolve against
-        const cachedVersions = cache.getRegistryVersions(name);
+        const cachedVersions = cache.getRegistryVersions(cacheName);
         if (cachedVersions.length > 0) {
-            const isDistTag = !versionRange || versionRange === 'latest' || versionRange === '*' || versionRange === '';
+            const isDistTag = !requestedRange || requestedRange === 'latest' || requestedRange === '*' || requestedRange === '';
             if (isDistTag) {
                 // "latest", "*", "" → pick the highest cached version (sort descending)
                 const sorted = cachedVersions
@@ -196,25 +226,25 @@ export async function resolvePackage(name, versionRange, cache, fetchFn, log) {
                     .filter(x => x.parsed !== null)
                     .sort((a, b) => compareSemver(b.parsed, a.parsed));
                 if (sorted.length > 0) {
-                    log?.(`  ${name}: resolved ${versionRange || '(empty)'} → ${sorted[0].entry.version} (highest cached)`);
+                    log?.(`  ${cacheName}: resolved ${requestedRange || '(empty)'} → ${sorted[0].entry.version} (highest cached)`);
                     return registryCacheToResolved(sorted[0].entry);
                 }
             }
             else {
                 // Semver range: try to match against cached versions
                 const versions = cachedVersions.map(e => e.version);
-                const resolved = resolveVersion(versions, versionRange);
+                const resolved = resolveVersion(versions, requestedRange);
                 if (resolved) {
                     const entry = cachedVersions.find(e => e.version === resolved);
                     if (entry) {
-                        log?.(`  ${name}: resolved ${versionRange} → ${resolved} from cache`);
+                        log?.(`  ${cacheName}: resolved ${requestedRange} → ${resolved} from cache`);
                         return registryCacheToResolved(entry);
                     }
                 }
                 // Cached versions exist but none match — only skip fetch if cache is fresh
                 const newest = Math.max(...cachedVersions.map(e => e.fetchedAt));
                 if (Date.now() - newest < 3600_000) {
-                    log?.(`  ${name}: ${cachedVersions.length} cached versions, none match ${versionRange}, cache fresh`);
+                    log?.(`  ${cacheName}: ${cachedVersions.length} cached versions, none match ${requestedRange}, cache fresh`);
                     return null;
                 }
             }
@@ -222,18 +252,20 @@ export async function resolvePackage(name, versionRange, cache, fetchFn, log) {
     }
     catch (e) {
         // Cache read failed (schema issue, corrupt data, etc.) — fall through to network
-        log?.(`  ${name}: cache read error: ${e?.message}`);
+        log?.(`  ${cacheName}: cache read error: ${e?.message}`);
     }
     // 3. Fetch from registry
-    log?.(`  ${name}: fetching from registry (${fetchFn ? 'proxy' : 'direct'})...`);
+    log?.(request.alias
+        ? `  ${cacheName}: fetching ${registryName} from registry (${fetchFn ? 'proxy' : 'direct'})...`
+        : `  ${registryName}: fetching from registry (${fetchFn ? 'proxy' : 'direct'})...`);
     setResolverPhase('fetching');
-    packumentFetchStart(name);
+    packumentFetchStart(registryName);
     let data;
     let bytesDecoded = 0;
     try {
-        const safeName = name.startsWith('@')
-            ? '@' + encodeURIComponent(name.slice(1))
-            : encodeURIComponent(name);
+        const safeName = registryName.startsWith('@')
+            ? '@' + encodeURIComponent(registryName.slice(1))
+            : encodeURIComponent(registryName);
         const url = `${NPM_REGISTRY}/${safeName}`;
         // retryableFetch: 3 retries on 5xx/network errors with jittered
         // exponential backoff. Per-attempt timeout = the prior single-attempt
@@ -244,14 +276,14 @@ export async function resolvePackage(name, versionRange, cache, fetchFn, log) {
             headers: { 'Accept': 'application/json' },
         }, {
             retries: DEFAULT_RETRIES,
-            name,
+            name: registryName,
             fetchImpl: fetchFn,
             perAttemptTimeoutMs: FETCH_TIMEOUT_MS,
             onRetry: (attempt, total, delayMs, reason) => {
-                log?.(`  ${name}: retry ${attempt}/${total} after ${delayMs}ms (${reason})`);
+                log?.(`  ${registryName}: retry ${attempt}/${total} after ${delayMs}ms (${reason})`);
             },
         });
-        log?.(`  ${name}: registry responded ${resp.status}`);
+        log?.(`  ${registryName}: registry responded ${resp.status}`);
         // Dispose the (potentially RPC-stub-backed) Response explicitly once
         // the body is consumed / dropped. When fetchFn is the supervisor fetch
         // proxy, `resp` is a cross-isolate stub returned from
@@ -303,7 +335,7 @@ export async function resolvePackage(name, versionRange, cache, fetchFn, log) {
         }
     }
     catch (e) {
-        log?.(`  ${name}: fetch error: ${e?.message}`);
+        log?.(`  ${registryName}: fetch error: ${e?.message}`);
         // Balance counters even on the error path. responseStubDisposed
         // was either already called in the finally above (if we got past
         // retryableFetch) or not — the safe move is to always run
@@ -313,31 +345,33 @@ export async function resolvePackage(name, versionRange, cache, fetchFn, log) {
     }
     packumentFetchEnd(bytesDecoded);
     if (!data.versions) {
-        log?.(`  ${name}: no versions field in packument`);
+        log?.(`  ${registryName}: no versions field in packument`);
         return null;
     }
     // Resolve version
     let version = null;
     // Try exact match
-    if (versionRange && data.versions[versionRange]) {
-        version = versionRange;
+    if (requestedRange && data.versions[requestedRange]) {
+        version = requestedRange;
     }
     // Try range resolution
-    if (!version && versionRange && versionRange !== 'latest') {
+    if (!version && requestedRange && requestedRange !== 'latest') {
         const allVersions = Object.keys(data.versions);
-        version = resolveVersion(allVersions, versionRange);
+        version = resolveVersion(allVersions, requestedRange);
     }
     // Try dist-tags
     if (!version) {
-        version = data['dist-tags']?.[versionRange] || data['dist-tags']?.latest || null;
+        version = data['dist-tags']?.[requestedRange] || data['dist-tags']?.latest || null;
     }
     if (!version || !data.versions[version]) {
-        log?.(`  ${name}: could not resolve version for range ${versionRange}`);
+        log?.(`  ${registryName}: could not resolve version for range ${requestedRange}`);
         return null;
     }
-    log?.(`  ${name}: resolved → ${version}`);
+    log?.(request.alias
+        ? `  ${cacheName}: resolved ${registryName}@${requestedRange} → ${version}`
+        : `  ${registryName}: resolved → ${version}`);
     const vData = data.versions[version];
-    const pkg = versionToResolved(vData);
+    const pkg = versionToResolved(vData, cacheName);
     setResolverPhase('caching');
     // Cache the resolved version (non-fatal — if caching fails, we still return the package)
     try {
@@ -360,10 +394,10 @@ export async function resolvePackage(name, versionRange, cache, fetchFn, log) {
     }
     // Also cache other popular versions from the packument (non-fatal)
     try {
-        cachePopularVersions(data, cache, pkg.version);
+        cachePopularVersions(data, cache, pkg.version, cacheName);
     }
     catch (e) {
-        console.error(`[npm-resolve] popular version cache failed for ${name}:`, e?.message);
+        console.error(`[npm-resolve] popular version cache failed for ${registryName}:`, e?.message);
     }
     return pkg;
 }
@@ -372,7 +406,7 @@ export async function resolvePackage(name, versionRange, cache, fetchFn, log) {
  * Avoids re-fetching the full packument for transitive deps that reference
  * the same package with a different range.
  */
-function cachePopularVersions(data, cache, alreadyCached) {
+function cachePopularVersions(data, cache, alreadyCached, installName) {
     const versions = Object.keys(data.versions || {});
     // Cache the latest dist-tag version if different
     const latest = data['dist-tags']?.latest;
@@ -393,7 +427,7 @@ function cachePopularVersions(data, cache, alreadyCached) {
         if (!vData)
             continue;
         try {
-            const pkg = versionToResolved(vData);
+            const pkg = versionToResolved(vData, installName);
             cache.putRegistryEntry({
                 name: pkg.name,
                 version: pkg.version,
@@ -412,10 +446,11 @@ function cachePopularVersions(data, cache, alreadyCached) {
     }
 }
 /** Convert npm registry version data to ResolvedPackage. */
-function versionToResolved(vData) {
+function versionToResolved(vData, installName) {
+    const packageName = installName || vData.name;
     const binField = vData.bin || {};
     const bin = typeof binField === 'string'
-        ? { [vData.name.split('/').pop()]: binField }
+        ? { [packageName.split('/').pop()]: binField }
         : binField;
     // X.5-F R2.5: keep the full peer set (including optionals) on a
     // hidden field so the BFS walk can include optional peers when
@@ -431,7 +466,7 @@ function versionToResolved(vData) {
             .filter(([, r]) => typeof r === 'string'))
         : undefined;
     const out = {
-        name: vData.name,
+        name: packageName,
         version: vData.version,
         tarballUrl: vData.dist?.tarball || '',
         integrity: vData.dist?.integrity || vData.dist?.shasum || '',

package/dist/router/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAqBH,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EACV,YAAY,IAAI,eAAe,EAC/B,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,oDAAoD;IACpD,aAAa,EAAE,MAAM,CAAC;IACtB,qCAAqC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,kFAAkF;IAClF,OAAO,EAAE,OAAO,CAAC;IACjB,oBAAoB;IACpB,GAAG,EAAE,GAAG,CAAC;CACV;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;;OAMG;IACH,cAAc,CAAC,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9D;;;OAGG;IACH,YAAY,CAAC,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;AAErD,0CAA0C;AAC1C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;GAMG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,gBAAgB,KAClB,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;AAEhD,+CAA+C;AAC/C,MAAM,WAAW,0BAA0B;IACzC,oCAAoC;IACpC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,qDAAqD;IACrD,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,4CAA4C;IAC5C,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,yEAAyE;IACzE,GAAG,CAAC,EAAE,qBAAqB,CAAC;CAC7B;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC7E;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,GAAE,0BAA+B,GACvC,aAAa,CAkHf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAwBH,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,iBAAiB,CAAC;AAGzB,YAAY,EACV,YAAY,IAAI,eAAe,EAC/B,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,oDAAoD;IACpD,aAAa,EAAE,MAAM,CAAC;IACtB,qCAAqC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,kFAAkF;IAClF,OAAO,EAAE,OAAO,CAAC;IACjB,oBAAoB;IACpB,GAAG,EAAE,GAAG,CAAC;CACV;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;;OAMG;IACH,cAAc,CAAC,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9D;;;OAGG;IACH,YAAY,CAAC,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;AAErD,0CAA0C;AAC1C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;GAMG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,gBAAgB,KAClB,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;AAEhD,+CAA+C;AAC/C,MAAM,WAAW,0BAA0B;IACzC,oCAAoC;IACpC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,qDAAqD;IACrD,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,4CAA4C;IAC5C,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,yEAAyE;IACzE,GAAG,CAAC,EAAE,qBAAqB,CAAC;CAC7B;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC7E;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,GAAE,0BAA+B,GACvC,aAAa,CA+If"}