@lotics/app-sdk 0.115.3 → 0.115.4

package/dist/index.js

@@ -31520,33 +31520,37 @@ function buildDependencyGraph(formulaFields, allFields) {
   }
   return { sortedFields: result, circularDependencies };
 }
-function readsFieldsOnlyThroughEmptinessPredicates(node) {
+function readsFieldsOnlyThroughEmptinessPredicates(node, taken) {
+  const reads = (child) => readsFieldsOnlyThroughEmptinessPredicates(child, taken);
   if (node === void 0) return true;
   if (isFieldRead(node)) return false;
   switch (node.type) {
     case "Invoke": {
       const args = node.arguments ?? [];
       const predicate = node.method === void 0 && node.receiver.type === "ID" && EMPTINESS_PREDICATES.has(node.receiver.value);
-      return (predicate || readsFieldsOnlyThroughEmptinessPredicates(node.receiver)) && args.every(
-        (arg) => predicate && isFieldRead(arg) || readsFieldsOnlyThroughEmptinessPredicates(arg)
+      return (predicate || reads(node.receiver)) && args.every(
+        (arg) => predicate && isFieldRead(arg) || reads(arg)
       );
     }
     case "Unary":
-      return readsFieldsOnlyThroughEmptinessPredicates(node.child);
+      return reads(node.child);
     case "Binary":
-      return readsFieldsOnlyThroughEmptinessPredicates(node.left) && readsFieldsOnlyThroughEmptinessPredicates(node.right);
+      return reads(node.left) && reads(node.right);
     case "Getter":
-      return readsFieldsOnlyThroughEmptinessPredicates(node.receiver);
+      return reads(node.receiver);
     case "Index":
-      return readsFieldsOnlyThroughEmptinessPredicates(node.receiver) && readsFieldsOnlyThroughEmptinessPredicates(node.argument);
-    case "Ternary":
-      return readsFieldsOnlyThroughEmptinessPredicates(node.condition) && readsFieldsOnlyThroughEmptinessPredicates(node.trueExpr) && readsFieldsOnlyThroughEmptinessPredicates(node.falseExpr);
+      return reads(node.receiver) && reads(node.argument);
+    case "Ternary": {
+      if (!reads(node.condition)) return false;
+      const decided = node.condition === void 0 || taken === void 0 ? void 0 : taken(node.condition);
+      return decided === true ? reads(node.trueExpr) : decided === false ? reads(node.falseExpr) : reads(node.trueExpr) && reads(node.falseExpr);
+    }
     case "List":
-      return (node.items ?? []).every(readsFieldsOnlyThroughEmptinessPredicates);
+      return (node.items ?? []).every((item) => reads(item));
     case "Map":
-      return Object.values(node.entries ?? {}).every(readsFieldsOnlyThroughEmptinessPredicates);
+      return Object.values(node.entries ?? {}).every((entry) => reads(entry));
     case "ArrowFunction":
-      return readsFieldsOnlyThroughEmptinessPredicates(node.body);
+      return reads(node.body);
     case "ID":
       return node.value !== "data";
     case "Literal":
@@ -31559,8 +31563,13 @@ function isFieldRead(node) {
 }
 function evaluateFormulaWithJS(preparedExpression, data, timezone, everyReferenceEmpty) {
   try {
-    if (everyReferenceEmpty && !readsFieldsOnlyThroughEmptinessPredicates(parseExpression(preparedExpression))) {
-      return null;
+    if (everyReferenceEmpty) {
+      const helpers = createTimezoneAwareFunctions(timezone);
+      const taken = (condition2) => {
+        const answer = condition2.evaluate({ ...data, ...helpers });
+        return typeof answer === "boolean" ? answer : void 0;
+      };
+      if (!readsFieldsOnlyThroughEmptinessPredicates(parseExpression(preparedExpression), taken)) return null;
     }
     const result = evaluateJsExpression(preparedExpression, data, void 0, timezone);
     if (result === null || result === void 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lotics/app-sdk",
-  "version": "0.115.3",
+  "version": "0.115.4",
   "description": "The SDK a Lotics custom-code app reads and writes through \u2014 typed hooks over the host bridge, cell readers, mount() and AppRouter",
   "type": "module",
   "exports": {