nudojs 1.3.1 → 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nudojs",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "engines": {
     "node": ">=20"
   },
@@ -46,10 +46,10 @@
   "dependencies": {
     "@babel/generator": "^8.0.6",
     "@babel/types": "^8.0.6",
-    "@nudojs/core": "1.7.0",
-    "@nudojs/parser": "1.3.1",
-    "@nudojs/service": "1.6.0",
-    "@nudojs/harvester": "0.3.1",
+    "@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": {