@fieldia/core 0.9.2 → 0.10.0

package/src/lib/expression/evaluator.d.mts

@@ -1,11 +1,14 @@
 /**
- * AST evaluator for modifiers, ported from the React form engine.
+ * AST evaluator for expressions, ported from the React form engine.
  *
  * Python semantics where the React version used JavaScript's: an empty list
  * or string is false, and an empty value is never smaller or larger than
- * anything — modifiers come from backends that think in Python.
+ * anything — modifiers come from backends that think in Python. Arithmetic
+ * and functions give null for what they cannot work out, never an error.
  */
 import type { ASTNode } from './parser.mjs';
+import { type ExpressionEnv } from './functions.mjs';
+export { truthy } from './operations.mjs';
 /**
  * Evaluate an AST node against a context object
  *
@@ -18,6 +21,4 @@ import type { ASTNode } from './parser.mjs';
  * const context = { state: 'draft', amount: 100 };
  * evaluate(ast, context); // Returns boolean result
  */
-export declare function evaluate(ast: ASTNode, context: Record<string, unknown>): unknown;
-/** Python's truth test: empty lists, strings and objects, 0 and None are false. */
-export declare function truthy(value: unknown): boolean;
+export declare function evaluate(ast: ASTNode, context: Record<string, unknown>, env?: ExpressionEnv): unknown;

package/src/lib/expression/evaluator.d.ts

@@ -1,11 +1,14 @@
 /**
- * AST evaluator for modifiers, ported from the React form engine.
+ * AST evaluator for expressions, ported from the React form engine.
  *
  * Python semantics where the React version used JavaScript's: an empty list
  * or string is false, and an empty value is never smaller or larger than
- * anything — modifiers come from backends that think in Python.
+ * anything — modifiers come from backends that think in Python. Arithmetic
+ * and functions give null for what they cannot work out, never an error.
  */
 import type { ASTNode } from './parser';
+import { type ExpressionEnv } from './functions';
+export { truthy } from './operations';
 /**
  * Evaluate an AST node against a context object
  *
@@ -18,6 +21,4 @@ import type { ASTNode } from './parser';
  * const context = { state: 'draft', amount: 100 };
  * evaluate(ast, context); // Returns boolean result
  */
-export declare function evaluate(ast: ASTNode, context: Record<string, unknown>): unknown;
-/** Python's truth test: empty lists, strings and objects, 0 and None are false. */
-export declare function truthy(value: unknown): boolean;
+export declare function evaluate(ast: ASTNode, context: Record<string, unknown>, env?: ExpressionEnv): unknown;

package/src/lib/expression/evaluator.js

@@ -1,14 +1,19 @@
 "use strict";
 /**
- * AST evaluator for modifiers, ported from the React form engine.
+ * AST evaluator for expressions, ported from the React form engine.
  *
  * Python semantics where the React version used JavaScript's: an empty list
  * or string is false, and an empty value is never smaller or larger than
- * anything — modifiers come from backends that think in Python.
+ * anything — modifiers come from backends that think in Python. Arithmetic
+ * and functions give null for what they cannot work out, never an error.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.truthy = void 0;
 exports.evaluate = evaluate;
-exports.truthy = truthy;
+const functions_1 = require("./functions");
+const operations_1 = require("./operations");
+var operations_2 = require("./operations");
+Object.defineProperty(exports, "truthy", { enumerable: true, get: function () { return operations_2.truthy; } });
 /**
  * Evaluate an AST node against a context object
  *
@@ -21,12 +26,14 @@ exports.truthy = truthy;
  * const context = { state: 'draft', amount: 100 };
  * evaluate(ast, context); // Returns boolean result
  */
-function evaluate(ast, context) {
+function evaluate(ast, context, env = {}) {
     switch (ast.type) {
         case 'BinaryOp':
-            return evaluateBinaryOp(ast, context);
+            return evaluateBinaryOp(ast, context, env);
         case 'UnaryOp':
-            return evaluateUnaryOp(ast, context);
+            return evaluateUnaryOp(ast, context, env);
+        case 'Call':
+            return evaluateCall(ast, context, env);
         case 'Literal':
             return ast.value;
         case 'Identifier':
@@ -38,9 +45,9 @@ function evaluate(ast, context) {
 /**
  * Evaluate binary operations
  */
-function evaluateBinaryOp(node, context) {
-    const left = normalize(evaluate(node.left, context));
-    const right = normalize(evaluate(node.right, context));
+function evaluateBinaryOp(node, context, env) {
+    const left = normalize(evaluate(node.left, context, env));
+    const right = normalize(evaluate(node.right, context, env));
     const operator = node.operator.toLowerCase();
     const ordered = left !== null && right !== null;
     switch (operator) {
@@ -63,11 +70,18 @@ function evaluateBinaryOp(node, context) {
             return Array.isArray(right) && right.includes(left);
         case 'not in':
             return Array.isArray(right) && !right.includes(left);
+        // Arithmetic, and + joining text
+        case '+':
+        case '-':
+        case '*':
+        case '/':
+        case '%':
+            return (0, operations_1.arithmetic)(operator, left, right);
         // Logical operators (use truthiness)
         case 'and':
-            return truthy(left) && truthy(right);
+            return (0, operations_1.truthy)(left) && (0, operations_1.truthy)(right);
         case 'or':
-            return truthy(left) || truthy(right);
+            return (0, operations_1.truthy)(left) || (0, operations_1.truthy)(right);
         default:
             throw new Error(`Unknown binary operator: ${node.operator}`);
     }
@@ -75,28 +89,29 @@ function evaluateBinaryOp(node, context) {
 /**
  * Evaluate unary operations
  */
-function evaluateUnaryOp(node, context) {
-    const operand = evaluate(node.operand, context);
+function evaluateUnaryOp(node, context, env) {
+    const operand = evaluate(node.operand, context, env);
     const operator = node.operator.toLowerCase();
     switch (operator) {
         case 'not':
-            return !truthy(operand);
+            return !(0, operations_1.truthy)(operand);
+        case '-':
+            return (0, operations_1.negate)(operand);
         default:
             throw new Error(`Unknown unary operator: ${node.operator}`);
     }
 }
+/** A function called with its values, each read only when the function asks for it. */
+function evaluateCall(node, context, env) {
+    const fn = functions_1.FUNCTIONS.get(node.name);
+    if (!fn)
+        throw new Error(`Unknown function: ${node.name}`);
+    return fn.call({ args: node.args, value: (arg) => evaluate(arg, context, env), env });
+}
 /** A missing value compares like None. */
 function normalize(value) {
     return value === undefined ? null : value;
 }
-/** Python's truth test: empty lists, strings and objects, 0 and None are false. */
-function truthy(value) {
-    if (Array.isArray(value))
-        return value.length > 0;
-    if (value !== null && typeof value === 'object')
-        return Object.keys(value).length > 0;
-    return Boolean(value);
-}
 /**
  * Get a nested value from an object using dot notation
  *

package/src/lib/expression/evaluator.js.map

@@ -1 +1 @@
-{"version":3,"file":"evaluator.js","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/expression/evaluator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evaluator.js","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/expression/evaluator.ts"],"names":[],"mappings":"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"}

package/src/lib/expression/evaluator.mjs

@@ -1,10 +1,14 @@
 /**
- * AST evaluator for modifiers, ported from the React form engine.
+ * AST evaluator for expressions, ported from the React form engine.
  *
  * Python semantics where the React version used JavaScript's: an empty list
  * or string is false, and an empty value is never smaller or larger than
- * anything — modifiers come from backends that think in Python.
+ * anything — modifiers come from backends that think in Python. Arithmetic
+ * and functions give null for what they cannot work out, never an error.
  */
+import { FUNCTIONS } from './functions.mjs';
+import { arithmetic, negate, truthy } from './operations.mjs';
+export { truthy } from './operations.mjs';
 /**
  * Evaluate an AST node against a context object
  *
@@ -17,12 +21,14 @@
  * const context = { state: 'draft', amount: 100 };
  * evaluate(ast, context); // Returns boolean result
  */
-export function evaluate(ast, context) {
+export function evaluate(ast, context, env = {}) {
     switch (ast.type) {
         case 'BinaryOp':
-            return evaluateBinaryOp(ast, context);
+            return evaluateBinaryOp(ast, context, env);
         case 'UnaryOp':
-            return evaluateUnaryOp(ast, context);
+            return evaluateUnaryOp(ast, context, env);
+        case 'Call':
+            return evaluateCall(ast, context, env);
         case 'Literal':
             return ast.value;
         case 'Identifier':
@@ -34,9 +40,9 @@ export function evaluate(ast, context) {
 /**
  * Evaluate binary operations
  */
-function evaluateBinaryOp(node, context) {
-    const left = normalize(evaluate(node.left, context));
-    const right = normalize(evaluate(node.right, context));
+function evaluateBinaryOp(node, context, env) {
+    const left = normalize(evaluate(node.left, context, env));
+    const right = normalize(evaluate(node.right, context, env));
     const operator = node.operator.toLowerCase();
     const ordered = left !== null && right !== null;
     switch (operator) {
@@ -59,6 +65,13 @@ function evaluateBinaryOp(node, context) {
             return Array.isArray(right) && right.includes(left);
         case 'not in':
             return Array.isArray(right) && !right.includes(left);
+        // Arithmetic, and + joining text
+        case '+':
+        case '-':
+        case '*':
+        case '/':
+        case '%':
+            return arithmetic(operator, left, right);
         // Logical operators (use truthiness)
         case 'and':
             return truthy(left) && truthy(right);
@@ -71,28 +84,29 @@ function evaluateBinaryOp(node, context) {
 /**
  * Evaluate unary operations
  */
-function evaluateUnaryOp(node, context) {
-    const operand = evaluate(node.operand, context);
+function evaluateUnaryOp(node, context, env) {
+    const operand = evaluate(node.operand, context, env);
     const operator = node.operator.toLowerCase();
     switch (operator) {
         case 'not':
             return !truthy(operand);
+        case '-':
+            return negate(operand);
         default:
             throw new Error(`Unknown unary operator: ${node.operator}`);
     }
 }
+/** A function called with its values, each read only when the function asks for it. */
+function evaluateCall(node, context, env) {
+    const fn = FUNCTIONS.get(node.name);
+    if (!fn)
+        throw new Error(`Unknown function: ${node.name}`);
+    return fn.call({ args: node.args, value: (arg) => evaluate(arg, context, env), env });
+}
 /** A missing value compares like None. */
 function normalize(value) {
     return value === undefined ? null : value;
 }
-/** Python's truth test: empty lists, strings and objects, 0 and None are false. */
-export function truthy(value) {
-    if (Array.isArray(value))
-        return value.length > 0;
-    if (value !== null && typeof value === 'object')
-        return Object.keys(value).length > 0;
-    return Boolean(value);
-}
 /**
  * Get a nested value from an object using dot notation
  *

package/src/lib/expression/evaluator.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"evaluator.mjs","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/expression/evaluator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evaluator.mjs","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/expression/evaluator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,SAAS,EAAsB,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,QAAQ,CAAC,GAAY,EAAE,OAAgC,EAAE,MAAqB,EAAE;IAC9F,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,UAAU;YACb,OAAO,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QAE7C,KAAK,SAAS;YACZ,OAAO,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QAE5C,KAAK,MAAM;YACT,OAAO,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QAEzC,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,KAAK,CAAC;QAEnB,KAAK,YAAY;YACf,OAAO,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAE3C;YACE,MAAM,IAAI,KAAK,CAAC,0BAA2B,GAAwB,CAAC,IAAI,EAAE,CAAC,CAAC;IAChF,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CAAC,IAAkB,EAAE,OAAgC,EAAE,GAAkB;IAChG,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,CAAC;IAEhD,QAAQ,QAAQ,EAAE,CAAC;QACjB,uBAAuB;QACvB,KAAK,IAAI;YACP,OAAO,IAAI,KAAK,KAAK,CAAC;QAExB,KAAK,IAAI,CAAC;QACV,KAAK,IAAI;YACP,OAAO,IAAI,KAAK,KAAK,CAAC;QAExB,KAAK,GAAG;YACN,OAAO,OAAO,IAAK,IAAmB,GAAI,KAAoB,CAAC;QAEjE,KAAK,GAAG;YACN,OAAO,OAAO,IAAK,IAAmB,GAAI,KAAoB,CAAC;QAEjE,KAAK,IAAI;YACP,OAAO,OAAO,IAAK,IAAmB,IAAK,KAAoB,CAAC;QAElE,KAAK,IAAI;YACP,OAAO,OAAO,IAAK,IAAmB,IAAK,KAAoB,CAAC;QAElE,eAAe;QACf,KAAK,IAAI;YACP,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEtD,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEvD,iCAAiC;QACjC,KAAK,GAAG,CAAC;QACT,KAAK,GAAG,CAAC;QACT,KAAK,GAAG,CAAC;QACT,KAAK,GAAG,CAAC;QACT,KAAK,GAAG;YACN,OAAO,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAE3C,qCAAqC;QACrC,KAAK,KAAK;YACR,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;QAEvC,KAAK,IAAI;YACP,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;QAEvC;YACE,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,eAAe,CAAC,IAAiB,EAAE,OAAgC,EAAE,GAAkB;IAC9F,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAE7C,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,KAAK;YACR,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE1B,KAAK,GAAG;YACN,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC;QAEzB;YACE,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAChE,CAAC;AACH,CAAC;AAED,uFAAuF;AACvF,SAAS,YAAY,CAAC,IAAc,EAAE,OAAgC,EAAE,GAAkB;IACxF,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;AACxF,CAAC;AAKD,0CAA0C;AAC1C,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AAC5C,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,cAAc,CAAC,GAAY,EAAE,IAAY;IAChD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,OAAO,GAAY,GAAG,CAAC;IAE3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC9C,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,GAAI,OAAmC,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/src/lib/expression/expression.d.mts

@@ -0,0 +1,21 @@
+import type { ExpressionEnv } from './functions.mjs';
+export type { ExpressionEnv } from './functions.mjs';
+/** An expression read once, ready to work out a value from a record's values many times. */
+export interface CompiledExpression {
+    readonly source: string;
+    /** The fields it reads, by their first name, in order of appearance. */
+    readonly fields: readonly string[];
+    /** The line fields it adds up, as `sum(lines, 'subtotal')` names them. */
+    readonly sums: readonly {
+        lines: string;
+        field: string;
+    }[];
+    /** The value, or null when it cannot be worked out. Never throws. */
+    evaluate(values: Readonly<Record<string, unknown>>, env?: ExpressionEnv): unknown;
+}
+/**
+ * Read an expression for a value, such as `price * qty` or
+ * `if(total > 1000, 10, 0)`. It is parsed now, so a mistake surfaces when the
+ * page is read and not on the first keystroke: throws when it cannot be read.
+ */
+export declare function compileExpression(source: string): CompiledExpression;

package/src/lib/expression/expression.d.ts

@@ -0,0 +1,21 @@
+import type { ExpressionEnv } from './functions';
+export type { ExpressionEnv } from './functions';
+/** An expression read once, ready to work out a value from a record's values many times. */
+export interface CompiledExpression {
+    readonly source: string;
+    /** The fields it reads, by their first name, in order of appearance. */
+    readonly fields: readonly string[];
+    /** The line fields it adds up, as `sum(lines, 'subtotal')` names them. */
+    readonly sums: readonly {
+        lines: string;
+        field: string;
+    }[];
+    /** The value, or null when it cannot be worked out. Never throws. */
+    evaluate(values: Readonly<Record<string, unknown>>, env?: ExpressionEnv): unknown;
+}
+/**
+ * Read an expression for a value, such as `price * qty` or
+ * `if(total > 1000, 10, 0)`. It is parsed now, so a mistake surfaces when the
+ * page is read and not on the first keystroke: throws when it cannot be read.
+ */
+export declare function compileExpression(source: string): CompiledExpression;

package/src/lib/expression/expression.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compileExpression = compileExpression;
+const evaluator_1 = require("./evaluator");
+const parser_1 = require("./parser");
+const reads_1 = require("./reads");
+const tokenizer_1 = require("./tokenizer");
+/**
+ * Read an expression for a value, such as `price * qty` or
+ * `if(total > 1000, 10, 0)`. It is parsed now, so a mistake surfaces when the
+ * page is read and not on the first keystroke: throws when it cannot be read.
+ */
+function compileExpression(source) {
+    const ast = new parser_1.ExpressionParser((0, tokenizer_1.tokenize)(source)).parse();
+    return {
+        source,
+        fields: (0, reads_1.fieldsRead)(ast),
+        sums: (0, reads_1.sumsRead)(ast),
+        evaluate(values, env = {}) {
+            try {
+                return (0, evaluator_1.evaluate)(ast, values, env) ?? null;
+            }
+            catch {
+                return null;
+            }
+        },
+    };
+}
+//# sourceMappingURL=expression.js.map

package/src/lib/expression/expression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/expression/expression.ts"],"names":[],"mappings":";;AAwBA,8CAcC;AAtCD,2CAAuC;AAEvC,qCAA4C;AAC5C,mCAA+C;AAC/C,2CAAuC;AAevC;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,MAAM,GAAG,GAAG,IAAI,yBAAgB,CAAC,IAAA,oBAAQ,EAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAC3D,OAAO;QACL,MAAM;QACN,MAAM,EAAE,IAAA,kBAAU,EAAC,GAAG,CAAC;QACvB,IAAI,EAAE,IAAA,gBAAQ,EAAC,GAAG,CAAC;QACnB,QAAQ,CAAC,MAAM,EAAE,GAAG,GAAG,EAAE;YACvB,IAAI,CAAC;gBACH,OAAO,IAAA,oBAAQ,EAAC,GAAG,EAAE,MAAiC,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC;YACvE,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}

package/src/lib/expression/expression.mjs

@@ -0,0 +1,26 @@
+import { evaluate } from './evaluator.mjs';
+import { ExpressionParser } from './parser.mjs';
+import { fieldsRead, sumsRead } from './reads.mjs';
+import { tokenize } from './tokenizer.mjs';
+/**
+ * Read an expression for a value, such as `price * qty` or
+ * `if(total > 1000, 10, 0)`. It is parsed now, so a mistake surfaces when the
+ * page is read and not on the first keystroke: throws when it cannot be read.
+ */
+export function compileExpression(source) {
+    const ast = new ExpressionParser(tokenize(source)).parse();
+    return {
+        source,
+        fields: fieldsRead(ast),
+        sums: sumsRead(ast),
+        evaluate(values, env = {}) {
+            try {
+                return evaluate(ast, values, env) ?? null;
+            }
+            catch {
+                return null;
+            }
+        },
+    };
+}
+//# sourceMappingURL=expression.mjs.map

package/src/lib/expression/expression.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"expression.mjs","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/expression/expression.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAevC;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,MAAM,GAAG,GAAG,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAC3D,OAAO;QACL,MAAM;QACN,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC;QACvB,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC;QACnB,QAAQ,CAAC,MAAM,EAAE,GAAG,GAAG,EAAE;YACvB,IAAI,CAAC;gBACH,OAAO,QAAQ,CAAC,GAAG,EAAE,MAAiC,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC;YACvE,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}

package/src/lib/expression/extractFieldNames.js

@@ -34,12 +34,17 @@ function extractFieldNames(expression) {
         const fields = new Set();
         // Keywords that look like identifiers but aren't field names
         const keywords = new Set(['null', 'true', 'false', 'True', 'False', 'None']);
-        tokens.forEach(token => {
+        tokens.forEach((token, i) => {
             if (token.type === 'IDENTIFIER') {
                 // Skip literal keywords
                 if (keywords.has(token.value)) {
                     return;
                 }
+                // A name followed by "(" is a function called, not a field: round(x)
+                const next = tokens[i + 1];
+                if (next?.type === 'PAREN' && next.value === '(') {
+                    return;
+                }
                 // For nested fields like 'partner_id.country_id.name',
                 // we only need to watch the root field 'partner_id'
                 const rootField = token.value.split('.')[0];

package/src/lib/expression/extractFieldNames.js.map

@@ -1 +1 @@
-{"version":3,"file":"extractFieldNames.js","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/expression/extractFieldNames.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAUH,8CAiCC;AAuBD,wEA0BC;AA1FD,2CAAuC;AAEvC;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,UAAwC;IACxE,gDAAgD;IAChD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC/D,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,oBAAQ,EAAC,UAAU,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;QAEjC,6DAA6D;QAC7D,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QAE7E,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrB,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAChC,wBAAwB;gBACxB,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9B,OAAO;gBACT,CAAC;gBAED,uDAAuD;gBACvD,oDAAoD;gBACpD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5C,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACxB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,0EAA0E;QAC1E,qDAAqD;QACrD,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,6EAA6E;AAC7E,6EAA6E;AAC7E,MAAM,eAAe,GAAG,IAAI,OAAO,EAAoB,CAAC;AAExD,6DAA6D;AAC7D,MAAM,kBAAkB,GAAa,MAAM,CAAC,MAAM,CAAC,EAAE,CAAwB,CAAC;AAE9E;;;;;;;;;;;;;GAaG;AACH,SAAgB,8BAA8B,CAC5C,SAAoJ;IAEpJ,yCAAyC;IACzC,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC5C,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,yCAAyC;IACzC,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACzB,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QACnD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,iDAAiD;IACjD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAa,CAAC;IAChE,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACvC,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"extractFieldNames.js","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/expression/extractFieldNames.ts"],"names":[],"mappings":"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"}

package/src/lib/expression/extractFieldNames.mjs

@@ -30,12 +30,17 @@ export function extractFieldNames(expression) {
         const fields = new Set();
         // Keywords that look like identifiers but aren't field names
         const keywords = new Set(['null', 'true', 'false', 'True', 'False', 'None']);
-        tokens.forEach(token => {
+        tokens.forEach((token, i) => {
             if (token.type === 'IDENTIFIER') {
                 // Skip literal keywords
                 if (keywords.has(token.value)) {
                     return;
                 }
+                // A name followed by "(" is a function called, not a field: round(x)
+                const next = tokens[i + 1];
+                if (next?.type === 'PAREN' && next.value === '(') {
+                    return;
+                }
                 // For nested fields like 'partner_id.country_id.name',
                 // we only need to watch the root field 'partner_id'
                 const rootField = token.value.split('.')[0];

package/src/lib/expression/extractFieldNames.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"extractFieldNames.mjs","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/expression/extractFieldNames.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,UAAwC;IACxE,gDAAgD;IAChD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC/D,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;QAEjC,6DAA6D;QAC7D,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QAE7E,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrB,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAChC,wBAAwB;gBACxB,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9B,OAAO;gBACT,CAAC;gBAED,uDAAuD;gBACvD,oDAAoD;gBACpD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5C,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACxB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,0EAA0E;QAC1E,qDAAqD;QACrD,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,6EAA6E;AAC7E,6EAA6E;AAC7E,MAAM,eAAe,GAAG,IAAI,OAAO,EAAoB,CAAC;AAExD,6DAA6D;AAC7D,MAAM,kBAAkB,GAAa,MAAM,CAAC,MAAM,CAAC,EAAE,CAAwB,CAAC;AAE9E;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,8BAA8B,CAC5C,SAAoJ;IAEpJ,yCAAyC;IACzC,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC5C,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,yCAAyC;IACzC,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACzB,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QACnD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,iDAAiD;IACjD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAa,CAAC;IAChE,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACvC,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"extractFieldNames.mjs","sourceRoot":"","sources":["../../../../../../libs/core/src/lib/expression/extractFieldNames.ts"],"names":[],"mappings":"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"}

package/src/lib/expression/functions.d.mts

@@ -0,0 +1,35 @@
+import type { ASTNode } from './parser.mjs';
+/**
+ * The functions an expression may call. Each says how many values it takes,
+ * so a call with too many or too few is refused when the page is read; and
+ * each gives null rather than failing when what it is handed does not fit.
+ */
+/** What an expression is worked out with, besides the record's values. */
+export interface ExpressionEnv {
+    /**
+     * The lines of a one2many, as rows of their values, for `sum` and `count`:
+     * the values hold only the lines' keys. Sections and notes are left out.
+     */
+    lines?(field: string): readonly Readonly<Record<string, unknown>>[] | undefined;
+    /** Today, as YYYY-MM-DD. The computer's own clock when left out. */
+    today?(): string;
+}
+/** One call, as a function sees it: its values unread, a way to read each, and the env. */
+interface Call {
+    args: readonly ASTNode[];
+    value(node: ASTNode): unknown;
+    env: ExpressionEnv;
+}
+interface ExpressionFunction {
+    /** How many values it takes: at least, at most. */
+    readonly takes: readonly [number, number];
+    /** What is wrong with the values it was given, found as the expression is read. */
+    check?(args: readonly ASTNode[]): string | undefined;
+    call(call: Call): unknown;
+}
+/** A day as YYYY-MM-DD, in the computer's own time zone. */
+export declare function localDay(date: Date): string;
+export declare const FUNCTIONS: ReadonlyMap<string, ExpressionFunction>;
+/** How many values a function takes, in words: "round takes 1 or 2 values". */
+export declare function takesInWords(name: string, [least, most]: readonly [number, number]): string;
+export {};

package/src/lib/expression/functions.d.ts

@@ -0,0 +1,35 @@
+import type { ASTNode } from './parser';
+/**
+ * The functions an expression may call. Each says how many values it takes,
+ * so a call with too many or too few is refused when the page is read; and
+ * each gives null rather than failing when what it is handed does not fit.
+ */
+/** What an expression is worked out with, besides the record's values. */
+export interface ExpressionEnv {
+    /**
+     * The lines of a one2many, as rows of their values, for `sum` and `count`:
+     * the values hold only the lines' keys. Sections and notes are left out.
+     */
+    lines?(field: string): readonly Readonly<Record<string, unknown>>[] | undefined;
+    /** Today, as YYYY-MM-DD. The computer's own clock when left out. */
+    today?(): string;
+}
+/** One call, as a function sees it: its values unread, a way to read each, and the env. */
+interface Call {
+    args: readonly ASTNode[];
+    value(node: ASTNode): unknown;
+    env: ExpressionEnv;
+}
+interface ExpressionFunction {
+    /** How many values it takes: at least, at most. */
+    readonly takes: readonly [number, number];
+    /** What is wrong with the values it was given, found as the expression is read. */
+    check?(args: readonly ASTNode[]): string | undefined;
+    call(call: Call): unknown;
+}
+/** A day as YYYY-MM-DD, in the computer's own time zone. */
+export declare function localDay(date: Date): string;
+export declare const FUNCTIONS: ReadonlyMap<string, ExpressionFunction>;
+/** How many values a function takes, in words: "round takes 1 or 2 values". */
+export declare function takesInWords(name: string, [least, most]: readonly [number, number]): string;
+export {};