@ballistix.digital/odata-query-builder 0.7.0 → 0.9.0

package/dist/module/query/domain/chain/expandChain.model.d.ts

@@ -29,13 +29,13 @@ export interface ExpandChain<T> {
      */
     filter(build: (scope: Scope<T>, operators: Operators) => Predicate): ExpandChain<T>;
     /**
-     * `$expand=rel($top=…)`. The server applies it per parent row; it needs
-     * @ballistix.digital/typeorm-extensions 3.13.0.
+     * `$expand=rel($top=…)`. The server applies it per parent row, on a to-many
+     * relation only.
      */
     top(count: number): ExpandChain<T>;
     /**
-     * `$expand=rel($skip=…)`. The server applies it per parent row; it needs
-     * @ballistix.digital/typeorm-extensions 3.13.0.
+     * `$expand=rel($skip=…)`. The server applies it per parent row, on a to-many
+     * relation only.
      */
     skip(count: number): ExpandChain<T>;
 }

package/dist/module/query/domain/filter/comparable.model.d.ts

@@ -20,11 +20,11 @@ export interface Comparable<V, E = never> {
     le(value: V | E): Predicate;
     /**
      * `in (a,b,c)`. `null` is allowed here: a set literal cannot be mistaken
-     * for "no filter". A column of the same type is a legal member too. An
-     * empty list throws, and so does an arithmetic expression as a member: the
-     * server grammar takes literals and paths inside `in (...)`, nothing else.
+     * for "no filter". The members are literal values only: the server answers
+     * a column or an expression inside `in (...)` with a 400, so `E` is absent.
+     * An empty list throws.
      */
-    in(values: readonly (V | E | null)[]): Predicate;
+    in(values: readonly (V | null)[]): Predicate;
     /** `x eq null`. */
     isNull(): Predicate;
     /** `x ne null` — which in OData also matches rows where a *different* operand is null. */

package/dist/module/query/domain/filter/node.model.d.ts

@@ -2,8 +2,9 @@
  * The two shapes every filter fragment is one of.
  *
  * Nothing in this file has a runtime body — the whole implementation is one
- * Proxy per scope, in `util/filter/scopeProxy.util.ts`. A construct the server
- * rejects is not typed here at all, so a 400 becomes a red squiggle.
+ * Proxy per scope, made by `ScopeService` in `service/filter/scope.service.ts`.
+ * A construct the server rejects is not typed here at all, so a 400 becomes a
+ * red squiggle.
  */
 /** An emitted fragment. `text` is the OData source of this node. */
 export interface Node {

package/dist/module/query/domain/filter/node.model.js

@@ -3,8 +3,9 @@
  * The two shapes every filter fragment is one of.
  *
  * Nothing in this file has a runtime body — the whole implementation is one
- * Proxy per scope, in `util/filter/scopeProxy.util.ts`. A construct the server
- * rejects is not typed here at all, so a 400 becomes a red squiggle.
+ * Proxy per scope, made by `ScopeService` in `service/filter/scope.service.ts`.
+ * A construct the server rejects is not typed here at all, so a 400 becomes a
+ * red squiggle.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=node.model.js.map

package/dist/module/query/domain/filter/node.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"node.model.js","sourceRoot":"","sources":["../../../../../src/module/query/domain/filter/node.model.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG"}
+{"version":3,"file":"node.model.js","sourceRoot":"","sources":["../../../../../src/module/query/domain/filter/node.model.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG"}

package/dist/module/query/exception/queryBuilder.exception.d.ts

@@ -6,8 +6,8 @@
  * HTTP-ish `status`, a stable machine-readable `code`, and a list of details —
  * so a caller's existing handling of the server's errors (reading those three
  * fields) also handles the builder's. It is field-compatible, not a shared
- * type: that package exports its own, unrelated `LibraryException` and
- * `ExceptionCode`, so this class is never an `instanceof` that one.
+ * type: that package throws the `@ballistix.digital/exception-types` classes,
+ * so this class is never an `instanceof` their `BaseException`.
  *
  * Every error class in `exception/` extends it. It imports only its two
  * envelope types, `QueryBuilderExceptionCode` and `ExceptionDetail`, and

package/dist/module/query/exception/queryBuilder.exception.js

@@ -7,8 +7,8 @@
  * HTTP-ish `status`, a stable machine-readable `code`, and a list of details —
  * so a caller's existing handling of the server's errors (reading those three
  * fields) also handles the builder's. It is field-compatible, not a shared
- * type: that package exports its own, unrelated `LibraryException` and
- * `ExceptionCode`, so this class is never an `instanceof` that one.
+ * type: that package throws the `@ballistix.digital/exception-types` classes,
+ * so this class is never an `instanceof` their `BaseException`.
  *
  * Every error class in `exception/` extends it. It imports only its two
  * envelope types, `QueryBuilderExceptionCode` and `ExceptionDetail`, and

package/dist/module/query/service/emit/emit.facade.d.ts

@@ -2,15 +2,9 @@
  * The only file that other code imports from the emit stage: a `QueryState`
  * in, the query text out.
  *
- * Both entry functions read the same ordered parts, so the string form and the
- * map form can never disagree about what the query says — they differ only in
- * the transport escaping each one leaves in place.
+ * Each function here is one call into a new `EmitService` and holds no logic
+ * of its own.
  */
 import type { QueryState } from '../../domain/queryState.model';
 export declare const emitQueryString: (queryState: QueryState) => string;
-/**
- * The same parts as a map, with the transport escaping undone so the caller's
- * own encoder does not double-encode. `$filter`, `$search` and `$expand` are
- * the only parts that ever carry that escaping.
- */
 export declare const emitQueryParams: (queryState: QueryState) => Record<string, string>;

package/dist/module/query/service/emit/emit.facade.js

@@ -1,23 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.emitQueryParams = exports.emitQueryString = void 0;
-const queryParts_util_1 = require("../../util/emit/queryParts.util");
-const escape_util_1 = require("../../util/filter/escape.util");
-const emitQueryString = (queryState) => (0, queryParts_util_1.toQueryParts)(queryState)
-    .map(([key, value]) => `${key}=${value}`)
-    .join('&');
+const emit_service_1 = require("./emit.service");
+const emitQueryString = (queryState) => new emit_service_1.EmitService(queryState).toQueryString();
 exports.emitQueryString = emitQueryString;
-/**
- * The same parts as a map, with the transport escaping undone so the caller's
- * own encoder does not double-encode. `$filter`, `$search` and `$expand` are
- * the only parts that ever carry that escaping.
- */
-const emitQueryParams = (queryState) => {
-    const queryParams = {};
-    for (const [key, value] of (0, queryParts_util_1.toQueryParts)(queryState)) {
-        queryParams[key] = (0, escape_util_1.unescapeParamValue)(value);
-    }
-    return queryParams;
-};
+const emitQueryParams = (queryState) => new emit_service_1.EmitService(queryState).toParams();
 exports.emitQueryParams = emitQueryParams;
 //# sourceMappingURL=emit.facade.js.map

package/dist/module/query/service/emit/emit.facade.js.map

@@ -1 +1 @@
-{"version":3,"file":"emit.facade.js","sourceRoot":"","sources":["../../../../../src/module/query/service/emit/emit.facade.ts"],"names":[],"mappings":";;;AASA,qEAA+D;AAC/D,+DAAmE;AAE5D,MAAM,eAAe,GAAG,CAAC,UAAsB,EAAU,EAAE,CACjE,IAAA,8BAAY,EAAC,UAAU,CAAC;KACtB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;KACxC,IAAI,CAAC,GAAG,CAAC,CAAC;AAHA,QAAA,eAAe,mBAGf;AAEb;;;;GAIG;AACI,MAAM,eAAe,GAAG,CAC9B,UAAsB,EACG,EAAE;IAC3B,MAAM,WAAW,GAA2B,EAAE,CAAC;IAC/C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAA,8BAAY,EAAC,UAAU,CAAC,EAAE,CAAC;QACrD,WAAW,CAAC,GAAG,CAAC,GAAG,IAAA,gCAAkB,EAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AARW,QAAA,eAAe,mBAQ1B"}
+{"version":3,"file":"emit.facade.js","sourceRoot":"","sources":["../../../../../src/module/query/service/emit/emit.facade.ts"],"names":[],"mappings":";;;AAQA,iDAA6C;AAEtC,MAAM,eAAe,GAAG,CAAC,UAAsB,EAAU,EAAE,CACjE,IAAI,0BAAW,CAAC,UAAU,CAAC,CAAC,aAAa,EAAE,CAAC;AADhC,QAAA,eAAe,mBACiB;AAEtC,MAAM,eAAe,GAAG,CAC9B,UAAsB,EACG,EAAE,CAAC,IAAI,0BAAW,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;AAFvD,QAAA,eAAe,mBAEwC"}

package/dist/module/query/service/emit/emit.service.d.ts

@@ -0,0 +1,38 @@
+/**
+ * `EmitService` prints one finished `QueryState`. Nothing here builds state
+ * and nothing here validates it: the chain has already decided what the query
+ * says, and this class only decides how it is printed. That split is why a
+ * golden-string test can be written against a hand-built state.
+ *
+ * `toQueryString()` and `toParams()` read the same ordered parts from
+ * `toQueryParts()`, so the string form and the map form can never disagree
+ * about what the query says. They differ only in the transport escaping each
+ * one leaves in place.
+ */
+import type { QueryState } from '../../domain/queryState.model';
+export declare class EmitService {
+    private readonly queryState;
+    constructor(queryState: QueryState);
+    toQueryString(): string;
+    /**
+     * The same parts as a map, with the transport escaping undone so the
+     * caller's own encoder does not double-encode. `$filter`, `$search` and
+     * `$expand` are the only parts that ever carry that escaping.
+     */
+    toParams(): Record<string, string>;
+    /**
+     * The root's options, as `$key=value` pairs in a stable order. The order is
+     * the one a reader scans for: what is selected, then how it is shaped, then
+     * how it is paged.
+     */
+    private toQueryParts;
+    /**
+     * The options of ONE expanded level, in the order the root prints them.
+     * They are joined with `;` inside the relation's parentheses.
+     */
+    private nestedParts;
+    /** `a($select=x),b` — a relation with no options of its own prints bare. */
+    private expandList;
+    /** Repeated `.filter()` calls AND together. */
+    private filterText;
+}

package/dist/module/query/service/emit/emit.service.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmitService = void 0;
+const escape_util_1 = require("../../util/filter/escape.util");
+const predicate_util_1 = require("../../util/filter/predicate.util");
+class EmitService {
+    queryState;
+    constructor(queryState) {
+        this.queryState = queryState;
+    }
+    toQueryString() {
+        return this.toQueryParts()
+            .map(([key, value]) => `${key}=${value}`)
+            .join('&');
+    }
+    /**
+     * The same parts as a map, with the transport escaping undone so the
+     * caller's own encoder does not double-encode. `$filter`, `$search` and
+     * `$expand` are the only parts that ever carry that escaping.
+     */
+    toParams() {
+        const queryParams = {};
+        for (const [key, value] of this.toQueryParts()) {
+            queryParams[key] = (0, escape_util_1.unescapeParamValue)(value);
+        }
+        return queryParams;
+    }
+    /**
+     * The root's options, as `$key=value` pairs in a stable order. The order is
+     * the one a reader scans for: what is selected, then how it is shaped, then
+     * how it is paged.
+     */
+    toQueryParts() {
+        const { queryState } = this;
+        const parts = [];
+        if (queryState.filters.length)
+            parts.push(['$filter', this.filterText(queryState)]);
+        if (queryState.search) {
+            parts.push(['$search', queryState.search.term]);
+            parts.push(['$searchColumns', queryState.search.columns.join(',')]);
+        }
+        if (queryState.select.length)
+            parts.push(['$select', queryState.select.join(',')]);
+        if (queryState.expand.length)
+            parts.push(['$expand', this.expandList(queryState)]);
+        if (queryState.orderBy.length)
+            parts.push(['$orderby', queryState.orderBy.join(',')]);
+        if (queryState.top !== undefined)
+            parts.push(['$top', String(queryState.top)]);
+        if (queryState.skip !== undefined)
+            parts.push(['$skip', String(queryState.skip)]);
+        if (queryState.count)
+            parts.push(['$count', 'true']);
+        return parts;
+    }
+    /**
+     * The options of ONE expanded level, in the order the root prints them.
+     * They are joined with `;` inside the relation's parentheses.
+     */
+    nestedParts(queryState) {
+        const parts = [];
+        if (queryState.filters.length)
+            parts.push(`$filter=${this.filterText(queryState)}`);
+        if (queryState.select.length)
+            parts.push(`$select=${queryState.select.join(',')}`);
+        if (queryState.expand.length)
+            parts.push(`$expand=${this.expandList(queryState)}`);
+        if (queryState.top !== undefined)
+            parts.push(`$top=${queryState.top}`);
+        if (queryState.skip !== undefined)
+            parts.push(`$skip=${queryState.skip}`);
+        return parts;
+    }
+    /** `a($select=x),b` — a relation with no options of its own prints bare. */
+    expandList(queryState) {
+        return queryState.expand
+            .map((entry) => {
+            const parts = this.nestedParts(entry.queryState);
+            return parts.length ? `${entry.name}(${parts.join(';')})` : entry.name;
+        })
+            .join(',');
+    }
+    /** Repeated `.filter()` calls AND together. */
+    filterText(queryState) {
+        return (0, predicate_util_1.combine)('and', queryState.filters).text;
+    }
+}
+exports.EmitService = EmitService;
+//# sourceMappingURL=emit.service.js.map

package/dist/module/query/service/emit/emit.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"emit.service.js","sourceRoot":"","sources":["../../../../../src/module/query/service/emit/emit.service.ts"],"names":[],"mappings":"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"}

package/dist/module/query/service/filter/filter.facade.d.ts

@@ -3,14 +3,12 @@
  * a caller writes, and the four entry functions that run a caller's callback
  * against a fresh scope.
  *
- * A scope proxy never leaves this stage as itself. `buildFilterPredicate`
- * hands one to the callback and returns the predicate that comes back;
- * `pickSearchColumns`, `pickOrderColumn` and `pickSelectColumns` hand one out
- * and return plain text. Nothing outside the stage therefore has to know that
- * a scope is a Proxy at all.
+ * Every function here is one call into `FilterService` and holds no logic of
+ * its own. An entry function creates one `FilterService` per callback, so
+ * every callback gets its own scope.
  */
-import type { Node, Predicate } from '../../domain/filter/node.model';
 import type { DateExpr } from '../../domain/filter/dateExpr.model';
+import type { Node, Predicate } from '../../domain/filter/node.model';
 import type { Operators } from '../../domain/filter/operators.model';
 import type { SearchState } from '../../domain/queryState.model';
 export declare const and: (...predicates: Predicate[]) => Predicate;
@@ -20,18 +18,7 @@ export declare const now: () => DateExpr;
 export declare const maxdatetime: () => DateExpr;
 export declare const mindatetime: () => DateExpr;
 export declare const raw: (odataExpression: string) => Predicate;
-/**
- * Run one `.filter()` callback. A callback that returns a bare column rather
- * than a predicate is a runtime error here, because the type layer cannot see
- * through a caller's `any`.
- */
 export declare const buildFilterPredicate: (build: (scope: unknown, operators: Operators) => Predicate) => Predicate;
-/**
- * Run one `.search()` callback. `$search` is a 400 without `$searchColumns`,
- * so an empty column list is rejected before the query is ever emitted.
- */
 export declare const pickSearchColumns: (term: string, columns: (scope: unknown) => Node | readonly Node[]) => SearchState;
-/** Run one `.orderBy()` callback and return the path of the column it picks. */
 export declare const pickOrderColumn: (column: (scope: unknown) => unknown) => string;
-/** Run one `.select()` callback and return the paths of the columns it picks. */
 export declare const pickSelectColumns: (columns: (scope: unknown) => unknown) => string[];

package/dist/module/query/service/filter/filter.facade.js

@@ -1,76 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pickSelectColumns = exports.pickOrderColumn = exports.pickSearchColumns = exports.buildFilterPredicate = exports.raw = exports.mindatetime = exports.maxdatetime = exports.now = exports.not = exports.or = exports.and = void 0;
-const invalidFilter_exception_1 = require("../../exception/invalidFilter.exception");
-const escape_util_1 = require("../../util/filter/escape.util");
-const literal_util_1 = require("../../util/filter/literal.util");
-const predicate_util_1 = require("../../util/filter/predicate.util");
-const scopeProxy_util_1 = require("../../util/filter/scopeProxy.util");
-const and = (...predicates) => (0, predicate_util_1.combine)('and', predicates);
+const filter_service_1 = require("./filter.service");
+const and = (...predicates) => filter_service_1.FilterService.and(...predicates);
 exports.and = and;
-const or = (...predicates) => (0, predicate_util_1.combine)('or', predicates);
+const or = (...predicates) => filter_service_1.FilterService.or(...predicates);
 exports.or = or;
-const not = (predicate) => 
-// `not (…)` carries its own grouping, so it never needs wrapping again.
-new predicate_util_1.PredicateNode(`not (${predicate.text})`);
+const not = (predicate) => filter_service_1.FilterService.not(predicate);
 exports.not = not;
-const now = () => (0, scopeProxy_util_1.createMember)(new literal_util_1.ExpressionNode('now()', 0));
+const now = () => filter_service_1.FilterService.now();
 exports.now = now;
-const maxdatetime = () => (0, scopeProxy_util_1.createMember)(new literal_util_1.ExpressionNode('maxdatetime()', 0));
+const maxdatetime = () => filter_service_1.FilterService.maxdatetime();
 exports.maxdatetime = maxdatetime;
-const mindatetime = () => (0, scopeProxy_util_1.createMember)(new literal_util_1.ExpressionNode('mindatetime()', 0));
+const mindatetime = () => filter_service_1.FilterService.mindatetime();
 exports.mindatetime = mindatetime;
-const raw = (odataExpression) => new predicate_util_1.PredicateNode(odataExpression, true);
+const raw = (odataExpression) => filter_service_1.FilterService.raw(odataExpression);
 exports.raw = raw;
-/** The second argument of every filter callback. */
-const operators = {
-    and: exports.and,
-    or: exports.or,
-    not: exports.not,
-    now: exports.now,
-    maxdatetime: exports.maxdatetime,
-    mindatetime: exports.mindatetime,
-    raw: exports.raw,
-};
-/**
- * Run one `.filter()` callback. A callback that returns a bare column rather
- * than a predicate is a runtime error here, because the type layer cannot see
- * through a caller's `any`.
- */
-const buildFilterPredicate = (build) => {
-    const predicate = build((0, scopeProxy_util_1.rootScope)(), operators);
-    if (!(predicate instanceof predicate_util_1.PredicateNode))
-        throw new invalidFilter_exception_1.InvalidFilterError('a filter callback must return a predicate, not a bare column');
-    return predicate;
-};
+const buildFilterPredicate = (build) => new filter_service_1.FilterService().buildPredicate(build);
 exports.buildFilterPredicate = buildFilterPredicate;
-/**
- * Run one `.search()` callback. `$search` is a 400 without `$searchColumns`,
- * so an empty column list is rejected before the query is ever emitted.
- */
-const pickSearchColumns = (term, columns) => {
-    const paths = columnPaths(columns((0, scopeProxy_util_1.rootScope)()), '$searchColumns');
-    if (paths.length === 0)
-        throw new invalidFilter_exception_1.InvalidFilterError('$search needs at least one column');
-    return { term: (0, escape_util_1.escapeBareValue)(term), columns: paths };
-};
+const pickSearchColumns = (term, columns) => new filter_service_1.FilterService().pickSearchColumns(term, columns);
 exports.pickSearchColumns = pickSearchColumns;
-/** Run one `.orderBy()` callback and return the path of the column it picks. */
-const pickOrderColumn = (column) => columnPath(column((0, scopeProxy_util_1.rootScope)()), '$orderby');
+const pickOrderColumn = (column) => new filter_service_1.FilterService().pickOrderColumn(column);
 exports.pickOrderColumn = pickOrderColumn;
-/** Run one `.select()` callback and return the paths of the columns it picks. */
-const pickSelectColumns = (columns) => columnPaths(columns((0, scopeProxy_util_1.rootScope)()), '$select');
+const pickSelectColumns = (columns) => new filter_service_1.FilterService().pickSelectColumns(columns);
 exports.pickSelectColumns = pickSelectColumns;
-/** One column or a list of them, as a callback returns it. */
-const columnPaths = (picked, option) => (Array.isArray(picked) ? picked : [picked]).map((column) => columnPath(column, option));
-/**
- * `$searchColumns`, `$orderby` and `$select` take plain property paths: a
- * function call is a 400.
- */
-const columnPath = (value, option) => {
-    const node = (0, scopeProxy_util_1.nodeOf)(value);
-    if (node === undefined || node.text === '' || /[(),']/.test(node.text))
-        throw new invalidFilter_exception_1.InvalidFilterError(`${option} takes property paths only, not expressions`);
-    return node.text;
-};
 //# sourceMappingURL=filter.facade.js.map

package/dist/module/query/service/filter/filter.facade.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter.facade.js","sourceRoot":"","sources":["../../../../../src/module/query/service/filter/filter.facade.ts"],"names":[],"mappings":";;;AAeA,qFAA6E;AAC7E,+DAAgE;AAChE,iEAAgE;AAChE,qEAA0E;AAC1E,uEAI2C;AAEpC,MAAM,GAAG,GAAG,CAAC,GAAG,UAAuB,EAAa,EAAE,CAC5D,IAAA,wBAAO,EAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AADf,QAAA,GAAG,OACY;AACrB,MAAM,EAAE,GAAG,CAAC,GAAG,UAAuB,EAAa,EAAE,CAC3D,IAAA,wBAAO,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AADd,QAAA,EAAE,MACY;AACpB,MAAM,GAAG,GAAG,CAAC,SAAoB,EAAa,EAAE;AACtD,wEAAwE;AACxE,IAAI,8BAAa,CAAC,QAAQ,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC;AAFjC,QAAA,GAAG,OAE8B;AACvC,MAAM,GAAG,GAAG,GAAa,EAAE,CAAC,IAAA,8BAAY,EAAC,IAAI,6BAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;AAAnE,QAAA,GAAG,OAAgE;AACzE,MAAM,WAAW,GAAG,GAAa,EAAE,CACzC,IAAA,8BAAY,EAAC,IAAI,6BAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC;AADzC,QAAA,WAAW,eAC8B;AAC/C,MAAM,WAAW,GAAG,GAAa,EAAE,CACzC,IAAA,8BAAY,EAAC,IAAI,6BAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC;AADzC,QAAA,WAAW,eAC8B;AAC/C,MAAM,GAAG,GAAG,CAAC,eAAuB,EAAa,EAAE,CACzD,IAAI,8BAAa,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AAD7B,QAAA,GAAG,OAC0B;AAE1C,oDAAoD;AACpD,MAAM,SAAS,GAAc;IAC5B,GAAG,EAAH,WAAG;IACH,EAAE,EAAF,UAAE;IACF,GAAG,EAAH,WAAG;IACH,GAAG,EAAH,WAAG;IACH,WAAW,EAAX,mBAAW;IACX,WAAW,EAAX,mBAAW;IACX,GAAG,EAAH,WAAG;CACH,CAAC;AAEF;;;;GAIG;AACI,MAAM,oBAAoB,GAAG,CACnC,KAA0D,EAC9C,EAAE;IACd,MAAM,SAAS,GAAG,KAAK,CAAC,IAAA,2BAAS,GAAE,EAAE,SAAS,CAAC,CAAC;IAChD,IAAI,CAAC,CAAC,SAAS,YAAY,8BAAa,CAAC;QACxC,MAAM,IAAI,4CAAkB,CAC3B,8DAA8D,CAC9D,CAAC;IACH,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AATW,QAAA,oBAAoB,wBAS/B;AAEF;;;GAGG;AACI,MAAM,iBAAiB,GAAG,CAChC,IAAY,EACZ,OAAmD,EACrC,EAAE;IAChB,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,IAAA,2BAAS,GAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAClE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QACrB,MAAM,IAAI,4CAAkB,CAAC,mCAAmC,CAAC,CAAC;IACnE,OAAO,EAAE,IAAI,EAAE,IAAA,6BAAe,EAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AACxD,CAAC,CAAC;AARW,QAAA,iBAAiB,qBAQ5B;AAEF,gFAAgF;AACzE,MAAM,eAAe,GAAG,CAAC,MAAmC,EAAU,EAAE,CAC9E,UAAU,CAAC,MAAM,CAAC,IAAA,2BAAS,GAAE,CAAC,EAAE,UAAU,CAAC,CAAC;AADhC,QAAA,eAAe,mBACiB;AAE7C,iFAAiF;AAC1E,MAAM,iBAAiB,GAAG,CAChC,OAAoC,EACzB,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,IAAA,2BAAS,GAAE,CAAC,EAAE,SAAS,CAAC,CAAC;AAF/C,QAAA,iBAAiB,qBAE8B;AAI5D,8DAA8D;AAC9D,MAAM,WAAW,GAAG,CAAC,MAAe,EAAE,MAAkB,EAAY,EAAE,CACrE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC1D,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAC1B,CAAC;AAEH;;;GAGG;AACH,MAAM,UAAU,GAAG,CAAC,KAAc,EAAE,MAAkB,EAAU,EAAE;IACjE,MAAM,IAAI,GAAG,IAAA,wBAAM,EAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACrE,MAAM,IAAI,4CAAkB,CAC3B,GAAG,MAAM,6CAA6C,CACtD,CAAC;IACH,OAAO,IAAI,CAAC,IAAI,CAAC;AAClB,CAAC,CAAC"}
+{"version":3,"file":"filter.facade.js","sourceRoot":"","sources":["../../../../../src/module/query/service/filter/filter.facade.ts"],"names":[],"mappings":";;;AAaA,qDAAiD;AAE1C,MAAM,GAAG,GAAG,CAAC,GAAG,UAAuB,EAAa,EAAE,CAC5D,8BAAa,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC;AADrB,QAAA,GAAG,OACkB;AAC3B,MAAM,EAAE,GAAG,CAAC,GAAG,UAAuB,EAAa,EAAE,CAC3D,8BAAa,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC;AADpB,QAAA,EAAE,MACkB;AAC1B,MAAM,GAAG,GAAG,CAAC,SAAoB,EAAa,EAAE,CACtD,8BAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AADjB,QAAA,GAAG,OACc;AACvB,MAAM,GAAG,GAAG,GAAa,EAAE,CAAC,8BAAa,CAAC,GAAG,EAAE,CAAC;AAA1C,QAAA,GAAG,OAAuC;AAChD,MAAM,WAAW,GAAG,GAAa,EAAE,CAAC,8BAAa,CAAC,WAAW,EAAE,CAAC;AAA1D,QAAA,WAAW,eAA+C;AAChE,MAAM,WAAW,GAAG,GAAa,EAAE,CAAC,8BAAa,CAAC,WAAW,EAAE,CAAC;AAA1D,QAAA,WAAW,eAA+C;AAChE,MAAM,GAAG,GAAG,CAAC,eAAuB,EAAa,EAAE,CACzD,8BAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AADvB,QAAA,GAAG,OACoB;AAE7B,MAAM,oBAAoB,GAAG,CACnC,KAA0D,EAC9C,EAAE,CAAC,IAAI,8BAAa,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;AAF7C,QAAA,oBAAoB,wBAEyB;AAEnD,MAAM,iBAAiB,GAAG,CAChC,IAAY,EACZ,OAAmD,EACrC,EAAE,CAAC,IAAI,8BAAa,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAH1D,QAAA,iBAAiB,qBAGyC;AAEhE,MAAM,eAAe,GAAG,CAAC,MAAmC,EAAU,EAAE,CAC9E,IAAI,8BAAa,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;AADhC,QAAA,eAAe,mBACiB;AAEtC,MAAM,iBAAiB,GAAG,CAChC,OAAoC,EACzB,EAAE,CAAC,IAAI,8BAAa,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AAFjD,QAAA,iBAAiB,qBAEgC"}

package/dist/module/query/service/filter/filter.service.d.ts

@@ -0,0 +1,51 @@
+/**
+ * `FilterService` runs one caller callback against a fresh scope and turns
+ * what comes back into filter text or column paths. Its static methods are the
+ * combinators a caller writes (`and`, `or`, `not`, `raw`, `now`,
+ * `maxdatetime`, `mindatetime`); they need no scope, so they need no instance.
+ *
+ * A scope proxy never leaves this class as itself. `buildPredicate` hands one
+ * to the callback and returns the predicate that comes back;
+ * `pickSearchColumns`, `pickOrderColumn` and `pickSelectColumns` hand one out
+ * and return plain text. Nothing outside the filter stage therefore has to
+ * know that a scope is a Proxy at all.
+ */
+import type { DateExpr } from '../../domain/filter/dateExpr.model';
+import type { Node, Predicate } from '../../domain/filter/node.model';
+import type { Operators } from '../../domain/filter/operators.model';
+import type { SearchState } from '../../domain/queryState.model';
+export declare class FilterService {
+    static and(...predicates: Predicate[]): Predicate;
+    static or(...predicates: Predicate[]): Predicate;
+    static not(predicate: Predicate): Predicate;
+    static now(): DateExpr;
+    static maxdatetime(): DateExpr;
+    static mindatetime(): DateExpr;
+    static raw(odataExpression: string): Predicate;
+    /** The second argument of every filter callback. */
+    private static readonly operators;
+    /** The scope this instance hands to its one callback. */
+    private readonly scope;
+    /**
+     * Run one `.filter()` callback. A callback that returns a bare column rather
+     * than a predicate is a runtime error here, because the type layer cannot see
+     * through a caller's `any`.
+     */
+    buildPredicate(build: (scope: unknown, operators: Operators) => Predicate): Predicate;
+    /**
+     * Run one `.search()` callback. `$search` is a 400 without `$searchColumns`,
+     * so an empty column list is rejected before the query is ever emitted.
+     */
+    pickSearchColumns(term: string, columns: (scope: unknown) => Node | readonly Node[]): SearchState;
+    /** Run one `.orderBy()` callback and return the path of the column it picks. */
+    pickOrderColumn(column: (scope: unknown) => unknown): string;
+    /** Run one `.select()` callback and return the paths of the columns it picks. */
+    pickSelectColumns(columns: (scope: unknown) => unknown): string[];
+    /** One column or a list of them, as a callback returns it. */
+    private columnPaths;
+    /**
+     * `$searchColumns`, `$orderby` and `$select` take plain property paths: a
+     * function call is a 400.
+     */
+    private columnPath;
+}

package/dist/module/query/service/filter/filter.service.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FilterService = void 0;
+const invalidFilter_exception_1 = require("../../exception/invalidFilter.exception");
+const escape_util_1 = require("../../util/filter/escape.util");
+const predicate_util_1 = require("../../util/filter/predicate.util");
+const scope_service_1 = require("./scope.service");
+class FilterService {
+    static and(...predicates) {
+        return (0, predicate_util_1.combine)('and', predicates);
+    }
+    static or(...predicates) {
+        return (0, predicate_util_1.combine)('or', predicates);
+    }
+    static not(predicate) {
+        // `not (…)` carries its own grouping, so it never needs wrapping again.
+        return new predicate_util_1.PredicateNode(`not (${predicate.text})`);
+    }
+    static now() {
+        return scope_service_1.ScopeService.createMember(new scope_service_1.ExpressionNode('now()', 0));
+    }
+    static maxdatetime() {
+        return scope_service_1.ScopeService.createMember(new scope_service_1.ExpressionNode('maxdatetime()', 0));
+    }
+    static mindatetime() {
+        return scope_service_1.ScopeService.createMember(new scope_service_1.ExpressionNode('mindatetime()', 0));
+    }
+    static raw(odataExpression) {
+        return new predicate_util_1.PredicateNode(odataExpression, true);
+    }
+    /** The second argument of every filter callback. */
+    static operators = {
+        and: FilterService.and,
+        or: FilterService.or,
+        not: FilterService.not,
+        now: FilterService.now,
+        maxdatetime: FilterService.maxdatetime,
+        mindatetime: FilterService.mindatetime,
+        raw: FilterService.raw,
+    };
+    /** The scope this instance hands to its one callback. */
+    scope = scope_service_1.ScopeService.rootScope();
+    /**
+     * Run one `.filter()` callback. A callback that returns a bare column rather
+     * than a predicate is a runtime error here, because the type layer cannot see
+     * through a caller's `any`.
+     */
+    buildPredicate(build) {
+        const predicate = build(this.scope, FilterService.operators);
+        if (!(predicate instanceof predicate_util_1.PredicateNode))
+            throw new invalidFilter_exception_1.InvalidFilterError('a filter callback must return a predicate, not a bare column');
+        return predicate;
+    }
+    /**
+     * Run one `.search()` callback. `$search` is a 400 without `$searchColumns`,
+     * so an empty column list is rejected before the query is ever emitted.
+     */
+    pickSearchColumns(term, columns) {
+        const paths = this.columnPaths(columns(this.scope), '$searchColumns');
+        if (paths.length === 0)
+            throw new invalidFilter_exception_1.InvalidFilterError('$search needs at least one column');
+        return { term: (0, escape_util_1.escapeBareValue)(term), columns: paths };
+    }
+    /** Run one `.orderBy()` callback and return the path of the column it picks. */
+    pickOrderColumn(column) {
+        return this.columnPath(column(this.scope), '$orderby');
+    }
+    /** Run one `.select()` callback and return the paths of the columns it picks. */
+    pickSelectColumns(columns) {
+        return this.columnPaths(columns(this.scope), '$select');
+    }
+    /** One column or a list of them, as a callback returns it. */
+    columnPaths(picked, option) {
+        return (Array.isArray(picked) ? picked : [picked]).map((column) => this.columnPath(column, option));
+    }
+    /**
+     * `$searchColumns`, `$orderby` and `$select` take plain property paths: a
+     * function call is a 400.
+     */
+    columnPath(value, option) {
+        const node = scope_service_1.ScopeService.nodeOf(value);
+        if (node === undefined || node.text === '' || /[(),']/.test(node.text))
+            throw new invalidFilter_exception_1.InvalidFilterError(`${option} takes property paths only, not expressions`);
+        return node.text;
+    }
+}
+exports.FilterService = FilterService;
+//# sourceMappingURL=filter.service.js.map

package/dist/module/query/service/filter/filter.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"filter.service.js","sourceRoot":"","sources":["../../../../../src/module/query/service/filter/filter.service.ts"],"names":[],"mappings":"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"}