@almadar/evaluator 2.26.0 → 2.28.0

package/dist/{index-CA1FEv6g.d.ts → index-BjtK8dP9.d.ts}

@@ -230,14 +230,22 @@ declare function evalMatches(args: SExpr[], evaluate: Evaluator$4, ctx: Evaluati
 type Evaluator$3 = (expr: SExpr, ctx: EvaluationContext) => unknown;
 /**
  * Evaluate logical AND: ["and", a, b, ...]
- * Short-circuits: returns false as soon as any argument is falsy.
+ * Operand semantics (matches JS `&&` and the compiled TS path — Phase 5,
+ * R-OR-AND-RETURN-BOOLEAN): returns the first falsy argument's VALUE, or the
+ * last argument's value if all are truthy. Short-circuits — does not evaluate
+ * past the first falsy. (When every operand is boolean — the case for all
+ * shipping behaviors — this is observationally identical to returning a
+ * boolean.)
  */
-declare function evalAnd(args: SExpr[], evaluate: Evaluator$3, ctx: EvaluationContext): boolean;
+declare function evalAnd(args: SExpr[], evaluate: Evaluator$3, ctx: EvaluationContext): unknown;
 /**
  * Evaluate logical OR: ["or", a, b, ...]
- * Short-circuits: returns true as soon as any argument is truthy.
+ * Operand semantics (matches JS `||` and the compiled TS path — Phase 5,
+ * R-OR-AND-RETURN-BOOLEAN): returns the first truthy argument's VALUE, or the
+ * last argument's value if all are falsy. Short-circuits — does not evaluate
+ * past the first truthy.
  */
-declare function evalOr(args: SExpr[], evaluate: Evaluator$3, ctx: EvaluationContext): boolean;
+declare function evalOr(args: SExpr[], evaluate: Evaluator$3, ctx: EvaluationContext): unknown;
 /**
  * Evaluate logical NOT: ["not", a]
  */

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { SExpr } from '@almadar/core';
 export { CORE_BINDINGS, CoreBinding, Expression, ExpressionSchema, ParsedBinding, SExpr, SExprAtom, SExprSchema, collectBindings, getArgs, getOperator, isBinding, isSExpr, isSExprAtom, isSExprCall, isValidBinding, parseBinding, sexpr, walkSExpr } from '@almadar/core';
-import { E as EvaluationContext } from './index-CA1FEv6g.js';
-export { U as UserContext, c as createChildContext, a as createEffectContext, b as createMinimalContext, e as evalAbs, d as evalAdd, f as evalAnd, g as evalAtomic, h as evalCallService, i as evalCeil, j as evalClamp, k as evalConcat, l as evalCount, m as evalDecrement, n as evalDeref, o as evalDespawn, p as evalDivide, q as evalDo, r as evalEmit, s as evalEmpty, t as evalEqual, u as evalFilter, v as evalFind, w as evalFirst, x as evalFloor, y as evalFn, z as evalGreaterThan, A as evalGreaterThanOrEqual, B as evalIf, C as evalIncludes, D as evalIncrement, F as evalLast, G as evalLessThan, H as evalLessThanOrEqual, I as evalLet, J as evalList, K as evalMap, L as evalMatches, M as evalMax, N as evalMin, O as evalModulo, P as evalMultiply, Q as evalNavigate, R as evalNot, S as evalNotEqual, T as evalNotify, V as evalNth, W as evalOr, X as evalPersist, Y as evalRef, Z as evalRenderUI, _ as evalRound, $ as evalSet, a0 as evalSetDynamic, a1 as evalSpawn, a2 as evalSubtract, a3 as evalSum, a4 as evalSwap, a5 as evalWatch, a6 as evalWhen, a7 as resolveBinding } from './index-CA1FEv6g.js';
+import { E as EvaluationContext } from './index-BjtK8dP9.js';
+export { U as UserContext, c as createChildContext, a as createEffectContext, b as createMinimalContext, e as evalAbs, d as evalAdd, f as evalAnd, g as evalAtomic, h as evalCallService, i as evalCeil, j as evalClamp, k as evalConcat, l as evalCount, m as evalDecrement, n as evalDeref, o as evalDespawn, p as evalDivide, q as evalDo, r as evalEmit, s as evalEmpty, t as evalEqual, u as evalFilter, v as evalFind, w as evalFirst, x as evalFloor, y as evalFn, z as evalGreaterThan, A as evalGreaterThanOrEqual, B as evalIf, C as evalIncludes, D as evalIncrement, F as evalLast, G as evalLessThan, H as evalLessThanOrEqual, I as evalLet, J as evalList, K as evalMap, L as evalMatches, M as evalMax, N as evalMin, O as evalModulo, P as evalMultiply, Q as evalNavigate, R as evalNot, S as evalNotEqual, T as evalNotify, V as evalNth, W as evalOr, X as evalPersist, Y as evalRef, Z as evalRenderUI, _ as evalRound, $ as evalSet, a0 as evalSetDynamic, a1 as evalSpawn, a2 as evalSubtract, a3 as evalSum, a4 as evalSwap, a5 as evalWatch, a6 as evalWhen, a7 as resolveBinding } from './index-BjtK8dP9.js';
 
 /**
  * S-Expression Evaluator

package/dist/index.js

@@ -1,4 +1,4 @@
-import { isSExpr, isBinding, getOperator, getArgs, OrbitalZodSchema, safeParseOrbitalSchema } from '@almadar/core';
+import { isSExpr, isBinding, getOperator, getArgs, isFieldValue, isEventPayloadValue, isSessionHistoryEntry, isPlanSnapshot, OrbitalZodSchema, safeParseOrbitalSchema } from '@almadar/core';
 export { CORE_BINDINGS, ExpressionSchema, SExprSchema, collectBindings, getArgs, getOperator, isBinding, isSExpr, isSExprAtom, isSExprCall, isValidBinding, parseBinding, sexpr, walkSExpr } from '@almadar/core';
 
 // types/expression.ts
@@ -237,20 +237,24 @@ function toComparable(value) {
 
 // operators/logic.ts
 function evalAnd(args, evaluate2, ctx) {
+  let last = true;
   for (const arg of args) {
-    if (!toBoolean(evaluate2(arg, ctx))) {
-      return false;
+    last = evaluate2(arg, ctx);
+    if (!toBoolean(last)) {
+      return last;
     }
   }
-  return true;
+  return last;
 }
 function evalOr(args, evaluate2, ctx) {
+  let last = false;
   for (const arg of args) {
-    if (toBoolean(evaluate2(arg, ctx))) {
-      return true;
+    last = evaluate2(arg, ctx);
+    if (toBoolean(last)) {
+      return last;
     }
   }
-  return false;
+  return last;
 }
 function evalNot(args, evaluate2, ctx) {
   return !toBoolean(evaluate2(args[0], ctx));
@@ -2563,37 +2567,6 @@ function evalLlmCompact(args, evaluate2, ctx) {
   const strategy = args.length > 0 ? evaluate2(args[0], ctx) : void 0;
   return ctx.llm.compact(strategy);
 }
-function isFieldValue(value) {
-  if (value === null) return true;
-  const kind = typeof value;
-  if (kind === "string" || kind === "number" || kind === "boolean") return true;
-  if (value instanceof Date) return true;
-  if (Array.isArray(value)) return value.every((item) => isFieldValue(item));
-  if (kind === "object" && value !== null && typeof value === "object") {
-    return Object.values(value).every((item) => item === void 0 || isFieldValue(item));
-  }
-  return false;
-}
-function isEventPayloadValue(value) {
-  if (value === null || value === void 0) return true;
-  const kind = typeof value;
-  if (kind === "string" || kind === "number" || kind === "boolean") return true;
-  if (value instanceof Date) return true;
-  if (Array.isArray(value)) return value.every((item) => isEventPayloadValue(item));
-  if (kind === "object" && value !== null && typeof value === "object") {
-    return Object.values(value).every((item) => isEventPayloadValue(item));
-  }
-  return false;
-}
-function isSessionHistoryEntry(value) {
-  if (typeof value !== "object" || value === null) return false;
-  return "role" in value && typeof value.role === "string" && "content" in value && typeof value.content === "string" && "timestamp" in value && typeof value.timestamp === "number";
-}
-function isPlanSnapshot(value) {
-  if (typeof value !== "object" || value === null) return false;
-  const statuses = ["proposed", "confirmed", "built", "failed"];
-  return "schemaVersion" in value && value.schemaVersion === 1 && "status" in value && statuses.some((s) => s === value.status) && "builtAt" in value && typeof value.builtAt === "string" && "orbitals" in value && Array.isArray(value.orbitals) && "renames" in value && Array.isArray(value.renames) && "deletedOrbitals" in value && Array.isArray(value.deletedOrbitals);
-}
 function isOrbital(value) {
   return OrbitalZodSchema.safeParse(value).success;
 }