nudojs 1.3.0 → 1.3.2

package/dist/index.js

@@ -17635,6 +17635,29 @@ var init_may_throw = __esm({
 });
 
 // ../core/src/algebra/arithmetic.ts
+function distributeSumBinOp(op, a, b, phi2, eval2) {
+  if (a.shape.k !== "sum" && b.shape.k !== "sum") return void 0;
+  const parts = [];
+  const as = a.shape.k === "sum" ? a.shape.members : [a];
+  const bs = b.shape.k === "sum" ? b.shape.members : [b];
+  for (const x of as) {
+    for (const y of bs) {
+      const r = eval2(x, y, phi2);
+      if (r.shape.k === "never") continue;
+      if (r.shape.k === "sum") parts.push(...r.shape.members);
+      else parts.push(r);
+    }
+  }
+  const uniq = dedupAbsMembers(parts);
+  const term = a.term && b.term ? simplifyTerm(app(op, [a.term, b.term])) : void 0;
+  if (uniq.length === 0) {
+    return abs({ k: "unknown" }, term, void 0, "partial");
+  }
+  if (uniq.length === 1) {
+    return abs(uniq[0].shape, term, uniq[0].pred, confJoin(a.conf, b.conf));
+  }
+  return abs({ k: "sum", members: uniq }, term, void 0, "partial");
+}
 function add(a, b, phi2 = pTrue) {
   if (isSymbolAbs(a) || isSymbolAbs(b)) {
     throw new NudoThrow(errorTypeAbs("TypeError"));
@@ -17692,28 +17715,8 @@ function add(a, b, phi2 = pTrue) {
       "partial"
     );
   }
-  if (a.shape.k === "sum" || b.shape.k === "sum") {
-    const parts = [];
-    const as = a.shape.k === "sum" ? a.shape.members : [a];
-    const bs = b.shape.k === "sum" ? b.shape.members : [b];
-    for (const x of as) {
-      for (const y of bs) {
-        const r = add(x, y, phi2);
-        if (r.shape.k === "never") continue;
-        if (r.shape.k === "sum") parts.push(...r.shape.members);
-        else parts.push(r);
-      }
-    }
-    const uniq = dedupAbsMembers(parts);
-    const term = a.term && b.term ? simplifyTerm(app("+", [a.term, b.term])) : void 0;
-    if (uniq.length === 0) {
-      return abs({ k: "unknown" }, term, void 0, "partial");
-    }
-    if (uniq.length === 1) {
-      return abs(uniq[0].shape, term, uniq[0].pred, confJoin(a.conf, b.conf));
-    }
-    return abs({ k: "sum", members: uniq }, term, void 0, "partial");
-  }
+  const distributed = distributeSumBinOp("+", a, b, phi2, add);
+  if (distributed) return distributed;
   if (isNumPrim(a) || isNumPrim(b) || isBigPrim(a) || isBigPrim(b) || a.shape.k === "unknown" || b.shape.k === "unknown" || a.shape.k === "obj" || b.shape.k === "obj" || a.shape.k === "fn" || b.shape.k === "fn" || a.shape.k === "brand" || b.shape.k === "brand") {
     return abs({ k: "sum", members: [num(), str()] }, void 0, void 0, "partial");
   }
@@ -17830,6 +17833,35 @@ function addPred(a, b, sumTerm, phi2) {
   return and(...facts);
 }
 function numericBounds(a, phi2 = pTrue) {
+  if (a.shape.k === "sum") {
+    const members = a.shape.members;
+    let lo;
+    let hi;
+    let loOpen = false;
+    let hiOpen = false;
+    for (const m of members) {
+      const mb = numericBounds(m, phi2);
+      if (!mb) return void 0;
+      if (mb.lo === void 0) {
+        loOpen = true;
+      } else if (!loOpen) {
+        if (lo === void 0 || mb.lo.value < lo.value || mb.lo.value === lo.value && !mb.lo.strict && lo.strict) {
+          lo = mb.lo;
+        }
+      }
+      if (mb.hi === void 0) {
+        hiOpen = true;
+      } else if (!hiOpen) {
+        if (hi === void 0 || mb.hi.value > hi.value || mb.hi.value === hi.value && !mb.hi.strict && hi.strict) {
+          hi = mb.hi;
+        }
+      }
+    }
+    if (loOpen) lo = void 0;
+    if (hiOpen) hi = void 0;
+    if (lo === void 0 && hi === void 0) return void 0;
+    return { lo, hi };
+  }
   if (!isNumPrim(a)) return void 0;
   const result = {};
   if (a.pred && a.term) {
@@ -17936,6 +17968,8 @@ function sub(a, b, phi2 = pTrue) {
   if (isAnyLike(a) || isAnyLike(b)) {
     return toNumberResult(a, b, "-");
   }
+  const distributed = distributeSumBinOp("-", a, b, phi2, sub);
+  if (distributed) return distributed;
   return abs({ k: "unknown" }, void 0, void 0, "partial");
 }
 function mul(a, b, phi2 = pTrue) {
@@ -18008,6 +18042,8 @@ function mul(a, b, phi2 = pTrue) {
   if (isAnyLike(a) || isAnyLike(b)) {
     return toNumberResult(a, b, "*");
   }
+  const distributed = distributeSumBinOp("*", a, b, phi2, mul);
+  if (distributed) return distributed;
   return abs({ k: "unknown" }, void 0, void 0, "partial");
 }
 function div(a, b, phi2 = pTrue) {
@@ -18068,6 +18104,8 @@ function div(a, b, phi2 = pTrue) {
   if (isAnyLike(a) || isAnyLike(b)) {
     return toNumberResult(a, b, "/");
   }
+  const distributed = distributeSumBinOp("/", a, b, phi2, div);
+  if (distributed) return distributed;
   return abs({ k: "unknown" }, void 0, void 0, "partial");
 }
 function mod(a, b, phi2 = pTrue) {
@@ -18118,6 +18156,8 @@ function mod(a, b, phi2 = pTrue) {
   if (isAnyLike(a) || isAnyLike(b)) {
     return toNumberResult(a, b, "%");
   }
+  const distributed = distributeSumBinOp("%", a, b, phi2, mod);
+  if (distributed) return distributed;
   return abs({ k: "unknown" }, void 0, void 0, "partial");
 }
 function cmp(op, a, b, phi2 = pTrue) {
@@ -18722,6 +18762,11 @@ function isNonNaN(a, phi2) {
   if (a.term?.op === "lit") {
     return typeof a.term.value === "number" && !Number.isNaN(a.term.value);
   }
+  if (a.shape.k === "sum") {
+    return a.shape.members.every(
+      (m) => isNonNaN(m, phi2)
+    );
+  }
   const hasNonNaNFact = (p) => {
     if (!p) return false;
     if (p.op === "and") return p.args.some(hasNonNaNFact);
@@ -18843,7 +18888,9 @@ function roundingAbs(name, arg) {
   const impl = name === "round" ? Math.round : name === "floor" ? Math.floor : name === "ceil" ? Math.ceil : Math.trunc;
   const b = numericBounds(arg, phi2);
   const mayNaN = !isNonNaN(arg, phi2);
-  const term = arg.term ? simplifyTerm(app(`Math.${name}`, [arg.term])) : void 0;
+  const term = simplifyTerm(
+    app(`Math.${name}`, [arg.term ?? app("arg0", [])])
+  );
   let out = {};
   if (b) {
     if (b.lo !== void 0) {
@@ -18855,7 +18902,7 @@ function roundingAbs(name, arg) {
       out.hi = Number.isNaN(v2) ? void 0 : { value: v2, strict: false };
     }
   }
-  const pred = term ? boundsToPred(term, out) : void 0;
+  const pred = boundsToPred(term, out);
   const bounded = abs({ k: "prim", type: "number" }, term, pred, "path");
   if (!mayNaN) return bounded;
   return makeSum(numLit(NaN), bounded);
@@ -37924,7 +37971,7 @@ function scanLiteralCalls(source, knownFns, phi2, opts) {
     if (absArg.shape.k === "unknown" && !absArg.term) return;
     const slots = absArg.shape.k === "obj" ? absArg.shape.slots : void 0;
     if (!slots) {
-      if (absArg.shape.k !== "unknown" && absArg.shape.k !== "never") {
+      if (absArg.shape.k !== "unknown" && absArg.shape.k !== "never" && absArg.shape.k !== "any") {
         out.push({
           severity: "error",
           code: "nudo:constraint-violated",
@@ -279237,12 +279284,38 @@ function collectParamBodyReadTypes(source) {
   const visitFn = (fnName, fnNode, paramNames) => {
     if (paramNames.size === 0) return;
     const byParam = /* @__PURE__ */ new Map();
-    const add2 = (pname, field, hint) => {
-      if (!byParam.has(pname)) byParam.set(pname, /* @__PURE__ */ new Map());
-      const fields = byParam.get(pname);
-      if (!fields.has(field)) fields.set(field, []);
-      if (hint) fields.get(field).push(hint);
+    const add2 = (pname, path, hint) => {
+      if (path.length === 0) return;
+      let m = byParam.get(pname);
+      if (!m) byParam.set(pname, m = /* @__PURE__ */ new Map());
+      const k = JSON.stringify(path);
+      let e = m.get(k);
+      if (!e) m.set(k, e = { path, hints: [] });
+      if (hint) e.hints.push(hint);
     };
+    const downChainPath = (mem) => {
+      const keys = [];
+      let cur = mem;
+      let param;
+      while (cur) {
+        if (cur.type !== "MemberExpression" && cur.type !== "OptionalMemberExpression" || cur.computed === true) {
+          return void 0;
+        }
+        const key = keyOf(cur.property);
+        if (key === void 0) return void 0;
+        keys.unshift(key);
+        const obj2 = cur.object;
+        if (!obj2) return void 0;
+        if (obj2.type === "Identifier") {
+          param = obj2.name;
+          break;
+        }
+        cur = obj2;
+      }
+      if (param === void 0) return void 0;
+      return { path: keys, param };
+    };
+    const synthMemberParent = (prop) => ({ type: "MemberExpression", property: { type: "Identifier", name: prop } });
     const walk = (node, shadowed, parent, parentKey) => {
       if (!node || typeof node !== "object") return;
       const n = node;
@@ -279254,29 +279327,31 @@ function collectParamBodyReadTypes(source) {
         const arg = n.argument;
         const mem = arg;
         if (mem && (mem.type === "MemberExpression" || mem.type === "OptionalMemberExpression")) {
-          const obj2 = mem.object;
-          const prop = mem.property;
-          if (obj2?.type === "Identifier" && paramNames.has(obj2.name) && !shadowed.has(obj2.name) && prop && mem.computed !== true) {
-            const key = keyOf(prop);
-            const pname = obj2.name;
-            if (key !== void 0) {
-              const gp = parent;
-              add2(pname, key, hintFromTypeof(n, gp));
-            }
+          const chain = downChainPath(mem);
+          if (chain && paramNames.has(chain.param) && !shadowed.has(chain.param)) {
+            const gp = parent;
+            add2(chain.param, chain.path, hintFromTypeof(n, gp));
           }
         }
       }
       if (n.type === "MemberExpression" || n.type === "OptionalMemberExpression") {
-        const obj2 = n.object;
-        const prop = n.property;
-        const computed = n.computed === true;
-        if (obj2?.type === "Identifier" && paramNames.has(obj2.name) && !shadowed.has(obj2.name) && prop && !computed) {
-          const key = keyOf(prop);
-          const pname = obj2.name;
-          if (key !== void 0) {
-            const hint = hintFromUse(parent, parentKey ?? "object");
-            add2(pname, key, hint);
+        const innerLink = !!parent && (parent.type === "MemberExpression" || parent.type === "OptionalMemberExpression") && parentKey === "object" && parent.computed !== true;
+        if (innerLink) return;
+        const chain = downChainPath(n);
+        if (chain && paramNames.has(chain.param) && !shadowed.has(chain.param)) {
+          const rev = chain.path;
+          let leafLen = rev.length;
+          let leafHint;
+          for (let i = 0; i < rev.length; i++) {
+            const nextProp = i + 1 < rev.length ? rev[i + 1] : void 0;
+            const h = nextProp !== void 0 ? hintFromUse(synthMemberParent(nextProp), "object") : hintFromUse(parent, parentKey ?? "object");
+            if (h) {
+              leafLen = i + 1;
+              leafHint = h;
+              break;
+            }
           }
+          add2(chain.param, rev.slice(0, leafLen), leafHint);
         }
       }
       for (const k of Object.keys(n)) {
@@ -279292,13 +279367,20 @@ function collectParamBodyReadTypes(source) {
     walk(fnNode, /* @__PURE__ */ new Set());
     if (byParam.size === 0) return;
     const fieldsOf = /* @__PURE__ */ new Map();
-    for (const [pname, fieldMap] of byParam) {
-      const list = [];
-      for (const [field, hints] of fieldMap) {
-        list.push({ field, ...mergeHints(hints) });
+    for (const [pname, pathMap] of byParam) {
+      const root = { hints: [], children: /* @__PURE__ */ new Map() };
+      for (const { path, hints } of pathMap.values()) {
+        let node = root;
+        for (const seg of path) {
+          let child = node.children.get(seg);
+          if (!child) {
+            node.children.set(seg, child = { hints: [], children: /* @__PURE__ */ new Map() });
+          }
+          node = child;
+        }
+        node.hints.push(...hints);
       }
-      list.sort((a, b) => a.field < b.field ? -1 : 1);
-      fieldsOf.set(pname, list);
+      fieldsOf.set(pname, emitFields(root));
     }
     out.set(fnName, fieldsOf);
   };
@@ -279377,6 +279459,24 @@ function collectParamBodyReadTypes(source) {
   }
   return out;
 }
+function emitFields(trie) {
+  const list = [];
+  for (const [name, child] of [...trie.children.entries()].sort(
+    (a, b) => a[0] < b[0] ? -1 : 1
+  )) {
+    if (child.children.size > 0) {
+      list.push({
+        field: name,
+        type: "shape({ \u2026 })",
+        via: "dereferenced member read (nested shape)",
+        fields: emitFields(child)
+      });
+    } else {
+      list.push({ field: name, ...mergeHints(child.hints) });
+    }
+  }
+  return list;
+}
 function mergeHints(hints) {
   if (hints.length === 0) return { type: "any()", via: "read (no type evidence)" };
   const types2 = [...new Set(hints.map((h) => h.type))];
@@ -279419,7 +279519,9 @@ function bodyReadFieldsFor(map, fnName, paramName2) {
 }
 function shapeDslFromFields(fields) {
   if (fields.length === 0) return "shape({})";
-  const parts = fields.map((f) => `${f.field}: ${f.type}`);
+  const parts = fields.map(
+    (f) => f.fields && f.fields.length > 0 ? `${f.field}: ${shapeDslFromFields(f.fields)}` : `${f.field}: ${f.type}`
+  );
   return `shape({ ${parts.join(", ")} })`;
 }
 function collectParamBodyAccesses(source) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nudojs",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "engines": {
     "node": ">=20"
   },
@@ -46,14 +46,14 @@
   "dependencies": {
     "@babel/generator": "^8.0.6",
     "@babel/types": "^8.0.6",
-    "@nudojs/core": "1.6.0",
-    "@nudojs/parser": "1.3.0",
-    "@nudojs/service": "1.5.0",
-    "@nudojs/harvester": "0.3.0",
+    "@nudojs/core": "1.7.1",
+    "@nudojs/parser": "1.3.2",
+    "@nudojs/service": "1.6.1",
+    "@nudojs/harvester": "0.3.2",
     "commander": "^15.0.0"
   },
   "devDependencies": {
-    "@types/node": "^26.6.2"
+    "@types/node": "^26.6.3"
   },
   "scripts": {
     "build": "tsup"