parseman 0.60.1 → 0.60.2

package/dist/analysis/diagnostics.js

@@ -13192,7 +13192,7 @@ function clearOf(ranges, input, from, to) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.60.1";
+var PARSEMAN_VERSION = "0.60.2";
 
 // src/table/assemble.ts
 import { PlainBuf as PlainBuf2, PlainField, PlainLeaf as PlainLeaf9, PlainNode as PlainNode2, PlainSpan as PlainSpan10 } from "../cst/plain.js";

package/dist/cli/index.js

@@ -13337,7 +13337,7 @@ function clearOf(ranges, input, from, to) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.60.1";
+var PARSEMAN_VERSION = "0.60.2";
 
 // src/table/assemble.ts
 import { PlainBuf as PlainBuf2, PlainField, PlainLeaf as PlainLeaf9, PlainNode as PlainNode2, PlainSpan as PlainSpan10 } from "../cst/plain.js";

package/dist/index.js

@@ -13793,7 +13793,7 @@ function clearOf(ranges, input, from, to) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.60.1";
+var PARSEMAN_VERSION = "0.60.2";
 
 // src/table/assemble.ts
 import { PlainBuf as PlainBuf2, PlainField, PlainLeaf as PlainLeaf9, PlainNode as PlainNode2, PlainSpan as PlainSpan10 } from "./cst/plain.js";

package/dist/plugin/index.d.ts

@@ -20,9 +20,26 @@ export type CarriedSidecarItem = IRPiece | {
     from: string;
     name: string;
 };
+/**
+ * A recorded item: a reference also carries the pieces it stands for, expanded, so a
+ * build that BUNDLES the referenced package rather than keeping it external writes
+ * those pieces instead of a reference to a package its artifact no longer imports
+ * (`emitCarriedSidecars`).
+ */
+export type CarriedSinkItem = IRPiece | {
+    from: string;
+    name: string;
+    expanded?: readonly CarriedSidecarItem[];
+};
 /** One module's carried lists, by export name. */
-export type CarriedSink = Map<string, CarriedSidecarItem[]>;
+export type CarriedSink = Map<string, CarriedSinkItem[]>;
 export declare const CARRIED_SIDECAR_SUFFIX = ".parseman.json";
+/**
+ * The digest a sidecar records of its artifact: SHA-256 of the chunk's code, less a
+ * trailing `sourceMappingURL` comment, which a bundler appends after the hook that
+ * writes the sidecar has seen the code.
+ */
+export declare function artifactDigest(code: string): string;
 export type ParsecraftPluginOptions = {
     /** Extra module specifiers to treat as parseman re-exports */
     moduleAliases?: string[];

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAyBA,OAAO,WAAW,MAAM,cAAc,CAAA;AActC,OAAO,EAAmB,KAAK,OAAO,EAAE,MAAM,uBAAuB,CAAA;AA6BrE;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AACzE,kDAAkD;AAClD,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAA;AAC3D,eAAO,MAAM,sBAAsB,mBAAmB,CAAA;AAuBtD,MAAM,MAAM,uBAAuB,GAAG;IACpC,8DAA8D;IAC9D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;8CAC0C;IAC1C,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,wFAAwF;AACxF,MAAM,MAAM,eAAe,GAAG;IAC5B;qDACiD;IACjD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,sCAAsC;IACtC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;CAClC,CAAA;;;AA+fD,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAA;IAC3C,kFAAkF;IAClF,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB,CAAA;AA0CD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,aAAa,cAA6B,EAC1C,kBAAkB,UAAQ,EAC1B,QAAQ,UAAQ,EAChB,eAAe,UAAQ,EACvB,eAAe,CAAC,EAAE,eAAe,EACjC,cAAc,SAA0B,EACxC,WAAW,CAAC,EAAE,WAAW,GACxB,oBAAoB,GAAG,IAAI,CAW7B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAyBA,OAAO,WAAW,MAAM,cAAc,CAAA;AActC,OAAO,EAAmB,KAAK,OAAO,EAAE,MAAM,uBAAuB,CAAA;AA6BrE;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AACzE;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAA;CAAE,CAAA;AAChH,kDAAkD;AAClD,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAA;AACxD,eAAO,MAAM,sBAAsB,mBAAmB,CAAA;AAQtD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGnD;AA+BD,MAAM,MAAM,uBAAuB,GAAG;IACpC,8DAA8D;IAC9D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;8CAC0C;IAC1C,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,wFAAwF;AACxF,MAAM,MAAM,eAAe,GAAG;IAC5B;qDACiD;IACjD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,sCAAsC;IACtC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;CAClC,CAAA;;;AA6jBD,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAA;IAC3C,kFAAkF;IAClF,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB,CAAA;AA0CD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,aAAa,cAA6B,EAC1C,kBAAkB,UAAQ,EAC1B,QAAQ,UAAQ,EAChB,eAAe,UAAQ,EACvB,eAAe,CAAC,EAAE,eAAe,EACjC,cAAc,SAA0B,EACxC,WAAW,CAAC,EAAE,WAAW,GACxB,oBAAoB,GAAG,IAAI,CAW7B"}

package/dist/plugin/index.js

@@ -13387,7 +13387,7 @@ function clearOf(ranges, input, from, to) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.60.1";
+var PARSEMAN_VERSION = "0.60.2";
 
 // src/table/assemble.ts
 import { PlainBuf as PlainBuf2, PlainField, PlainLeaf as PlainLeaf9, PlainNode as PlainNode2, PlainSpan as PlainSpan10 } from "../cst/plain.js";
@@ -22741,26 +22741,36 @@ function evalIR(ir, rulesImpl) {
 import { createHash } from "node:crypto";
 var TABLE_RUNTIME_SPECIFIER = "parseman/table";
 var CARRIED_SIDECAR_SUFFIX = ".parseman.json";
+function artifactDigest(code) {
+  const body = code.replace(/\n?\/\/# sourceMappingURL=[^\n]*\n?$/, "");
+  return createHash("sha256").update(body).digest("hex").slice(0, 32);
+}
 var _sidecarCache = /* @__PURE__ */ new Map();
 function readCarriedSidecar(artifact) {
   const file = artifact + CARRIED_SIDECAR_SUFFIX;
   let mtimeMs;
+  let artifactMtimeMs;
   try {
     mtimeMs = fs2.statSync(file).mtimeMs;
+    artifactMtimeMs = fs2.statSync(artifact).mtimeMs;
   } catch {
     return null;
   }
   const hit = _sidecarCache.get(file);
-  if (hit && hit.mtimeMs === mtimeMs) return hit.sidecar;
-  let sidecar = null;
+  if (hit && hit.mtimeMs === mtimeMs && hit.artifactMtimeMs === artifactMtimeMs) return hit.read;
+  let read = null;
   try {
     const parsed = JSON.parse(fs2.readFileSync(file, "utf8"));
     const exports = typeof parsed === "object" && parsed !== null ? parsed.exports : void 0;
-    if (typeof exports === "object" && exports !== null) sidecar = parsed;
+    if (typeof exports === "object" && exports !== null) {
+      const sidecar = parsed;
+      const stale = typeof sidecar.artifact === "string" && sidecar.artifact !== artifactDigest(fs2.readFileSync(artifact, "utf8"));
+      read = { sidecar, stale };
+    }
   } catch {
   }
-  _sidecarCache.set(file, { mtimeMs, sidecar });
-  return sidecar;
+  _sidecarCache.set(file, { mtimeMs, artifactMtimeMs, read });
+  return read;
 }
 var corpusCache = /* @__PURE__ */ new Map();
 function corpusTexts(profile) {
@@ -22880,58 +22890,95 @@ function parseModuleCached(filePath) {
   _moduleParseCache.set(filePath, { mtimeMs, parsed });
   return parsed;
 }
-function reexportSource(body, exported) {
+function exportOrigin(body, exported) {
+  const stars = [];
   for (const st of body) {
+    if (st.type === "ExportAllDeclaration") {
+      const from = st.source?.value;
+      if (st.exported == null && from !== void 0) stars.push(from);
+      continue;
+    }
     if (st.type !== "ExportNamedDeclaration") continue;
+    const decl = st.declaration;
+    if (decl != null) {
+      const ids = decl.type === "VariableDeclaration" ? (decl.declarations ?? []).map((d) => d.id?.name) : [decl.id?.name];
+      if (ids.includes(exported)) return "local";
+    }
     for (const sp of st.specifiers ?? []) {
       const exp = sp.exported;
       if ((exp?.name ?? exp?.value) !== exported) continue;
       const local = sp.local;
       const name = local?.name ?? local?.value;
-      if (name === void 0) return null;
+      if (name === void 0) return "local";
       const from = st.source?.value;
-      return from !== void 0 ? { source: from, imported: name } : extractImportBindings(body).get(name) ?? null;
+      if (from !== void 0) return { from, imported: name };
+      const imported = extractImportBindings(body).get(name);
+      return imported === void 0 ? "local" : { from: imported.source, imported: imported.imported };
+    }
+  }
+  return { stars };
+}
+async function followCarried(sinks, moduleId, name, depth = 0) {
+  if (depth > 64) return void 0;
+  const own = sinks.get(moduleId)?.get(name);
+  if (own !== void 0) return { items: own, recorder: moduleId };
+  const code = this.getModuleInfo(moduleId)?.code;
+  if (!code) return void 0;
+  const parsed = parseSync5(moduleId, code);
+  if (parsed.errors.length > 0) return void 0;
+  const origin = exportOrigin(parsed.program.body, name);
+  if (origin === "local") return null;
+  const follow = async (source, imported) => {
+    const resolved = await this.resolve(source, moduleId);
+    if (resolved === null || resolved.external) return void 0;
+    return followCarried.call(this, sinks, resolved.id, imported, depth + 1);
+  };
+  if ("from" in origin) return follow(origin.from, origin.imported);
+  let found;
+  let unknown = false;
+  for (const source of origin.stars) {
+    const got = await follow(source, name);
+    if (got === void 0) unknown = true;
+    else if (got !== null) {
+      if (found !== void 0 && found.items !== got.items) return null;
+      found = got;
     }
   }
-  return null;
-}
-async function followCarried(sinks, moduleId, name) {
-  for (let hop = 0; hop < 64; hop++) {
-    const own = sinks.get(moduleId)?.get(name);
-    if (own !== void 0) return own;
-    const code = this.getModuleInfo(moduleId)?.code;
-    if (!code) return void 0;
-    const parsed = parseSync5(moduleId, code);
-    if (parsed.errors.length > 0) return void 0;
-    const next = reexportSource(parsed.program.body, name);
-    if (next === null) return void 0;
-    const resolved = await this.resolve(next.source, moduleId);
-    if (resolved === null || resolved.external) return void 0;
-    moduleId = resolved.id;
-    name = next.imported;
-  }
-  return void 0;
+  return found ?? (unknown || origin.stars.length === 0 ? void 0 : null);
 }
 async function emitCarriedSidecars(sinks, bundle) {
-  const recorders = /* @__PURE__ */ new Map();
-  for (const [moduleId, sink] of sinks) for (const name of sink.keys()) (recorders.get(name) ?? recorders.set(name, []).get(name)).push(moduleId);
+  const write = async (rec) => {
+    const out = [];
+    for (const item of rec.items) {
+      if ("ir" in item) {
+        out.push(item);
+        continue;
+      }
+      const resolved = item.expanded === void 0 ? null : await this.resolve(item.from, rec.recorder);
+      if (resolved !== null && !resolved.external) out.push(...item.expanded);
+      else out.push({ from: item.from, name: item.name });
+    }
+    return out;
+  };
   for (const chunk of Object.values(bundle)) {
     if (chunk.type !== "chunk") continue;
     const exports = {};
     for (const name of chunk.exports ?? []) {
       const followed = chunk.facadeModuleId ? await followCarried.call(this, sinks, chunk.facadeModuleId, name) : void 0;
+      if (followed === null) continue;
       if (followed !== void 0) {
-        exports[name] = followed;
+        exports[name] = await write(followed);
         continue;
       }
-      const ids = recorders.get(name);
-      if (ids === void 0) continue;
-      const own = ids.filter((m) => chunk.moduleIds?.includes(m));
-      const moduleId = own.length === 1 ? own[0] : own.length === 0 && ids.length === 1 ? ids[0] : void 0;
-      if (moduleId !== void 0) exports[name] = sinks.get(moduleId).get(name);
+      const own = (chunk.moduleIds ?? []).filter((m) => sinks.get(m)?.has(name) === true);
+      if (own.length === 1) exports[name] = await write({ items: sinks.get(own[0]).get(name), recorder: own[0] });
     }
     if (Object.keys(exports).length === 0) continue;
-    const sidecar = { parseman: PARSEMAN_VERSION, exports };
+    const sidecar = {
+      parseman: PARSEMAN_VERSION,
+      ...chunk.code === void 0 ? {} : { artifact: artifactDigest(chunk.code) },
+      exports
+    };
     this.emitFile({ type: "asset", fileName: chunk.fileName + CARRIED_SIDECAR_SUFFIX, source: JSON.stringify(sidecar) });
   }
 }
@@ -22939,8 +22986,11 @@ var SIDECAR_FRAMEWORKS = /* @__PURE__ */ new Set(["rollup", "rolldown", "vite"])
 var plugin_default = createUnplugin((opts = {}, meta) => {
   const sinks = SIDECAR_FRAMEWORKS.has(meta.framework) ? /* @__PURE__ */ new Map() : void 0;
   const generateBundle = sinks === void 0 ? void 0 : {
-    generateBundle(_options, bundle) {
-      return emitCarriedSidecars.call(this, sinks, bundle);
+    generateBundle: {
+      order: "post",
+      handler(_options, bundle) {
+        return emitCarriedSidecars.call(this, sinks, bundle);
+      }
     }
   };
   return {
@@ -22954,16 +23004,14 @@ var plugin_default = createUnplugin((opts = {}, meta) => {
       return /\.[jt]sx?$/.test(id) && !id.includes("node_modules");
     },
     transform(code, id) {
+      sinks?.delete(id);
       if (!code.includes("parseman")) return null;
       if (!code.includes("macro")) return null;
       for (const file of opts.assemblyProfile?.files ?? []) this?.addWatchFile?.(file);
       const moduleAliases = /* @__PURE__ */ new Set([PARSEMAN_MODULE, ...opts.moduleAliases ?? []]);
       const sink = sinks && /* @__PURE__ */ new Map();
       const result = transformMacro(code, id, moduleAliases, opts.warnUnloweredRegex === true, opts.recovery === true, opts.grammarCoverage === true, opts.assemblyProfile, opts.assemblyBudget, sink);
-      if (sinks && sink) {
-        if (sink.size > 0) sinks.set(id, sink);
-        else sinks.delete(id);
-      }
+      if (sinks && sink && sink.size > 0) sinks.set(id, sink);
       if (result?.warnings.length) {
         for (const w of result.warnings) {
           if (typeof this?.warn === "function") this.warn(`[parseman] ${w}`);
@@ -23737,7 +23785,12 @@ ${names.map((n) => `  - ${n}`).join("\n")}` : " (it is not a static combinator/v
       unresolved.why ??= `${exportName} in ${file}: ${why}`;
       return null;
     };
-    const sidecarItems = module.source || local ? void 0 : readCarriedSidecar(file)?.exports[exportName];
+    const sidecarRead = module.source || local ? null : readCarriedSidecar(file);
+    if (sidecarRead?.stale === true) {
+      return fail(`${path2.basename(file)}${CARRIED_SIDECAR_SUFFIX} was written for a different build of ${path2.basename(file)} (the artifact digest it records does not match). Rebuild the package so the two are written together`);
+    }
+    const sidecarExports = sidecarRead?.sidecar.exports;
+    const sidecarItems = sidecarExports !== void 0 && Object.hasOwn(sidecarExports, exportName) ? sidecarExports[exportName] : void 0;
     if (sidecarItems !== void 0) {
       const list = [];
       for (const item of sidecarItems) {
@@ -23760,7 +23813,20 @@ ${names.map((n) => `  - ${n}`).join("\n")}` : " (it is not a static combinator/v
     const initNode = localFor ? topLevelInit(mod.body, localFor) : null;
     const literalRange = initNode ? findCarriedPiecesLiteral(initNode) : null;
     if (!literalRange) {
-      return initNode !== null && !module.source && mod.src.slice(initNode.start, initNode.end).includes("tableRules(") ? fail(`is a compiled grammar with no carried pieces \u2014 no inline literal, and no entry in ${path2.basename(file)}${CARRIED_SIDECAR_SUFFIX}. Rebuild it with this parseman, and keep that file beside the artifact`) : null;
+      if (initNode !== null && !module.source && mod.src.slice(initNode.start, initNode.end).includes("tableRules(")) {
+        return fail(`is a compiled grammar with no carried pieces \u2014 no inline literal, and no entry in ${path2.basename(file)}${CARRIED_SIDECAR_SUFFIX}. Rebuild it with this parseman, and keep that file beside the artifact`);
+      }
+      if (module.source || local) return null;
+      const origin = exportOrigin(mod.body, exportName);
+      const targets = origin === "local" ? [] : "from" in origin ? [{ source: origin.from, imported: origin.imported }] : origin.stars.map((source) => ({ source, imported: exportName }));
+      for (const target of targets) {
+        const sub = resolveGrammarModule(file, target.source);
+        if (sub === null || seen.has(sub.file)) continue;
+        const pieces = resolveModulePieces(sub, target.imported, new Set(seen).add(sub.file), unresolved);
+        if (pieces !== null) return pieces;
+      }
+      if (unresolved.why === void 0 && !mod.src.includes(TABLE_RUNTIME_SPECIFIER)) return null;
+      return fail(`is exported by a compiled grammar artifact, but no carried pieces could be found for it \u2014 no inline literal, no entry in ${path2.basename(file)}${CARRIED_SIDECAR_SUFFIX}, and no re-export of it that has either. Rebuild it with this parseman, and keep each chunk's .parseman.json beside it`);
     }
     const literal2 = mod.src.slice(literalRange.start, literalRange.end);
     const imports = extractImportBindings(mod.body);
@@ -23822,7 +23888,8 @@ ${names.map((n) => `  - ${n}`).join("\n")}` : " (it is not a static combinator/v
       const b = importBindings.get(it.__spreadLocal);
       if (b === void 0) return false;
       if (!b.source.startsWith(".") && !path2.isAbsolute(b.source)) {
-        out.push({ from: b.source, name: b.imported });
+        const expanded = importedPieces(it.__spreadLocal);
+        out.push({ from: b.source, name: b.imported, ...expanded === null ? {} : { expanded } });
         continue;
       }
       const pieces = importedPieces(it.__spreadLocal);
@@ -24567,6 +24634,7 @@ ${lines2.join("\n")}`);
 }
 export {
   CARRIED_SIDECAR_SUFFIX,
+  artifactDigest,
   plugin_default as default,
   transformMacro
 };