nudojs 1.3.16 → 1.3.17

package/dist/index.js

@@ -19481,7 +19481,12 @@ var init_unsupported = __esm({
 });
 
 // ../core/src/algebra/param-surface.ts
-function collectPatternNames(p, top, nested, depth, propKey) {
+function pushNestedPath(prefix2, key, nestedPaths) {
+  if (prefix2.length === 0 || !key) return;
+  if (key.includes(".") || prefix2.some((seg) => seg.includes("."))) return;
+  nestedPaths.push([...prefix2, key].join("."));
+}
+function collectPatternNames(p, top, nested, depth, propKey, prefix2, nestedPaths) {
   if (!p) return;
   if (p.type === "Identifier" && p.name) {
     if (depth === 0) top.push(p.name);
@@ -19489,17 +19494,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, prefix2, nestedPaths);
     return;
   }
   if (p.type === "RestElement") {
-    collectPatternNames(p.argument, top, nested, depth, propKey);
+    collectPatternNames(p.argument, top, nested, depth, propKey, prefix2, 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, prefix2, 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;
@@ -19511,7 +19516,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 && prefix2.length === 0) {
+          top.push(keyName);
+          if (propKey) propKey[keyName] = keyName;
+        } else {
+          pushNestedPath(prefix2, keyName, nestedPaths);
+        }
+      };
       if (v2.type === "Identifier" && v2.name) {
+        pushNestedPath(prefix2, keyName ?? "", nestedPaths);
         if (depth === 0) {
           top.push(v2.name);
           if (propKey && keyName) propKey[v2.name] = keyName;
@@ -19519,15 +19534,38 @@ function collectPatternNames(p, top, nested, depth, propKey) {
       } else if (v2.type === "AssignmentPattern") {
         const left = v2.left;
         if (left?.type === "Identifier" && left.name) {
+          pushNestedPath(prefix2, 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,
+            prefix2.concat(keyName ? [keyName] : []),
+            nestedPaths
+          );
         } else {
-          collectPatternNames(v2, top, nested, depth, propKey);
-        }
+          collectPatternNames(v2, top, nested, depth, propKey, prefix2, nestedPaths);
+        }
+      } else if (v2.type === "ObjectPattern" || v2.type === "ArrayPattern") {
+        patternValueKeyRule();
+        collectPatternNames(
+          v2,
+          top,
+          nested,
+          depth + 1,
+          propKey,
+          prefix2.concat(keyName ? [keyName] : []),
+          nestedPaths
+        );
       } else {
-        collectPatternNames(v2, top, nested, depth + 1, propKey);
+        collectPatternNames(v2, top, nested, depth + 1, propKey, prefix2, nestedPaths);
       }
     }
     return;
@@ -19539,9 +19577,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);
       }
     }
   }
@@ -19560,13 +19598,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${index2}`,
         bound: top2,
         propKey: propKey2,
         nested: nested2,
+        nestedPaths: nestedPaths2,
         index: index2
       };
     }
@@ -19578,13 +19618,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${index2}`,
       bound: top,
       propKey,
       nested,
+      nestedPaths,
       index: index2
     };
   });
@@ -19626,6 +19668,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;
@@ -19643,10 +19686,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;
 }
 var init_param_surface = __esm({
@@ -42869,10 +42918,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 skip2 = false;
+            for (let i = 0; i < segs.length - 1; i++) {
+              const node = level[segs[i]];
+              if (node === void 0) {
+                const sub2 = { slots: {} };
+                level[segs[i]] = sub2;
+                level = sub2.slots;
+              } else if ("slots" in node) {
+                level = node.slots;
+              } else {
+                skip2 = true;
+                break;
+              }
+            }
+            if (!skip2) {
+              level[segs[segs.length - 1]] = leaf;
+            }
           } else if (hit) {
             const entryAbs = constraintToEntryAbs(e.constraint, e.param);
             typeParams[hit.index] = {
@@ -42885,20 +42957,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 objAbs2 = 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 objAbs2 = buildPatternObjAbs(
+            bag,
+            sigNames[pIdx] ?? params[pIdx] ?? `_p${pIdx}`,
+            []
+          );
           typeParams[pIdx] = {
             id: typeParams[pIdx].id,
             value: objAbs2
@@ -43042,6 +43128,7 @@ function generalizeFromAstUncached(fnName, source, opts = {}) {
       }));
     }
   }
+  const renderNames = formals.length > 0 ? formalParamSignatureNames(formals) : params;
   return {
     name: fnName,
     params,
@@ -43050,6 +43137,7 @@ function generalizeFromAstUncached(fnName, source, opts = {}) {
     instantiate: (args, phi2) => run(args, phi2 ?? pTrue),
     display: formatPoly(
       fnName,
+      renderNames,
       params,
       typeParams,
       symbolic,
@@ -43064,12 +43152,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") {
@@ -44313,13 +44402,17 @@ function scanLiteralCalls(source, knownFns, phi2, 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 ?? []);
@@ -44341,7 +44434,7 @@ function scanLiteralCalls(source, knownFns, phi2, opts) {
           entries.push([
             hit.index,
             { param, pred: instantiateConstraint(constraint, param), constraint },
-            hit.field
+            hit.fieldPath ?? (hit.field !== void 0 ? [hit.field] : void 0)
           ]);
         }
       }
@@ -44377,17 +44470,18 @@ function scanLiteralCalls(source, knownFns, phi2, 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 paramName2 = 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",
@@ -44728,7 +44822,7 @@ function scanLiteralCalls(source, knownFns, phi2, 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);
@@ -44736,11 +44830,12 @@ function scanLiteralCalls(source, knownFns, phi2, opts) {
       let arg = absArgs[argIdx];
       if (!arg) continue;
       const paramName2 = 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",
@@ -46131,13 +46226,17 @@ var init_check_assign = __esm({
 });
 
 // ../core/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 = [];
@@ -46218,12 +46317,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;
@@ -46234,7 +46333,7 @@ function scanCaseInconsistency(source, knownFns, opts) {
           pred: instantiateConstraint(p.constraint, p.param),
           constraint: p.constraint
         },
-        field
+        fieldPath
       ]);
     }
     if (reqs.length === 0) return;
@@ -46242,16 +46341,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 paramName2 = entry.param || paramNames[idx] || `arg${idx}`;
+            const field = fieldPath.join(".");
             out.push({
               severity: "error",
               code: "nudo:case-inconsistency",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nudojs",
-  "version": "1.3.16",
+  "version": "1.3.17",
   "engines": {
     "node": ">=20"
   },
@@ -46,11 +46,11 @@
   "dependencies": {
     "@babel/generator": "^8.0.6",
     "@babel/types": "^8.0.6",
-    "@nudojs/core": "1.9.3",
-    "@nudojs/env": "0.4.30",
-    "@nudojs/harvester": "0.3.16",
-    "@nudojs/parser": "1.4.12",
-    "@nudojs/service": "1.6.15",
+    "@nudojs/core": "1.9.4",
+    "@nudojs/env": "0.4.31",
+    "@nudojs/harvester": "0.3.17",
+    "@nudojs/parser": "1.4.13",
+    "@nudojs/service": "1.6.16",
     "commander": "^15.0.0"
   },
   "devDependencies": {