nudojs 1.3.9 → 1.3.11

package/README.md

@@ -21,6 +21,6 @@ nudojs <version>
 @nudojs/core <version>   # when resolvable
 ```
 
-> **Migration:** `@nudojs/cli` is a deprecated stub that forwards here. Install `nudojs` only.
+> **Migration:** the `@nudojs/cli` forward stub has been retired — install `nudojs` only.
 
 Full documentation: <https://nudojs.github.io/nudo/>

package/dist/index.js

@@ -17880,7 +17880,12 @@ function isKnownNonBigintNumeric(a) {
   if (r.ok && r.value === void 0) return true;
   return a.shape.k === "prim" && (a.shape.type === "number" || a.shape.type === "boolean");
 }
+function isNullishLitOperand(a) {
+  const r = litValue(a);
+  return r.ok && (r.value === null || r.value === void 0);
+}
 function isMaybeBigintOperand(a) {
+  if (isNullishLitOperand(a)) return false;
   const k = a.shape.k;
   if (k === "sum") {
     const members = a.shape.members;
@@ -21654,9 +21659,15 @@ function nullishGuardOf(test) {
   if (t?.type === "UnaryExpression" && t.operator === "!" && t.argument?.type === "Identifier" && t.argument.name) {
     return { name: t.argument.name, arm: "alt", grain: "nullish" };
   }
+  if (t?.type === "UnaryExpression" && t.operator === "!") {
+    const m = memberGuardTarget(t.argument);
+    if (m) return { name: m.name, arm: "alt", grain: "nullish", memberKey: m.key };
+  }
   if (t?.type === "Identifier" && t.name) {
     return { name: t.name, arm: "cons", grain: "nullish" };
   }
+  const bare = memberGuardTarget(t);
+  if (bare) return { name: bare.name, arm: "cons", grain: "nullish", memberKey: bare.key };
   if (t?.type !== "BinaryExpression") return void 0;
   const op = t.operator;
   if (op !== "===" && op !== "!==" && op !== "==" && op !== "!=") return void 0;
@@ -21693,15 +21704,20 @@ function nullishGuardOf(test) {
 function compositeNullishGuardOf(test) {
   const t = test;
   if (t?.type !== "LogicalExpression" || t.operator !== "||" && t.operator !== "&&") return void 0;
+  const wantArm = t.operator === "||" ? "alt" : "cons";
   const l = nullishGuardOf(t.left);
   const r = nullishGuardOf(t.right);
-  if (!l || !r || l.name !== r.name) return void 0;
-  const wantArm = t.operator === "||" ? "alt" : "cons";
-  if (l.arm !== wantArm || r.arm !== wantArm) return void 0;
-  const g1 = l.grain === "null" || l.grain === "undefined" ? l.grain : null;
-  const g2 = r.grain === "null" || r.grain === "undefined" ? r.grain : null;
-  const grain = g1 === null || g2 === null ? "nullish" : mergeGrain(g1, g2);
-  return { name: l.name, arm: wantArm, grain };
+  const lg = l && l.arm === wantArm ? l : void 0;
+  const rg = r && r.arm === wantArm ? r : void 0;
+  if (lg && rg) {
+    if (lg.name !== rg.name) return void 0;
+    const g1 = lg.grain === "null" || lg.grain === "undefined" ? lg.grain : null;
+    const g2 = rg.grain === "null" || rg.grain === "undefined" ? rg.grain : null;
+    const grain = g1 === null || g2 === null ? "nullish" : mergeGrain(g1, g2);
+    const memberKey = lg.memberKey ?? rg.memberKey;
+    return { name: lg.name, arm: wantArm, grain, ...memberKey !== void 0 ? { memberKey } : {} };
+  }
+  return lg ?? rg;
 }
 function typeGuardOf(test) {
   const t = test;
@@ -21716,16 +21732,19 @@ function typeGuardOf(test) {
   if (litSide.value === "undefined" || !TYPEOF_NAMES2.has(litSide.value)) return void 0;
   return { name, typeOf: litSide.value, arm: op === "===" || op === "==" ? "cons" : "alt" };
 }
-function removeCallOf(grain) {
-  if (grain === "undefined") return "$removeUndefined";
-  if (grain === "null") return "$removeNull";
-  return "$removeNullish";
+function nullishRemoveCallOf(guard) {
+  if (guard.memberKey !== void 0) {
+    return `$removeMemberNullish($removeNullish(${guard.name}), ${JSON.stringify(guard.memberKey)})`;
+  }
+  if (guard.grain === "undefined") return `$removeUndefined(${guard.name})`;
+  if (guard.grain === "null") return `$removeNull(${guard.name})`;
+  return `$removeNullish(${guard.name})`;
 }
 function narrowNullishArmThunk(thunk, guard, arm, forkBindingNames) {
   if (!guard || guard.arm !== arm) return thunk;
   const names2 = forkBindingNames instanceof Set ? forkBindingNames : new Set(forkBindingNames);
   if (names2.has(guard.name)) return thunk;
-  return `((${guard.name}) => ${thunk})(${removeCallOf(guard.grain)}(${guard.name}))`;
+  return `((${guard.name}) => ${thunk})(${nullishRemoveCallOf(guard)})`;
 }
 function narrowTypeArmThunk(thunk, guard, arm, forkBindingNames) {
   if (!guard) return thunk;
@@ -21734,7 +21753,7 @@ function narrowTypeArmThunk(thunk, guard, arm, forkBindingNames) {
   const keep = arm === guard.arm;
   return `((${guard.name}) => ${thunk})($narrowTypeOf(${guard.name}, ${JSON.stringify(guard.typeOf)}, ${keep}))`;
 }
-var TYPEOF_NAMES2, isStrLitNode, typeofArgName;
+var TYPEOF_NAMES2, isStrLitNode, typeofArgName, memberGuardTarget;
 var init_stmt_predicates = __esm({
   "../core/src/algebra/exec/transpile/stmt-predicates.ts"() {
     "use strict";
@@ -21760,6 +21779,17 @@ var init_stmt_predicates = __esm({
       }
       return void 0;
     };
+    memberGuardTarget = (n) => {
+      const t = n;
+      const m = t?.type === "ChainExpression" ? t.expression : t;
+      if (m?.type !== "MemberExpression" && m?.type !== "OptionalMemberExpression") return void 0;
+      if (m.computed) return void 0;
+      if (m.object?.type !== "Identifier" || !m.object.name) return void 0;
+      const p = m.property;
+      const key = p?.type === "Identifier" ? p.name : p?.type === "StringLiteral" && typeof p.value === "string" ? p.value : void 0;
+      if (key === void 0) return void 0;
+      return { name: m.object.name, key };
+    };
   }
 });
 
@@ -21855,13 +21885,24 @@ function transpileFnBodyStmts(stmtsIn, depth, opts, varScope) {
     };
     const testRecvs = collectArrMutatorReceivers(stmt.test);
     const testRebinds = testRecvs.size ? emitArrMutatorRebinds(stmt.test, scopedOpts, pad) : [];
-    const cons = wrapArm(transpileBlockAsThunk(stmt.consequent, depth, scopedOpts), "fk1_");
+    const earlyGuard = nullishGuardOf(stmt.test);
+    const earlyTGuard = typeGuardOf(stmt.test);
+    const consNarrowed = narrowTypeArmThunk(
+      narrowNullishArmThunk(
+        transpileBlockAsThunk(stmt.consequent, depth, scopedOpts),
+        earlyGuard,
+        "cons",
+        recvSet
+      ),
+      earlyTGuard,
+      "cons",
+      recvSet
+    );
+    const cons = wrapArm(consNarrowed, "fk1_");
     const altBody = transpileFnBodyStmts(rest, depth + 1, { ...scopedOpts, inLoop: opts.inLoop });
     const altThunk = `() => {
 ${altBody}
 ${pad}}`;
-    const earlyGuard = nullishGuardOf(stmt.test);
-    const earlyTGuard = typeGuardOf(stmt.test);
     const altNarrowed = narrowTypeArmThunk(
       narrowNullishArmThunk(altThunk, earlyGuard, "alt", recvSet),
       earlyTGuard,
@@ -23117,9 +23158,9 @@ function transpileShortCircuitExpr(opts, parts) {
     let altExpr = parts.altSrc === "__test" ? parts.alwaysSrc : parts.altSrc;
     if (parts.narrowGuard) {
       if (parts.narrowGuard.arm === "cons") {
-        consExpr = `((${parts.narrowGuard.name}) => (${consExpr}))($removeNullish(${parts.narrowGuard.name}))`;
+        consExpr = `((${parts.narrowGuard.name}) => (${consExpr}))(${nullishRemoveCallOf(parts.narrowGuard)})`;
       } else {
-        altExpr = `((${parts.narrowGuard.name}) => (${altExpr}))($removeNullish(${parts.narrowGuard.name}))`;
+        altExpr = `((${parts.narrowGuard.name}) => (${altExpr}))(${nullishRemoveCallOf(parts.narrowGuard)})`;
       }
     }
     if (parts.typeGuard) {
@@ -24153,7 +24194,7 @@ function transpileSource(source, opts = {}) {
   return transpileFile(file, { ...opts, source: opts.source ?? source });
 }
 function runtimeImportOf(runtime) {
-  return `import { $absVal, $add, $sub, $mul, $div, $mod, $bitand, $bitor, $bitxor, $bitnot, $shl, $shr, $ushr, $pow, $toNumber, $toNumeric, $updateAdd, $updateSub, $in, $instanceof, $instanceofNonIdent, $classExpr, $del, $delRes, $objAccessor, $objAccessorKey, $neg, $typeof, $not, $eq, $ne, $eqLoose, $neLoose, $lt, $le, $gt, $ge, $join, $lit, $fork, $for, $forIter, $obj, $get, $set, $setProto, $while, $whileSeq, $arr, $arrWithHoles, $arrMutContainer, $idx, $idxSet, $len, $call, $throw, $loopReturn, $loopBreak, $loopContinue, $class, $new, $invoke, $invokeSuper, $invokeSuperObj, $invokeSuperKey, $getSuper, $getSuperObj, $super, $async, $copy, $await, $asyncReturn, $orDefault, $callNamed, $optionalGet, $optionalInvoke, $spread, $concat, $forOf, $forInKeys, $iterCheck, $catchVal, $switch, $staticInvoke, $setKey, $gen, $newTarget, $staticInit, $yield, $fnVal, $regex, $reStateCall, $rethrowIfNudoReturn, $nullishTest, $removeNullish, $removeNull, $removeUndefined, $narrowTypeOf, $tryMark, $assignRecord, $recordBinding, $unknown, $importMeta, $dynamicImport, $tryTakeSince, $tryCurrentMark, $tryPopMark, $tryDigestSoftCatch, $tryReleaseSoftOut, $tryDetachSoftCatch, $tryDiscardSoft, $tryOrphanSoft, $pushLoopExit, $objRest, $arrRest, $elems, $arguments, $isForkExit, $rawThis, $isBreakTo, $yieldStar, $tpl } from ${JSON.stringify(runtime)};`;
+  return `import { $absVal, $add, $sub, $mul, $div, $mod, $bitand, $bitor, $bitxor, $bitnot, $shl, $shr, $ushr, $pow, $toNumber, $toNumeric, $updateAdd, $updateSub, $in, $instanceof, $instanceofNonIdent, $classExpr, $del, $delRes, $objAccessor, $objAccessorKey, $neg, $typeof, $not, $eq, $ne, $eqLoose, $neLoose, $lt, $le, $gt, $ge, $join, $lit, $fork, $for, $forIter, $obj, $get, $set, $setProto, $while, $whileSeq, $arr, $arrWithHoles, $arrMutContainer, $idx, $idxSet, $len, $call, $throw, $loopReturn, $loopBreak, $loopContinue, $class, $new, $invoke, $invokeSuper, $invokeSuperObj, $invokeSuperKey, $getSuper, $getSuperObj, $super, $async, $copy, $await, $asyncReturn, $orDefault, $callNamed, $optionalGet, $optionalInvoke, $spread, $concat, $forOf, $forInKeys, $iterCheck, $catchVal, $switch, $staticInvoke, $setKey, $gen, $newTarget, $staticInit, $yield, $fnVal, $regex, $reStateCall, $rethrowIfNudoReturn, $nullishTest, $removeNullish, $removeNull, $removeUndefined, $removeMemberNullish, $narrowTypeOf, $tryMark, $assignRecord, $recordBinding, $unknown, $importMeta, $dynamicImport, $tryTakeSince, $tryCurrentMark, $tryPopMark, $tryDigestSoftCatch, $tryReleaseSoftOut, $tryDetachSoftCatch, $tryDiscardSoft, $tryOrphanSoft, $pushLoopExit, $objRest, $arrRest, $elems, $arguments, $isForkExit, $rawThis, $isBreakTo, $yieldStar, $tpl } from ${JSON.stringify(runtime)};`;
 }
 function transpileFile(file, opts = {}) {
   const runtime = opts.runtimeImport ?? "@nudojs/core/exec";
@@ -24174,7 +24215,7 @@ function transpileFile(file, opts = {}) {
   };
   const lines = [
     `// nudo evaluator transpile \u2014 values are Abs; operators are overloaded calls`,
-    `import { $absVal, $add, $sub, $mul, $div, $mod, $bitand, $bitor, $bitxor, $bitnot, $shl, $shr, $ushr, $pow, $toNumber, $toNumeric, $updateAdd, $updateSub, $in, $instanceof, $instanceofNonIdent, $classExpr, $del, $delRes, $objAccessor, $objAccessorKey, $neg, $typeof, $not, $eq, $ne, $eqLoose, $neLoose, $lt, $le, $gt, $ge, $join, $lit, $fork, $for, $forIter, $obj, $get, $set, $setProto, $while, $whileSeq, $arr, $arrWithHoles, $arrMutContainer, $idx, $idxSet, $len, $call, $throw, $loopReturn, $loopBreak, $loopContinue, $class, $new, $invoke, $invokeSuper, $invokeSuperObj, $invokeSuperKey, $getSuper, $getSuperObj, $super, $async, $copy, $await, $asyncReturn, $orDefault, $callNamed, $optionalGet, $optionalInvoke, $spread, $concat, $forOf, $forInKeys, $iterCheck, $catchVal, $switch, $staticInvoke, $setKey, $gen, $newTarget, $staticInit, $yield, $fnVal, $regex, $reStateCall, $rethrowIfNudoReturn, $nullishTest, $removeNullish, $removeNull, $removeUndefined, $narrowTypeOf, $tryMark, $assignRecord, $recordBinding, $unknown, $importMeta, $dynamicImport, $tryTakeSince, $tryCurrentMark, $tryPopMark, $tryDigestSoftCatch, $tryReleaseSoftOut, $tryDetachSoftCatch, $tryDiscardSoft, $tryOrphanSoft, $pushLoopExit, $objRest, $arrRest, $elems, $arguments, $isForkExit, $rawThis, $isBreakTo, $yieldStar, $tpl } from ${JSON.stringify(runtime)};`,
+    `import { $absVal, $add, $sub, $mul, $div, $mod, $bitand, $bitor, $bitxor, $bitnot, $shl, $shr, $ushr, $pow, $toNumber, $toNumeric, $updateAdd, $updateSub, $in, $instanceof, $instanceofNonIdent, $classExpr, $del, $delRes, $objAccessor, $objAccessorKey, $neg, $typeof, $not, $eq, $ne, $eqLoose, $neLoose, $lt, $le, $gt, $ge, $join, $lit, $fork, $for, $forIter, $obj, $get, $set, $setProto, $while, $whileSeq, $arr, $arrWithHoles, $arrMutContainer, $idx, $idxSet, $len, $call, $throw, $loopReturn, $loopBreak, $loopContinue, $class, $new, $invoke, $invokeSuper, $invokeSuperObj, $invokeSuperKey, $getSuper, $getSuperObj, $super, $async, $copy, $await, $asyncReturn, $orDefault, $callNamed, $optionalGet, $optionalInvoke, $spread, $concat, $forOf, $forInKeys, $iterCheck, $catchVal, $switch, $staticInvoke, $setKey, $gen, $newTarget, $staticInit, $yield, $fnVal, $regex, $reStateCall, $rethrowIfNudoReturn, $nullishTest, $removeNullish, $removeNull, $removeUndefined, $removeMemberNullish, $narrowTypeOf, $tryMark, $assignRecord, $recordBinding, $unknown, $importMeta, $dynamicImport, $tryTakeSince, $tryCurrentMark, $tryPopMark, $tryDigestSoftCatch, $tryReleaseSoftOut, $tryDetachSoftCatch, $tryDiscardSoft, $tryOrphanSoft, $pushLoopExit, $objRest, $arrRest, $elems, $arguments, $isForkExit, $rawThis, $isBreakTo, $yieldStar, $tpl } from ${JSON.stringify(runtime)};`,
     ``
   ];
   if (varHoistLine) lines.push(varHoistLine);
@@ -28152,6 +28193,28 @@ function $removeUndefined(a) {
   }
   return a;
 }
+function $removeMemberNullish(a, key) {
+  if (!a || typeof a !== "object" || !("shape" in a)) return a;
+  if (a.shape.k !== "obj") return a;
+  const slots = a.shape.slots;
+  if (!Object.prototype.hasOwnProperty.call(slots, key)) return a;
+  const slot = slots[key];
+  let value = slot.value;
+  let changed = false;
+  if (!definitelyNotNullishShape(value.shape) && value.shape.k === "sum") {
+    const members = value.shape.members;
+    const kept = members.filter((m) => !isNullishLitAbs(m));
+    if (kept.length > 0 && kept.length < members.length) {
+      value = kept.length === 1 ? kept[0] : { ...value, shape: { k: "sum", members: kept } };
+      changed = true;
+    }
+  }
+  if (slot.optional) changed = true;
+  if (!changed) return a;
+  const next = { ...slot, value };
+  delete next.optional;
+  return { ...a, shape: { ...a.shape, slots: { ...slots, [key]: next } } };
+}
 function typeofOfMember(m) {
   const t = m.term;
   if (t?.op === "lit") {
@@ -28289,6 +28352,7 @@ __export(runtime_exports, {
   $pushLoopExit: () => $pushLoopExit,
   $rawThis: () => $rawThis,
   $regex: () => $regex,
+  $removeMemberNullish: () => $removeMemberNullish,
   $removeNull: () => $removeNull,
   $removeNullish: () => $removeNullish,
   $removeUndefined: () => $removeUndefined,
@@ -35718,7 +35782,12 @@ function isKnownNonBigintNumeric2(a) {
   if (a.term?.op === "lit" && a.term.value === void 0) return true;
   return a.shape.k === "prim" && (a.shape.type === "number" || a.shape.type === "boolean");
 }
+function isNullishLitOperand2(a) {
+  const r = litValue(a);
+  return r.ok && (r.value === null || r.value === void 0);
+}
 function isMaybeBigintOperand2(a) {
+  if (isNullishLitOperand2(a)) return false;
   const k = a.shape.k;
   if (k === "sum") {
     const members = a.shape.members;
@@ -40820,6 +40889,15 @@ function flattenSumArms(ret) {
 function isWidenedSumArm(m, parent) {
   return parent.conf === "partial" && m.shape.k === "prim" && !m.term && (!m.pred || m.pred.op === "true");
 }
+function provesBarePrimDomain(arm, constraint) {
+  if (!constraint.prim || constraint.preds.length > 0 || isIntFlag(constraint)) {
+    return false;
+  }
+  if (constraint.fields || constraint.element || constraint.members || constraint.fn) {
+    return false;
+  }
+  return arm.shape.k === "prim" && arm.shape.type === constraint.prim;
+}
 function assertImplies(ret, constraint, opts) {
   const phi2 = opts?.phi ?? pTrue;
   if (ret.shape.k === "never") return proved();
@@ -40854,6 +40932,9 @@ function assertSumArms(arms, parent, constraint, opts, phi2) {
       continue;
     }
     if (isValueSetUnknown(arm) || isWidenedSumArm(arm, parent)) {
+      if (isWidenedSumArm(arm, parent) && provesBarePrimDomain(arm, constraint)) {
+        continue;
+      }
       sawUnprovable = true;
       continue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nudojs",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "engines": {
     "node": ">=20"
   },
@@ -46,11 +46,11 @@
   "dependencies": {
     "@babel/generator": "^8.0.6",
     "@babel/types": "^8.0.6",
-    "@nudojs/core": "1.7.8",
-    "@nudojs/env": "0.4.23",
-    "@nudojs/harvester": "0.3.9",
-    "@nudojs/parser": "1.4.5",
-    "@nudojs/service": "1.6.8",
+    "@nudojs/core": "1.7.10",
+    "@nudojs/env": "0.4.25",
+    "@nudojs/harvester": "0.3.11",
+    "@nudojs/parser": "1.4.7",
+    "@nudojs/service": "1.6.10",
     "commander": "^15.0.0"
   },
   "devDependencies": {