@nudojs/core 1.5.0 → 1.6.0

package/dist/{chunk-YO4GKCNE.js → chunk-I35CHJNO.js}

@@ -25,6 +25,7 @@ import {
   joinAbs,
   le,
   lit,
+  litKeyString,
   litValue,
   locateContractParam,
   lt,
@@ -45,7 +46,7 @@ import {
   withEvalBudgetOverride,
   withExecPhi,
   withFnBudgetOverride
-} from "./chunk-W2MP6REI.js";
+} from "./chunk-LZJC7X5J.js";
 
 // src/algebra/directive-scan.ts
 function cleanDirectiveLine(raw, kind) {
@@ -432,12 +433,19 @@ function parseNudoImportPayload(payload) {
   if (s === "") return void 0;
   const named = s.match(/^\{([^}]+)\}\s*from\s*["']([^"']+)["']$/);
   if (named) {
-    const names = named[1].split("\n").map((line) => line.replace(/^\s*\/\/\/?\s?/, "").trim()).join("\n").split(",").map((x) => x.trim()).filter(Boolean).map((x) => x.split(/\s+as\s+/).pop().trim());
-    return { names, spec: named[2] };
+    const names = [];
+    const importedOfLocal = {};
+    for (const x of named[1].split("\n").map((line) => line.replace(/^\s*\/\/\/?\s?/, "").trim()).join("\n").split(",").map((x2) => x2.trim()).filter(Boolean)) {
+      const seg = x.split(/\s+as\s+/);
+      const local = seg[seg.length - 1].trim();
+      names.push(local);
+      if (seg.length > 1) importedOfLocal[local] = seg[0].trim();
+    }
+    return { names, importedOfLocal, spec: named[2] };
   }
   const ns = s.match(/^\*\s+as\s+(\w+)\s+from\s*["']([^"']+)["']$/);
   if (ns) {
-    return { names: [`*${ns[1]}`], spec: ns[2] };
+    return { names: [`*${ns[1]}`], importedOfLocal: {}, spec: ns[2] };
   }
   if (/^[\w$]+\s+from\b/.test(s) || /^[\w$]+\s*,/.test(s)) return "malformed-default";
   return "malformed";
@@ -448,7 +456,7 @@ function fileDirectiveVisibleText(source) {
 }
 function extractFileEnvNames(source) {
   const text = fileDirectiveVisibleText(source);
-  const re = new RegExp(`${LINE_COMMENT_PREFIX}\\s*@nudo:env\\s+([^\\n*]+)`, "g");
+  const re = new RegExp(`${LINE_COMMENT_PREFIX}[ \\t]*@nudo:env[ \\t]+([^\\n*]+)`, "g");
   const out = [];
   let m;
   while (m = re.exec(text)) {
@@ -459,7 +467,7 @@ function extractFileEnvNames(source) {
 function extractMockModuleRecords(source) {
   const text = fileDirectiveVisibleText(source);
   const re = new RegExp(
-    `${LINE_COMMENT_PREFIX}\\s*@nudo:mock-module\\s+([^\\n]+)`,
+    `${LINE_COMMENT_PREFIX}[ \\t]*@nudo:mock-module[ \\t]+([^\\n]+)`,
     "g"
   );
   const out = [];
@@ -552,7 +560,7 @@ function extractBalancedParens(text, startIdx) {
   }
   return null;
 }
-var CASE_NAME_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*|\/\/\/?\s*)?@nudo:case\s+"([^"]+)"\s*\(/g;
+var CASE_NAME_REGEX = /(?:^|\n)[ \t]*(?:\*[ \t]*|\/[ \t]*)?@nudo:case[ \t]+"([^"\n]+)"[ \t]*\(/g;
 function extractCaseExpectedExpr(text, afterParen) {
   const lines = text.slice(afterParen).split("\n");
   for (let i = 0; i < lines.length; i++) {
@@ -1248,11 +1256,7 @@ function throwConstraintToKinds(c) {
 }
 
 // src/algebra/refine.ts
-function extractNudoImports(source) {
-  const out = [];
-  for (const rec of extractNudoImportRecords(source)) {
-    out.push({ names: rec.names, spec: rec.spec });
-  }
+function diagnoseMalformedNudoImports(source) {
   for (const bad of scanMalformedNudoImports(source)) {
     if (bad === "malformed-default") {
       collectDiag({
@@ -1266,7 +1270,13 @@ function extractNudoImports(source) {
       });
     }
   }
-  return out;
+}
+function extractNudoImports(source) {
+  diagnoseMalformedNudoImports(source);
+  return extractNudoImportRecords(source).map((rec) => ({
+    names: rec.names,
+    spec: rec.spec
+  }));
 }
 var refineDiagCollector = null;
 var refineDiagSeq = 0;
@@ -1376,6 +1386,21 @@ function rewriteSidecarSource(src, fromFile) {
         cuts.push({ start: stmt.start, end: decl.start, text: "" });
         continue;
       }
+      if (!stmt.source) {
+        let aliasPairs = false;
+        for (const spec of stmt.specifiers) {
+          if (spec.type !== "ExportSpecifier") continue;
+          if (spec.local.type !== "Identifier") continue;
+          const key = spec.exported.type === "Identifier" ? spec.exported.name : spec.exported.value;
+          if (key === void 0) continue;
+          exportPairs.push({ key, expr: spec.local.name });
+          aliasPairs = true;
+        }
+        if (aliasPairs) {
+          cuts.push({ start: stmt.start, end: stmt.end, text: "" });
+          continue;
+        }
+      }
       badExport("'export { \u2026 }' (list / re-export)");
       if (stmt.start != null && stmt.end != null) {
         cuts.push({ start: stmt.start, end: stmt.end, text: "" });
@@ -1540,14 +1565,15 @@ function execSidecar(src, opts, chain, preloaded) {
           });
           prologue.push(`var ${n.local} = __nudoInjects;`);
         } else if (n.imported !== void 0) {
-          if (!(n.imported in sidecarInjects)) {
+          const hasOwnInject = Object.hasOwn(sidecarInjects, n.imported);
+          if (!hasOwnInject) {
             collectDiag({
               code: "nudo:interface-load",
               message: `sidecar import '{ ${n.imported} }' from '${imp.spec}' is not an injected builder`,
               file: fromFile
             });
-          }
-          if (n.local !== n.imported || !(n.imported in sidecarInjects)) {
+            prologue.push(`var ${n.local} = undefined;`);
+          } else if (n.local !== n.imported) {
             prologue.push(`var ${n.local} = __nudoInjects[${JSON.stringify(n.imported)}];`);
           }
         } else {
@@ -1616,21 +1642,23 @@ function execSidecar(src, opts, chain, preloaded) {
       if (n.ns) {
         deps[n.local] = depExports;
       } else if (n.imported !== void 0) {
-        if (!(n.imported in depExports)) {
+        if (Object.hasOwn(depExports, n.imported)) {
+          deps[n.local] = depExports[n.imported];
+        } else {
           collectDiag({
             code: "nudo:interface-load",
             message: `sidecar '${imp.spec}' has no export '${n.imported}'`,
             file: fromFile
           });
+          deps[n.local] = void 0;
         }
-        deps[n.local] = depExports[n.imported];
       } else {
         collectDiag({
           code: "nudo:interface-load",
           message: `sidecar default import '${n.local}' from '${imp.spec}' has no default export (sidecars export named constraints only)`,
           file: fromFile
         });
-        deps[n.local] = depExports.default;
+        deps[n.local] = Object.hasOwn(depExports, "default") ? depExports.default : void 0;
       }
     }
   }
@@ -1738,7 +1766,8 @@ function resetNudoModuleExecCache() {
 }
 function collectConstraints(source, opts) {
   const map = /* @__PURE__ */ new Map();
-  const imports = extractNudoImports(source);
+  diagnoseMalformedNudoImports(source);
+  const imports = extractNudoImportRecords(source);
   for (const imp of imports) {
     if (!opts.loadModule || !opts.fromFile) {
       collectDiag({
@@ -1793,19 +1822,20 @@ function collectConstraints(source, opts) {
         }
         continue;
       }
-      const v2 = exports[name];
+      const imported = imp.importedOfLocal[name] ?? name;
+      const v2 = Object.hasOwn(exports, imported) ? exports[imported] : void 0;
       if (isNudoConstraint(v2)) {
         map.set(name, v2);
       } else if (v2 === void 0) {
         collectDiag({
           code: "nudo:interface-load",
-          message: `sidecar '${imp.spec}' has no export '${name}'`,
+          message: `sidecar '${imp.spec}' has no export '${imported}'`,
           file: opts.fromFile
         });
       } else {
         collectDiag({
           code: "nudo:interface-load",
-          message: `sidecar '${imp.spec}' export '${name}' is not a Nudo constraint`,
+          message: `sidecar '${imp.spec}' export '${imported}' is not a Nudo constraint`,
           file: opts.fromFile
         });
       }
@@ -1836,7 +1866,13 @@ function extractRefinesFromSource(source, fnName, opts = {}) {
       const [, param, cName] = m;
       if (param === "return") continue;
       const c = constraints.get(cName);
-      if (!c) continue;
+      if (!c) {
+        collectDiag({
+          code: "nudo:contract-syntax",
+          message: `Unknown constraint name '${cName}' in @nudo:contract (expected a name bound by @nudo:import)`
+        });
+        continue;
+      }
       out.push({
         param,
         pred: instantiateConstraint(c, param),
@@ -1873,7 +1909,13 @@ function extractRefineReturnFromSource(source, fnName, opts = {}) {
       }
       const cName = m[1];
       const c = constraints.get(cName);
-      if (!c) continue;
+      if (!c) {
+        collectDiag({
+          code: "nudo:contract-syntax",
+          message: `Unknown constraint name '${cName}' in @nudo:contract return (expected a name bound by @nudo:import)`
+        });
+        continue;
+      }
       return { name: cName, constraint: c };
     }
   }
@@ -1950,7 +1992,9 @@ function localNamedExports(source) {
   const identName = (n) => {
     if (!n) return void 0;
     if (n.type === "Identifier" && typeof n.name === "string") return n.name;
-    if (n.type === "Literal" && typeof n.value === "string") return n.value;
+    if ((n.type === "StringLiteral" || n.type === "Literal") && typeof n.value === "string") {
+      return n.value;
+    }
     return void 0;
   };
   const localClasses = /* @__PURE__ */ new Map();
@@ -2098,6 +2142,25 @@ function localNamedExports(source) {
   }
   return out;
 }
+function exportedNameOfLocal(source, localName) {
+  let ast;
+  try {
+    ast = parseSource(source, { errorRecovery: true });
+  } catch {
+    return void 0;
+  }
+  for (const stmt of ast.program.body) {
+    if (stmt.type !== "ExportNamedDeclaration" || stmt.source) continue;
+    for (const spec of stmt.specifiers) {
+      if (spec.type !== "ExportSpecifier") continue;
+      if (spec.local.type !== "Identifier" || spec.local.name !== localName) continue;
+      const name = spec.exported.type === "Identifier" ? spec.exported.name : spec.exported.value;
+      if (name === void 0 || name === localName || name === "default") continue;
+      return name;
+    }
+  }
+  return void 0;
+}
 function generatedExportNames(sidecarSrc) {
   const out = /* @__PURE__ */ new Set();
   let ast;
@@ -2111,8 +2174,18 @@ function generatedExportNames(sidecarSrc) {
     const stmt = stmts[i];
     if (stmt.type !== "ExportNamedDeclaration") continue;
     if (stmt.source) continue;
+    if (stmt.start == null) continue;
     const d = stmt.declaration;
-    if (!d || stmt.start == null) continue;
+    if (!d) {
+      if (regionHasGeneratedMarker(stmts, i, sidecarSrc)) {
+        for (const spec of stmt.specifiers) {
+          if (spec.type !== "ExportSpecifier") continue;
+          const name = spec.exported.type === "Identifier" ? spec.exported.name : spec.exported.value;
+          if (name !== void 0) out.add(name);
+        }
+      }
+      continue;
+    }
     const names = [];
     if (d.type === "VariableDeclaration") {
       for (const decl of d.declarations) {
@@ -2183,6 +2256,8 @@ function sidecarMayBind(sidecarNames, fnName, source) {
   if (!sidecarNames) return true;
   if (sidecarNames.size === 0) return true;
   if (sidecarNames.has(fnName)) return true;
+  const aliasExport = exportedNameOfLocal(source, fnName);
+  if (aliasExport !== void 0 && sidecarNames.has(aliasExport)) return true;
   if (sidecarNames.has("default") && isDefaultExportLocal(source, fnName)) return true;
   if (fnName.includes(".")) {
     const [cls, method] = fnName.split(".", 2);
@@ -2253,20 +2328,26 @@ function loadSidecarBinding(source, fnName, opts) {
     }
     return { ok: false };
   }
-  let binding = exports[fnName];
+  let binding = Object.hasOwn(exports, fnName) ? exports[fnName] : void 0;
+  if (binding === void 0) {
+    const aliasExport2 = exportedNameOfLocal(source, fnName);
+    if (aliasExport2 !== void 0 && Object.hasOwn(exports, aliasExport2)) {
+      binding = exports[aliasExport2];
+    }
+  }
   if (binding === void 0 && exports.default !== void 0 && isDefaultExportLocal(source, fnName)) {
     binding = exports.default;
   }
   if (binding === void 0 && fnName.includes(".")) {
     const [cls, method] = fnName.split(".", 2);
-    binding = exports[`${cls}_${method}`];
+    binding = Object.hasOwn(exports, `${cls}_${method}`) ? exports[`${cls}_${method}`] : void 0;
     if (binding === void 0) {
-      const bag = exports[cls];
+      const bag = Object.hasOwn(exports, cls) ? exports[cls] : void 0;
       if (bag && typeof bag === "object" && !isNudoConstraint(bag)) {
-        binding = bag[method];
+        binding = Object.hasOwn(bag, method) ? bag[method] : void 0;
       }
     }
-    if (binding === void 0 && method !== void 0 && exports[method] !== void 0) {
+    if (binding === void 0 && method !== void 0 && Object.hasOwn(exports, method)) {
       collectDiag2({
         code: "nudo:interface-load",
         message: `sidecar key '${method}' does not bind '${fnName}' \u2014 use '${cls}.${method}', '${cls}_${method}', or nested { ${cls}: { ${method}: \u2026 } }`,
@@ -2292,7 +2373,8 @@ function loadSidecarBinding(source, fnName, opts) {
     return { ok: false };
   }
   const generatedNames = generatedExportNames(sidecarSrc);
-  const isGenerated = generatedNames.has(fnName) || (fnName.includes(".") ? (() => {
+  const aliasExport = exportedNameOfLocal(source, fnName);
+  const isGenerated = generatedNames.has(fnName) || (aliasExport !== void 0 ? generatedNames.has(aliasExport) : false) || (fnName.includes(".") ? (() => {
     const [cls, method] = fnName.split(".", 2);
     return generatedNames.has(`${cls}_${method}`) || generatedNames.has(cls);
   })() : false);
@@ -2943,7 +3025,7 @@ function loadModuleDepsFingerprint(source, loadModule, fromFile) {
 function termKey(t, rename) {
   switch (t.op) {
     case "lit":
-      return `L:${typeof t.value}:${String(t.value)}`;
+      return `L:${typeof t.value}:${litKeyString(t.value)}`;
     case "var":
       return `V:${rename?.get(t.id) ?? t.id}`;
     case "app":
@@ -3050,6 +3132,9 @@ function collectPredVars(p, acc) {
     case "typeof":
       collectTermVars(p.t, acc);
       return;
+    case "assumeFinite":
+      collectTermVars(p.t, acc);
+      return;
   }
 }
 function collectAbsVars(a, acc, seen) {
@@ -5789,6 +5874,7 @@ export {
   takeInterfaceDiags,
   takeInterfaceDiagsSince,
   localNamedExports,
+  exportedNameOfLocal,
   generatedExportNames,
   resetSidecarLoadFailureCache,
   effectiveInterface,