@nudojs/core 1.15.2 → 1.17.0

package/dist/internal.js

@@ -4,25 +4,33 @@ import {
   checkInjectedDomainEvidence,
   createDiagChannel,
   createScopedDiagChannel,
+  escapeTemplateTypeFixed,
   exportedNameOfLocal,
   extractAllLoadSpecs,
   fnFingerprints,
+  formatObjectKey,
   generalizeFromAst,
   generalizeSourceKeyPart,
   getFnNameAndBodies,
   hashSource,
   interfaceTierOf,
+  isJsBindingIdent,
+  isJsIdent,
   listTopFunctions,
   loadModuleDepsFingerprint,
+  localNamedExports,
   normPath,
   resetFnFpCache,
   resetHashSourceCache,
   resolveDepPath,
+  safeMemberAccess,
+  sanitizeCommentText,
   sidecarSpecsOf,
   stableAnalyzeKeySource,
   stablePathKey,
-  stablePathKeyGraph
-} from "./chunk-NXZSRLCT.js";
+  stablePathKeyGraph,
+  toJsBindingIdent
+} from "./chunk-4MRLOJMI.js";
 import {
   $tryDigestSoft,
   $tryMarkSoft,
@@ -40,24 +48,22 @@ import {
   PROMISE_MICRO_ERROR_LABEL,
   PROMISE_MICRO_OVERFLOW_LABEL,
   ProjectionBudget,
+  SELF,
   abortDerivationSession,
   absLit,
   absNumLit,
   absStrLit,
   absTemplateViews,
+  accessorReadDomain,
   allAbsStr,
   allFixedTextOfViews,
   anyMemberResult,
-  awaitAbs,
   beginDerivationSession,
   bumpEvalForkBudget,
   callBudgetKey,
-  classChainNames,
-  classFromMethods,
   clearLiveImportRefreshers,
   clearPureCallMemo,
   clearPureMemo,
-  coerceAsyncReturn,
   concatString,
   createScopedSlot,
   createTemplateAbs,
@@ -65,7 +71,6 @@ import {
   decideIncludes,
   decideStartsWith,
   defaultLeakBudget,
-  defineClass,
   definitelyUncallableMember,
   derivationChain,
   endDerivationSession,
@@ -85,7 +90,6 @@ import {
   formatThrowsAbs,
   getAbsCallBudgetStats,
   getAbsOrigin,
-  getClass,
   getClassChain,
   getDerivation,
   getEvalCallBudgetState,
@@ -95,19 +99,16 @@ import {
   getMayThrowCollector,
   getPromiseMicrosLength,
   hasDerivationSession,
-  instanceOf,
-  instantiateClass,
   isEvalMissingSlotEnabled,
+  isHiddenInternalSlot,
   isNullishAbs,
   isTemplateLike,
   isThrowsIgnored,
   knownPrefixOfViews,
   knownSuffixOfViews,
   leakIfNeeded,
+  litKeyString,
   litValue,
-  lookupMethod,
-  lookupMethodWithOwner,
-  lookupSuperMethod,
   maskCommentsAndStrings,
   mayThrowEffectsToAbs,
   maybeLeak,
@@ -128,7 +129,6 @@ import {
   popCallLoc,
   popMayThrowFrame,
   predToString,
-  projectBrand,
   projectDerivationDsl,
   pushCallLoc,
   pushMayThrowFrame,
@@ -156,12 +156,12 @@ import {
   stableCallId,
   stripCommentsAndStrings,
   stripStringsKeepComments,
-  superNameOf,
   tagAbsOrigin,
   tagDerivationRoot,
   templateMatchesValue,
   templatePartsOf,
   termDepth,
+  termEquals,
   termKey,
   termNodes,
   termToString,
@@ -172,17 +172,33 @@ import {
   withEvalBudgetOverride,
   withFnBudgetOverride,
   wrapPromise
-} from "./chunk-WKIRPUHZ.js";
+} from "./chunk-ARIQO5XX.js";
 
 // src/algebra/inlay.ts
 function listFunctions(source) {
   const file = parseSource(source);
   const out = [];
+  const exported = localNamedExports(source);
   const visitDecl = (decl) => {
     if (decl.type === "FunctionDeclaration" && decl.id) {
       const fd = decl;
       out.push({ name: fd.id.name, node: fd });
     }
+    if (decl.type === "ClassDeclaration") {
+      const cd = decl;
+      const clsName = cd.id?.name;
+      if (clsName) {
+        for (const m of cd.body?.body ?? []) {
+          if (m.type !== "ClassMethod") continue;
+          if (m.kind && m.kind !== "method") continue;
+          const keyName = m.key?.type === "Identifier" ? m.key.name : void 0;
+          if (!keyName) continue;
+          const fullName = `${clsName}.${keyName}`;
+          if (!exported.has(fullName)) continue;
+          out.push({ name: fullName, node: m });
+        }
+      }
+    }
     if (decl.type === "VariableDeclaration") {
       const dcls = decl.declarations ?? [];
       for (const d of dcls) {
@@ -194,11 +210,40 @@ function listFunctions(source) {
       }
     }
   };
+  const isExportsTarget = (n) => {
+    if (!n) return false;
+    if (n.type === "Identifier") return n.name === "exports";
+    if (n.type === "MemberExpression") {
+      const me = n;
+      return me.object?.type === "Identifier" && me.object.name === "module" && me.property?.type === "Identifier" && me.property.name === "exports";
+    }
+    return false;
+  };
+  const visitCjsAssign = (stmt) => {
+    const expr = stmt.expression;
+    if (!expr || expr.type !== "AssignmentExpression") return;
+    const assign = expr;
+    if (assign.operator !== "=") return;
+    const left = assign.left;
+    const right = assign.right;
+    if (!left || !right || left.type !== "MemberExpression") return;
+    const me = left;
+    if (me.computed === true) return;
+    if (!isExportsTarget(me.object)) return;
+    const prop = me.property;
+    const propName = prop?.type === "Identifier" ? prop.name : void 0;
+    if (!propName) return;
+    if (!exported.has(propName)) return;
+    if (right.type !== "FunctionExpression" && right.type !== "ArrowFunctionExpression") return;
+    out.push({ name: propName, node: right });
+  };
   for (const stmt of file.program.body) {
     if (stmt.type === "ExportNamedDeclaration" && stmt.declaration) {
       visitDecl(stmt.declaration);
     } else if (stmt.type === "ExportDefaultDeclaration" && stmt.declaration) {
       visitDecl(stmt.declaration);
+    } else if (stmt.type === "ExpressionStatement") {
+      visitCjsAssign(stmt);
     } else {
       visitDecl(stmt);
     }
@@ -213,6 +258,17 @@ function renameTypeVars(s, varMap) {
   }
   return out;
 }
+var INTERNAL_LEN_ID_RE = /^len#\d+$/;
+var READABLE_LEN_ID = "len";
+function readableTerm(t) {
+  if (t.op === "var") {
+    return INTERNAL_LEN_ID_RE.test(t.id) ? { op: "var", id: READABLE_LEN_ID } : t;
+  }
+  if (t.op === "app") {
+    return { op: "app", fn: t.fn, args: t.args.map(readableTerm) };
+  }
+  return t;
+}
 function formatReturnDisplay(g) {
   const varMap = /* @__PURE__ */ new Map();
   for (let i = 0; i < (g.typeParams?.length ?? 0); i++) {
@@ -221,28 +277,28 @@ function formatReturnDisplay(g) {
     if (pname) varMap.set(id, pname);
   }
   const stripParens = (t) => t.startsWith("(") && t.endsWith(")") ? t.slice(1, -1) : t;
+  const termText = (t) => stripParens(renameTypeVars(termToString(readableTerm(t)), varMap));
   const memberPath = (m) => {
     if (m.term?.op === "var") {
-      const name = renameTypeVars(m.term.id, varMap);
+      const name = INTERNAL_LEN_ID_RE.test(m.term.id) ? READABLE_LEN_ID : renameTypeVars(m.term.id, varMap);
       return { key: `var:${name}`, text: name };
     }
     if (m.term?.op === "app") {
-      const t = stripParens(renameTypeVars(termToString(m.term), varMap));
+      const t = termText(m.term);
       return { key: `app:${t}`, text: t };
     }
     const lvR = litValue(m);
     if (lvR.ok) {
       const lv = lvR.value;
-      if (typeof lv === "number" && !Number.isFinite(lv)) {
-        return { key: `lit:${String(lv)}`, text: String(lv) };
-      }
-      return { key: `lit:${String(lv)}`, text: JSON.stringify(lv) ?? "undefined" };
+      const text = termToString({ op: "lit", value: lv });
+      const key = `lit:${typeof lv}:${litKeyString(lv)}`;
+      return { key, text };
     }
     return { key: `shape:${formatShape(m)}`, text: formatShape(m) };
   };
   const abs = g.symbolic;
   if (abs.term && abs.term.op !== "lit") {
-    return stripParens(renameTypeVars(termToString(abs.term), varMap));
+    return termText(abs.term);
   }
   if (abs.shape.k === "sum") {
     const parts = [];
@@ -269,7 +325,10 @@ function collectAbsInlays(source, opts) {
     try {
       g = generalizeFromAst(name, source, {
         ...refineOpts ? { refine: refineOpts } : {},
-        ...opts?.modules ? { modules: opts.modules } : {}
+        ...opts?.modules ? { modules: opts.modules } : {},
+        // 注入包透传（Bug 786）：@nudo:mock / @nudo:as / @nudo:replace /
+        // env 全局缺席 ⇒ 推导链塌缩 unknown（与 CLI 面分叉）。
+        ...opts?.inject ? { inject: opts.inject } : {}
       });
     } catch {
       continue;
@@ -311,8 +370,10 @@ function collectAbsInlays(source, opts) {
         });
       }
     }
-    const bodyLoc = fnNode.body?.loc;
-    if (bodyLoc?.start) {
+    const bodyNode = fnNode.body;
+    const bodyLoc = bodyNode?.loc;
+    const anchor = bodyNode?.type === "BlockStatement" ? bodyLoc?.start : bodyLoc?.end ?? bodyLoc?.start;
+    if (anchor) {
       let label;
       try {
         label = `: ${formatReturnDisplay(g)}`;
@@ -321,8 +382,8 @@ function collectAbsInlays(source, opts) {
       }
       if (isImplicitExport) label += "  \xB7 derived";
       inlays.push({
-        line: bodyLoc.start.line,
-        character: Math.max(0, bodyLoc.start.column),
+        line: anchor.line,
+        character: Math.max(0, anchor.column),
         label: `${label}  `,
         kind: "type",
         ...tierSrc ? { interfaceSource: tierSrc } : {},
@@ -333,103 +394,32 @@ function collectAbsInlays(source, opts) {
   return inlays;
 }
 
-// src/algebra/codegen-escape.ts
-var JS_IDENT = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
-var JS_BINDING_IDENT = /^(?:[$_\p{ID_Start}])(?:[$\u200C\u200D\p{ID_Continue}])*$/u;
-var JS_BINDING_RESERVED = /* @__PURE__ */ new Set([
-  // ECMA-262 keywords
-  "break",
-  "case",
-  "catch",
-  "class",
-  "const",
-  "continue",
-  "debugger",
-  "default",
-  "delete",
-  "do",
-  "else",
-  "enum",
-  "export",
-  "extends",
-  "false",
-  "finally",
-  "for",
-  "function",
-  "if",
-  "import",
-  "in",
-  "instanceof",
-  "new",
-  "null",
-  "return",
-  "super",
-  "switch",
-  "this",
-  "throw",
-  "true",
-  "try",
-  "typeof",
-  "var",
-  "void",
-  "while",
-  "with",
-  "yield",
-  // strict mode / module-code reserved
-  "let",
-  "static",
-  "await",
-  "implements",
-  "interface",
-  "package",
-  "private",
-  "protected",
-  "public",
-  // never legal bindings in strict / module code
+// src/algebra/denote.ts
+var PROTOTYPE_LESS_GLOBALS = /* @__PURE__ */ new Set([
+  // 可调用但没有对象 prototype
+  "Proxy",
+  "parseFloat",
+  "parseInt",
+  "decodeURI",
+  "decodeURIComponent",
+  "encodeURI",
+  "encodeURIComponent",
+  "escape",
+  "unescape",
   "eval",
-  "arguments"
+  "isFinite",
+  "isNaN",
+  // 不可调用（非构造器）
+  "Math",
+  "JSON",
+  "Intl",
+  "Reflect",
+  "Atomics",
+  "globalThis"
 ]);
-var JS_CANONICAL_INT = /^(?:0|[1-9]\d*)$/;
-function isJsIdent(name) {
-  return JS_IDENT.test(name);
-}
-function isJsBindingIdent(name) {
-  return JS_BINDING_IDENT.test(name) && !JS_BINDING_RESERVED.has(name);
-}
-function toJsBindingIdent(name, used) {
-  let base = name;
-  if (!JS_BINDING_IDENT.test(base)) {
-    base = base.replace(/[^\p{ID_Continue}$\u200C\u200D]/gu, "_");
-    if (base.length === 0) base = "_";
-    else if (!/^[$_\p{ID_Start}]/u.test(base)) base = `_${base}`;
-  }
-  if (JS_BINDING_RESERVED.has(base)) base = `_${base}`;
-  if (!used) return base;
-  let n = base;
-  let i = 2;
-  while (used.has(n)) {
-    n = `${base}_${i}`;
-    i++;
-  }
-  used.add(n);
-  return n;
-}
-function formatObjectKey(k) {
-  if (JS_IDENT.test(k)) return k;
-  if (JS_CANONICAL_INT.test(k)) return k;
-  return JSON.stringify(k);
-}
-function safeMemberAccess(recv, key) {
-  return JS_IDENT.test(key) ? `${recv}.${key}` : `${recv}[${JSON.stringify(key)}]`;
-}
-function escapeTemplateTypeFixed(text) {
-  return text.replace(/[\\`$]/g, "\\$&");
+function hasUnusablePrototype(name) {
+  return PROTOTYPE_LESS_GLOBALS.has(name);
 }
-function sanitizeCommentText(text) {
-  return text.replace(/\*\//g, "*\\/").replace(/[\r\n\u2028\u2029\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, " ");
-}
-
-// src/algebra/denote.ts
 function denoteGuard(a, v) {
   return denoteGuardB(a, v, new ProjectionBudget());
 }
@@ -440,7 +430,7 @@ function denoteGuardB(a, v, budget) {
     if (a.term?.op === "lit" && (!a.pred || a.pred.op === "true")) {
       return eqGuard(v, a.term.value);
     }
-    const shape = denoteShape(a.shape, v, budget);
+    const shape = denoteShape(a, v, budget);
     const pred = denotePred(a, v);
     if (shape === "true") return pred;
     if (pred === "true") return shape;
@@ -449,7 +439,8 @@ function denoteGuardB(a, v, budget) {
     budget.exit();
   }
 }
-function denoteShape(s, v, budget) {
+function denoteShape(a, v, budget) {
+  const s = a.shape;
   switch (s.k) {
     case "never":
       return "false";
@@ -472,13 +463,16 @@ function denoteShape(s, v, budget) {
           return "true";
       }
     case "obj": {
-      const checks = [`typeof ${v} === "object"`, `${v} !== null`];
+      const checks = [`typeof ${v} === "object"`, `${v} !== null`, `!Array.isArray(${v})`];
       for (const [key, slot] of Object.entries(s.slots)) {
+        if (isHiddenInternalSlot(key, slot)) continue;
         const access = safeMemberAccess(v, key);
-        const inner = denoteGuardB(slot.value, access, budget);
+        const slotAbs = accessorReadDomain(a, key) ?? slot.value;
+        const inner = denoteGuardB(slotAbs, access, budget);
         if (slot.optional) {
           if (inner !== "true") checks.push(`(${access} === undefined || ${inner})`);
         } else {
+          checks.push(hasPropertyClause(v, key));
           if (inner !== "true") checks.push(inner);
         }
       }
@@ -515,8 +509,13 @@ function denoteShape(s, v, budget) {
     case "eff":
       if (s.eff === "promise") return `${v} instanceof Promise`;
       return "true";
-    case "brand":
-      return denoteShape(s.shape.shape, v, budget);
+    case "brand": {
+      const inner = denoteShape(s.shape, v, budget);
+      if (hasUnusablePrototype(s.name)) return inner;
+      const identity = brandIdentityClause(s.name, v);
+      if (inner === "true") return identity;
+      return `(${identity}) && (${inner})`;
+    }
     case "sum": {
       if (s.members.length === 0) return "false";
       const parts = s.members.map((m) => denoteGuardB(m, v, budget));
@@ -566,12 +565,29 @@ function predAsJs(p, v, a) {
       if (leftLitTerm && rightLitTerm) {
         return `${jsLit(leftLitTerm.value)} ${op} ${jsLit(rightLitTerm.value)}`;
       }
+      if (rightLitTerm && typeof rightLitTerm.value === "number" && isLengthSelf(p.a, a)) {
+        return `${v}.length ${op} ${rightLitTerm.value}`;
+      }
       return "true";
     }
     default:
       return "true";
   }
 }
+function hasPropertyClause(v, key) {
+  const k = JSON.stringify(key);
+  return `(Object.hasOwn(${v}, ${k}) || (${k} in ${v} && !Object.hasOwn(Object.prototype, ${k})))`;
+}
+function brandIdentityClause(name, v) {
+  const ctor = `Reflect.get(globalThis, ${JSON.stringify(name)})`;
+  return `(typeof ${ctor} !== "function" || ${v} instanceof ${ctor})`;
+}
+function isLengthSelf(t, a) {
+  if (t.op !== "app" || t.fn !== "length" || t.args.length !== 1) return false;
+  const arg = t.args[0];
+  if (a.term && termEquals(arg, a.term)) return true;
+  return arg.op === "var" && arg.id === SELF;
+}
 function jsLit(v) {
   if (v === void 0) return "undefined";
   if (v === null) return "null";
@@ -634,19 +650,15 @@ export {
   allAbsStr,
   allFixedTextOfViews,
   anyMemberResult,
-  awaitAbs,
   beginDerivationSession,
   budgetAttributionSegs,
   bumpEvalForkBudget,
   callBudgetKey,
   canSkipLiteralCallScan,
   checkInjectedDomainEvidence,
-  classChainNames,
-  classFromMethods,
   clearLiveImportRefreshers,
   clearPureCallMemo,
   clearPureMemo,
-  coerceAsyncReturn,
   collectAbsInlays,
   concatString,
   createDiagChannel,
@@ -657,7 +669,6 @@ export {
   decideIncludes,
   decideStartsWith,
   defaultLeakBudget,
-  defineClass,
   definitelyUncallableMember,
   denoteGuard,
   derivationChain,
@@ -683,7 +694,6 @@ export {
   generalizeSourceKeyPart,
   getAbsCallBudgetStats,
   getAbsOrigin,
-  getClass,
   getClassChain,
   getDerivation,
   getEvalCallBudgetState,
@@ -695,8 +705,6 @@ export {
   getPromiseMicrosLength,
   hasDerivationSession,
   hashSource,
-  instanceOf,
-  instantiateClass,
   isEvalMissingSlotEnabled,
   isJsBindingIdent,
   isJsIdent,
@@ -708,9 +716,6 @@ export {
   leakIfNeeded,
   listTopFunctions,
   loadModuleDepsFingerprint,
-  lookupMethod,
-  lookupMethodWithOwner,
-  lookupSuperMethod,
   maskCommentsAndStrings,
   mayThrowEffectsToAbs,
   maybeLeak,
@@ -730,7 +735,6 @@ export {
   orphanMayThrowEffects,
   popCallLoc,
   popMayThrowFrame,
-  projectBrand,
   projectDerivationDsl,
   pushCallLoc,
   pushMayThrowFrame,
@@ -767,7 +771,6 @@ export {
   stablePathKeyGraph,
   stripCommentsAndStrings,
   stripStringsKeepComments,
-  superNameOf,
   tagAbsOrigin,
   tagDerivationRoot,
   templateMatchesValue,