@vmz/vmz 0.2.7 → 0.2.8

package/dist/workspace/content-addressed-assets.js

@@ -9,7 +9,6 @@
 import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
-import { requireNativeAddon } from './native-addon.js';
 import { canonicalJson, sha256Hex } from './release-pack.js';
 import { writePrettyJsonFile } from './pretty-json.js';
 export const CONTENT_ADDRESSED_ASSETS_SCHEMA = 'vmz.content_addressed_assets.v0';
@@ -62,18 +61,14 @@ export function rewriteCssImports(cssText, rewrites) {
  * @param {Record<string, string>} [_rewrites]
  */
 export function rewriteJsEntryRelativeImports(jsText, _rewrites = {}) {
-    const native = requireNativeAddon();
-    if (typeof native.rewriteModuleSpecifiers !== 'function') {
-        throw new Error('native missing rewriteModuleSpecifiers — run `pnpm napi:build`');
-    }
-    // Static import/export specs via oxc AST (`./x` → `../x`). Dynamic
-    // `import("./"+id)` is not a literal specifier — rewrite that codegen form only.
-    let out = String(native.rewriteModuleSpecifiers(String(jsText ?? ''), JSON.stringify({
-        tsExtToJs: false,
-        dotSlashToParent: true,
-    })));
-    out = out.replace(/import\(\s*"\.\/"\s*\+/g, 'import("../"+');
-    out = out.replace(/import\(\s*'\.\/'\s*\+/g, "import('../'+");
+    // These files are already generated JavaScript. Re-parsing them through
+    // the native module parser here creates a second parser boundary during
+    // static assembly and can re-enter the generated graph indefinitely.
+    // Restrict the rewrite to import/export module-specifier positions and
+    // keep it bounded to the source text.
+    let out = String(jsText ?? '').replace(/(\b(?:from|import)\s*)(["'])\.\/([^"'\\]+)\2/g, (_match, prefix, quote, specifier) => `${prefix}${quote}../${specifier}${quote}`);
+    out = out.replace(/import\(\s*(["'])\.\/([^"'\\]+)\1\s*\)/g, (_match, quote, specifier) => `import(${quote}../${specifier}${quote})`);
+    out = out.replace(/import\(\s*(["'])\.\/\1\s*\+/g, (_match, quote) => `import(${quote}../${quote}+`);
     return out;
 }
 /**

package/dist/workspace/pack-client-packages.d.ts

@@ -4,7 +4,8 @@
  * Bare npm/workspace imports are legal on the author surface (01/04).
  * Browser ESM cannot resolve them. Pack materializes reachable package
  * modules under `dist/vendor/<pkg>/…` and rewrites importers to relative paths
- * via oxc AST (N-API `rewriteModuleSpecifiers`) — no import-text regex.
+ * via a bounded rewrite of generated module syntax. Pack must not re-enter the
+ * parser pipeline for every emitted JavaScript file.
  *
  * Not full oxc chunk-split/minify (`oxc-pending` remains for release minify).
  */

package/dist/workspace/pack-client-packages.js

@@ -4,7 +4,8 @@
  * Bare npm/workspace imports are legal on the author surface (01/04).
  * Browser ESM cannot resolve them. Pack materializes reachable package
  * modules under `dist/vendor/<pkg>/…` and rewrites importers to relative paths
- * via oxc AST (N-API `rewriteModuleSpecifiers`) — no import-text regex.
+ * via a bounded rewrite of generated module syntax. Pack must not re-enter the
+ * parser pipeline for every emitted JavaScript file.
  *
  * Not full oxc chunk-split/minify (`oxc-pending` remains for release minify).
  */
@@ -60,7 +61,7 @@ export function packClientBareImports(outDir, opts = {}) {
         const before = readFileSync(file, 'utf8');
         let after = rewriteBareImports(before, file, bareToVendor);
         try {
-            after = rewriteRelativeTsSpecs(after);
+            after = rewritePackModuleSpecifiers(after);
         }
         catch (error) {
             throw new Error(`pack module ${file}: ${error instanceof Error ? error.message : String(error)}`);
@@ -184,14 +185,14 @@ export function collectBareSpecs(js) {
     };
     // `from 'x'` covers import/export … from
     let m;
-    const fromRe = /\bfrom\s+['"]([^'"]+)['"]/g;
+    const fromRe = /\bfrom\s*['"]([^'"]+)['"]/g;
     while ((m = fromRe.exec(js)))
         add(m[1]);
     const dynRe = /\bimport\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
     while ((m = dynRe.exec(js)))
         add(m[1]);
     // side-effect: import 'x' (not import( and not import … from)
-    const sideRe = /\bimport\s+['"]([^'"]+)['"]/g;
+    const sideRe = /\bimport\s*['"]([^'"]+)['"]/g;
     while ((m = sideRe.exec(js)))
         add(m[1]);
     return [...specs];
@@ -199,7 +200,7 @@ export function collectBareSpecs(js) {
 function collectRelativeSpecs(js) {
     /** @type {Set<string>} */
     const specs = new Set();
-    const re = /(?:from\s+|import\s*\(\s*)['"](\.[^'"]+)['"]/g;
+    const re = /(?:\bfrom\s*|\bimport\s*\(\s*|\bimport\s*)['"](\.[^'"]+)['"]/g;
     let m;
     while ((m = re.exec(js)))
         specs.add(m[1]);
@@ -327,7 +328,7 @@ function materializeModule(sourceFile) {
     if (ext === '.ts' || ext === '.tsx')
         return transpileTs(raw, sourceFile);
     try {
-        return rewriteRelativeTsSpecs(raw);
+        return rewritePackModuleSpecifiers(raw);
     }
     catch (error) {
         throw new Error(`pack source ${sourceFile}: ${error instanceof Error ? error.message : String(error)}`);
@@ -347,11 +348,11 @@ function transpileTs(source, filename) {
                 skipLibCheck: true,
             },
         });
-        return rewriteRelativeTsSpecs(out.outputText || '');
+        return rewritePackModuleSpecifiers(out.outputText || '');
     }
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
-        return `/* vmz-pack: typescript transpile failed (${msg}) */\n${rewriteRelativeTsSpecs(source)}`;
+        return `/* vmz-pack: typescript transpile failed (${msg}) */\n${rewritePackModuleSpecifiers(source)}`;
     }
 }
 function rewriteTsExt(p) {
@@ -362,6 +363,13 @@ function rewriteTsExt(p) {
 }
 /** oxc AST module specifier rewrite (`.ts`→`.js` + optional exact map). */
 export function rewriteRelativeTsSpecs(js, exactMap = null) {
+    const source = String(js ?? '');
+    const hasModuleTsSpecifier = /(?:import\s*(?:[^'"()]*?\s*from\s*)?|export\s+[^'"()]*?\s*from\s*|import\s*\()(['"])[^'"\r\n]+\.tsx?\1/i.test(source);
+    const exactKeys = Object.keys(exactMap ?? {});
+    const hasExactSpecifier = exactKeys.some((spec) => source.includes(`'${spec}'`) || source.includes(`"${spec}"`));
+    if (!hasModuleTsSpecifier && !hasExactSpecifier) {
+        return source;
+    }
     const native = requireNativeAddon();
     if (typeof native.rewriteModuleSpecifiers !== 'function') {
         throw new Error('native missing rewriteModuleSpecifiers — run `pnpm napi:build`');
@@ -405,5 +413,21 @@ function rewriteBareImports(js, fromFile, bareToVendor) {
             rel = `./${rel}`;
         exact[spec] = rel;
     }
-    return rewriteRelativeTsSpecs(js, exact);
+    return rewritePackModuleSpecifiers(js, exact);
+}
+function rewritePackModuleSpecifiers(source, exactMap = null) {
+    const rewrite = (spec) => {
+        const exact = exactMap && exactMap[spec];
+        if (typeof exact === 'string')
+            return exact;
+        return /\.tsx?$/i.test(spec) ? spec.replace(/\.tsx?$/i, '.js') : spec;
+    };
+    const replace = (match, quote, spec) => {
+        const next = rewrite(spec);
+        return next === spec ? match : match.replace(`${quote}${spec}${quote}`, `${quote}${next}${quote}`);
+    };
+    let out = source.replace(/\bimport\s*\(\s*(['"])([^'"]+)\1\s*\)/g, replace);
+    out = out.replace(/\bimport\s+[^;\n]*?\sfrom\s+(['"])([^'"]+)\1/g, replace);
+    out = out.replace(/\bimport\s*(['"])([^'"]+)\1/g, replace);
+    return out.replace(/\bfrom\s*(['"])([^'"]+)\1/g, replace);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vmz/vmz",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "type": "module",
   "description": "VMZ Node toolchain — N-API workspace session + CLI (publish name @vmz/vmz)",
   "license": "MIT",
@@ -48,16 +48,16 @@
     }
   },
   "dependencies": {
-    "@vmz/commander": "0.2.7",
-    "@vmz/core": "0.2.7",
-    "@vmz/diagnostic": "0.2.7",
-    "@vmz/plugin": "0.2.7",
-    "@vmz/protocol": "0.2.7",
+    "@vmz/commander": "0.2.8",
+    "@vmz/core": "0.2.8",
+    "@vmz/diagnostic": "0.2.8",
+    "@vmz/plugin": "0.2.8",
+    "@vmz/protocol": "0.2.8",
     "jiti": "^2.6.1"
   },
   "peerDependencies": {
-    "@vmz/plugin-markdown-it": "0.2.7",
-    "@vmz/test": "0.2.7",
+    "@vmz/plugin-markdown-it": "0.2.8",
+    "@vmz/test": "0.2.8",
     "typescript": "^5.8.3"
   },
   "peerDependenciesMeta": {
@@ -96,12 +96,12 @@
     "cli"
   ],
   "optionalDependencies": {
-    "@vmz/vmz-win32-x64": "0.2.7",
-    "@vmz/vmz-win32-arm64": "0.2.7",
-    "@vmz/vmz-darwin-x64": "0.2.7",
-    "@vmz/vmz-darwin-arm64": "0.2.7",
-    "@vmz/vmz-linux-x64": "0.2.7",
-    "@vmz/vmz-linux-arm64": "0.2.7"
+    "@vmz/vmz-win32-x64": "0.2.8",
+    "@vmz/vmz-win32-arm64": "0.2.8",
+    "@vmz/vmz-darwin-x64": "0.2.8",
+    "@vmz/vmz-darwin-arm64": "0.2.8",
+    "@vmz/vmz-linux-x64": "0.2.8",
+    "@vmz/vmz-linux-arm64": "0.2.8"
   },
   "repository": {
     "type": "git",