@nudojs/core 1.9.3 → 1.9.4

package/dist/{chunk-HD6XZFOU.js → chunk-PGTNSUTE.js}

@@ -4612,7 +4612,12 @@ var NudoUnsupportedError = class extends Error {
 };
 
 // src/algebra/param-surface.ts
-function collectPatternNames(p, top, nested, depth, propKey) {
+function pushNestedPath(prefix, key, nestedPaths) {
+  if (prefix.length === 0 || !key) return;
+  if (key.includes(".") || prefix.some((seg) => seg.includes("."))) return;
+  nestedPaths.push([...prefix, key].join("."));
+}
+function collectPatternNames(p, top, nested, depth, propKey, prefix, nestedPaths) {
   if (!p) return;
   if (p.type === "Identifier" && p.name) {
     if (depth === 0) top.push(p.name);
@@ -4620,17 +4625,17 @@ function collectPatternNames(p, top, nested, depth, propKey) {
     return;
   }
   if (p.type === "AssignmentPattern") {
-    collectPatternNames(p.left, top, nested, depth, propKey);
+    collectPatternNames(p.left, top, nested, depth, propKey, prefix, nestedPaths);
     return;
   }
   if (p.type === "RestElement") {
-    collectPatternNames(p.argument, top, nested, depth, propKey);
+    collectPatternNames(p.argument, top, nested, depth, propKey, prefix, nestedPaths);
     return;
   }
   if (p.type === "ObjectPattern") {
     for (const prop of p.properties ?? []) {
       if (prop.type === "RestElement" || prop.argument) {
-        collectPatternNames(prop.argument, top, nested, depth, propKey);
+        collectPatternNames(prop.argument, top, nested, depth, propKey, prefix, nestedPaths);
         continue;
       }
       const keyName = prop.key?.type === "Identifier" && prop.key.name ? prop.key.name : prop.key && "value" in prop.key ? String(prop.key.value ?? "") : void 0;
@@ -4642,7 +4647,17 @@ function collectPatternNames(p, top, nested, depth, propKey) {
         else nested.push(keyName);
         if (propKey && depth === 0) propKey[keyName] = keyName;
       }
+      const patternValueKeyRule = () => {
+        if (!keyName) return;
+        if (depth === 0 && prefix.length === 0) {
+          top.push(keyName);
+          if (propKey) propKey[keyName] = keyName;
+        } else {
+          pushNestedPath(prefix, keyName, nestedPaths);
+        }
+      };
       if (v2.type === "Identifier" && v2.name) {
+        pushNestedPath(prefix, keyName ?? "", nestedPaths);
         if (depth === 0) {
           top.push(v2.name);
           if (propKey && keyName) propKey[v2.name] = keyName;
@@ -4650,15 +4665,38 @@ function collectPatternNames(p, top, nested, depth, propKey) {
       } else if (v2.type === "AssignmentPattern") {
         const left = v2.left;
         if (left?.type === "Identifier" && left.name) {
+          pushNestedPath(prefix, keyName ?? "", nestedPaths);
           if (depth === 0) {
             top.push(left.name);
             if (propKey && keyName) propKey[left.name] = keyName;
           } else nested.push(left.name);
+        } else if (left && (left.type === "ObjectPattern" || left.type === "ArrayPattern")) {
+          patternValueKeyRule();
+          collectPatternNames(
+            v2,
+            top,
+            nested,
+            depth,
+            propKey,
+            prefix.concat(keyName ? [keyName] : []),
+            nestedPaths
+          );
         } else {
-          collectPatternNames(v2, top, nested, depth, propKey);
+          collectPatternNames(v2, top, nested, depth, propKey, prefix, nestedPaths);
         }
+      } else if (v2.type === "ObjectPattern" || v2.type === "ArrayPattern") {
+        patternValueKeyRule();
+        collectPatternNames(
+          v2,
+          top,
+          nested,
+          depth + 1,
+          propKey,
+          prefix.concat(keyName ? [keyName] : []),
+          nestedPaths
+        );
       } else {
-        collectPatternNames(v2, top, nested, depth + 1, propKey);
+        collectPatternNames(v2, top, nested, depth + 1, propKey, prefix, nestedPaths);
       }
     }
     return;
@@ -4670,9 +4708,9 @@ function collectPatternNames(p, top, nested, depth, propKey) {
         if (depth === 0) top.push(el.name);
         else nested.push(el.name);
       } else if (el.type === "AssignmentPattern") {
-        collectPatternNames(el, top, nested, depth, propKey);
+        collectPatternNames(el, top, nested, depth, propKey, [], nestedPaths);
       } else {
-        collectPatternNames(el, top, nested, depth + 1, propKey);
+        collectPatternNames(el, top, nested, depth + 1, propKey, [], nestedPaths);
       }
     }
   }
@@ -4691,13 +4729,15 @@ function formalParamsFromNodes(params) {
       const top2 = [];
       const nested2 = [];
       const propKey2 = {};
-      if (left) collectPatternNames(left, top2, nested2, 0, propKey2);
+      const nestedPaths2 = [];
+      if (left) collectPatternNames(left, top2, nested2, 0, propKey2, [], nestedPaths2);
       return {
         kind: "pattern",
         placeholder: `_p${index}`,
         bound: top2,
         propKey: propKey2,
         nested: nested2,
+        nestedPaths: nestedPaths2,
         index
       };
     }
@@ -4709,13 +4749,15 @@ function formalParamsFromNodes(params) {
     const top = [];
     const nested = [];
     const propKey = {};
-    if (p) collectPatternNames(p, top, nested, 0, propKey);
+    const nestedPaths = [];
+    if (p) collectPatternNames(p, top, nested, 0, propKey, [], nestedPaths);
     return {
       kind: "pattern",
       placeholder: `_p${index}`,
       bound: top,
       propKey,
       nested,
+      nestedPaths,
       index
     };
   });
@@ -4757,6 +4799,7 @@ function contractParamNameSet(formals) {
       out.add(f.placeholder);
       out.add("_");
       for (const b of f.bound) out.add(b);
+      for (const np of f.nestedPaths) out.add(np);
     }
   }
   return out;
@@ -4774,10 +4817,16 @@ function locateContractParam(formals, contractName) {
         return { index: f.index };
       }
       if (f.bound.includes(contractName)) {
-        return { index: f.index, field: f.propKey?.[contractName] ?? contractName };
+        const field = f.propKey?.[contractName] ?? contractName;
+        return { index: f.index, field, fieldPath: [field] };
       }
     }
   }
+  for (const f of formals) {
+    if (f.kind === "pattern" && f.nestedPaths.includes(contractName)) {
+      return { index: f.index, field: contractName, fieldPath: contractName.split(".") };
+    }
+  }
   return void 0;
 }
 

package/dist/{chunk-VMGJYMIF.js → chunk-S7HJL5GW.js}

@@ -15,6 +15,7 @@ import {
   fnConstraintToEntryReqs,
   foldRequireSpecArg,
   formalParamDisplayNames,
+  formalParamSignatureNames,
   formalParamsFromNodes,
   formatAbs,
   formatShape,
@@ -46,7 +47,7 @@ import {
   withEvalBudgetOverride,
   withExecPhi,
   withFnBudgetOverride
-} from "./chunk-HD6XZFOU.js";
+} from "./chunk-PGTNSUTE.js";
 
 // src/algebra/directive-scan.ts
 function cleanDirectiveLine(raw, kind) {
@@ -3504,10 +3505,33 @@ function generalizeFromAstUncached(fnName, source, opts = {}) {
               patternFields.set(hit.index, bag);
             }
             const fieldAbs = constraintToEntryAbs(e.constraint, e.param);
-            bag[hit.field] = {
+            const leaf = {
               abs: fieldAbs,
               ...e.constraint.isOptional ? { optional: true } : {}
             };
+            const segs = hit.fieldPath ?? [hit.field];
+            if (segs.length <= 1) {
+              bag[hit.field] = leaf;
+              continue;
+            }
+            let level = bag;
+            let skip = false;
+            for (let i = 0; i < segs.length - 1; i++) {
+              const node = level[segs[i]];
+              if (node === void 0) {
+                const sub = { slots: {} };
+                level[segs[i]] = sub;
+                level = sub.slots;
+              } else if ("slots" in node) {
+                level = node.slots;
+              } else {
+                skip = true;
+                break;
+              }
+            }
+            if (!skip) {
+              level[segs[segs.length - 1]] = leaf;
+            }
           } else if (hit) {
             const entryAbs = constraintToEntryAbs(e.constraint, e.param);
             typeParams[hit.index] = {
@@ -3520,20 +3544,34 @@ function generalizeFromAstUncached(fnName, source, opts = {}) {
             });
           }
         }
-        for (const [pIdx, bag] of patternFields) {
+        const sigNames = formalParamSignatureNames(formals);
+        const buildPatternObjAbs = (slotsBag, sigName, walked) => {
           const slots = {};
-          for (const [key, rec] of Object.entries(bag)) {
-            slots[key] = {
-              value: rec.abs,
-              ...rec.optional ? { optional: true } : {}
-            };
+          for (const [key, node] of Object.entries(slotsBag)) {
+            if ("abs" in node) {
+              slots[key] = {
+                value: node.abs,
+                ...node.optional ? { optional: true } : {}
+              };
+            } else {
+              slots[key] = {
+                value: buildPatternObjAbs(node.slots, sigName, [...walked, key])
+              };
+            }
           }
-          const objAbs = abs(
+          return abs(
             { k: "obj", slots },
-            v(params[pIdx] ?? `_p${pIdx}`),
+            v(walked.length === 0 ? sigName : `${sigName}.${walked.join(".")}`),
             void 0,
             "path"
           );
+        };
+        for (const [pIdx, bag] of patternFields) {
+          const objAbs = buildPatternObjAbs(
+            bag,
+            sigNames[pIdx] ?? params[pIdx] ?? `_p${pIdx}`,
+            []
+          );
           typeParams[pIdx] = {
             id: typeParams[pIdx].id,
             value: objAbs
@@ -3677,6 +3715,7 @@ function generalizeFromAstUncached(fnName, source, opts = {}) {
       }));
     }
   }
+  const renderNames = formals.length > 0 ? formalParamSignatureNames(formals) : params;
   return {
     name: fnName,
     params,
@@ -3685,6 +3724,7 @@ function generalizeFromAstUncached(fnName, source, opts = {}) {
     instantiate: (args, phi) => run(args, phi ?? pTrue),
     display: formatPoly(
       fnName,
+      renderNames,
       params,
       typeParams,
       symbolic,
@@ -3699,12 +3739,13 @@ function generalizeFromAstUncached(fnName, source, opts = {}) {
     ...hofSites ? { hofSites } : {}
   };
 }
-function formatPoly(name, params, typeParams, symbolic, entryReqs, entryShapes, fnRels) {
+function formatPoly(name, renderNames, params, typeParams, symbolic, entryReqs, entryShapes, fnRels) {
   const reqByParam = new Map((entryReqs ?? []).map((r) => [r.param, r.pred]));
-  const ps = params.map((p, i) => {
+  const ps = renderNames.map((p, i) => {
+    const key = params[i] ?? p;
     const id = typeParams[i]?.id ?? "unknown";
-    const pred = reqByParam.get(p);
-    const promoted = entryShapes?.get(p)?.abs ?? fnRels?.get(p)?.abs;
+    const pred = reqByParam.get(key);
+    const promoted = entryShapes?.get(key)?.abs ?? fnRels?.get(key)?.abs;
     if (promoted) {
       const slot = formatShapeSlot(promoted);
       if (pred && pred.op !== "true") {
@@ -4480,13 +4521,17 @@ function scanLiteralCalls(source, knownFns, phi, opts) {
     eiCache.set(key, r);
     return r;
   };
-  const projectArgField = (arg, field) => {
-    if (!arg) return void 0;
-    if (arg.shape.k === "brand") {
-      return projectArgField(arg.shape.shape, field);
+  const projectArgPath = (arg, segments) => {
+    let cur = arg;
+    for (const seg of segments) {
+      if (!cur) return void 0;
+      if (cur.shape.k === "brand") {
+        cur = cur.shape.shape;
+      }
+      if (cur.shape.k !== "obj") return void 0;
+      cur = getSlot(cur.shape.slots, seg)?.value;
     }
-    if (arg.shape.k !== "obj") return void 0;
-    return getSlot(arg.shape.slots, field)?.value;
+    return cur;
   };
   const interfaceToIndexed = (ei, paramNames, formals) => {
     const conflict = new Set(ei.conflict?.params ?? []);
@@ -4508,7 +4553,7 @@ function scanLiteralCalls(source, knownFns, phi, opts) {
           entries.push([
             hit.index,
             { param, pred: instantiateConstraint(constraint, param), constraint },
-            hit.field
+            hit.fieldPath ?? (hit.field !== void 0 ? [hit.field] : void 0)
           ]);
         }
       }
@@ -4544,17 +4589,18 @@ function scanLiteralCalls(source, knownFns, phi, opts) {
     return lv <= n;
   };
   const checkReqs = (displayName, reqs, paramNames, absArgs, argIndexOf, loc) => {
-    for (const [idx, pred, field, contractParam] of reqs) {
+    for (const [idx, pred, fieldPath, contractParam] of reqs) {
       const argIdx = argIndexOf(idx);
       if (argIdx === void 0) continue;
       let arg = absArgs[argIdx];
       if (!arg) continue;
       const paramName = contractParam || paramNames[idx] || `arg${idx}`;
-      if (field) {
-        const projected = projectArgField(arg, field);
+      if (fieldPath) {
+        const projected = projectArgPath(arg, fieldPath);
         if (!projected) {
           const k = arg.shape.k;
           if (k !== "unknown" && k !== "any") {
+            const field = fieldPath.join(".");
             out.push({
               severity: "error",
               code: "nudo:constraint-violated",
@@ -4895,7 +4941,7 @@ function scanLiteralCalls(source, knownFns, phi, opts) {
     }
   };
   const checkShapeReqs = (displayName, reqs, paramNames, absArgs, argIndexOf, loc) => {
-    for (const [idx, entry, field] of reqs) {
+    for (const [idx, entry, fieldPath] of reqs) {
       const c = entry.constraint;
       if (!c.fields && !c.element && !isIntFlag(c) && !c.prim) continue;
       const argIdx = argIndexOf(idx);
@@ -4903,11 +4949,12 @@ function scanLiteralCalls(source, knownFns, phi, opts) {
       let arg = absArgs[argIdx];
       if (!arg) continue;
       const paramName = entry.param || paramNames[idx] || `arg${idx}`;
-      if (field) {
-        const projected = projectArgField(arg, field);
+      if (fieldPath) {
+        const projected = projectArgPath(arg, fieldPath);
         if (!projected) {
           const k = arg.shape.k;
           if (k !== "unknown" && k !== "any") {
+            const field = fieldPath.join(".");
             out.push({
               severity: "error",
               code: "nudo:constraint-violated",

package/dist/exec.js

@@ -195,7 +195,7 @@ import {
   tryRunTranspiled,
   withEvalBudgetOverride,
   withExecPhi
-} from "./chunk-HD6XZFOU.js";
+} from "./chunk-PGTNSUTE.js";
 export {
   $absVal,
   $add,

package/dist/index.d.ts

@@ -847,6 +847,11 @@ type FormalParam = {
     propKey: Record<string, string>;
     /** 仅嵌套内出现、顶层不可单独表达的名（降级用） */
     nested: string[];
+    /**
+     * #137：嵌套解构点路径契约面（'card.grade'，源属性键点连接）。
+     * 中间键（card）同时在 bound 里平铺可绑（整对象 shape 契约）。
+     */
+    nestedPaths: string[];
     index: number;
 };
 type AstParam = {
@@ -877,13 +882,17 @@ declare function contractParamNameSet(formals: FormalParam[]): Set<string>;
 /**
  * 契约参数名 → 形参定位。
  * - 命中 id/default/rest → 该 index（执法按整参）
- * - 命中 pattern 顶层 bound 名 → 该 pattern index + field
+ * - 命中 pattern 顶层 bound 名 → 该 pattern index + field（fieldPath 单段）
  * - 命中 placeholder / `_` → pattern index（整对象）
+ * - #137：命中嵌套点路径（'card.grade' ∈ nestedPaths）→ index + fieldPath
+ *   多段（field 为展示用点连接串）。平铺精确匹配必须先于任何点路径解析：
+ *   源键 'a.b' 与路径 'a.b' 不可歧义——平铺胜。
  * - 未命中 → undefined（C4.5 param-mismatch）
  */
 declare function locateContractParam(formals: FormalParam[], contractName: string): {
     index: number;
     field?: string;
+    fieldPath?: string[];
     rest?: boolean;
 } | undefined;
 

package/dist/index.js

@@ -64,7 +64,7 @@ import {
   takeInterfaceDiagsSince,
   takeRefineDiags,
   takeRefineDiagsSince
-} from "./chunk-VMGJYMIF.js";
+} from "./chunk-S7HJL5GW.js";
 import {
   $add,
   $arguments,
@@ -520,7 +520,7 @@ import {
   v,
   withExecPhi,
   withVar
-} from "./chunk-HD6XZFOU.js";
+} from "./chunk-PGTNSUTE.js";
 
 // src/environment.ts
 function createEnvironment(parent, bindings = /* @__PURE__ */ new Map()) {
@@ -1920,13 +1920,17 @@ function structuralAssignIssues(records) {
 }
 
 // src/algebra/check-case-scan.ts
-function projectCaseArgField(arg, field) {
-  if (!arg) return void 0;
-  if (arg.shape.k === "brand") {
-    return projectCaseArgField(arg.shape.shape, field);
+function projectCaseArgField(arg, fieldPath) {
+  let cur = arg;
+  for (const seg of fieldPath) {
+    if (!cur) return void 0;
+    if (cur.shape.k === "brand") {
+      cur = cur.shape.shape;
+    }
+    if (cur.shape.k !== "obj") return void 0;
+    cur = getSlot(cur.shape.slots, seg)?.value;
   }
-  if (arg.shape.k !== "obj") return void 0;
-  return getSlot(arg.shape.slots, field)?.value;
+  return cur;
 }
 function scanCaseInconsistency(source, knownFns, opts) {
   const out = [];
@@ -2007,12 +2011,12 @@ function scanCaseInconsistency(source, knownFns, opts) {
     for (const p of eff.params) {
       if (conflictParams.has(p.param)) continue;
       let idx = paramNames.indexOf(p.param);
-      let field;
+      let fieldPath;
       if (idx < 0 && formals.length > 0) {
         const hit = locateContractParam(formals, p.param);
         if (hit) {
           idx = hit.index;
-          field = hit.field;
+          fieldPath = hit.fieldPath ?? (hit.field !== void 0 ? [hit.field] : void 0);
         }
       }
       if (idx < 0) continue;
@@ -2023,7 +2027,7 @@ function scanCaseInconsistency(source, knownFns, opts) {
           pred: instantiateConstraint(p.constraint, p.param),
           constraint: p.constraint
         },
-        field
+        fieldPath
       ]);
     }
     if (reqs.length === 0) return;
@@ -2031,16 +2035,17 @@ function scanCaseInconsistency(source, knownFns, opts) {
     for (const req of reqs) {
       const idx = req[0];
       const entry = req[1];
-      const field = req[2];
+      const fieldPath = req[2];
       if (entry.constraint.fields) continue;
       let arg = absArgs[idx];
       if (!arg) continue;
-      if (field) {
-        const projected = projectCaseArgField(arg, field);
+      if (fieldPath) {
+        const projected = projectCaseArgField(arg, fieldPath);
         if (!projected) {
           const k = arg.shape.k;
           if (k !== "unknown" && k !== "any") {
             const paramName = entry.param || paramNames[idx] || `arg${idx}`;
+            const field = fieldPath.join(".");
             out.push({
               severity: "error",
               code: "nudo:case-inconsistency",

package/dist/internal.js

@@ -21,7 +21,7 @@ import {
   stableAnalyzeKeySource,
   stablePathKey,
   stablePathKeyGraph
-} from "./chunk-VMGJYMIF.js";
+} from "./chunk-S7HJL5GW.js";
 import {
   $tryDigestSoft,
   $tryMarkSoft,
@@ -169,7 +169,7 @@ import {
   withEvalBudgetOverride,
   withFnBudgetOverride,
   wrapPromise
-} from "./chunk-HD6XZFOU.js";
+} from "./chunk-PGTNSUTE.js";
 
 // src/algebra/inlay.ts
 function listFunctions(source) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nudojs/core",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "engines": {
     "node": ">=20"
   },