@routier/core 0.6.0 → 0.8.0

package/dist/expressions/index.js

@@ -4,6 +4,7 @@ __webpack_require__.d(__webpack_exports__, {
   Cv: () => (assertString),
   S6: () => (isValueExpression),
   e3: () => (isPropertyExpression),
+  fm: () => (isCallExpression),
   vg: () => (isOperatorExpression),
   xH: () => (isComparatorExpression)
 });
@@ -77,6 +78,11 @@ function isObjectWithType(value) {
  */ function isValueExpression(value) {
     return isObjectWithType(value) && value.type === "value";
 }
+/**
+ * Type guard: narrows `value` to `CallExpression` when it is an object with `type === "call"`.
+ */ function isCallExpression(value) {
+    return isObjectWithType(value) && value.type === "call";
+}
 /**
  * Type guard: narrows `value` to `EmptyExpression` when it is an object with `type === "empty"`.
  */ function isEmptyExpression(value) {
@@ -89,62 +95,396 @@ function isObjectWithType(value) {
 }
 
 
+},
+429(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.d(__webpack_exports__, {
+  N: () => (CALL_SOURCE),
+  a: () => (renderCallAsJs)
+});
+const CALL_SOURCE = {
+    "to-lower-case": {
+        form: "method",
+        name: "toLowerCase"
+    },
+    "to-upper-case": {
+        form: "method",
+        name: "toUpperCase"
+    },
+    "length": {
+        form: "property",
+        name: "length"
+    },
+    "trim": {
+        form: "method",
+        name: "trim"
+    },
+    "trim-start": {
+        form: "method",
+        name: "trimStart"
+    },
+    "trim-end": {
+        form: "method",
+        name: "trimEnd"
+    },
+    "index-of": {
+        form: "method",
+        name: "indexOf"
+    },
+    "substring": {
+        form: "method",
+        name: "substring"
+    },
+    "concat": {
+        form: "method",
+        name: "concat"
+    },
+    "replace": {
+        form: "method",
+        name: "replace"
+    },
+    "replace-all": {
+        form: "method",
+        name: "replaceAll"
+    },
+    "absolute": {
+        form: "function",
+        name: "Math.abs"
+    },
+    "floor": {
+        form: "function",
+        name: "Math.floor"
+    },
+    "ceiling": {
+        form: "function",
+        name: "Math.ceil"
+    },
+    "round": {
+        form: "function",
+        name: "Math.round"
+    },
+    "sign": {
+        form: "function",
+        name: "Math.sign"
+    },
+    "square-root": {
+        form: "function",
+        name: "Math.sqrt"
+    },
+    "add": {
+        form: "operator",
+        symbol: "+"
+    },
+    "subtract": {
+        form: "operator",
+        symbol: "-"
+    },
+    "multiply": {
+        form: "operator",
+        symbol: "*"
+    },
+    "divide": {
+        form: "operator",
+        symbol: "/"
+    },
+    "modulo": {
+        form: "operator",
+        symbol: "%"
+    },
+    "utc-year": {
+        form: "method",
+        name: "getUTCFullYear"
+    },
+    "utc-month": {
+        form: "method",
+        name: "getUTCMonth"
+    },
+    "utc-day-of-month": {
+        form: "method",
+        name: "getUTCDate"
+    },
+    "utc-day-of-week": {
+        form: "method",
+        name: "getUTCDay"
+    },
+    "utc-hour": {
+        form: "method",
+        name: "getUTCHours"
+    },
+    "utc-minute": {
+        form: "method",
+        name: "getUTCMinutes"
+    },
+    "utc-second": {
+        form: "method",
+        name: "getUTCSeconds"
+    },
+    "utc-millisecond": {
+        form: "method",
+        name: "getUTCMilliseconds"
+    },
+    "epoch-ms": {
+        form: "method",
+        name: "getTime"
+    },
+    "to-string": {
+        form: "function",
+        name: "String"
+    },
+    "to-number": {
+        form: "function",
+        name: "Number"
+    },
+    "to-boolean": {
+        form: "function",
+        name: "Boolean"
+    },
+    "type-of": {
+        form: "prefix",
+        keyword: "typeof"
+    },
+    "some": {
+        form: "method",
+        name: "some"
+    },
+    "every": {
+        form: "method",
+        name: "every"
+    },
+    // `Math.pow(a, b)` parses to the same call; `**` is the shorter of the two spellings
+    "power": {
+        form: "operator",
+        symbol: "**"
+    },
+    "bit-and": {
+        form: "operator",
+        symbol: "&"
+    },
+    "bit-or": {
+        form: "operator",
+        symbol: "|"
+    },
+    "bit-xor": {
+        form: "operator",
+        symbol: "^"
+    },
+    "shift-left": {
+        form: "operator",
+        symbol: "<<"
+    },
+    "shift-right": {
+        form: "operator",
+        symbol: ">>"
+    },
+    "shift-right-unsigned": {
+        form: "operator",
+        symbol: ">>>"
+    },
+    "bit-not": {
+        form: "prefix",
+        keyword: "~"
+    },
+    "coalesce": {
+        form: "operator",
+        symbol: "??"
+    },
+    "conditional": {
+        form: "conditional"
+    },
+    "matches": {
+        form: "regex-test"
+    }
+};
+/**
+ * A call rendered as the JavaScript that produced it, from operand and argument text already
+ * rendered by the caller.
+ *
+ * Takes strings so one implementation serves a live tree and a serialized one.
+ */ /**
+ * Thunked because rendering a side can record a parameter, and `regex-test` emits its argument
+ * before its operand — so the two orders have to agree.
+ */ const renderCallAsJs = (call, renderOperand, renderArgs)=>{
+    const source = CALL_SOURCE[call];
+    if (source == null) {
+        const operand = renderOperand();
+        return `${operand}.${call}(${renderArgs().join(", ")})`;
+    }
+    if (source.form === "property") {
+        return `${renderOperand()}.${source.name}`;
+    }
+    if (source.form === "regex-test") {
+        const pattern = renderArgs()[0] ?? "?";
+        return `${pattern}.test(${renderOperand()})`;
+    }
+    if (source.form === "method") {
+        const operand = renderOperand();
+        return `${operand}.${source.name}(${renderArgs().join(", ")})`;
+    }
+    if (source.form === "function") {
+        const operand = renderOperand();
+        return `${source.name}(${[
+            operand,
+            ...renderArgs()
+        ].join(", ")})`;
+    }
+    if (source.form === "prefix") {
+        // `~x`, not `~ x` — a bitwise complement is written tight, unlike `typeof`
+        const operand = renderOperand();
+        return source.keyword === "~" ? `${source.keyword}${operand}` : `${source.keyword} ${operand}`;
+    }
+    if (source.form === "conditional") {
+        const operand = renderOperand();
+        const args = renderArgs();
+        return `${operand} ? ${args[0] ?? "?"} : ${args[1] ?? "?"}`;
+    }
+    const operand = renderOperand();
+    return `${[
+        operand,
+        ...renderArgs()
+    ].join(` ${source.symbol} `)}`;
+};
+
+
 },
 835(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
 __webpack_require__.d(__webpack_exports__, {
   t: () => (EXPRESSION_TYPES)
 });
-const EXPRESSION_TYPES = [
-    "operator",
-    "comparator",
-    "property",
-    "value",
-    "empty",
-    "not-parsable"
-];
+/**
+ * A `Record` rather than a list, so adding to `ExpressionType` without adding it here is a compile
+ * error. As a list it was not exhaustive, and `call` was silently missing from `isExpression`.
+ */ const EXPRESSION_TYPE_SET = {
+    "operator": true,
+    "comparator": true,
+    "property": true,
+    "value": true,
+    "call": true,
+    "empty": true,
+    "not-parsable": true
+};
+const EXPRESSION_TYPES = Object.keys(EXPRESSION_TYPE_SET);
 
 
 },
 379(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
 __webpack_require__.d(__webpack_exports__, {
   Vu: () => (toPredicate),
+  Vv: () => (operandValue),
   _3: () => (evaluate),
+  gm: () => (UNRESOLVED),
   wS: () => (toStrictPredicate)
 });
 /* import */ var _assertions__rspack_import_0 = __webpack_require__(126);
 
 /** Reads a property or literal operand, or `UNRESOLVED` when the node is not one. */ const UNRESOLVED = Symbol("unresolved");
-const applyTransformer = (value, transformer)=>{
-    if (transformer == null) {
-        return value;
-    }
-    // A transformer applied to an absent value has no answer, and inventing one ("" for a missing
-    // string) is how a filter starts matching rows it should not.
+const ARITHMETIC = {
+    "add": (left, right)=>left + right,
+    "subtract": (left, right)=>left - right,
+    "multiply": (left, right)=>left * right,
+    "divide": (left, right)=>left / right,
+    "modulo": (left, right)=>left % right,
+    "power": (left, right)=>left ** right,
+    "bit-and": (left, right)=>left & right,
+    "bit-or": (left, right)=>left | right,
+    "bit-xor": (left, right)=>left ^ right,
+    "shift-left": (left, right)=>left << right,
+    "shift-right": (left, right)=>left >> right,
+    "shift-right-unsigned": (left, right)=>left >>> right
+};
+const applyCall = (call, value, args)=>{
+    // Above the guard: a template renders null as "null" in JavaScript, so these two are total.
+    if (call === "to-string") {
+        return String(value);
+    }
+    if (call === "concat") {
+        return [
+            value,
+            ...args
+        ].map(String).join("");
+    }
+    // A call applied to an absent value has no answer, and inventing one ("" for a missing string)
+    // is how a filter starts matching rows it should not.
     if (value == null) {
         return UNRESOLVED;
     }
-    if (transformer === "to-lower-case") {
-        return typeof value === "string" ? value.toLowerCase() : UNRESOLVED;
-    }
-    if (transformer === "to-upper-case") {
-        return typeof value === "string" ? value.toUpperCase() : UNRESOLVED;
+    if (call === "to-lower-case" || call === "to-upper-case") {
+        if (typeof value !== "string") {
+            return UNRESOLVED;
+        }
+        const lower = call === "to-lower-case";
+        if (args.length === 0 || args[0] == null) {
+            return lower ? value.toLowerCase() : value.toUpperCase();
+        }
+        if (typeof args[0] !== "string") {
+            return UNRESOLVED;
+        }
+        try {
+            // An explicit locale is deterministic; dropping it answers a different question in Turkish.
+            return lower ? value.toLocaleLowerCase(args[0]) : value.toLocaleUpperCase(args[0]);
+        } catch  {
+            // An invalid language tag throws RangeError; no answer beats the host's default.
+            return UNRESOLVED;
+        }
     }
-    if (transformer === "length") {
+    if (call === "length") {
         return typeof value === "string" || Array.isArray(value) ? value.length : UNRESOLVED;
     }
+    if (call === "bit-not") {
+        return typeof value === "number" ? ~value : UNRESOLVED;
+    }
+    if (call === "matches") {
+        if (typeof value !== "string" || !(args[0] instanceof RegExp)) {
+            return UNRESOLVED;
+        }
+        // `test` advances `lastIndex` on a global or sticky pattern, and the pattern is shared with
+        // the cached template, where a source evaluates fresh in JavaScript.
+        return args[0].global || args[0].sticky ? new RegExp(args[0].source, args[0].flags).test(value) : args[0].test(value);
+    }
+    const arithmetic = ARITHMETIC[call];
+    if (arithmetic != null) {
+        return typeof value === "number" && typeof args[0] === "number" ? arithmetic(value, args[0]) : UNRESOLVED;
+    }
     return UNRESOLVED;
 };
-const operand = (expression, row)=>{
+const operandValue = (expression, row)=>{
     if (expression == null) {
         return UNRESOLVED;
     }
     if ((0,_assertions__rspack_import_0/* .isValueExpression */.S6)(expression)) {
-        return applyTransformer(expression.value, expression.transformer);
+        return expression.value;
     }
     if ((0,_assertions__rspack_import_0/* .isPropertyExpression */.e3)(expression)) {
         // Through the PropertyInfo, so a nested path and a `from`-renamed segment resolve the same
         // way every other consumer of the tree resolves them.
-        return applyTransformer(expression.property.getValue(row), expression.transformer);
+        return expression.property.getValue(row);
+    }
+    if ((0,_assertions__rspack_import_0/* .isCallExpression */.fm)(expression)) {
+        /**
+         * `??` and `? :` are the two calls whose whole job is to answer when something is absent, so
+         * they run before the guard that refuses an absent operand.
+         */ if (expression.call === "coalesce") {
+            const left = operandValue(expression.expression, row);
+            return left === UNRESOLVED || left == null ? operandValue(expression.arguments[0], row) : left;
+        }
+        if (expression.call === "conditional") {
+            const condition = evaluate(expression.expression, row);
+            if (condition === undefined) {
+                return UNRESOLVED;
+            }
+            return operandValue(expression.arguments[condition === true ? 0 : 1], row);
+        }
+        const inner = operandValue(expression.expression, row);
+        if (inner === UNRESOLVED) {
+            return UNRESOLVED;
+        }
+        const args = [];
+        for (const argument of expression.arguments){
+            const resolved = operandValue(argument, row);
+            if (resolved === UNRESOLVED) {
+                return UNRESOLVED;
+            }
+            args.push(resolved);
+        }
+        return applyCall(expression.call, inner, args);
     }
     return UNRESOLVED;
 };
@@ -229,8 +569,8 @@ const evaluateComparator = (comparator, left, right, strict)=>{
         return left === false && right === false ? false : undefined;
     }
     if ((0,_assertions__rspack_import_0/* .isComparatorExpression */.xH)(expression)) {
-        const left = operand(expression.left, row);
-        const right = operand(expression.right, row);
+        const left = operandValue(expression.left, row);
+        const right = operandValue(expression.right, row);
         if (left === UNRESOLVED || right === UNRESOLVED) {
             return undefined;
         }
@@ -268,21 +608,136 @@ const evaluateComparator = (comparator, left, right, strict)=>{
     };
 
 
+},
+43(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.d(__webpack_exports__, {
+  F5: () => (foldConstantCalls),
+  Sv: () => (FOLDABLE),
+  br: () => (foldedOperandValue)
+});
+/* import */ var _assertions__rspack_import_0 = __webpack_require__(126);
+/* import */ var _evaluate__rspack_import_3 = __webpack_require__(379);
+/* import */ var _types__rspack_import_2 = __webpack_require__(27);
+/* import */ var _utils__rspack_import_1 = __webpack_require__(63);
+
+
+
+
+/** Calls fold may compute. Absent means a plugin declines it, so a new call is opt-in. */ const FOLDABLE = new Set([
+    "to-lower-case",
+    "to-upper-case",
+    "length",
+    "bit-not",
+    "matches",
+    "to-string",
+    "concat",
+    "add",
+    "subtract",
+    "multiply",
+    "divide",
+    "modulo",
+    "power",
+    "bit-and",
+    "bit-or",
+    "bit-xor",
+    "shift-left",
+    "shift-right",
+    "shift-right-unsigned",
+    "coalesce",
+    "conditional"
+]);
+/** `String(value)` on an object is the host's rendering — a Date carries its timezone. */ const COERCES_TO_TEXT = new Set([
+    "to-string",
+    "concat"
+]);
+const isFrozenPrimitive = (value)=>value == null || typeof value !== "object";
+const readsAProperty = (expression)=>{
+    if ((0,_assertions__rspack_import_0/* .isPropertyExpression */.e3)(expression)) {
+        return true;
+    }
+    return (0,_utils__rspack_import_1/* .childrenOf */.LU)(expression).some(readsAProperty);
+};
+/** A `conditional` holds a condition where every other call holds a value. */ const isConstant = (call)=>{
+    if (!FOLDABLE.has(call.call) || !call.arguments.every(_assertions__rspack_import_0/* .isValueExpression */.S6)) {
+        return false;
+    }
+    if (COERCES_TO_TEXT.has(call.call) && [
+        call.expression,
+        ...call.arguments
+    ].some((operand)=>(0,_assertions__rspack_import_0/* .isValueExpression */.S6)(operand) && !isFrozenPrimitive(operand.value))) {
+        return false;
+    }
+    return call.call === "conditional" ? !readsAProperty(call.expression) : (0,_assertions__rspack_import_0/* .isValueExpression */.S6)(call.expression);
+};
+/** Computes every call whose operand and arguments are all literals. Runs after `bindExpression`. */ const foldConstantCalls = (expression)=>{
+    if ((0,_assertions__rspack_import_0/* .isCallExpression */.fm)(expression)) {
+        const folded = new _types__rspack_import_2/* .CallExpression */.DG({
+            call: expression.call,
+            expression: foldConstantCalls(expression.expression),
+            arguments: expression.arguments.map(foldConstantCalls)
+        });
+        if (!isConstant(folded)) {
+            return folded;
+        }
+        const value = (0,_evaluate__rspack_import_3/* .operandValue */.Vv)(folded, {});
+        return value === _evaluate__rspack_import_3/* .UNRESOLVED */.gm ? folded : new _types__rspack_import_2/* .ValueExpression */.Ko({
+            value
+        });
+    }
+    if ((0,_assertions__rspack_import_0/* .isComparatorExpression */.xH)(expression)) {
+        return new _types__rspack_import_2/* .ComparatorExpression */.bQ({
+            comparator: expression.comparator,
+            negated: expression.negated,
+            strict: expression.strict,
+            left: expression.left == null ? undefined : foldConstantCalls(expression.left),
+            right: expression.right == null ? undefined : foldConstantCalls(expression.right)
+        });
+    }
+    if ((0,_assertions__rspack_import_0/* .isOperatorExpression */.vg)(expression)) {
+        return new _types__rspack_import_2/* .OperatorExpression */.fw({
+            operator: expression.operator,
+            left: expression.left == null ? undefined : foldConstantCalls(expression.left),
+            right: expression.right == null ? undefined : foldConstantCalls(expression.right)
+        });
+    }
+    return expression;
+};
+/** The value a literal operand binds as once the calls on it are computed. Throws if it cannot. */ const foldedOperandValue = (operand, calls)=>{
+    if (calls.length === 0) {
+        return operand.value;
+    }
+    // `peelCalls` returns calls innermost first, so the last one evaluates the whole chain.
+    const outermost = calls[calls.length - 1];
+    const value = readsAProperty(outermost) ? _evaluate__rspack_import_3/* .UNRESOLVED */.gm : (0,_evaluate__rspack_import_3/* .operandValue */.Vv)(outermost, {});
+    if (value === _evaluate__rspack_import_3/* .UNRESOLVED */.gm) {
+        throw new Error(`'${calls.map((call)=>call.call).join("', '")}' cannot be computed on the literal ` + `'${String(operand.value)}'.`);
+    }
+    return value;
+};
+
+
 },
 91(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
 __webpack_require__.d(__webpack_exports__, {
   MY: () => (toExpression),
+  Pl: () => (parseSelector),
   oH: () => (parseFragment),
   pg: () => (combineExpressions)
 });
-/* import */ var _utilities__rspack_import_3 = __webpack_require__(581);
+/* import */ var _utilities__rspack_import_5 = __webpack_require__(581);
 /* import */ var _assertions__rspack_import_0 = __webpack_require__(126);
 /* import */ var _schema__rspack_import_2 = __webpack_require__(537);
+/* import */ var _evaluate__rspack_import_3 = __webpack_require__(379);
+/* import */ var _fold__rspack_import_4 = __webpack_require__(43);
+/* import */ var _utils__rspack_import_6 = __webpack_require__(63);
 /* import */ var _types__rspack_import_1 = __webpack_require__(27);
 
 
 
 
+
+
+
 // Error message constants
 const ERROR_MESSAGES = {
     PROPERTY_NOT_FOUND: (path)=>`Error parsing query, could not find PropertyInfo for path: ${path}`,
@@ -328,8 +783,13 @@ const converters = {
 };
 // Longest first so multi-character punctuation wins over its prefixes
 const MULTI_CHARACTER_PUNCTUATION = [
+    ">>>",
     "===",
     "!==",
+    "**",
+    "<<",
+    ">>",
+    "??",
     "?.",
     "&&",
     "||",
@@ -366,9 +826,17 @@ const SINGLE_CHARACTER_PUNCTUATION = new Set([
     "?",
     ":",
     "&",
-    "|"
+    "|",
+    "^",
+    "~"
 ]);
-const STRING_ESCAPES = {
+/**
+ * A lookup table keyed by source text.
+ *
+ * Null-prototype: `TRANSFORM_METHODS["toString"]` otherwise returns `Object.prototype.toString`,
+ * which is truthy, and the parser reads a method it does not support as one it does.
+ */ const sourceKeyed = (entries)=>Object.assign(Object.create(null), entries);
+const STRING_ESCAPES = sourceKeyed({
     "n": "\n",
     "r": "\r",
     "t": "\t",
@@ -376,6 +844,24 @@ const STRING_ESCAPES = {
     "f": "\f",
     "v": "\v",
     "0": "\0"
+});
+/**
+ * Whether a `/` here opens a regex rather than dividing.
+ *
+ * A regex cannot follow a value. Everything else — the start of the source, an operator, an opening
+ * bracket, a comma — is a position where only a regex makes sense.
+ */ const regexCanStartHere = (tokens)=>{
+    const previous = tokens[tokens.length - 1];
+    if (previous == null) {
+        return true;
+    }
+    if (previous.kind === "number" || previous.kind === "string" || previous.kind === "bigint" || previous.kind === "regex") {
+        return false;
+    }
+    if (previous.kind === "identifier") {
+        return false;
+    }
+    return previous.value !== ")" && previous.value !== "]";
 };
 const isIdentifierStart = (char)=>/[a-zA-Z_$]/.test(char);
 const isIdentifierPart = (char)=>/[a-zA-Z0-9_$]/.test(char);
@@ -425,6 +911,51 @@ const isHexDigit = (char)=>isDigit(char) || char >= "a" && char <= "f" || char >
             i++;
             continue;
         }
+        /**
+         * A regex literal, told from division by what came before it.
+         *
+         * `/` after a value — a number, string, identifier, `)` or `]` — is division. Anywhere else
+         * it opens a regex. That is the same rule a JavaScript lexer uses, and it is why `x.a / 2`
+         * and `/^a/.test(x.a)` can share a character.
+         */ if (char === "/" && source[i + 1] !== "/" && source[i + 1] !== "*" && regexCanStartHere(tokens)) {
+            let value = "";
+            let inClass = false;
+            let j = i + 1;
+            while(j < source.length){
+                const current = source[j];
+                if (current === "\\") {
+                    value += current + (source[j + 1] ?? "");
+                    j += 2;
+                    continue;
+                }
+                if (current === "[") {
+                    inClass = true;
+                } else if (current === "]") {
+                    inClass = false;
+                } else if (current === "/" && inClass === false) {
+                    break;
+                } else if (current === "\n") {
+                    throw new Error(ERROR_MESSAGES.UNSUPPORTED("unterminated regular expression"));
+                }
+                value += current;
+                j++;
+            }
+            if (j >= source.length) {
+                throw new Error(ERROR_MESSAGES.UNSUPPORTED("unterminated regular expression"));
+            }
+            j++;
+            let flags = "";
+            while(j < source.length && isIdentifierPart(source[j])){
+                flags += source[j];
+                j++;
+            }
+            i = j;
+            tokens.push({
+                kind: "regex",
+                value: `${value}\u0000${flags}`
+            });
+            continue;
+        }
         // Comments
         if (char === "/" && source[i + 1] === "/") {
             while(i < source.length && source[i] !== "\n"){
@@ -444,6 +975,8 @@ const isHexDigit = (char)=>isDigit(char) || char >= "a" && char <= "f" || char >
         if (char === "'" || char === "\"" || char === "`") {
             const quote = char;
             let value = "";
+            const chunks = [];
+            const expressions = [];
             i++;
             while(i < source.length && source[i] !== quote){
                 if (source[i] === "\\") {
@@ -458,8 +991,43 @@ const isHexDigit = (char)=>isDigit(char) || char >= "a" && char <= "f" || char >
                     i += 2;
                     continue;
                 }
-                if (quote === "`" && source[i] === "$" && source[i + 1] === "{") {
-                    throw new Error(ERROR_MESSAGES.UNSUPPORTED("template literal interpolation"));
+                /**
+                 * An interpolation. The literal so far becomes a chunk and the expression source is
+                 * kept whole, to be parsed by its own stream — nesting means the inner source can
+                 * hold anything, including another template.
+                 */ if (quote === "`" && source[i] === "$" && source[i + 1] === "{") {
+                    let depth = 1;
+                    let expression = "";
+                    let at = i + 2;
+                    while(at < source.length && depth > 0){
+                        const current = source[at];
+                        if (current === "{") {
+                            depth++;
+                        } else if (current === "}") {
+                            depth--;
+                            if (depth === 0) {
+                                break;
+                            }
+                        } else if (current === "'" || current === '"' || current === "`") {
+                            const closing = current;
+                            expression += current;
+                            at++;
+                            while(at < source.length && source[at] !== closing){
+                                expression += source[at] === "\\" ? source[at] + (source[at + 1] ?? "") : source[at];
+                                at += source[at] === "\\" ? 2 : 1;
+                            }
+                        }
+                        expression += source[at];
+                        at++;
+                    }
+                    if (depth > 0) {
+                        throw new Error(ERROR_MESSAGES.UNSUPPORTED("unterminated template interpolation"));
+                    }
+                    chunks.push(value);
+                    expressions.push(expression);
+                    value = "";
+                    i = at + 1;
+                    continue;
                 }
                 value += source[i];
                 i++;
@@ -468,6 +1036,17 @@ const isHexDigit = (char)=>isDigit(char) || char >= "a" && char <= "f" || char >
                 throw new Error(ERROR_MESSAGES.UNSUPPORTED("unterminated string literal"));
             }
             i++; // consume closing quote
+            if (expressions.length > 0) {
+                chunks.push(value);
+                tokens.push({
+                    kind: "template",
+                    value: JSON.stringify({
+                        chunks,
+                        expressions
+                    })
+                });
+                continue;
+            }
             tokens.push({
                 kind: "string",
                 value
@@ -511,6 +1090,14 @@ const isHexDigit = (char)=>isDigit(char) || char >= "a" && char <= "f" || char >
                     }
                 }
             }
+            if (source[i] === "n") {
+                i++;
+                tokens.push({
+                    kind: "bigint",
+                    value: value.replace(/_/g, "")
+                });
+                continue;
+            }
             tokens.push({
                 kind: "number",
                 value: value.replace(/_/g, "")
@@ -561,6 +1148,24 @@ const isHexDigit = (char)=>isDigit(char) || char >= "a" && char <= "f" || char >
     constructor(tokens){
         this.tokens = tokens;
     }
+    /** Inserts tokens at the cursor, bracketed so they keep their own precedence. */ splice(tokens) {
+        const bracketed = [
+            {
+                kind: "punctuation",
+                value: "("
+            },
+            ...tokens,
+            {
+                kind: "punctuation",
+                value: ")"
+            }
+        ];
+        this.tokens = [
+            ...this.tokens.slice(0, this.index),
+            ...bracketed,
+            ...this.tokens.slice(this.index)
+        ];
+    }
     get isAtEnd() {
         return this.index >= this.tokens.length;
     }
@@ -575,10 +1180,108 @@ const isHexDigit = (char)=>isDigit(char) || char >= "a" && char <= "f" || char >
         this.index++;
         return token;
     }
+    /** The tokens of one statement's value, through the `;` or block end that closes it. */ takeStatementTokens() {
+        const tokens = [];
+        let depth = 0;
+        while(!this.isAtEnd){
+            const token = this.peek();
+            if (token.kind === "punctuation") {
+                if (token.value === "(" || token.value === "[" || token.value === "{") {
+                    depth++;
+                } else if (token.value === ")" || token.value === "]" || token.value === "}") {
+                    if (depth === 0) {
+                        break;
+                    }
+                    depth--;
+                } else if (token.value === ";" && depth === 0) {
+                    this.next();
+                    break;
+                }
+            }
+            tokens.push(this.next());
+        }
+        if (tokens.length === 0) {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED("a declaration with no value"));
+        }
+        return tokens;
+    }
     isPunctuation(value, offset = 0) {
         const token = this.peek(offset);
         return token != null && token.kind === "punctuation" && token.value === value;
     }
+    /**
+     * Whether the group starting here holds a value rather than a condition.
+     *
+     * `(a && b)` is a boolean sub-expression; `(x.name ?? '') === 'ada'` and `(x.name).length` are
+     * values. Only the token after the matching bracket tells them apart, so the decision is made by
+     * looking ahead rather than by parsing one way and catching the failure — a rewind on exception
+     * would swallow a genuine syntax error inside the group and report it as something else.
+     */ groupIsValue() {
+        let depth = 0;
+        let at = this.index;
+        for(; at < this.tokens.length; at++){
+            const token = this.tokens[at];
+            if (token.kind !== "punctuation") {
+                continue;
+            }
+            if (token.value === "(") {
+                depth++;
+                continue;
+            }
+            if (token.value === ")") {
+                depth--;
+                if (depth === 0) {
+                    break;
+                }
+            }
+        }
+        const after = this.tokens[at + 1];
+        if (after == null || after.kind !== "punctuation") {
+            return false;
+        }
+        return COMPARISON_OPERATORS[after.value] != null || after.value === "." || after.value === "?.";
+    }
+    /** Whether a `?` sits at the top level of what is left, so this is a conditional. */ holdsConditional() {
+        let depth = 0;
+        for(let at = this.index; at < this.tokens.length; at++){
+            const token = this.tokens[at];
+            if (token.kind !== "punctuation") {
+                continue;
+            }
+            if (token.value === "(" || token.value === "[") {
+                depth++;
+            } else if (token.value === ")" || token.value === "]") {
+                depth--;
+            } else if (token.value === "?" && depth === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /** Whether the group starting here is `( … ? … : … )` rather than a plain value. */ groupHoldsConditional() {
+        let depth = 0;
+        for(let at = this.index; at < this.tokens.length; at++){
+            const token = this.tokens[at];
+            if (token.kind !== "punctuation") {
+                continue;
+            }
+            if (token.value === "(") {
+                depth++;
+                continue;
+            }
+            if (token.value === ")") {
+                depth--;
+                if (depth === 0) {
+                    return false;
+                }
+                continue;
+            }
+            if (token.value === "?" && depth === 1) {
+                return true;
+            }
+        }
+        return false;
+    }
     matchPunctuation(value) {
         if (this.isPunctuation(value)) {
             this.index++;
@@ -592,12 +1295,104 @@ const isHexDigit = (char)=>isDigit(char) || char >= "a" && char <= "f" || char >
         }
     }
 }
-const COMPARATOR_METHODS = {
+/**
+ * Calls JavaScript binds LOOSER than a comparison.
+ *
+ * This grammar reads a comparison's operands as values, which puts these tighter than they belong:
+ * `x.flags & 6 === 2` is `x.flags & (6 === 2)` in JavaScript and would be read here as
+ * `(x.flags & 6) === 2`. The two answer differently, so an ungrouped one is refused rather than
+ * reinterpreted — the filter then runs in memory against the caller's own function, which is right by
+ * construction. Brackets say which was meant, and JavaScript itself makes an unbracketed `??` mix a
+ * syntax error for the same reason.
+ */ const LOOSER_THAN_COMPARISON = [
+    "bit-and",
+    "bit-or",
+    "bit-xor",
+    "coalesce"
+];
+const needsBrackets = (operand)=>operand.kind === "arithmetic" && operand.grouped !== true && LOOSER_THAN_COMPARISON.includes(operand.call);
+/** JavaScript precedence: `*`, `/`, `%` bind tighter than `+` and `-`. */ const MULTIPLICATIVE_OPERATORS = sourceKeyed({
+    "*": "multiply",
+    "/": "divide",
+    "%": "modulo"
+});
+const ADDITIVE_OPERATORS = sourceKeyed({
+    "+": "add",
+    "-": "subtract"
+});
+const SHIFT_OPERATORS = sourceKeyed({
+    "<<": "shift-left",
+    ">>": "shift-right",
+    ">>>": "shift-right-unsigned"
+});
+const BITWISE_AND_OPERATORS = sourceKeyed({
+    "&": "bit-and"
+});
+const BITWISE_XOR_OPERATORS = sourceKeyed({
+    "^": "bit-xor"
+});
+const BITWISE_OR_OPERATORS = sourceKeyed({
+    "|": "bit-or"
+});
+const COALESCE_OPERATORS = sourceKeyed({
+    "??": "coalesce"
+});
+/** Whether a schema property is reachable in here, which decides which side of a comparison it is. */ const containsProperty = (operand)=>{
+    if (operand.kind === "property") {
+        return true;
+    }
+    if (operand.kind === "conditional") {
+        // A comparison always names a schema property, so the condition alone settles it
+        return true;
+    }
+    if (operand.kind === "opaque") {
+        return operand.reads.some(containsProperty);
+    }
+    return operand.kind === "arithmetic" && (containsProperty(operand.left) || containsProperty(operand.right) || operand.extra != null && containsProperty(operand.extra));
+};
+const DECLARATION_KEYWORDS = new Set([
+    "const",
+    "let",
+    "var"
+]);
+/** An operand whose value only a row can supply. */ const UNKNOWN_UNTIL_ROW = Symbol("unknown until row");
+/** The empty argument slot of a unary call. Compared by identity, so a real `undefined` still counts. */ const NO_ARGUMENT = Object.freeze({
+    kind: "value",
+    value: undefined,
+    transformer: null,
+    locale: null
+});
+const noArgument = ()=>NO_ARGUMENT;
+/** A predicate no row satisfies. Never reaches a tree: no expression node means "match nothing". */ const NEVER = "never";
+const and = (left, right)=>{
+    if (_types__rspack_import_1/* .Expression.isEmpty */.r4.isEmpty(left)) {
+        return right;
+    }
+    if (_types__rspack_import_1/* .Expression.isEmpty */.r4.isEmpty(right)) {
+        return left;
+    }
+    return new _types__rspack_import_1/* .OperatorExpression */.fw({
+        operator: "&&",
+        left,
+        right
+    });
+};
+const or = (left, right)=>{
+    if (_types__rspack_import_1/* .Expression.isEmpty */.r4.isEmpty(left) || _types__rspack_import_1/* .Expression.isEmpty */.r4.isEmpty(right)) {
+        return _types__rspack_import_1/* .Expression.EMPTY */.r4.EMPTY;
+    }
+    return new _types__rspack_import_1/* .OperatorExpression */.fw({
+        operator: "||",
+        left,
+        right
+    });
+};
+const COMPARATOR_METHODS = sourceKeyed({
     startsWith: "starts-with",
     endsWith: "ends-with",
     includes: "includes"
-};
-const TRANSFORM_METHODS = {
+});
+const TRANSFORM_METHODS = sourceKeyed({
     toLowerCase: {
         transformer: "to-lower-case",
         locale: null
@@ -614,8 +1409,8 @@ const TRANSFORM_METHODS = {
         transformer: "to-upper-case",
         locale: "en-US"
     }
-};
-const COMPARISON_OPERATORS = {
+});
+const COMPARISON_OPERATORS = sourceKeyed({
     "==": {
         comparator: "equals",
         negated: false,
@@ -656,7 +1451,7 @@ const COMPARISON_OPERATORS = {
         negated: false,
         strict: false
     }
-};
+});
 const SWAPPED_COMPARATORS = {
     "equals": "equals",
     "greater-than": "less-than",
@@ -727,16 +1522,21 @@ const resolveParamPath = (paramsName, path, data)=>{
  */ class ExpressionParser {
     schema;
     stream;
-    entityName;
+    scope;
     paramsName;
     params;
+    /**
+     * Whether this parses a value selector rather than a filter, and so reads a call it has no node for
+     * as an `OpaqueOperand` instead of refusing it.
+     */ readsValues;
     /** Set when a param value shaped the tree itself (e.g. x[p.name]) — such templates cannot be cached. */ structurallyDependsOnParams = false;
-    constructor(schema, stream, entityName, paramsName, params){
+    constructor(schema, stream, scope, paramsName, params, readsValues = false){
         this.schema = schema;
         this.stream = stream;
-        this.entityName = entityName;
+        this.scope = scope;
         this.paramsName = paramsName;
         this.params = params;
+        this.readsValues = readsValues;
     }
     parse() {
         const expression = this.parseOr();
@@ -745,6 +1545,245 @@ const resolveParamPath = (paramsName, path, data)=>{
         }
         return expression;
     }
+    parseBody() {
+        if (!this.stream.isPunctuation("{")) {
+            return this.parse();
+        }
+        const answer = this.parseBlock();
+        if (!this.stream.isAtEnd) {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED(`unexpected token '${this.stream.peek()?.value}'`));
+        }
+        if (answer === NEVER) {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED("a predicate no row can satisfy"));
+        }
+        return answer;
+    }
+    /**
+     * What a value selector returns: one value, or the fields of an object literal.
+     *
+     * A block body is read only when it does nothing but return, which is what a transpiler makes of an
+     * arrow function. Anything more is refused, and the caller falls back to running the function.
+     */ parseSelector() {
+        const block = this.stream.matchPunctuation("{");
+        if (block) {
+            const keyword = this.stream.next();
+            if (keyword.kind !== "identifier" || keyword.value !== "return") {
+                throw new Error(ERROR_MESSAGES.UNSUPPORTED("a selector block that does more than return"));
+            }
+        }
+        const selected = this.stream.isPunctuation("{") ? this.parseObjectLiteral() : this.stream.isPunctuation("(") && this.stream.isPunctuation("{", 1) ? this.parseBracketedObjectLiteral() : this.parseInterpolation();
+        if (block) {
+            this.stream.matchPunctuation(";");
+            this.stream.expectPunctuation("}");
+        }
+        if (!this.stream.isAtEnd) {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED(`unexpected token '${this.stream.peek()?.value}'`));
+        }
+        return selected;
+    }
+    /** `({ … })`, the arrow body that returns an object. */ parseBracketedObjectLiteral() {
+        this.stream.expectPunctuation("(");
+        const fields = this.parseObjectLiteral();
+        this.stream.expectPunctuation(")");
+        return fields;
+    }
+    /**
+     * The fields of an object literal, each one value.
+     *
+     * A field's value is read without a top-level conditional, which needs brackets here: the look-ahead
+     * for a `?` does not stop at the comma that ends the field.
+     */ parseObjectLiteral() {
+        this.stream.expectPunctuation("{");
+        const fields = [];
+        while(!this.stream.matchPunctuation("}")){
+            const key = this.stream.next();
+            if (key.kind !== "identifier" && key.kind !== "string") {
+                throw new Error(ERROR_MESSAGES.UNSUPPORTED(`the object key '${key.value}'`));
+            }
+            fields.push({
+                name: key.value,
+                operand: this.stream.matchPunctuation(":") ? this.parseValue() : this.parseShorthand(key)
+            });
+            if (!this.stream.matchPunctuation(",")) {
+                this.stream.expectPunctuation("}");
+                break;
+            }
+        }
+        return fields;
+    }
+    /** `{ name }`, which reads what the parameter list bound `name` to. */ parseShorthand(key) {
+        const binding = key.kind === "identifier" ? this.scope.get(key.value) : undefined;
+        if (binding == null || binding.kind === "inlined") {
+            throw new Error(ERROR_MESSAGES.VARIABLE_VALUE(key.value));
+        }
+        return this.parseChain({
+            kind: binding.kind,
+            path: [
+                ...binding.path
+            ]
+        });
+    }
+    /** The expression a `{ … }` block answers with. */ parseBlock() {
+        this.stream.expectPunctuation("{");
+        const answer = this.parseStatements();
+        this.stream.expectPunctuation("}");
+        return answer;
+    }
+    /** Statements up to the one that returns. What follows a `return` is never read, as in JavaScript. */ parseStatements() {
+        if (this.stream.isPunctuation("}") || this.stream.isAtEnd) {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED("a block body that returns nothing"));
+        }
+        const keyword = this.stream.peek();
+        if (keyword == null || keyword.kind !== "identifier") {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED(`a statement starting '${keyword?.value}'`));
+        }
+        if (DECLARATION_KEYWORDS.has(keyword.value)) {
+            this.declare();
+            return this.parseStatements();
+        }
+        if (keyword.value === "return") {
+            this.stream.next();
+            const answer = this.parseReturnedCondition();
+            this.stream.matchPunctuation(";");
+            return answer;
+        }
+        if (keyword.value === "if") {
+            return this.parseIfStatement();
+        }
+        if (keyword.value === "switch") {
+            return this.parseSwitchStatement();
+        }
+        throw new Error(ERROR_MESSAGES.UNSUPPORTED(`the statement '${keyword.value}'`));
+    }
+    /**
+     * Binds a `const`/`let`/`var` name to the tokens of its initializer — tokens rather than a parsed
+     * expression, so the name works as an operand, an argument, or a call receiver alike.
+     */ declare() {
+        this.stream.next();
+        const name = this.stream.next();
+        if (name.kind !== "identifier") {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED(`the declaration '${name.value}'`));
+        }
+        this.stream.expectPunctuation("=");
+        this.scope.set(name.value, {
+            kind: "inlined",
+            tokens: this.stream.takeStatementTokens()
+        });
+    }
+    /** `return false` on its own, which no row satisfies, and every other returned condition. */ parseReturnedCondition() {
+        const next = this.stream.peek();
+        const after = this.stream.peek(1);
+        const endsHere = after == null || after.kind === "punctuation" && (after.value === ";" || after.value === "}");
+        if (next != null && next.kind === "identifier" && next.value === "false" && endsHere) {
+            this.stream.next();
+            return NEVER;
+        }
+        return this.parseOr();
+    }
+    parseIfStatement() {
+        this.stream.next();
+        this.stream.expectPunctuation("(");
+        const condition = this.parseOr();
+        this.stream.expectPunctuation(")");
+        const whenTrue = this.parseBranch();
+        if (this.stream.peek()?.value === "else") {
+            this.stream.next();
+            return this.either(condition, whenTrue, this.parseBranch());
+        }
+        // Without an `else`, the statements after the `if` are the other branch
+        return this.either(condition, whenTrue, this.parseStatements());
+    }
+    /** One arm of an `if`: a block, or a single statement. */ parseBranch() {
+        return this.stream.isPunctuation("{") ? this.parseBlock() : this.parseStatements();
+    }
+    /** A `switch` over one subject, as the disjunction of its cases. */ parseSwitchStatement() {
+        this.stream.next();
+        this.stream.expectPunctuation("(");
+        const subject = this.parseValue();
+        this.stream.expectPunctuation(")");
+        this.stream.expectPunctuation("{");
+        let matching = null;
+        let pending = [];
+        let everyLabel = [];
+        let byDefault = null;
+        let anyCaseBroke = false;
+        while(!this.stream.matchPunctuation("}")){
+            const label = this.stream.next();
+            if (label.kind !== "identifier" || label.value !== "case" && label.value !== "default") {
+                throw new Error(ERROR_MESSAGES.UNSUPPORTED(`'${label.value}' inside a switch`));
+            }
+            if (label.value === "case") {
+                const test = this.buildComparison(subject, COMPARISON_OPERATORS["==="], this.parseValue());
+                pending.push(test);
+                everyLabel.push(test);
+            }
+            this.stream.expectPunctuation(":");
+            // `case 'a':` with no body of its own runs the next case's body
+            if (this.stream.peek()?.value === "case" || this.stream.peek()?.value === "default") {
+                continue;
+            }
+            if (this.stream.peek()?.value === "break") {
+                this.stream.next();
+                this.stream.matchPunctuation(";");
+                anyCaseBroke = true;
+                pending = [];
+                continue;
+            }
+            const body = this.parseCaseBody();
+            if (label.value === "default") {
+                byDefault = body === NEVER ? null : body;
+                continue;
+            }
+            if (body !== NEVER && pending.length > 0) {
+                const reached = pending.reduce((left, right)=>or(left, right));
+                const term = _types__rspack_import_1/* .Expression.isEmpty */.r4.isEmpty(body) ? reached : and(reached, body);
+                matching = matching == null ? term : or(matching, term);
+            }
+            pending = [];
+        }
+        // Falling out of the switch continues after it, so the statements there are the default too
+        const afterSwitch = byDefault == null && !this.stream.isPunctuation("}") && !this.stream.isAtEnd ? this.parseStatements() : NEVER;
+        if (afterSwitch !== NEVER) {
+            // A `break` also continues after the switch, so its case would take that answer rather
+            // than none — a distinction this rewrite cannot carry
+            if (anyCaseBroke) {
+                throw new Error(ERROR_MESSAGES.UNSUPPORTED("a switch that breaks and then falls into more statements"));
+            }
+            byDefault = afterSwitch;
+        }
+        // A `default` runs only when every case failed, wherever it was written
+        if (byDefault != null) {
+            const noCaseMatched = everyLabel.length === 0 ? byDefault : and(this.negateExpression(everyLabel.reduce((left, right)=>or(left, right))), byDefault);
+            matching = matching == null ? noCaseMatched : or(matching, noCaseMatched);
+        }
+        return matching ?? NEVER;
+    }
+    /** One case body, and the `break` that may follow its `return`. */ parseCaseBody() {
+        const answer = this.parseStatements();
+        if (this.stream.peek()?.value === "break") {
+            this.stream.next();
+            this.stream.matchPunctuation(";");
+        }
+        return answer;
+    }
+    /**
+     * The predicate an `if`/`else` answers: `(condition && whenTrue) || (!condition && whenFalse)`,
+     * with each case below that form after a constant branch cancels out.
+     */ either(condition, whenTrue, whenFalse) {
+        if (whenTrue === NEVER) {
+            return whenFalse === NEVER ? NEVER : and(this.negateExpression(condition), whenFalse);
+        }
+        if (whenFalse === NEVER) {
+            return and(condition, whenTrue);
+        }
+        if (_types__rspack_import_1/* .Expression.isEmpty */.r4.isEmpty(whenTrue)) {
+            return or(condition, whenFalse);
+        }
+        if (_types__rspack_import_1/* .Expression.isEmpty */.r4.isEmpty(whenFalse)) {
+            return or(this.negateExpression(condition), whenTrue);
+        }
+        return or(and(condition, whenTrue), and(this.negateExpression(condition), whenFalse));
+    }
     // || binds loosest, so it sits at the root of the parse
     parseOr() {
         let left = this.parseAnd();
@@ -792,10 +1831,18 @@ const resolveParamPath = (paramsName, path, data)=>{
     /**
      * Applies `!` to an already-parsed expression: comparators flip their
      * negated flag, compound expressions distribute via De Morgan's laws.
+     *
+     * Builds a new tree rather than flipping the flag in place, because an `if` uses its condition
+     * twice — once negated — and a shared node would carry the flip into both branches.
      */ negateExpression(expression) {
         if (expression instanceof _types__rspack_import_1/* .ComparatorExpression */.bQ) {
-            expression.negated = !expression.negated;
-            return expression;
+            return new _types__rspack_import_1/* .ComparatorExpression */.bQ({
+                comparator: expression.comparator,
+                negated: !expression.negated,
+                strict: expression.strict,
+                left: expression.left,
+                right: expression.right
+            });
         }
         if (expression instanceof _types__rspack_import_1/* .OperatorExpression */.fw && expression.left != null && expression.right != null) {
             return new _types__rspack_import_1/* .OperatorExpression */.fw({
@@ -804,27 +1851,127 @@ const resolveParamPath = (paramsName, path, data)=>{
                 right: this.negateExpression(expression.right)
             });
         }
-        throw new Error(ERROR_MESSAGES.UNSUPPORTED("'!' on this expression"));
+        throw new Error(ERROR_MESSAGES.UNSUPPORTED("'!' on this expression"));
+    }
+    parseComparison() {
+        /**
+         * A parenthesised group is either a boolean sub-expression or a VALUE — `(a && b)` against
+         * `(x.name ?? '') === 'ada'` — and which one it is is only known at the closing bracket, by
+         * what follows. So the boolean reading is tried first and rewound if a comparator turns up.
+         */ if (this.stream.isPunctuation("(") && this.stream.groupIsValue() === false) {
+            this.stream.next();
+            const expression = this.parseOr();
+            this.stream.expectPunctuation(")");
+            return expression;
+        }
+        const left = this.parseValue();
+        const operatorToken = this.stream.peek();
+        if (operatorToken != null && operatorToken.kind === "punctuation" && COMPARISON_OPERATORS[operatorToken.value] != null) {
+            this.stream.next();
+            const right = this.parseValue();
+            return this.buildComparison(left, COMPARISON_OPERATORS[operatorToken.value], right);
+        }
+        return this.buildStandalone(left);
+    }
+    /**
+     * A value, at JavaScript's precedence.
+     *
+     * Lowest first: the conditional operator, then nullish coalescing, then the bitwise levels, then
+     * the shifts, then the arithmetic. Comparison sits between the shifts and the bitwise levels in
+     * JavaScript, but a comparison is a boolean and is handled by `parseComparison` above, so this
+     * chain skips it — a bitwise operand here is always a value.
+     */ /**
+     * An operand from its own source, sharing this parser's schema and parameter names.
+     *
+     * A structural dependence found inside propagates outward: the template it belongs to cannot be
+     * cached either.
+     */ parseNested(source) {
+        const nested = new ExpressionParser(this.schema, new TokenStream(tokenize(source)), this.scope, this.paramsName, this.params, this.readsValues);
+        const operand = nested.parseInterpolation();
+        // Leftover tokens mean the interpolation held something this reads only part of. Silently
+        // keeping the part it understood is the worst outcome available: `${x.age > 5 ? "a" : "b"}`
+        // would become `x.age`, and the filter would answer a question nobody asked.
+        if (nested.stream.isAtEnd === false) {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED("an interpolation this parser reads only part of"));
+        }
+        if (nested.structurallyDependsOnParams === true) {
+            this.structurallyDependsOnParams = true;
+        }
+        return operand;
+    }
+    /**
+     * The whole of one `${…}`.
+     *
+     * A conditional is read here rather than in `parseValue`, because an interpolation is the one
+     * place a conditional appears without brackets around it.
+     */ parseInterpolation() {
+        if (this.stream.holdsConditional()) {
+            const condition = this.parseOr();
+            this.stream.expectPunctuation("?");
+            const whenTrue = this.parseValue();
+            this.stream.expectPunctuation(":");
+            const whenFalse = this.parseValue();
+            return {
+                kind: "conditional",
+                condition,
+                whenTrue,
+                whenFalse
+            };
+        }
+        return this.parseValue();
     }
-    parseComparison() {
-        // Parenthesized group
-        if (this.stream.matchPunctuation("(")) {
-            const expression = this.parseOr();
-            this.stream.expectPunctuation(")");
-            const trailing = this.stream.peek();
-            if (trailing != null && trailing.kind === "punctuation" && COMPARISON_OPERATORS[trailing.value] != null) {
-                throw new Error(ERROR_MESSAGES.UNSUPPORTED("comparison against a parenthesized expression"));
-            }
-            return expression;
-        }
+    parseValue() {
+        return this.parseCoalesce();
+    }
+    parseCoalesce() {
+        return this.parseBinary(COALESCE_OPERATORS, ()=>this.parseBitwiseOr());
+    }
+    parseBitwiseOr() {
+        return this.parseBinary(BITWISE_OR_OPERATORS, ()=>this.parseBitwiseXor());
+    }
+    parseBitwiseXor() {
+        return this.parseBinary(BITWISE_XOR_OPERATORS, ()=>this.parseBitwiseAnd());
+    }
+    parseBitwiseAnd() {
+        return this.parseBinary(BITWISE_AND_OPERATORS, ()=>this.parseShift());
+    }
+    parseShift() {
+        return this.parseBinary(SHIFT_OPERATORS, ()=>this.parseAdditive());
+    }
+    parseAdditive() {
+        return this.parseBinary(ADDITIVE_OPERATORS, ()=>this.parseMultiplicative());
+    }
+    parseMultiplicative() {
+        return this.parseBinary(MULTIPLICATIVE_OPERATORS, ()=>this.parseExponent());
+    }
+    /** `**` is RIGHT-associative: `2 ** 3 ** 2` is 2 ** 9, not 8 ** 2. */ parseExponent() {
         const left = this.parseOperand();
-        const operatorToken = this.stream.peek();
-        if (operatorToken != null && operatorToken.kind === "punctuation" && COMPARISON_OPERATORS[operatorToken.value] != null) {
+        if (this.stream.isPunctuation("**") === false) {
+            return left;
+        }
+        this.stream.next();
+        return {
+            kind: "arithmetic",
+            call: "power",
+            left,
+            right: this.parseExponent()
+        };
+    }
+    /** Left-associative, so `a - b - c` is `(a - b) - c` rather than `a - (b - c)`. */ parseBinary(operators, next) {
+        let left = next();
+        for(;;){
+            const token = this.stream.peek();
+            if (token == null || token.kind !== "punctuation" || operators[token.value] == null) {
+                return left;
+            }
             this.stream.next();
-            const right = this.parseOperand();
-            return this.buildComparison(left, COMPARISON_OPERATORS[operatorToken.value], right);
+            left = {
+                kind: "arithmetic",
+                call: operators[token.value],
+                left,
+                right: next()
+            };
         }
-        return this.buildStandalone(left);
     }
     parseOperand() {
         const token = this.stream.peek();
@@ -849,6 +1996,131 @@ const resolveParamPath = (paramsName, path, data)=>{
                 locale: null
             };
         }
+        // A parenthesised VALUE — `(x.price & 1)`, `(x.name ?? '')`. The boolean reading of a group
+        // is handled in parseComparison; by the time an operand sees one it is arithmetic.
+        if (token.kind === "punctuation" && token.value === "(") {
+            const conditional = this.stream.groupHoldsConditional();
+            this.stream.next();
+            if (conditional === true) {
+                const condition = this.parseOr();
+                this.stream.expectPunctuation("?");
+                const whenTrue = this.parseValue();
+                this.stream.expectPunctuation(":");
+                const whenFalse = this.parseValue();
+                this.stream.expectPunctuation(")");
+                return {
+                    kind: "conditional",
+                    condition,
+                    whenTrue,
+                    whenFalse
+                };
+            }
+            const inner = this.parseValue();
+            this.stream.expectPunctuation(")");
+            const grouped = inner.kind === "arithmetic" ? {
+                ...inner,
+                grouped: true
+            } : inner;
+            return this.withGroupCall(grouped);
+        }
+        /**
+         * A template with interpolation, folded into `concat`.
+         *
+         * Each `${…}` was kept as source by the tokenizer and is parsed by its own stream, so it can
+         * hold anything an operand can — a property, a param, arithmetic, another template. Empty
+         * chunks are dropped: `${a}${b}` is two operands, not two operands and three empty strings.
+         */ if (token.kind === "template") {
+            this.stream.next();
+            const { chunks, expressions } = JSON.parse(token.value);
+            const pieces = [];
+            for(let at = 0; at < chunks.length; at++){
+                if (chunks[at].length > 0) {
+                    pieces.push({
+                        kind: "value",
+                        value: chunks[at],
+                        transformer: null,
+                        locale: null
+                    });
+                }
+                if (at < expressions.length) {
+                    pieces.push(this.parseNested(expressions[at]));
+                }
+            }
+            if (pieces.length === 0) {
+                return {
+                    kind: "value",
+                    value: "",
+                    transformer: null,
+                    locale: null
+                };
+            }
+            // One piece and no chunk means no concat to do the coercion, so the conversion has to be
+            // explicit: `` `${x.age}` `` is the STRING "9", not the number 9.
+            if (pieces.length === 1) {
+                const only = pieces[0];
+                const alreadyText = only.kind === "value" && typeof only.value === "string";
+                return alreadyText ? only : {
+                    kind: "arithmetic",
+                    call: "to-string",
+                    left: only,
+                    right: noArgument()
+                };
+            }
+            return pieces.reduce((left, right)=>({
+                    kind: "arithmetic",
+                    call: "concat",
+                    left,
+                    right
+                }));
+        }
+        if (token.kind === "bigint") {
+            this.stream.next();
+            return {
+                kind: "value",
+                value: BigInt(token.value),
+                transformer: null,
+                locale: null
+            };
+        }
+        if (token.kind === "regex") {
+            this.stream.next();
+            const [source, flags] = token.value.split("\u0000");
+            const pattern = {
+                kind: "value",
+                value: new RegExp(source, flags),
+                transformer: null,
+                locale: null
+            };
+            // `/^a/.test(x.name)` — the pattern is the literal, the subject is the argument, and the
+            // tree puts them the other way round: the property is what the call applies to.
+            if (this.stream.isPunctuation(".")) {
+                const method = this.stream.peek(1);
+                if (method != null && method.kind === "identifier" && method.value === "test") {
+                    this.stream.next();
+                    this.stream.next();
+                    this.stream.expectPunctuation("(");
+                    const subject = this.parseValue();
+                    this.stream.expectPunctuation(")");
+                    return {
+                        kind: "arithmetic",
+                        call: "matches",
+                        left: subject,
+                        right: pattern
+                    };
+                }
+            }
+            return pattern;
+        }
+        if (token.kind === "punctuation" && token.value === "~") {
+            this.stream.next();
+            // Unary, so the tree carries the operand and no argument
+            return {
+                kind: "arithmetic",
+                call: "bit-not",
+                left: this.parseOperand(),
+                right: noArgument()
+            };
+        }
         if (token.kind === "punctuation" && token.value === "-") {
             this.stream.next();
             const numberToken = this.stream.next();
@@ -906,6 +2178,9 @@ const resolveParamPath = (paramsName, path, data)=>{
             if (argument.kind === "method-call") {
                 throw new Error(ERROR_MESSAGES.UNSUPPORTED("nested method call inside .includes()"));
             }
+            if (argument.kind === "arithmetic" || argument.kind === "conditional" || argument.kind === "opaque") {
+                throw new Error(ERROR_MESSAGES.UNSUPPORTED("arithmetic inside .includes()"));
+            }
             return {
                 kind: "method-call",
                 target: array,
@@ -951,16 +2226,17 @@ const resolveParamPath = (paramsName, path, data)=>{
                 locale: null
             };
         }
-        if (root === this.entityName) {
-            return this.parseChain({
-                kind: "property",
-                root
-            });
-        }
-        if (this.paramsName != null && root === this.paramsName) {
+        const binding = this.scope.get(root);
+        if (binding != null) {
+            if (binding.kind === "inlined") {
+                this.stream.splice(binding.tokens);
+                return this.parseOperand();
+            }
             return this.parseChain({
-                kind: "param",
-                root
+                kind: binding.kind,
+                path: [
+                    ...binding.path
+                ]
             });
         }
         // A bare variable from the outer scope — its value cannot be derived from source text
@@ -970,7 +2246,7 @@ const resolveParamPath = (paramsName, path, data)=>{
      * Parses the segments after an entity/params root: dot access, bracket
      * access, transform methods and comparator methods.
      */ parseChain(options) {
-        const path = [];
+        const path = options.path;
         let transformer = null;
         let locale = null;
         while(true){
@@ -996,6 +2272,9 @@ const resolveParamPath = (paramsName, path, data)=>{
                         if (argument.kind === "method-call") {
                             throw new Error(ERROR_MESSAGES.UNSUPPORTED(`nested method call inside .${method}()`));
                         }
+                        if (argument.kind === "arithmetic" || argument.kind === "conditional" || argument.kind === "opaque") {
+                            throw new Error(ERROR_MESSAGES.UNSUPPORTED(`arithmetic inside .${method}()`));
+                        }
                         return {
                             kind: "method-call",
                             target: this.resolveChain(options.kind, path, transformer, locale),
@@ -1003,9 +2282,20 @@ const resolveParamPath = (paramsName, path, data)=>{
                             argument
                         };
                     }
+                    if (this.readsValues) {
+                        return this.withGroupCall(this.opaqueCall(this.resolveChain(options.kind, path, transformer, locale)));
+                    }
                     throw new Error(ERROR_MESSAGES.UNSUPPORTED(`method '.${method}()'`));
                 }
                 if (transformer != null) {
+                    if (this.readsValues) {
+                        return this.withGroupCall({
+                            kind: "opaque",
+                            reads: [
+                                this.resolveChain(options.kind, path, transformer, locale)
+                            ]
+                        });
+                    }
                     throw new Error(ERROR_MESSAGES.UNSUPPORTED("property access after a transform method"));
                 }
                 path.push(segment.value);
@@ -1032,12 +2322,15 @@ const resolveParamPath = (paramsName, path, data)=>{
         // docs/mutation-backlog.md) — every mutation of this four-conjunct guard reroutes
         // bracket access between two paths that both collapse to NOT_PARSABLE; the
         // experiment recorded there aimed 30 tests at this line and killed none.
-        if (kind === "property" && token.kind === "identifier" && this.paramsName != null && token.value === this.paramsName) {
-            const paramPath = [];
+        const binding = token.kind === "identifier" ? this.scope.get(token.value) : undefined;
+        if (kind === "property" && binding != null && binding.kind === "param") {
+            const paramPath = [
+                ...binding.path
+            ];
             while(this.stream.matchPunctuation(".") || this.stream.matchPunctuation("?.")){
                 paramPath.push(this.stream.next().value);
             }
-            const resolved = resolveParamPath(this.paramsName, paramPath, this.params);
+            const resolved = resolveParamPath(this.paramsName ?? token.value, paramPath, this.params);
             if (typeof resolved !== "string") {
                 throw new ParamDependentParseError(ERROR_MESSAGES.PROPERTY_NOT_FOUND(paramPath.join(".")));
             }
@@ -1090,6 +2383,96 @@ const resolveParamPath = (paramsName, path, data)=>{
             locale
         };
     }
+    /**
+     * A call on a parenthesised value: `(x.name).toLowerCase()`, `(x.age + 1).length`. Any operand can
+     * receive one here, unlike a property chain, which carries at most one transform.
+     */ withGroupCall(operand) {
+        let receiver = operand;
+        while(this.stream.isPunctuation(".") || this.stream.isPunctuation("?.")){
+            const segment = this.stream.peek(1);
+            if (segment == null || segment.kind !== "identifier") {
+                break;
+            }
+            if (segment.value === "length" && !this.stream.isPunctuation("(", 2)) {
+                this.stream.next();
+                this.stream.next();
+                receiver = {
+                    kind: "arithmetic",
+                    call: "length",
+                    left: receiver,
+                    right: noArgument()
+                };
+                continue;
+            }
+            const transform = TRANSFORM_METHODS[segment.value];
+            if (transform != null) {
+                this.stream.next();
+                this.stream.next();
+                this.stream.expectPunctuation("(");
+                this.stream.expectPunctuation(")");
+                receiver = {
+                    kind: "arithmetic",
+                    call: transform.transformer,
+                    left: receiver,
+                    right: transform.locale == null ? noArgument() : {
+                        kind: "value",
+                        value: transform.locale,
+                        transformer: null,
+                        locale: null
+                    }
+                };
+                continue;
+            }
+            // A comparator method needs a property target, which only an ungrouped chain produces
+            if (COMPARATOR_METHODS[segment.value] != null && receiver.kind === "property") {
+                this.stream.next();
+                this.stream.next();
+                this.stream.expectPunctuation("(");
+                const argument = this.parseOperand();
+                this.stream.expectPunctuation(")");
+                if (argument.kind !== "property" && argument.kind !== "value" && argument.kind !== "param") {
+                    throw new Error(ERROR_MESSAGES.UNSUPPORTED(`'.${segment.value}()' on that argument`));
+                }
+                return {
+                    kind: "method-call",
+                    target: receiver,
+                    method: segment.value,
+                    argument
+                };
+            }
+            // Any other member or call of a value, which a selector reads through
+            if (this.readsValues) {
+                this.stream.next();
+                this.stream.next();
+                receiver = this.stream.isPunctuation("(") ? this.opaqueCall(receiver) : {
+                    kind: "opaque",
+                    reads: [
+                        receiver
+                    ]
+                };
+                continue;
+            }
+            break;
+        }
+        return receiver;
+    }
+    /** A call with no node of its own, from its `(`, kept for what its receiver and arguments read. */ opaqueCall(receiver) {
+        const reads = [
+            receiver
+        ];
+        this.stream.expectPunctuation("(");
+        while(!this.stream.matchPunctuation(")")){
+            reads.push(this.parseValue());
+            if (!this.stream.matchPunctuation(",")) {
+                this.stream.expectPunctuation(")");
+                break;
+            }
+        }
+        return {
+            kind: "opaque",
+            reads
+        };
+    }
     withValueTransformer(operand) {
         if (this.stream.isPunctuation(".")) {
             const method = this.stream.peek(1);
@@ -1123,12 +2506,26 @@ const resolveParamPath = (paramsName, path, data)=>{
         if (right.kind === "method-call") {
             throw new Error(ERROR_MESSAGES.UNSUPPORTED("method call on the right side of a comparison"));
         }
-        if (left.kind === "property" && right.kind === "property") {
-            // Casing transformers are only valid with string-matching comparators,
-            // which cannot produce a property-to-property comparison
-            if (left.transformer === "to-lower-case" || left.transformer === "to-upper-case" || right.transformer === "to-lower-case" || right.transformer === "to-upper-case") {
-                throw new Error(ERROR_MESSAGES.UNSUPPORTED("transform method outside of startsWith/endsWith/includes"));
+        // A comparison is a tree a backend renders, and this operand has no node in one
+        if (left.kind === "opaque" || right.kind === "opaque") {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED("a call with no expression form inside a comparison"));
+        }
+        if (needsBrackets(left) || needsBrackets(right)) {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED("a bitwise or nullish operator compared without brackets, which JavaScript reads the other way round"));
+        }
+        if (left.kind === "arithmetic" || right.kind === "arithmetic" || left.kind === "conditional" || right.kind === "conditional") {
+            if (containsProperty(left) === false && containsProperty(right) === false) {
+                throw new Error(ERROR_MESSAGES.UNSUPPORTED("arithmetic that references no schema property"));
             }
+            return new _types__rspack_import_1/* .ComparatorExpression */.bQ({
+                comparator: operator.comparator,
+                negated: operator.negated,
+                strict: operator.strict,
+                left: this.createOperandExpression(left),
+                right: this.createOperandExpression(right)
+            });
+        }
+        if (left.kind === "property" && right.kind === "property") {
             return new _types__rspack_import_1/* .ComparatorExpression */.bQ({
                 comparator: operator.comparator,
                 negated: operator.negated,
@@ -1137,18 +2534,63 @@ const resolveParamPath = (paramsName, path, data)=>{
                 right: this.createPropertyExpression(right)
             });
         }
+        // Only a loose comparison coerces. `===` records `strict` and honouring it is the point.
         if (left.kind === "property" && right.kind !== "property") {
-            return this.buildPropertyComparator(left, operator, right, /* applyConverter */ true);
+            return this.buildPropertyComparator(left, operator, right, /* applyConverter */ !operator.strict);
         }
         if (right.kind === "property" && left.kind !== "property") {
             const swapped = {
                 ...operator,
                 comparator: SWAPPED_COMPARATORS[operator.comparator]
             };
-            return this.buildPropertyComparator(right, swapped, left, /* applyConverter */ true);
+            return this.buildPropertyComparator(right, swapped, left, /* applyConverter */ !operator.strict);
+        }
+        const settled = this.settleConstantComparison(left, operator, right);
+        if (settled != null) {
+            return settled;
         }
         throw new Error(ERROR_MESSAGES.UNSUPPORTED("comparison requires a schema property on at least one side"));
     }
+    /**
+     * The answer a comparison of two constants gives, when that answer is `true`. The other answer
+     * excludes every row, which has no expression node.
+     */ settleConstantComparison(left, operator, right) {
+        const leftValue = this.constantOf(left);
+        const rightValue = this.constantOf(right);
+        if (leftValue === UNKNOWN_UNTIL_ROW || rightValue === UNKNOWN_UNTIL_ROW) {
+            return null;
+        }
+        const answer = (0,_evaluate__rspack_import_3/* .evaluate */._3)(new _types__rspack_import_1/* .ComparatorExpression */.bQ({
+            comparator: operator.comparator,
+            negated: operator.negated,
+            strict: operator.strict,
+            left: new _types__rspack_import_1/* .ValueExpression */.Ko({
+                value: leftValue
+            }),
+            right: new _types__rspack_import_1/* .ValueExpression */.Ko({
+                value: rightValue
+            })
+        }), {});
+        if (answer === true) {
+            return _types__rspack_import_1/* .Expression.EMPTY */.r4.EMPTY;
+        }
+        // Params decided this, so the refusal must not be cached against the source: the same filter
+        // with other params can be a tautology.
+        if (left.kind === "param" || right.kind === "param") {
+            throw new ParamDependentParseError(ERROR_MESSAGES.UNSUPPORTED("a params comparison no row satisfies"));
+        }
+        return null;
+    }
+    /** The value an operand holds already, for the operands that do not depend on a row. */ constantOf(operand) {
+        if (operand.kind === "value" && operand.transformer == null) {
+            return operand.value;
+        }
+        if (operand.kind === "param" && operand.transformer == null) {
+            this.structurallyDependsOnParams = true;
+            return resolveParamPath(this.paramsName ?? "params", operand.path, this.params);
+        }
+        return UNKNOWN_UNTIL_ROW;
+    }
     buildStandalone(operand) {
         if (operand.kind === "method-call") {
             return this.buildMethodComparator(operand);
@@ -1171,6 +2613,21 @@ const resolveParamPath = (paramsName, path, data)=>{
                 locale: null
             }, /* applyConverter */ true);
         }
+        // A boolean-valued call standing alone IS the predicate
+        if (operand.kind === "arithmetic" && operand.call === "matches") {
+            return new _types__rspack_import_1/* .ComparatorExpression */.bQ({
+                comparator: "equals",
+                negated: false,
+                strict: false,
+                left: this.createOperandExpression(operand),
+                right: new _types__rspack_import_1/* .ValueExpression */.Ko({
+                    value: true
+                })
+            });
+        }
+        if (operand.kind === "arithmetic" || operand.kind === "conditional") {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED("arithmetic used as a condition rather than compared"));
+        }
         // Constant `true` — a tautology, which parseAnd/parseOr simplify away
         if (operand.kind === "value" && operand.value === true && operand.transformer == null) {
             return _types__rspack_import_1/* .Expression.EMPTY */.r4.EMPTY;
@@ -1223,12 +2680,6 @@ const resolveParamPath = (paramsName, path, data)=>{
                 right: this.createValueExpression(value, null, /* applyConverter */ false)
             });
         }
-        // Casing transformers on a property are only meaningful with string-matching
-        // comparators; on relational comparators the plugins would silently
-        // ignore them and return wrong data
-        if (property.transformer != null && !isStringMatch) {
-            throw new Error(ERROR_MESSAGES.UNSUPPORTED("transform method outside of startsWith/endsWith/includes"));
-        }
         return new _types__rspack_import_1/* .ComparatorExpression */.bQ({
             comparator: operator.comparator,
             negated: operator.negated,
@@ -1237,31 +2688,63 @@ const resolveParamPath = (paramsName, path, data)=>{
             right: this.createValueExpression(value, property.property, applyConverter)
         });
     }
+    /**
+     * Any operand as an expression.
+     *
+     * Values inside arithmetic take no paired property: the result is a computed number, so the
+     * property's serializer and type converter do not describe it — the same reason `.length` skips
+     * them.
+     */ createOperandExpression(operand) {
+        if (operand.kind === "conditional") {
+            return new _types__rspack_import_1/* .CallExpression */.DG({
+                call: "conditional",
+                expression: operand.condition,
+                arguments: [
+                    this.createOperandExpression(operand.whenTrue),
+                    this.createOperandExpression(operand.whenFalse)
+                ]
+            });
+        }
+        if (operand.kind === "arithmetic") {
+            return new _types__rspack_import_1/* .CallExpression */.DG({
+                call: operand.call,
+                expression: this.createOperandExpression(operand.left),
+                arguments: operand.right === NO_ARGUMENT ? [] : operand.extra == null ? [
+                    this.createOperandExpression(operand.right)
+                ] : [
+                    this.createOperandExpression(operand.right),
+                    this.createOperandExpression(operand.extra)
+                ]
+            });
+        }
+        if (operand.kind === "property") {
+            return this.createPropertyExpression(operand);
+        }
+        if (operand.kind === "method-call") {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED("a method call inside arithmetic"));
+        }
+        if (operand.kind === "opaque") {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED("a call with no expression form inside arithmetic"));
+        }
+        return this.createValueExpression(operand, null, /* applyConverter */ false);
+    }
     createPropertyExpression(operand) {
-        const expression = new _types__rspack_import_1/* .PropertyExpression */.ep({
+        return asCall(new _types__rspack_import_1/* .PropertyExpression */.ep({
             property: operand.property
-        });
-        expression.transformer = operand.transformer;
-        expression.locale = operand.locale;
-        return expression;
+        }), operand.transformer, operand.locale);
     }
     createValueExpression(operand, pairedProperty, applyConverter) {
         if (operand.kind === "param") {
-            const expression = new ParamReferenceExpression({
+            return asCall(new ParamReferenceExpression({
                 paramPath: operand.path,
                 pairedProperty,
                 applyConverter
-            });
-            expression.transformer = operand.transformer;
-            expression.locale = operand.locale;
-            return expression;
+            }), operand.transformer, operand.locale);
         }
         const expression = new _types__rspack_import_1/* .ValueExpression */.Ko({
             value: resolvePairedValue(operand.value, pairedProperty, applyConverter)
         });
-        expression.transformer = operand.transformer;
-        expression.locale = operand.locale;
-        return expression;
+        return asCall(expression, operand.transformer, operand.locale);
     }
 }
 // #endregion
@@ -1273,28 +2756,19 @@ const resolveParamPath = (paramsName, path, data)=>{
  */ const bindExpression = (expression, paramsName, params)=>{
     if (expression instanceof ParamReferenceExpression) {
         const raw = resolveParamPath(paramsName ?? "params", expression.paramPath, params);
-        const bound = new _types__rspack_import_1/* .ValueExpression */.Ko({
+        return new _types__rspack_import_1/* .ValueExpression */.Ko({
             value: resolvePairedValue(raw, expression.pairedProperty, expression.applyConverter)
         });
-        bound.transformer = expression.transformer;
-        bound.locale = expression.locale;
-        return bound;
     }
     if (expression instanceof _types__rspack_import_1/* .ValueExpression */.Ko) {
-        const clone = new _types__rspack_import_1/* .ValueExpression */.Ko({
+        return new _types__rspack_import_1/* .ValueExpression */.Ko({
             value: expression.value
         });
-        clone.transformer = expression.transformer;
-        clone.locale = expression.locale;
-        return clone;
     }
     if (expression instanceof _types__rspack_import_1/* .PropertyExpression */.ep) {
-        const clone = new _types__rspack_import_1/* .PropertyExpression */.ep({
+        return new _types__rspack_import_1/* .PropertyExpression */.ep({
             property: expression.property
         });
-        clone.transformer = expression.transformer;
-        clone.locale = expression.locale;
-        return clone;
     }
     if (expression instanceof _types__rspack_import_1/* .ComparatorExpression */.bQ) {
         return new _types__rspack_import_1/* .ComparatorExpression */.bQ({
@@ -1312,8 +2786,99 @@ const resolveParamPath = (paramsName, path, data)=>{
             right: expression.right ? bindExpression(expression.right, paramsName, params) : undefined
         });
     }
+    if (expression instanceof _types__rspack_import_1/* .CallExpression */.DG) {
+        return new _types__rspack_import_1/* .CallExpression */.DG({
+            call: expression.call,
+            expression: bindExpression(expression.expression, paramsName, params),
+            arguments: expression.arguments.map((argument)=>bindExpression(argument, paramsName, params))
+        });
+    }
     return expression;
 };
+/**
+ * Wraps an operand in the call a transform method named, if there was one.
+ *
+ * `Transformer` and `Call` share these three names, so the transform IS the call name. A locale
+ * becomes the call's first argument, which is where it belongs — it qualifies the casing, not the
+ * property.
+ */ const asCall = (inner, transformer, locale)=>{
+    if (transformer == null) {
+        return inner;
+    }
+    return new _types__rspack_import_1/* .CallExpression */.DG({
+        call: transformer,
+        expression: inner,
+        arguments: locale == null ? [] : [
+            new _types__rspack_import_1/* .ValueExpression */.Ko({
+                value: locale
+            })
+        ]
+    });
+};
+/** Binds every name a destructuring pattern introduces to the path it reads. */ const bindPattern = (stream, kind, path, scope)=>{
+    if (!stream.matchPunctuation("{")) {
+        const name = stream.next();
+        if (name.kind !== "identifier") {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED(`parameter '${name.value}'`));
+        }
+        scope.set(name.value, {
+            kind,
+            path
+        });
+        return;
+    }
+    while(!stream.matchPunctuation("}")){
+        const key = stream.next();
+        if (key.kind !== "identifier") {
+            throw new Error(ERROR_MESSAGES.UNSUPPORTED(`destructured key '${key.value}'`));
+        }
+        if (stream.matchPunctuation(":")) {
+            bindPattern(stream, kind, [
+                ...path,
+                key.value
+            ], scope);
+        } else {
+            scope.set(key.value, {
+                kind,
+                path: [
+                    ...path,
+                    key.value
+                ]
+            });
+        }
+        if (!stream.matchPunctuation(",")) {
+            stream.expectPunctuation("}");
+            return;
+        }
+    }
+};
+/** Reads a filter's parameter list — the entity alone, or the `[entity, params]` pair — into a scope. */ const buildScope = (parameterNames, hasParams)=>{
+    const stream = new TokenStream(tokenize(parameterNames));
+    const scope = new Map();
+    if (!stream.matchPunctuation("[")) {
+        bindPattern(stream, "property", [], scope);
+        return {
+            scope,
+            paramsName: null
+        };
+    }
+    bindPattern(stream, "property", [], scope);
+    if (hasParams && stream.matchPunctuation(",") && !stream.isPunctuation("]")) {
+        bindPattern(stream, "param", [], scope);
+    }
+    return {
+        scope,
+        paramsName: wholeParamsName(scope)
+    };
+};
+/** The name the whole params object was given, when it was not destructured. Error messages only. */ const wholeParamsName = (scope)=>{
+    for (const [name, binding] of scope){
+        if (binding.kind === "param" && binding.path.length === 0) {
+            return name;
+        }
+    }
+    return null;
+};
 /**
  * Splits stringified filter source into parameter names and the expression
  * body, unwrapping single-return block bodies.
@@ -1343,33 +2908,12 @@ const resolveParamPath = (paramsName, path, data)=>{
             parameterNames = parameterNames.slice(1, -1).trim();
         }
     }
-    let entityName;
-    let paramsName = null;
-    if (parameterNames.startsWith("[") && parameterNames.endsWith("]")) {
-        const destructured = parameterNames.slice(1, -1).split(",").map((w)=>w.trim());
-        entityName = destructured[0];
-        if (hasParams) {
-            paramsName = destructured[1] ?? null;
-        }
-    } else {
-        entityName = parameterNames;
-    }
-    if (entityName == null || entityName.length === 0) {
+    if (parameterNames.length === 0) {
         throw new Error("Invalid Function");
     }
-    // Unwrap a single-return block body: { return <expression>; }
-    if (body.startsWith("{")) {
-        const inner = body.slice(1, body.lastIndexOf("}")).trim();
-        if (!inner.startsWith("return")) {
-            throw new Error(ERROR_MESSAGES.UNSUPPORTED("block body without a single return statement"));
-        }
-        body = inner.slice("return".length).trim();
-        if (body.endsWith(";")) {
-            body = body.slice(0, -1).trim();
-        }
-    }
+    const { scope, paramsName } = buildScope(parameterNames, hasParams);
     return {
-        entityName,
+        scope,
         paramsName,
         body
     };
@@ -1437,17 +2981,27 @@ const combineExpressions = (...expressions)=>{
  */ const parseFragment = (schema, body, rootName)=>{
     try {
         const stream = new TokenStream(tokenize(body));
-        const parser = new ExpressionParser(schema, stream, rootName, null, undefined);
-        return parser.parse();
+        const scope = new Map([
+            [
+                rootName,
+                {
+                    kind: "property",
+                    path: []
+                }
+            ]
+        ]);
+        const parser = new ExpressionParser(schema, stream, scope, null, undefined);
+        return (0,_fold__rspack_import_4/* .foldConstantCalls */.F5)(parser.parse());
     } catch  {
         // The failure is expected and informative — see above — so it is not logged. A caller that
         // parses one conjunct against two schemas would otherwise warn on every successful split.
         return _types__rspack_import_1/* .Expression.NOT_PARSABLE */.r4.NOT_PARSABLE;
     }
 };
+/** What the parser refused, from a throw that may not be an `Error`. */ const refusalOf = (error)=>error instanceof Error ? error.message : String(error);
 const toExpression = (schema, fn, params)=>{
     const stringifiedFunction = fn.toString();
-    const warn = (error)=>_utilities__rspack_import_3/* .logger.warn */.vF.warn("Error parsing expression", {
+    const warn = (error)=>_utilities__rspack_import_5/* .logger.warn */.vF.warn("Error parsing expression", {
             error,
             collectionName: schema.collectionName,
             params,
@@ -1455,16 +3009,17 @@ const toExpression = (schema, fn, params)=>{
         });
     const cached = getCachedTemplate(schema, stringifiedFunction);
     if (cached != null) {
-        // A cached failure — the warning was already logged when it was discovered
+        // A cached failure — the warning was already logged when it was discovered. The template
+        // carries what was refused, and `.explain()` is usually called once the cache is warm.
         if (_types__rspack_import_1/* .Expression.isNotParsable */.r4.isNotParsable(cached.template)) {
-            return _types__rspack_import_1/* .Expression.NOT_PARSABLE */.r4.NOT_PARSABLE;
+            return cached.template;
         }
         try {
-            return bindExpression(cached.template, cached.paramsName, params);
+            return (0,_fold__rspack_import_4/* .foldConstantCalls */.F5)(bindExpression(cached.template, cached.paramsName, params));
         } catch (error) {
             // Binding failures are param-dependent by nature — never cached
             warn(error);
-            return _types__rspack_import_1/* .Expression.NOT_PARSABLE */.r4.NOT_PARSABLE;
+            return _types__rspack_import_1/* .Expression.notParsable */.r4.notParsable(refusalOf(error));
         }
     }
     let paramsName = null;
@@ -1473,22 +3028,23 @@ const toExpression = (schema, fn, params)=>{
     try {
         const shape = resolveFunctionShape(stringifiedFunction, params != null);
         const stream = new TokenStream(tokenize(shape.body));
-        const parser = new ExpressionParser(schema, stream, shape.entityName, shape.paramsName, params);
+        const parser = new ExpressionParser(schema, stream, shape.scope, shape.paramsName, params);
         paramsName = shape.paramsName;
-        template = parser.parse();
+        template = parser.parseBody();
         structurallyDependsOnParams = parser.structurallyDependsOnParams;
     } catch (error) {
         // Cache the failure so a hot query on an unsupported filter doesn't
         // re-parse and re-warn on every execution.  Param-dependent failures are
         // exempt: the same source can succeed with different params.
+        const refused = _types__rspack_import_1/* .Expression.notParsable */.r4.notParsable(refusalOf(error));
         if (!(error instanceof ParamDependentParseError)) {
             setCachedTemplate(schema, stringifiedFunction, {
-                template: _types__rspack_import_1/* .Expression.NOT_PARSABLE */.r4.NOT_PARSABLE,
+                template: refused,
                 paramsName: null
             });
         }
         warn(error);
-        return _types__rspack_import_1/* .Expression.NOT_PARSABLE */.r4.NOT_PARSABLE;
+        return refused;
     }
     // Templates whose structure was resolved from param values are only
     // valid for this exact params object — parse those fresh every time
@@ -1499,17 +3055,116 @@ const toExpression = (schema, fn, params)=>{
         });
     }
     try {
-        return bindExpression(template, paramsName, params);
+        return (0,_fold__rspack_import_4/* .foldConstantCalls */.F5)(bindExpression(template, paramsName, params));
     } catch (error) {
         warn(error);
-        return _types__rspack_import_1/* .Expression.NOT_PARSABLE */.r4.NOT_PARSABLE;
+        return _types__rspack_import_1/* .Expression.notParsable */.r4.notParsable(refusalOf(error));
+    }
+};
+const collectReads = (operand, into)=>{
+    switch(operand.kind){
+        case "property":
+            into.add(operand.property);
+            return;
+        case "method-call":
+            collectReads(operand.target, into);
+            collectReads(operand.argument, into);
+            return;
+        case "arithmetic":
+            collectReads(operand.left, into);
+            collectReads(operand.right, into);
+            if (operand.extra != null) {
+                collectReads(operand.extra, into);
+            }
+            return;
+        case "conditional":
+            for (const property of (0,_utils__rspack_import_6/* .getProperties */.oY)(operand.condition)){
+                into.add(property);
+            }
+            collectReads(operand.whenTrue, into);
+            collectReads(operand.whenFalse, into);
+            return;
+        case "opaque":
+            for (const read of operand.reads){
+                collectReads(read, into);
+            }
+            return;
     }
 };
+const selectedValue = (operand)=>{
+    const found = new Set();
+    collectReads(operand, found);
+    const reads = [
+        ...found
+    ];
+    return {
+        property: reads.length === 1 ? reads[0] : null,
+        reads,
+        isDirectProperty: operand.kind === "property" && operand.transformer == null
+    };
+};
+// Keyed like the template cache. A selector takes no params, so every result is cacheable
+const selectorCache = new WeakMap();
+/**
+ * Reads a sort, map, group or `nearest` selector with the grammar filters use, for what its value is
+ * read from.
+ *
+ * Not for evaluating it: the caller's function stays the value, and nothing here renders one. A plugin
+ * decides from the result whether it can run the option. One that orders or projects by column cannot
+ * run a value that is not the property itself, and one that runs the function over stored rows cannot
+ * run it over a renamed property.
+ *
+ * So the grammar is wider here than for a filter. A call it has no node for, such as `getFullYear()`,
+ * is kept for the operands it reads rather than refused, since the function it came from still runs.
+ *
+ * `not-parsable` is not logged. The option runs as it did before the selector was parsed.
+ *
+ * Cached by function source per schema, like `toExpression`. The result is shared, so it is read-only.
+ */ const parseSelector = (schema, selector)=>{
+    const source = selector.toString();
+    let bySource = selectorCache.get(schema);
+    const cached = bySource?.get(source);
+    if (cached != null) {
+        return cached;
+    }
+    let parsed;
+    try {
+        const shape = resolveFunctionShape(source, false);
+        const parser = new ExpressionParser(schema, new TokenStream(tokenize(shape.body)), shape.scope, null, undefined, true);
+        const selected = parser.parseSelector();
+        parsed = Array.isArray(selected) ? {
+            kind: "object",
+            fields: selected.map((field)=>({
+                    name: field.name,
+                    ...selectedValue(field.operand)
+                }))
+        } : {
+            kind: "value",
+            value: selectedValue(selected)
+        };
+    } catch (error) {
+        parsed = {
+            kind: "not-parsable",
+            reason: refusalOf(error)
+        };
+    }
+    if (bySource == null) {
+        bySource = new Map();
+        selectorCache.set(schema, bySource);
+    }
+    // Stryker disable next-line all: the same resource bound as the template cache's
+    if (bySource.size >= MAX_CACHED_TEMPLATES_PER_SCHEMA) {
+        bySource.clear();
+    }
+    bySource.set(source, parsed);
+    return parsed;
+}; // #endregion
 
 
 },
 27(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
 __webpack_require__.d(__webpack_exports__, {
+  DG: () => (CallExpression),
   Ko: () => (ValueExpression),
   SC: () => (NotParsableExpression),
   Sm: () => (EmptyExpression),
@@ -1521,59 +3176,69 @@ __webpack_require__.d(__webpack_exports__, {
 const valueToJson = (value)=>{
     if (value === undefined) {
         return {
-            k: "undefined"
+            undefined: true
         };
     }
     if (value === null) {
-        return {
-            k: "raw",
-            v: null
-        };
+        return null;
     }
     if (value instanceof Date) {
         // ISO rather than epoch millis: it survives a human reading the payload, and an invalid
         // Date has no ISO form — so it is caught here rather than becoming a silent `null`.
         return {
-            k: "date",
-            v: value.toISOString()
+            date: value.toISOString()
         };
     }
     if (Array.isArray(value)) {
-        return {
-            k: "array",
-            v: value.map(valueToJson)
-        };
+        return value.map(valueToJson);
     }
     if (typeof value === "number" && Number.isFinite(value) === false) {
         // `JSON.stringify` turns all three of these into `null`, which would compare as a different
         // value entirely rather than failing.
         return {
-            k: "number",
-            v: Number.isNaN(value) ? "NaN" : value > 0 ? "Infinity" : "-Infinity"
+            number: Number.isNaN(value) ? "NaN" : value > 0 ? "Infinity" : "-Infinity"
         };
     }
     if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+        return value;
+    }
+    if (value instanceof RegExp) {
+        return {
+            regex: {
+                source: value.source,
+                flags: value.flags
+            }
+        };
+    }
+    // `JSON.stringify` throws outright on a bigint rather than losing it quietly, so this is the one
+    // tag that turns a crash into a value
+    if (typeof value === "bigint") {
         return {
-            k: "raw",
-            v: value
+            bigint: value.toString()
         };
     }
     throw new Error(`Cannot serialize this filter value: only strings, numbers, booleans, null, undefined, Dates and arrays of those can cross a wire.  ` + `Received: ${Object.prototype.toString.call(value)}`);
 };
 const valueFromJson = (value)=>{
-    if (value.k === "undefined") {
-        return undefined;
+    if (value === null || typeof value !== "object") {
+        return value;
+    }
+    if (Array.isArray(value)) {
+        return value.map(valueFromJson);
+    }
+    if ("date" in value) {
+        return new Date(value.date);
     }
-    if (value.k === "date") {
-        return new Date(value.v);
+    if ("undefined" in value) {
+        return undefined;
     }
-    if (value.k === "array") {
-        return value.v.map(valueFromJson);
+    if ("regex" in value) {
+        return new RegExp(value.regex.source, value.regex.flags);
     }
-    if (value.k === "number") {
-        return value.v === "NaN" ? Number.NaN : value.v === "Infinity" ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY;
+    if ("bigint" in value) {
+        return BigInt(value.bigint);
     }
-    return value.v;
+    return value.number === "NaN" ? Number.NaN : value.number === "Infinity" ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY;
 };
 /**
  * The base class for all expression types.
@@ -1590,6 +3255,9 @@ const valueFromJson = (value)=>{
     static get NOT_PARSABLE() {
         return new NotParsableExpression();
     }
+    /** `NOT_PARSABLE`, carrying what the parser refused. */ static notParsable(reason) {
+        return new NotParsableExpression(reason);
+    }
     static isEmpty(expression) {
         return expression.type === "empty" || expression instanceof EmptyExpression;
     }
@@ -1606,7 +3274,7 @@ const valueFromJson = (value)=>{
      *
      * ## Why it is this small
      *
-     * Of the six node types a bound tree can contain, exactly one holds anything JSON cannot carry:
+     * Of the seven node types a bound tree can contain, exactly one holds anything JSON cannot carry:
      * `PropertyExpression`, whose live `PropertyInfo` has functions, a parent chain and caches. It
      * reduces to a property PATH — `PropertyInfo.id` IS the dotted path, and `getProperty` is keyed by
      * exactly that — so rebinding is one lookup.
@@ -1621,7 +3289,7 @@ const valueFromJson = (value)=>{
         if (expression.type === "operator") {
             const operator = expression;
             return {
-                t: "operator",
+                type: "operator",
                 operator: operator.operator,
                 ...operator.left != null && {
                     left: Expression.toJson(operator.left)
@@ -1634,7 +3302,7 @@ const valueFromJson = (value)=>{
         if (expression.type === "comparator") {
             const comparator = expression;
             return {
-                t: "comparator",
+                type: "comparator",
                 comparator: comparator.comparator,
                 negated: comparator.negated,
                 strict: comparator.strict,
@@ -1646,29 +3314,41 @@ const valueFromJson = (value)=>{
                 }
             };
         }
+        if (expression.type === "call") {
+            const call = expression;
+            return {
+                type: "call",
+                call: call.call,
+                expression: Expression.toJson(call.expression),
+                arguments: call.arguments.map(Expression.toJson)
+            };
+        }
         if (expression.type === "property") {
             const property = expression;
             return {
-                t: "property",
+                type: "property",
                 // The dotted path, which is exactly the key `getProperty` is looking up
-                path: property.property.id,
-                transformer: property.transformer,
-                locale: property.locale
+                path: property.property.id
             };
         }
         if (expression.type === "value") {
             const value = expression;
             return {
-                t: "value",
-                value: valueToJson(value.value),
-                transformer: value.transformer,
-                locale: value.locale
+                type: "value",
+                value: valueToJson(value.value)
+            };
+        }
+        if (expression.type === "empty") {
+            return {
+                type: "empty"
             };
         }
-        return expression.type === "empty" ? {
-            t: "empty"
+        const reason = expression.reason;
+        return reason == null ? {
+            type: "not-parsable"
         } : {
-            t: "not-parsable"
+            type: "not-parsable",
+            reason
         };
     }
     /**
@@ -1684,14 +3364,14 @@ const valueFromJson = (value)=>{
      * failure here worse than an error.
      */ static fromJson(json, schema) {
         const child = (node)=>node == null ? undefined : Expression.fromJson(node, schema);
-        if (json.t === "operator") {
+        if (json.type === "operator") {
             return new OperatorExpression({
                 operator: json.operator,
                 left: child(json.left),
                 right: child(json.right)
             });
         }
-        if (json.t === "comparator") {
+        if (json.type === "comparator") {
             return new ComparatorExpression({
                 comparator: json.comparator,
                 negated: json.negated,
@@ -1700,27 +3380,34 @@ const valueFromJson = (value)=>{
                 right: child(json.right)
             });
         }
-        if (json.t === "property") {
+        if (json.type === "call") {
+            if (json.expression == null) {
+                throw new Error(`Cannot deserialize a filter: a '${json.call}' call carries no operand.  ` + `Collection: ${schema.collectionName}.`);
+            }
+            return new CallExpression({
+                call: json.call,
+                expression: Expression.fromJson(json.expression, schema),
+                arguments: (json.arguments ?? []).map((argument)=>Expression.fromJson(argument, schema))
+            });
+        }
+        if (json.type === "property") {
             const property = schema.getProperty(json.path);
             if (property == null) {
                 throw new Error(`Cannot deserialize a filter: this schema does not declare the property it names.  ` + `Property: ${json.path}, Collection: ${schema.collectionName}.  ` + `The two sides disagree about the shape of the data, so the filter cannot be applied.`);
             }
-            const rebuilt = new PropertyExpression({
+            return new PropertyExpression({
                 property
             });
-            rebuilt.transformer = json.transformer;
-            rebuilt.locale = json.locale;
-            return rebuilt;
         }
-        if (json.t === "value") {
-            const rebuilt = new ValueExpression({
+        if (json.type === "value") {
+            return new ValueExpression({
                 value: valueFromJson(json.value)
             });
-            rebuilt.transformer = json.transformer;
-            rebuilt.locale = json.locale;
-            return rebuilt;
         }
-        return json.t === "empty" ? Expression.EMPTY : Expression.NOT_PARSABLE;
+        if (json.type === "empty") {
+            return Expression.EMPTY;
+        }
+        return json.reason == null ? Expression.NOT_PARSABLE : Expression.notParsable(json.reason);
     }
 }
 class EmptyExpression extends Expression {
@@ -1728,6 +3415,11 @@ class EmptyExpression extends Expression {
 }
 class NotParsableExpression extends Expression {
     type = "not-parsable";
+    /** What the parser refused, when it knows. `.explain()` prints it beside the source. */ reason;
+    constructor(reason){
+        super();
+        this.reason = reason;
+    }
 }
 /**
  * A class representing a comparison operation (e.g., equals, greater-than).
@@ -1758,20 +3450,28 @@ class NotParsableExpression extends Expression {
  */ class PropertyExpression extends Expression {
     /** The type of the expression (always 'property'). */ type = "property";
     /** The property info for the path. */ property;
-    transformer = null;
-    locale = null;
     constructor(options){
         super();
         this.property = options.property;
     }
 }
+class CallExpression extends Expression {
+    type = "call";
+    call;
+    expression;
+    /** Empty for a unary call. */ arguments;
+    constructor(options){
+        super();
+        this.call = options.call;
+        this.expression = options.expression;
+        this.arguments = options.arguments ?? [];
+    }
+}
 /**
  * A class representing a literal value.
  */ class ValueExpression extends Expression {
     /** The type of the expression (always 'value'). */ type = "value";
     /** The literal value. */ value;
-    transformer = null;
-    locale = null;
     constructor(options){
         super();
         this.value = options.value;
@@ -1782,9 +3482,45 @@ class NotParsableExpression extends Expression {
 },
 63(__unused_rspack_module, __webpack_exports__, __webpack_require__) {
 __webpack_require__.d(__webpack_exports__, {
-  j: () => (forEach),
-  o: () => (getProperties)
+  CC: () => (peelCalls),
+  LU: () => (childrenOf),
+  jJ: () => (forEach),
+  oY: () => (getProperties)
 });
+/**
+ * Separates an operand from the calls applied to it.
+ *
+ * `null` when there is no operand beneath the calls. Every consumer needs this to decide whether a
+ * comparator side is a property or a value, so it lives here rather than in each translator.
+ */ function peelCalls(expression) {
+    const calls = [];
+    let current = expression;
+    while(current != null && current.type === "call"){
+        calls.unshift(current);
+        current = current.expression;
+    }
+    return current == null ? null : {
+        operand: current,
+        calls
+    };
+}
+function childrenOf(expression) {
+    if (expression.type === "call") {
+        const call = expression;
+        return [
+            call.expression,
+            ...call.arguments ?? []
+        ].filter((child)=>child != null);
+    }
+    const children = [];
+    if (expression.left != null) {
+        children.push(expression.left);
+    }
+    if (expression.right != null) {
+        children.push(expression.right);
+    }
+    return children;
+}
 /**
  * Extracts all properties referenced in an expression
  * @param expression The expression to analyze
@@ -1796,12 +3532,8 @@ __webpack_require__.d(__webpack_exports__, {
         if (expr.type === "property") {
             properties.push(expr.property);
         }
-        // Traverse left and right expressions if they exist
-        if (expr.left) {
-            traverse(expr.left);
-        }
-        if (expr.right) {
-            traverse(expr.right);
+        for (const child of childrenOf(expr)){
+            traverse(child);
         }
     }
     traverse(expression);
@@ -1814,14 +3546,8 @@ function forEach(expression, callback) {
         if (!callback(expr)) {
             return false;
         }
-        // Traverse left and right expressions if they exist
-        if (expr.left) {
-            if (!traverse(expr.left)) {
-                return false;
-            }
-        }
-        if (expr.right) {
-            if (!traverse(expr.right)) {
+        for (const child of childrenOf(expr)){
+            if (!traverse(child)) {
                 return false;
             }
         }
@@ -1941,12 +3667,14 @@ const isLogLevel = (value)=>typeof value === 'string' && LOG_LEVELS.includes(val
         const debug = process.env.DEBUG;
         if (debug === 'routier' || debug === '*') return 'debug';
         const env = "production"?.toLowerCase();
-        // `test` is deliberately absent. It used to be here, which meant no test suite anywhere
-        // could run Routier quietly. Opt in with DEBUG=routier or ROUTIER_LOG_LEVEL when a test
-        // needs the output.
         if (env === 'dev' || env === 'development') return 'debug';
     }
-    return 'silent';
+    // Warnings are on unless something turns them off.
+    //
+    // Routier warns when a query returns correct rows a slower way than it could, or when a filter
+    // compares types that can never match. Both are the caller's to act on, and a default of
+    // `silent` meant the only people who ever saw them were the ones who already knew to look.
+    return 'warn';
 };
 let level = resolveLevel();
 let rank = RANK[level];
@@ -2038,28 +3766,43 @@ var __webpack_exports__ = {};
 // This entry needs to be wrapped in an IIFE because it needs to be isolated against other modules in the chunk.
 (() => {
 __webpack_require__.d(__webpack_exports__, {
-  Ko: () => (/* reexport safe */ _types__rspack_import_2.Ko),
-  MY: () => (/* reexport safe */ _parser__rspack_import_1.MY),
-  SC: () => (/* reexport safe */ _types__rspack_import_2.SC),
-  Sm: () => (/* reexport safe */ _types__rspack_import_2.Sm),
-  Vu: () => (/* reexport safe */ _evaluate__rspack_import_0.Vu),
-  _3: () => (/* reexport safe */ _evaluate__rspack_import_0._3),
-  bQ: () => (/* reexport safe */ _types__rspack_import_2.bQ),
-  ep: () => (/* reexport safe */ _types__rspack_import_2.ep),
-  fw: () => (/* reexport safe */ _types__rspack_import_2.fw),
-  jJ: () => (/* reexport safe */ _utils__rspack_import_3.j),
-  oH: () => (/* reexport safe */ _parser__rspack_import_1.oH),
-  oY: () => (/* reexport safe */ _utils__rspack_import_3.o),
-  pg: () => (/* reexport safe */ _parser__rspack_import_1.pg),
-  r4: () => (/* reexport safe */ _types__rspack_import_2.r4),
-  tA: () => (/* reexport safe */ _constants__rspack_import_4.t),
-  wS: () => (/* reexport safe */ _evaluate__rspack_import_0.wS)
+  CC: () => (/* reexport safe */ _utils__rspack_import_5.CC),
+  DG: () => (/* reexport safe */ _types__rspack_import_4.DG),
+  F5: () => (/* reexport safe */ _fold__rspack_import_2.F5),
+  Ko: () => (/* reexport safe */ _types__rspack_import_4.Ko),
+  LU: () => (/* reexport safe */ _utils__rspack_import_5.LU),
+  MY: () => (/* reexport safe */ _parser__rspack_import_3.MY),
+  Nb: () => (/* reexport safe */ _callSource__rspack_import_0.N),
+  Pl: () => (/* reexport safe */ _parser__rspack_import_3.Pl),
+  SC: () => (/* reexport safe */ _types__rspack_import_4.SC),
+  Sm: () => (/* reexport safe */ _types__rspack_import_4.Sm),
+  Sv: () => (/* reexport safe */ _fold__rspack_import_2.Sv),
+  Vu: () => (/* reexport safe */ _evaluate__rspack_import_1.Vu),
+  Vv: () => (/* reexport safe */ _evaluate__rspack_import_1.Vv),
+  _3: () => (/* reexport safe */ _evaluate__rspack_import_1._3),
+  ax: () => (/* reexport safe */ _callSource__rspack_import_0.a),
+  bQ: () => (/* reexport safe */ _types__rspack_import_4.bQ),
+  br: () => (/* reexport safe */ _fold__rspack_import_2.br),
+  ep: () => (/* reexport safe */ _types__rspack_import_4.ep),
+  fw: () => (/* reexport safe */ _types__rspack_import_4.fw),
+  gm: () => (/* reexport safe */ _evaluate__rspack_import_1.gm),
+  jJ: () => (/* reexport safe */ _utils__rspack_import_5.jJ),
+  oH: () => (/* reexport safe */ _parser__rspack_import_3.oH),
+  oY: () => (/* reexport safe */ _utils__rspack_import_5.oY),
+  pg: () => (/* reexport safe */ _parser__rspack_import_3.pg),
+  r4: () => (/* reexport safe */ _types__rspack_import_4.r4),
+  tA: () => (/* reexport safe */ _constants__rspack_import_6.t),
+  wS: () => (/* reexport safe */ _evaluate__rspack_import_1.wS)
 });
-/* import */ var _evaluate__rspack_import_0 = __webpack_require__(379);
-/* import */ var _parser__rspack_import_1 = __webpack_require__(91);
-/* import */ var _types__rspack_import_2 = __webpack_require__(27);
-/* import */ var _utils__rspack_import_3 = __webpack_require__(63);
-/* import */ var _constants__rspack_import_4 = __webpack_require__(835);
+/* import */ var _callSource__rspack_import_0 = __webpack_require__(429);
+/* import */ var _evaluate__rspack_import_1 = __webpack_require__(379);
+/* import */ var _fold__rspack_import_2 = __webpack_require__(43);
+/* import */ var _parser__rspack_import_3 = __webpack_require__(91);
+/* import */ var _types__rspack_import_4 = __webpack_require__(27);
+/* import */ var _utils__rspack_import_5 = __webpack_require__(63);
+/* import */ var _constants__rspack_import_6 = __webpack_require__(835);
+
+
 
 
 
@@ -2068,22 +3811,33 @@ __webpack_require__.d(__webpack_exports__, {
 
 })();
 
+var __webpack_exports__CALL_SOURCE = __webpack_exports__.Nb;
+var __webpack_exports__CallExpression = __webpack_exports__.DG;
 var __webpack_exports__ComparatorExpression = __webpack_exports__.bQ;
 var __webpack_exports__EXPRESSION_TYPES = __webpack_exports__.tA;
 var __webpack_exports__EmptyExpression = __webpack_exports__.Sm;
 var __webpack_exports__Expression = __webpack_exports__.r4;
+var __webpack_exports__FOLDABLE = __webpack_exports__.Sv;
 var __webpack_exports__NotParsableExpression = __webpack_exports__.SC;
 var __webpack_exports__OperatorExpression = __webpack_exports__.fw;
 var __webpack_exports__PropertyExpression = __webpack_exports__.ep;
+var __webpack_exports__UNRESOLVED = __webpack_exports__.gm;
 var __webpack_exports__ValueExpression = __webpack_exports__.Ko;
+var __webpack_exports__childrenOf = __webpack_exports__.LU;
 var __webpack_exports__combineExpressions = __webpack_exports__.pg;
 var __webpack_exports__evaluate = __webpack_exports__._3;
+var __webpack_exports__foldConstantCalls = __webpack_exports__.F5;
+var __webpack_exports__foldedOperandValue = __webpack_exports__.br;
 var __webpack_exports__forEach = __webpack_exports__.jJ;
 var __webpack_exports__getProperties = __webpack_exports__.oY;
+var __webpack_exports__operandValue = __webpack_exports__.Vv;
 var __webpack_exports__parseFragment = __webpack_exports__.oH;
+var __webpack_exports__parseSelector = __webpack_exports__.Pl;
+var __webpack_exports__peelCalls = __webpack_exports__.CC;
+var __webpack_exports__renderCallAsJs = __webpack_exports__.ax;
 var __webpack_exports__toExpression = __webpack_exports__.MY;
 var __webpack_exports__toPredicate = __webpack_exports__.Vu;
 var __webpack_exports__toStrictPredicate = __webpack_exports__.wS;
-export { __webpack_exports__ComparatorExpression as ComparatorExpression, __webpack_exports__EXPRESSION_TYPES as EXPRESSION_TYPES, __webpack_exports__EmptyExpression as EmptyExpression, __webpack_exports__Expression as Expression, __webpack_exports__NotParsableExpression as NotParsableExpression, __webpack_exports__OperatorExpression as OperatorExpression, __webpack_exports__PropertyExpression as PropertyExpression, __webpack_exports__ValueExpression as ValueExpression, __webpack_exports__combineExpressions as combineExpressions, __webpack_exports__evaluate as evaluate, __webpack_exports__forEach as forEach, __webpack_exports__getProperties as getProperties, __webpack_exports__parseFragment as parseFragment, __webpack_exports__toExpression as toExpression, __webpack_exports__toPredicate as toPredicate, __webpack_exports__toStrictPredicate as toStrictPredicate };
+export { __webpack_exports__CALL_SOURCE as CALL_SOURCE, __webpack_exports__CallExpression as CallExpression, __webpack_exports__ComparatorExpression as ComparatorExpression, __webpack_exports__EXPRESSION_TYPES as EXPRESSION_TYPES, __webpack_exports__EmptyExpression as EmptyExpression, __webpack_exports__Expression as Expression, __webpack_exports__FOLDABLE as FOLDABLE, __webpack_exports__NotParsableExpression as NotParsableExpression, __webpack_exports__OperatorExpression as OperatorExpression, __webpack_exports__PropertyExpression as PropertyExpression, __webpack_exports__UNRESOLVED as UNRESOLVED, __webpack_exports__ValueExpression as ValueExpression, __webpack_exports__childrenOf as childrenOf, __webpack_exports__combineExpressions as combineExpressions, __webpack_exports__evaluate as evaluate, __webpack_exports__foldConstantCalls as foldConstantCalls, __webpack_exports__foldedOperandValue as foldedOperandValue, __webpack_exports__forEach as forEach, __webpack_exports__getProperties as getProperties, __webpack_exports__operandValue as operandValue, __webpack_exports__parseFragment as parseFragment, __webpack_exports__parseSelector as parseSelector, __webpack_exports__peelCalls as peelCalls, __webpack_exports__renderCallAsJs as renderCallAsJs, __webpack_exports__toExpression as toExpression, __webpack_exports__toPredicate as toPredicate, __webpack_exports__toStrictPredicate as toStrictPredicate };
 
 //# sourceMappingURL=index.js.map