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

package/dist/index.d.ts

@@ -6,8 +6,8 @@
  * 400 is deliberately absent, so it is a compile error rather than a runtime
  * failure.
  */
-import type { Chain, ExpandKey, ExpandNamespace, QueryParams } from './module/query/domain/chain/chain.model';
-import type { ExpandChain } from './module/query/domain/chain/expandChain.model';
+import type { Chain, EmbeddedExpandNamespace, ExpandKey, ExpandNamespace, QueryParams } from './module/query/domain/chain/chain.model';
+import type { ExpandChain, ToOneExpandChain } from './module/query/domain/chain/expandChain.model';
 import type { ItemChain } from './module/query/domain/chain/itemChain.model';
 import { QueryBuilderExceptionCode } from './module/query/domain/exceptionCode.model';
 import type { ExceptionDetail } from './module/query/domain/exceptionDetail.model';
@@ -19,7 +19,7 @@ import type { Node, Predicate } from './module/query/domain/filter/node.model';
 import type { NumberExpr } from './module/query/domain/filter/numberExpr.model';
 import type { Operators } from './module/query/domain/filter/operators.model';
 import type { Scalar, Unwrap } from './module/query/domain/filter/scalar.model';
-import type { EmbeddedObjectKeys, EmbeddedOf, ExprFor, LambdaNamespace, OwnKeys, PrimitiveArrayKeys, PrimitiveLambdaNamespace, Relation, ScalarFieldKeys, Scope, ToManyKeys, ToOneKeys } from './module/query/domain/filter/scope.model';
+import type { ColumnExpr, EmbeddedObjectKeys, EmbeddedOf, ExprFor, InlineToOneKeys, LambdaNamespace, OwnKeys, PrimitiveArrayKeys, PrimitiveLambdaNamespace, Relation, ScalarFieldKeys, Scope, SelectColumn, SelectScope, ToManyKeys, ToOneKeys } from './module/query/domain/filter/scope.model';
 import type { StringExpr } from './module/query/domain/filter/stringExpr.model';
 import { InvalidFilterError } from './module/query/exception/invalidFilter.exception';
 import { QueryBuilderException } from './module/query/exception/queryBuilder.exception';
@@ -27,4 +27,4 @@ import { ReservedNameError } from './module/query/exception/reservedName.excepti
 import { and, maxdatetime, mindatetime, not, now, or, raw } from './module/query/service/filter/filter.facade';
 import { odataItem, odataQuery } from './module/query/service/queryChain.service';
 export { InvalidFilterError, QueryBuilderException, QueryBuilderExceptionCode, ReservedNameError, and, maxdatetime, mindatetime, not, now, odataItem, odataQuery, or, raw, };
-export type { BooleanExpr, CastResult, Castable, Chain, Comparable, DateExpr, DateInput, EdmTarget, EmbeddedObjectKeys, EmbeddedOf, ExceptionDetail, ExpandChain, ExpandKey, ExpandNamespace, ExprFor, ItemChain, LambdaNamespace, Node, NumberExpr, Operators, OwnKeys, Predicate, PrimitiveArrayKeys, PrimitiveLambdaNamespace, QueryParams, Relation, Scalar, ScalarFieldKeys, Scope, StringExpr, ToManyKeys, ToOneKeys, Unwrap, };
+export type { BooleanExpr, CastResult, Castable, Chain, ColumnExpr, Comparable, DateExpr, DateInput, EdmTarget, EmbeddedExpandNamespace, EmbeddedObjectKeys, EmbeddedOf, ExceptionDetail, ExpandChain, ExpandKey, ExpandNamespace, ExprFor, InlineToOneKeys, ItemChain, LambdaNamespace, Node, NumberExpr, Operators, OwnKeys, Predicate, PrimitiveArrayKeys, PrimitiveLambdaNamespace, QueryParams, Relation, Scalar, ScalarFieldKeys, Scope, SelectColumn, SelectScope, StringExpr, ToManyKeys, ToOneExpandChain, ToOneKeys, Unwrap, };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAUH,mFAAsF;AAoDrF,0GApDQ,+CAAyB,OAoDR;AApB1B,8FAAsF;AAkBrF,mGAlBQ,4CAAkB,OAkBR;AAjBnB,4FAAwF;AAkBvF,sGAlBQ,8CAAqB,OAkBR;AAjBtB,4FAAoF;AAmBnF,kGAnBQ,0CAAiB,OAmBR;AAlBlB,+EAQqD;AAWpD,oFAlBA,mBAAG,OAkBA;AACH,4FAlBA,2BAAW,OAkBA;AACX,4FAlBA,2BAAW,OAkBA;AACX,oFAlBA,mBAAG,OAkBA;AACH,oFAlBA,mBAAG,OAkBA;AAGH,mFApBA,kBAAE,OAoBA;AACF,oFApBA,mBAAG,OAoBA;AAlBJ,kFAGmD;AAYlD,0FAdA,8BAAS,OAcA;AACT,2FAdA,+BAAU,OAcA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAcH,mFAAsF;AAwDrF,0GAxDQ,+CAAyB,OAwDR;AApB1B,8FAAsF;AAkBrF,mGAlBQ,4CAAkB,OAkBR;AAjBnB,4FAAwF;AAkBvF,sGAlBQ,8CAAqB,OAkBR;AAjBtB,4FAAoF;AAmBnF,kGAnBQ,0CAAiB,OAmBR;AAlBlB,+EAQqD;AAWpD,oFAlBA,mBAAG,OAkBA;AACH,4FAlBA,2BAAW,OAkBA;AACX,4FAlBA,2BAAW,OAkBA;AACX,oFAlBA,mBAAG,OAkBA;AACH,oFAlBA,mBAAG,OAkBA;AAGH,mFApBA,kBAAE,OAoBA;AACF,oFApBA,mBAAG,OAoBA;AAlBJ,kFAGmD;AAYlD,0FAdA,8BAAS,OAcA;AACT,2FAdA,+BAAU,OAcA"}

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

@@ -4,34 +4,54 @@
  * The builder produces a query STRING. It does not fetch, and it does not know
  * about the `_embedded` / `_page` response envelope.
  *
- * `ExpandNamespace` is the type of the `expand` member of all three chain
- * types. It holds one function per relation of the DTO, typed from
+ * `ExpandNamespace` is the type of the `expand` member of every chain
+ * type. It holds one function per relation of the DTO, typed from
  * `_embedded`: `q.expand.` lists exactly the relations `_embedded` declares,
- * and each callback is typed to the entity that relation reaches. There is no
- * build step and no `$metadata` document.
+ * and each callback is typed to the entity that relation reaches. A to-many
+ * relation's callback receives an `ExpandChain`, a to-one relation's a
+ * `ToOneExpandChain`. There is no build step and no `$metadata` document.
  */
 import type { Predicate } from '../filter/node.model';
 import type { Operators } from '../filter/operators.model';
-import type { ColumnExpr, Relation, ScalarFieldKeys, Scope, SelectScope, ToManyKeys, ToOneKeys } from '../filter/scope.model';
+import type { ColumnExpr, EmbeddedObjectKeys, InlineToOneKeys, PrimitiveArrayKeys, Relation, ScalarFieldKeys, Scope, SelectColumn, SelectScope, ToManyKeys, ToOneKeys } from '../filter/scope.model';
 import type { StringExpr } from '../filter/stringExpr.model';
-import type { ExpandChain } from './expandChain.model';
+import type { ExpandChain, ToOneExpandChain } from './expandChain.model';
 /** A flat `{ $option: value }` map, for a caller that serialises its own URL. */
 export type QueryParams = Record<string, string>;
 /** Every expandable relation name of a DTO. A real allowlist. */
 export type ExpandKey<T> = ToOneKeys<T> | ToManyKeys<T>;
 /**
  * `Self` is the chain the call returns, so `expand.a(...).expand.b(...)`
- * chains at whatever level it is written.
+ * chains at whatever level it is written. An embedded object reads as an
+ * `EmbeddedExpandNamespace`, so `expand.address.supplier()` reaches the inline
+ * to-one inside it.
  */
 export type ExpandNamespace<T, Self> = {
-    readonly [K in ExpandKey<T>]: (build?: (chain: ExpandChain<Relation<T, K>>) => unknown) => Self;
+    readonly [K in ExpandKey<T>]: (build?: (chain: K extends ToManyKeys<T> ? ExpandChain<Relation<T, K>> : ToOneExpandChain<Relation<T, K>>) => unknown) => Self;
+} & {
+    readonly [K in Exclude<EmbeddedObjectKeys<T>, ExpandKey<T> | InlineToOneKeys<T>>]: EmbeddedExpandNamespace<NonNullable<T[K]>, Self>;
+};
+/**
+ * The inline to-ones inside embedded object `E`, and the embedded objects
+ * nested in it. A call prints the joined path: `expand.address.supplier()`
+ * gives `$expand=address/supplier`. The call takes no callback, because the
+ * server rejects options on an expand path of more than one segment
+ * (test/e2e/rejections.spec.ts).
+ */
+export type EmbeddedExpandNamespace<E, Self> = {
+    readonly [K in InlineToOneKeys<E>]: () => Self;
+} & {
+    readonly [K in Exclude<EmbeddedObjectKeys<E>, InlineToOneKeys<E>>]: EmbeddedExpandNamespace<NonNullable<E[K]>, Self>;
 };
 export interface Chain<T> {
     readonly expand: ExpandNamespace<T, Chain<T>>;
-    /** Own columns, by name. */
-    select(...keys: ScalarFieldKeys<T>[]): Chain<T>;
-    /** Own columns and embedded leaves: `select((v) => [v.id, v.address.city])`. */
-    select(columns: (scope: SelectScope<T>) => ColumnExpr | readonly ColumnExpr[]): Chain<T>;
+    /** Own columns and primitive array columns, by name. */
+    select(...keys: (ScalarFieldKeys<T> | PrimitiveArrayKeys<T>)[]): Chain<T>;
+    /**
+     * Own columns, primitive array columns and embedded leaves:
+     * `select((v) => [v.id, v.tags, v.address.city])`.
+     */
+    select(columns: (scope: SelectScope<T>) => SelectColumn | readonly SelectColumn[]): Chain<T>;
     /** Repeated calls AND together. */
     filter(build: (scope: Scope<T>, operators: Operators) => Predicate): Chain<T>;
     /** `$search` + its mandatory `$searchColumns`, as one verb. */

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

@@ -1,6 +1,9 @@
 /**
- * What a nested `$expand` may carry: `$filter`, `$select`, a further
- * `$expand`, `$top` and `$skip`, and nothing else.
+ * What a nested `$expand` may carry. `ExpandChain` is the chain of a to-many
+ * relation: `$filter`, `$select`, a further `$expand`, `$top` and `$skip`, and
+ * nothing else. `ToOneExpandChain` is the chain of a to-one relation: the same
+ * without `$top` and `$skip`, because the server pages a collection only and
+ * answers `$expand=owner($top=5)` with a 400.
  *
  * `$orderby`, `$count` and `$levels` inside `$expand` are an
  * `UnsupportedFeatureError` from the server, so they are absent from this
@@ -15,27 +18,39 @@
  */
 import type { Predicate } from '../filter/node.model';
 import type { Operators } from '../filter/operators.model';
-import type { ColumnExpr, ScalarFieldKeys, Scope, SelectScope } from '../filter/scope.model';
+import type { PrimitiveArrayKeys, ScalarFieldKeys, Scope, SelectColumn, SelectScope } from '../filter/scope.model';
 import type { ExpandNamespace } from './chain.model';
 export interface ExpandChain<T> {
     readonly expand: ExpandNamespace<T, ExpandChain<T>>;
-    /** Own columns, by name. */
-    select(...keys: ScalarFieldKeys<T>[]): ExpandChain<T>;
-    /** Own columns and embedded leaves: `select((v) => [v.id, v.address.city])`. */
-    select(columns: (scope: SelectScope<T>) => ColumnExpr | readonly ColumnExpr[]): ExpandChain<T>;
+    /** Own columns and primitive array columns, by name. */
+    select(...keys: (ScalarFieldKeys<T> | PrimitiveArrayKeys<T>)[]): ExpandChain<T>;
+    /**
+     * Own columns, primitive array columns and embedded leaves:
+     * `select((v) => [v.id, v.tags, v.address.city])`.
+     */
+    select(columns: (scope: SelectScope<T>) => SelectColumn | readonly SelectColumn[]): ExpandChain<T>;
     /**
      * `$expand=rel($filter=…)`. The scope is the EXPANDED entity, so paths are
      * written relative to it, not to the root. Repeated calls AND together.
      */
     filter(build: (scope: Scope<T>, operators: Operators) => Predicate): ExpandChain<T>;
+    /** `$expand=rel($top=…)`. The server applies it per parent row. */
+    top(count: number): ExpandChain<T>;
+    /** `$expand=rel($skip=…)`. The server applies it per parent row. */
+    skip(count: number): ExpandChain<T>;
+}
+export interface ToOneExpandChain<T> {
+    readonly expand: ExpandNamespace<T, ToOneExpandChain<T>>;
+    /** Own columns and primitive array columns, by name. */
+    select(...keys: (ScalarFieldKeys<T> | PrimitiveArrayKeys<T>)[]): ToOneExpandChain<T>;
     /**
-     * `$expand=rel($top=…)`. The server applies it per parent row, on a to-many
-     * relation only.
+     * Own columns, primitive array columns and embedded leaves:
+     * `select((v) => [v.id, v.tags, v.address.city])`.
      */
-    top(count: number): ExpandChain<T>;
+    select(columns: (scope: SelectScope<T>) => SelectColumn | readonly SelectColumn[]): ToOneExpandChain<T>;
     /**
-     * `$expand=rel($skip=…)`. The server applies it per parent row, on a to-many
-     * relation only.
+     * `$expand=rel($filter=…)`. The scope is the EXPANDED entity, so paths are
+     * written relative to it, not to the root. Repeated calls AND together.
      */
-    skip(count: number): ExpandChain<T>;
+    filter(build: (scope: Scope<T>, operators: Operators) => Predicate): ToOneExpandChain<T>;
 }

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

@@ -5,14 +5,17 @@
  * `$count` and `$search` have nothing to act on. Only the shaping options are
  * offered.
  */
-import type { ColumnExpr, ScalarFieldKeys, SelectScope } from '../filter/scope.model';
+import type { PrimitiveArrayKeys, ScalarFieldKeys, SelectColumn, SelectScope } from '../filter/scope.model';
 import type { ExpandNamespace, QueryParams } from './chain.model';
 export interface ItemChain<T> {
     readonly expand: ExpandNamespace<T, ItemChain<T>>;
-    /** Own columns, by name. */
-    select(...keys: ScalarFieldKeys<T>[]): ItemChain<T>;
-    /** Own columns and embedded leaves: `select((v) => [v.id, v.address.city])`. */
-    select(columns: (scope: SelectScope<T>) => ColumnExpr | readonly ColumnExpr[]): ItemChain<T>;
+    /** Own columns and primitive array columns, by name. */
+    select(...keys: (ScalarFieldKeys<T> | PrimitiveArrayKeys<T>)[]): ItemChain<T>;
+    /**
+     * Own columns, primitive array columns and embedded leaves:
+     * `select((v) => [v.id, v.tags, v.address.city])`.
+     */
+    select(columns: (scope: SelectScope<T>) => SelectColumn | readonly SelectColumn[]): ItemChain<T>;
     toQueryString(): string;
     /**
      * The same query as separate parts, with the transport escaping undone, for

package/dist/module/query/domain/exceptionDetail.model.d.ts

@@ -1,7 +1,8 @@
 /**
  * The machine-readable payload behind an error message. One entry of
- * `QueryBuilderException.errors` is one of these, and `errors[0].reason` is
- * the exception message.
+ * `QueryBuilderException.errors` is one of these. For InvalidFilterError,
+ * errors[0].reason is the message; ReservedNameError has a longer message and
+ * a fixed reason.
  *
  * Plain serializable data: an adapter can put the array straight into an HTTP
  * response body.

package/dist/module/query/domain/exceptionDetail.model.js

@@ -1,8 +1,9 @@
 "use strict";
 /**
  * The machine-readable payload behind an error message. One entry of
- * `QueryBuilderException.errors` is one of these, and `errors[0].reason` is
- * the exception message.
+ * `QueryBuilderException.errors` is one of these. For InvalidFilterError,
+ * errors[0].reason is the message; ReservedNameError has a longer message and
+ * a fixed reason.
  *
  * Plain serializable data: an adapter can put the array straight into an HTTP
  * response body.

package/dist/module/query/domain/exceptionDetail.model.js.map

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

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

@@ -1,7 +1,7 @@
 /**
  * A temporal expression. A DTO types a timestamp column as an ISO `string`, so
  * this type is reached through the explicit `.asDate()` opt-in rather than
- * inferred — which keeps the eight component functions off every text column.
+ * inferred — which keeps the component functions off every text column.
  */
 import type { Castable } from './castable.model';
 import type { Comparable } from './comparable.model';

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

@@ -1,8 +1,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, made by `ScopeService` in `service/filter/scope.service.ts`.
+ * Nothing in this file has a runtime body. PredicateNode in
+ * util/filter/predicate.util.ts implements Predicate, and ExpressionNode in
+ * service/filter/scope.service.ts carries the text of every other Node.
  * A construct the server rejects is not typed here at all, so a 400 becomes a
  * red squiggle.
  */

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

@@ -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, made by `ScopeService` in `service/filter/scope.service.ts`.
+ * Nothing in this file has a runtime body. PredicateNode in
+ * util/filter/predicate.util.ts implements Predicate, and ExpressionNode in
+ * service/filter/scope.service.ts carries the text of every other Node.
  * A construct the server rejects is not typed here at all, so a 400 becomes a
  * red squiggle.
  */

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;;;;;;;GAOG"}
+{"version":3,"file":"node.model.js","sourceRoot":"","sources":["../../../../../src/module/query/domain/filter/node.model.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG"}

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

@@ -1,10 +1,7 @@
 /**
- * A DTO type read as a filter NAMESPACE — the object a `.filter()` callback
- * receives.
- *
- * The eleven helper types below are mutually recursive (`Scope<T>` mentions
- * `Scope<Relation>`), so they stay in one file rather than being split one per
- * type: the split would only add import cycles between declaration files.
+ * The scopes that a filter, search, orderBy or select callback reads.
+ * `Scope<T>` and `LambdaNamespace<R>` refer to each other; the key types sit
+ * next to them because both scopes are built from them.
  *
  * The key sets are subtracted with `Exclude` rather than `Omit`. `Omit` makes
  * TypeScript compute `keyof` of a type that mentions `Scope<T>` again, which it
@@ -63,6 +60,15 @@ export type PrimitiveArrayKeys<T> = Extract<{
 export type EmbeddedObjectKeys<T> = Extract<{
     [K in keyof T]-?: K extends '_embedded' ? never : NonNullable<T[K]> extends Scalar ? never : NonNullable<T[K]> extends readonly unknown[] ? never : NonNullable<T[K]> extends object ? K : never;
 }[keyof T], string>;
+/**
+ * Every embedded object property whose type is a row-backed DTO, which the
+ * type shows by its `_embedded` key: an inline to-one (`address.supplier`).
+ * A filter reads it like an embedded object; its columns reach the response
+ * through `$expand`, never through `$select`.
+ */
+export type InlineToOneKeys<T> = {
+    [K in EmbeddedObjectKeys<T>]-?: '_embedded' extends keyof NonNullable<T[K]> ? K : never;
+}[EmbeddedObjectKeys<T>];
 /** Every `_embedded` relation of a DTO that holds a single row. */
 export type ToOneKeys<T> = Extract<{
     [K in keyof EmbeddedOf<T>]-?: NonNullable<EmbeddedOf<T>[K]> extends readonly unknown[] ? never : K;
@@ -99,12 +105,20 @@ export type Scope<T> = {
  */
 export type ColumnExpr = StringExpr<string> | NumberExpr<number | bigint> | DateExpr | BooleanExpr;
 /**
- * What a `select` callback reads: own columns and embedded objects, never a
- * relation. A relation column comes through `$expand`, so `owner/email` is
- * not a `$select` path.
+ * One column, as a `select` callback returns it: a `ColumnExpr`, or a
+ * primitive array column, which `$select` takes but `$orderby` does not.
+ */
+export type SelectColumn = ColumnExpr | PrimitiveLambdaNamespace<Scalar>;
+/**
+ * What a `select` callback reads: own columns, primitive array columns and
+ * embedded objects, never a relation. A relation column comes through
+ * `$expand`, so neither `owner/email` nor the inline to-one
+ * `address/supplier/name` is a `$select` path.
  */
 export type SelectScope<T> = {
     readonly [K in ScalarFieldKeys<T>]: ExprFor<T[K]>;
 } & {
-    readonly [K in EmbeddedObjectKeys<T>]: SelectScope<NonNullable<T[K]>>;
+    readonly [K in PrimitiveArrayKeys<T>]: PrimitiveLambdaNamespace<Unwrap<NonNullable<T[K]>>>;
+} & {
+    readonly [K in Exclude<EmbeddedObjectKeys<T>, InlineToOneKeys<T>>]: SelectScope<NonNullable<T[K]>>;
 };

package/dist/module/query/domain/queryState.model.d.ts

@@ -4,9 +4,9 @@
  * the predicates and the search parts it carries.
  *
  * One shape serves every level. The type layer is what decides which verbs a
- * level offers — the root carries all of them, an expanded level carries
- * `$filter`, `$select` and `$expand` — so the emitter never has to ask what
- * kind of node it is looking at: it prints whatever is present.
+ * level offers. The emitter does not check the level: toQueryParts() prints
+ * every root field, and nestedParts() prints only $filter, $select, $expand,
+ * $top and $skip of an expanded level.
  *
  * It sits at the root of `domain/` because it is the contract of
  * `src/module/query/`, not the product of one stage.

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

@@ -7,6 +7,10 @@ exports.InvalidFilterError = void 0;
  * Every case the type layer can reject is rejected at compile time instead;
  * this covers what only the runtime can see — an empty `in()` list, a NaN
  * literal, a callback that returns a column instead of a predicate.
+ *
+ * Despite the name, this is the error of every runtime check that is not a
+ * reserved name: top() and skip() values and search(), orderBy() and select()
+ * columns included.
  */
 const exceptionCode_model_1 = require("../domain/exceptionCode.model");
 const queryBuilder_exception_1 = require("./queryBuilder.exception");

package/dist/module/query/exception/invalidFilter.exception.js.map

@@ -1 +1 @@
-{"version":3,"file":"invalidFilter.exception.js","sourceRoot":"","sources":["../../../../src/module/query/exception/invalidFilter.exception.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,uEAA0E;AAC1E,qEAAiE;AAEjE,MAAa,kBAAmB,SAAQ,8CAAqB;IAC5D,YAAY,MAAc,EAAE,OAAgB;QAC3C,KAAK,CAAC,+CAAyB,CAAC,cAAc,EAAE,MAAM,EAAE;YACvD,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE;SACxD,CAAC,CAAC;IACJ,CAAC;CACD;AAND,gDAMC"}
+{"version":3,"file":"invalidFilter.exception.js","sourceRoot":"","sources":["../../../../src/module/query/exception/invalidFilter.exception.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,uEAA0E;AAC1E,qEAAiE;AAEjE,MAAa,kBAAmB,SAAQ,8CAAqB;IAC5D,YAAY,MAAc,EAAE,OAAgB;QAC3C,KAAK,CAAC,+CAAyB,CAAC,cAAc,EAAE,MAAM,EAAE;YACvD,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE;SACxD,CAAC,CAAC;IACJ,CAAC;CACD;AAND,gDAMC"}

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

@@ -22,7 +22,10 @@ export declare abstract class QueryBuilderException extends Error {
     readonly statusCode: number;
     /** Stable machine-readable code, e.g. "RESERVED_NAME". */
     readonly code: QueryBuilderExceptionCode;
-    /** Every detail behind this error; `errors[0]` fills the message. */
+    /**
+     * Every detail behind this error. For InvalidFilterError, errors[0].reason
+     * is the message; ReservedNameError has a longer message and a fixed reason.
+     */
     readonly errors: ExceptionDetail[];
     protected constructor(code: QueryBuilderExceptionCode, message: string, errors: ExceptionDetail[]);
 }

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

@@ -23,7 +23,10 @@ class QueryBuilderException extends Error {
     statusCode;
     /** Stable machine-readable code, e.g. "RESERVED_NAME". */
     code;
-    /** Every detail behind this error; `errors[0]` fills the message. */
+    /**
+     * Every detail behind this error. For InvalidFilterError, errors[0].reason
+     * is the message; ReservedNameError has a longer message and a fixed reason.
+     */
     errors;
     constructor(code, message, errors) {
         super(message);

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

@@ -1 +1 @@
-{"version":3,"file":"queryBuilder.exception.js","sourceRoot":"","sources":["../../../../src/module/query/exception/queryBuilder.exception.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAKH,MAAsB,qBAAsB,SAAQ,KAAK;IACxD,sDAAsD;IAC7C,MAAM,CAAS;IACxB,8DAA8D;IACrD,UAAU,CAAS;IAC5B,0DAA0D;IACjD,IAAI,CAA4B;IACzC,qEAAqE;IAC5D,MAAM,CAAoB;IAEnC,YACC,IAA+B,EAC/B,OAAe,EACf,MAAyB;QAEzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;CACD;AAtBD,sDAsBC"}
+{"version":3,"file":"queryBuilder.exception.js","sourceRoot":"","sources":["../../../../src/module/query/exception/queryBuilder.exception.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAKH,MAAsB,qBAAsB,SAAQ,KAAK;IACxD,sDAAsD;IAC7C,MAAM,CAAS;IACxB,8DAA8D;IACrD,UAAU,CAAS;IAC5B,0DAA0D;IACjD,IAAI,CAA4B;IACzC;;;OAGG;IACM,MAAM,CAAoB;IAEnC,YACC,IAA+B,EAC/B,OAAe,EACf,MAAyB;QAEzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;CACD;AAzBD,sDAyBC"}

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

@@ -4,16 +4,16 @@ exports.ReservedNameError = void 0;
 /**
  * A name the builder cannot hand out, because JavaScript itself would call it.
  *
- * Reading `then` on a scope would make `await q` treat the builder as a
- * thenable and hang; reading `toJSON` would make `JSON.stringify(q)` produce
- * silent nonsense. Both throw instead of returning a value.
+ * A filter scope member (ScopeService.createMember() in scope.service.ts) and
+ * chain.expand throw for then, toJSON, toString and valueOf. JavaScript reads
+ * these names in await, JSON.stringify and string or number coercion.
  */
 const exceptionCode_model_1 = require("../domain/exceptionCode.model");
 const queryBuilder_exception_1 = require("./queryBuilder.exception");
 class ReservedNameError extends queryBuilder_exception_1.QueryBuilderException {
     reservedName;
     constructor(reservedName) {
-        super(exceptionCode_model_1.QueryBuilderExceptionCode.RESERVED_NAME, `"${reservedName}" is reserved on a filter scope. The builder is not a ` +
+        super(exceptionCode_model_1.QueryBuilderExceptionCode.RESERVED_NAME, `"${reservedName}" is reserved on the query builder. The builder is not a ` +
             `promise and is not serialisable; call .toQueryString() instead.`, [
             {
                 reason: 'the name is reserved on a builder scope',

package/dist/module/query/exception/reservedName.exception.js.map

@@ -1 +1 @@
-{"version":3,"file":"reservedName.exception.js","sourceRoot":"","sources":["../../../../src/module/query/exception/reservedName.exception.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,uEAA0E;AAC1E,qEAAiE;AAEjE,MAAa,iBAAkB,SAAQ,8CAAqB;IACtC;IAArB,YAAqB,YAAoB;QACxC,KAAK,CACJ,+CAAyB,CAAC,aAAa,EACvC,IAAI,YAAY,wDAAwD;YACvE,iEAAiE,EAClE;YACC;gBACC,MAAM,EAAE,yCAAyC;gBACjD,OAAO,EAAE,YAAY;aACrB;SACD,CACD,CAAC;QAXkB,iBAAY,GAAZ,YAAY,CAAQ;IAYzC,CAAC;CACD;AAdD,8CAcC"}
+{"version":3,"file":"reservedName.exception.js","sourceRoot":"","sources":["../../../../src/module/query/exception/reservedName.exception.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,uEAA0E;AAC1E,qEAAiE;AAEjE,MAAa,iBAAkB,SAAQ,8CAAqB;IACtC;IAArB,YAAqB,YAAoB;QACxC,KAAK,CACJ,+CAAyB,CAAC,aAAa,EACvC,IAAI,YAAY,2DAA2D;YAC1E,iEAAiE,EAClE;YACC;gBACC,MAAM,EAAE,yCAAyC;gBACjD,OAAO,EAAE,YAAY;aACrB;SACD,CACD,CAAC;QAXkB,iBAAY,GAAZ,YAAY,CAAQ;IAYzC,CAAC;CACD;AAdD,8CAcC"}

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

@@ -5,9 +5,11 @@
  * 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.
+ * `toQueryParts()`, so for text the builder escapes, the string form and the
+ * map form say the same query. They differ only in the transport escaping
+ * each one leaves in place. raw() text goes into both forms as written, so a
+ * + or a percent escape in it means one thing in toQueryString() and another
+ * in toParams().
  */
 import type { QueryState } from '../../domain/queryState.model';
 export declare class EmitService {

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

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

@@ -13,17 +13,19 @@ class FilterService {
         return (0, predicate_util_1.combine)('or', predicates);
     }
     static not(predicate) {
+        if (!(predicate instanceof predicate_util_1.PredicateNode))
+            throw new invalidFilter_exception_1.InvalidFilterError('not() takes predicates, not a bare column', 'not');
         // `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));
+        return scope_service_1.ScopeService.createMember(new scope_service_1.ExpressionNode('now()'));
     }
     static maxdatetime() {
-        return scope_service_1.ScopeService.createMember(new scope_service_1.ExpressionNode('maxdatetime()', 0));
+        return scope_service_1.ScopeService.createMember(new scope_service_1.ExpressionNode('maxdatetime()'));
     }
     static mindatetime() {
-        return scope_service_1.ScopeService.createMember(new scope_service_1.ExpressionNode('mindatetime()', 0));
+        return scope_service_1.ScopeService.createMember(new scope_service_1.ExpressionNode('mindatetime()'));
     }
     static raw(odataExpression) {
         return new predicate_util_1.PredicateNode(odataExpression, true);

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

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

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

@@ -1,12 +1,8 @@
 export declare class ExpressionNode {
     readonly text: string;
-    /** lambda nesting level, for deterministic alias letters */
-    readonly depth: number;
     /** true for `a add 1`: needs parentheses as an operand of `mul`. */
     readonly arithmetic: boolean;
     constructor(text: string, 
-    /** lambda nesting level, for deterministic alias letters */
-    depth: number, 
     /** true for `a add 1`: needs parentheses as an operand of `mul`. */
     arithmetic?: boolean);
 }
@@ -14,9 +10,8 @@ export declare class ScopeService {
     /** The only key that reads a node. A DTO key can never be a symbol. */
     private static readonly NODE;
     /**
-     * The filter scope of an entity: an empty path at lambda depth 0. An
-     * expanded entity is filtered relative to itself, so it takes the same empty
-     * root.
+     * The filter scope of an entity: an empty path. An expanded entity is
+     * filtered relative to itself, so it takes the same empty root.
      */
     static rootScope(): any;
     /**
@@ -54,6 +49,12 @@ export declare class ScopeService {
     private static binaryFunction;
     private static arithmetic;
     private static stringMatch;
+    /**
+     * The number of lambda bodies running at this moment. A lambda takes its
+     * alias from it, so a lambda inside another lambda body gets the next
+     * letter, also when it opens on a root path.
+     */
+    private static openLambdas;
     /**
      * A distinct alias letter per lambda nesting level, so an inner lambda never
      * shadows the outer one and `b/x ne a/y` stays expressible.

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

@@ -7,15 +7,11 @@ const escape_util_1 = require("../../util/filter/escape.util");
 const predicate_util_1 = require("../../util/filter/predicate.util");
 class ExpressionNode {
     text;
-    depth;
     arithmetic;
     constructor(text, 
-    /** lambda nesting level, for deterministic alias letters */
-    depth, 
     /** true for `a add 1`: needs parentheses as an operand of `mul`. */
     arithmetic = false) {
         this.text = text;
-        this.depth = depth;
         this.arithmetic = arithmetic;
     }
 }
@@ -24,12 +20,11 @@ class ScopeService {
     /** The only key that reads a node. A DTO key can never be a symbol. */
     static NODE = Symbol('odata.node');
     /**
-     * The filter scope of an entity: an empty path at lambda depth 0. An
-     * expanded entity is filtered relative to itself, so it takes the same empty
-     * root.
+     * The filter scope of an entity: an empty path. An expanded entity is
+     * filtered relative to itself, so it takes the same empty root.
      */
     static rootScope() {
-        return ScopeService.createMember(new ExpressionNode('', 0));
+        return ScopeService.createMember(new ExpressionNode(''));
     }
     /**
      * `createMember(node)` is a value; `createMember(node, parent, name)` is a
@@ -65,17 +60,16 @@ class ScopeService {
                     property === 'toString' ||
                     property === 'valueOf')
                     throw new reservedName_exception_1.ReservedNameError(property);
-                return ScopeService.createMember(new ExpressionNode(node.text ? `${node.text}/${property}` : property, node.depth), node, property);
+                return ScopeService.createMember(new ExpressionNode(node.text ? `${node.text}/${property}` : property), node, property);
             },
             apply(_target, _thisArgument, callArguments) {
                 if (parent === undefined || name === undefined)
-                    throw new invalidFilter_exception_1.InvalidFilterError(`"${node.text}" is a property path, not a function`, node.text);
+                    throw new invalidFilter_exception_1.InvalidFilterError(`"${node.text}" is a value, not a function`, node.text);
                 const method = ScopeService.filterFunction(name);
                 if (method === undefined)
                     throw new invalidFilter_exception_1.InvalidFilterError(`${name}() is not an OData filter function served by this API`, name);
                 return method(parent, callArguments);
             },
-            has: (_target, property) => typeof property === 'string',
         });
     }
     /** The node behind a scope proxy, or `undefined` for a plain value. */
@@ -122,7 +116,18 @@ class ScopeService {
         if (typeof value === 'number') {
             if (!Number.isFinite(value))
                 throw new invalidFilter_exception_1.InvalidFilterError(`${value} is not an OData number literal`, String(value));
-            return String(value);
+            const text = String(value);
+            if (!text.includes('e'))
+                return text;
+            // The grammar has no exponent form, so 1e-7 and 1e21 print in full.
+            // Below 1e-100 the full form rounds to 0, a different value.
+            const fullText = value.toLocaleString('en-US', {
+                useGrouping: false,
+                maximumFractionDigits: 100,
+            });
+            if (Number(fullText) !== value)
+                throw new invalidFilter_exception_1.InvalidFilterError(`${value} is not an OData number literal`, text);
+            return fullText;
         }
         if (value instanceof Date) {
             if (Number.isNaN(value.getTime()))
@@ -142,18 +147,24 @@ class ScopeService {
     }
     /** A one-argument SQL function: `name(self)`. */
     static unaryFunction(name) {
-        return (self) => ScopeService.createMember(new ExpressionNode(`${name}(${self.text})`, self.depth));
+        return (self) => ScopeService.createMember(new ExpressionNode(`${name}(${self.text})`));
     }
     /** A two-argument SQL function: `name(self,argument)`. */
     static binaryFunction(name) {
-        return (self, callArguments) => ScopeService.createMember(new ExpressionNode(`${name}(${self.text},${ScopeService.literal(callArguments[0])})`, self.depth));
+        return (self, callArguments) => ScopeService.createMember(new ExpressionNode(`${name}(${self.text},${ScopeService.literal(callArguments[0])})`));
     }
     static arithmetic(operator) {
-        return (self, callArguments) => ScopeService.createMember(new ExpressionNode(`${ScopeService.parenthesiseArithmetic(self)} ${operator} ${ScopeService.literal(callArguments[0])}`, self.depth, true));
+        return (self, callArguments) => ScopeService.createMember(new ExpressionNode(`${ScopeService.parenthesiseArithmetic(self)} ${operator} ${ScopeService.literal(callArguments[0])}`, true));
     }
     static stringMatch(name) {
         return (self, callArguments) => new predicate_util_1.PredicateNode(`${name}(${self.text},${ScopeService.literal(callArguments[0])})`);
     }
+    /**
+     * The number of lambda bodies running at this moment. A lambda takes its
+     * alias from it, so a lambda inside another lambda body gets the next
+     * letter, also when it opens on a root path.
+     */
+    static openLambdas = 0;
     /**
      * A distinct alias letter per lambda nesting level, so an inner lambda never
      * shadows the outer one and `b/x ne a/y` stays expressible.
@@ -171,8 +182,15 @@ class ScopeService {
                     throw new invalidFilter_exception_1.InvalidFilterError('all() requires a predicate; the server rejects a bare all()', 'all');
                 return new predicate_util_1.PredicateNode(`${self.text}/any()`);
             }
-            const alias = ScopeService.lambdaAlias(self.depth);
-            const inner = build(ScopeService.createMember(new ExpressionNode(alias, self.depth + 1)));
+            const alias = ScopeService.lambdaAlias(ScopeService.openLambdas);
+            ScopeService.openLambdas += 1;
+            let inner;
+            try {
+                inner = build(ScopeService.createMember(new ExpressionNode(alias)));
+            }
+            finally {
+                ScopeService.openLambdas -= 1;
+            }
             if (!(inner instanceof predicate_util_1.PredicateNode))
                 throw new invalidFilter_exception_1.InvalidFilterError(`${kind}() must return a predicate, not a bare column`, kind);
             // The colon carries no space: the grammar requires `any(a:…)`.
@@ -195,7 +213,7 @@ class ScopeService {
                 if (ScopeService.nodeOf(member))
                     throw new invalidFilter_exception_1.InvalidFilterError('in() takes literal values only; the server rejects a column or an expression inside in (...)', 'in');
             }
-            return new predicate_util_1.PredicateNode(`${self.text} in (${values
+            return new predicate_util_1.PredicateNode(`${ScopeService.parenthesiseArithmetic(self)} in (${values
                 .map((value) => ScopeService.literal(value, true))
                 .join(',')})`);
         },
@@ -211,7 +229,7 @@ class ScopeService {
         concat: ScopeService.binaryFunction('concat'),
         substring: (self, callArguments) => ScopeService.createMember(new ExpressionNode(callArguments[1] === undefined
             ? `substring(${self.text},${ScopeService.literal(callArguments[0])})`
-            : `substring(${self.text},${ScopeService.literal(callArguments[0])},${ScopeService.literal(callArguments[1])})`, self.depth)),
+            : `substring(${self.text},${ScopeService.literal(callArguments[0])},${ScopeService.literal(callArguments[1])})`)),
         indexOf: ScopeService.binaryFunction('indexof'),
         contains: ScopeService.stringMatch('contains'),
         startsWith: ScopeService.stringMatch('startswith'),
@@ -240,7 +258,7 @@ class ScopeService {
         floor: ScopeService.unaryFunction('floor'),
         round: ScopeService.unaryFunction('round'),
         /* type */
-        cast: (self, callArguments) => ScopeService.createMember(new ExpressionNode(`cast(${self.text},${callArguments[0]})`, self.depth)),
+        cast: (self, callArguments) => ScopeService.createMember(new ExpressionNode(`cast(${self.text},${callArguments[0]})`)),
         /* lambdas */
         any: ScopeService.lambda('any'),
         all: ScopeService.lambda('all'),

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

@@ -1 +1 @@
-{"version":3,"file":"scope.service.js","sourceRoot":"","sources":["../../../../../src/module/query/service/filter/scope.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scope.service.js","sourceRoot":"","sources":["../../../../../src/module/query/service/filter/scope.service.ts"],"names":[],"mappings":";;;AA0CA,qFAA6E;AAC7E,mFAA2E;AAC3E,+DAAsD;AACtD,qEAAiE;AAEjE,MAAa,cAAc;IAEhB;IAEA;IAHV,YACU,IAAY;IACrB,oEAAoE;IAC3D,aAAsB,KAAK;QAF3B,SAAI,GAAJ,IAAI,CAAQ;QAEZ,eAAU,GAAV,UAAU,CAAiB;IAClC,CAAC;CACJ;AAND,wCAMC;AAOD,MAAa,YAAY;IACxB,uEAAuE;IAC/D,MAAM,CAAU,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IAEpD;;;OAGG;IACH,MAAM,CAAC,SAAS;QACf,OAAO,YAAY,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,YAAY,CAClB,IAAoB,EACpB,MAAuB,EACvB,IAAa;QAEb,yEAAyE;QACzE,mEAAmE;QACnE,OAAO,IAAI,KAAK;QACf,0BAA0B,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,CAAsB,EACjE;YACC,GAAG,CAAC,OAAO,EAAE,QAAQ;gBACpB,IAAI,QAAQ,KAAK,YAAY,CAAC,IAAI;oBAAE,OAAO,IAAI,CAAC;gBAChD,IAAI,OAAO,QAAQ,KAAK,QAAQ;oBAAE,OAAO,SAAS,CAAC;gBACnD,mEAAmE;gBACnE,iEAAiE;gBACjE,iEAAiE;gBACjE,mEAAmE;gBACnE,iEAAiE;gBACjE,cAAc;gBACd,IACC,QAAQ,KAAK,MAAM;oBACnB,QAAQ,KAAK,QAAQ;oBACrB,QAAQ,KAAK,UAAU;oBACvB,QAAQ,KAAK,SAAS;oBAEtB,MAAM,IAAI,0CAAiB,CAAC,QAAQ,CAAC,CAAC;gBACvC,OAAO,YAAY,CAAC,YAAY,CAC/B,IAAI,cAAc,CACjB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CACjD,EACD,IAAI,EACJ,QAAQ,CACR,CAAC;YACH,CAAC;YACD,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,aAAwB;gBACrD,IAAI,MAAM,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS;oBAC7C,MAAM,IAAI,4CAAkB,CAC3B,IAAI,IAAI,CAAC,IAAI,8BAA8B,EAC3C,IAAI,CAAC,IAAI,CACT,CAAC;gBACH,MAAM,MAAM,GAAG,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;gBACjD,IAAI,MAAM,KAAK,SAAS;oBACvB,MAAM,IAAI,4CAAkB,CAC3B,GAAG,IAAI,uDAAuD,EAC9D,IAAI,CACJ,CAAC;gBACH,OAAO,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;YACtC,CAAC;SACD,CACD,CAAC;IACH,CAAC;IAED,uEAAuE;IACvE,MAAM,CAAC,MAAM,CAAC,KAAc;QAC3B,OAAO,OAAO,KAAK,KAAK,UAAU;YACjC,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;YAC7C,CAAC,CAAG,KAAiC,CAAC,YAAY,CAAC,IAAI,CAEzC;YACd,CAAC,CAAC,SAAS,CAAC;IACd,CAAC;IAED,qEAAqE;IAC7D,MAAM,CAAC,sBAAsB,CAAC,IAAoB;QACzD,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IACvD,CAAC;IAEO,MAAM,CAAC,WAAW,CACzB,KAAc;QAEd,OAAO,CACN,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,OAAQ,KAA6B,CAAC,KAAK,KAAK,UAAU,CAC1D,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACK,MAAM,CAAC,OAAO,CAAC,KAAc,EAAE,SAAS,GAAG,KAAK;QACvD,IAAI,KAAK,KAAK,SAAS;YACtB,MAAM,IAAI,4CAAkB,CAC3B,+GAA+G,CAC/G,CAAC;QACH,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACpB,IAAI,SAAS;gBAAE,OAAO,MAAM,CAAC;YAC7B,MAAM,IAAI,4CAAkB,CAC3B,mHAAmH,CACnH,CAAC;QACH,CAAC;QACD,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,IAAI;YAAE,OAAO,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,IAAA,mBAAK,EAAC,KAAK,CAAC,CAAC;QACnD,IAAI,OAAO,KAAK,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QAChE,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAC1B,MAAM,IAAI,4CAAkB,CAC3B,GAAG,KAAK,iCAAiC,EACzC,MAAM,CAAC,KAAK,CAAC,CACb,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,OAAO,IAAI,CAAC;YACrC,oEAAoE;YACpE,6DAA6D;YAC7D,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE;gBAC9C,WAAW,EAAE,KAAK;gBAClB,qBAAqB,EAAE,GAAG;aAC1B,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,KAAK;gBAC7B,MAAM,IAAI,4CAAkB,CAC3B,GAAG,KAAK,iCAAiC,EACzC,IAAI,CACJ,CAAC;YACH,OAAO,QAAQ,CAAC;QACjB,CAAC;QACD,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YAC3B,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;gBAChC,MAAM,IAAI,4CAAkB,CAAC,oCAAoC,CAAC,CAAC;YACpE,OAAO,IAAA,mBAAK,EAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,OAAO,KAAK,IAAI;gBACnB,MAAM,IAAI,4CAAkB,CAAC,wCAAwC,CAAC,CAAC;YACxE,OAAO,IAAA,mBAAK,EAAC,OAAO,CAAC,CAAC;QACvB,CAAC;QACD,MAAM,IAAI,4CAAkB,CAC3B,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAClE,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,QAAgB;QACzC,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,CAC9B,IAAI,8BAAa,CAChB,GAAG,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CACpE,CAAC;IACJ,CAAC;IAED,iDAAiD;IACzC,MAAM,CAAC,aAAa,CAAC,IAAY;QACxC,OAAO,CAAC,IAAI,EAAE,EAAE,CACf,YAAY,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,0DAA0D;IAClD,MAAM,CAAC,cAAc,CAAC,IAAY;QACzC,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,CAC9B,YAAY,CAAC,YAAY,CACxB,IAAI,cAAc,CACjB,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CACjE,CACD,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,QAAgB;QACzC,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,CAC9B,YAAY,CAAC,YAAY,CACxB,IAAI,cAAc,CACjB,GAAG,YAAY,CAAC,sBAAsB,CACrC,IAAI,CACJ,IAAI,QAAQ,IAAI,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,EACzD,IAAI,CACJ,CACD,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,WAAW,CAAC,IAAY;QACtC,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,CAC9B,IAAI,8BAAa,CAChB,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CACjE,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,WAAW,GAAG,CAAC,CAAC;IAE/B;;;OAGG;IACK,MAAM,CAAC,WAAW,CAAC,KAAa;QACvC,OAAO,KAAK,GAAG,EAAE;YAChB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,GAAG,KAAK,CAAC;YACjC,CAAC,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,CAAC;IACzE,CAAC;IAEO,MAAM,CAAC,MAAM,CAAC,IAAmB;QACxC,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE;YAC9B,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAEjB,CAAC;YACb,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,IAAI,IAAI,KAAK,KAAK;oBACjB,MAAM,IAAI,4CAAkB,CAC3B,6DAA6D,EAC7D,KAAK,CACL,CAAC;gBACH,OAAO,IAAI,8BAAa,CAAC,GAAG,IAAI,CAAC,IAAI,QAAQ,CAAC,CAAC;YAChD,CAAC;YACD,MAAM,KAAK,GAAG,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YACjE,YAAY,CAAC,WAAW,IAAI,CAAC,CAAC;YAC9B,IAAI,KAAc,CAAC;YACnB,IAAI,CAAC;gBACJ,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrE,CAAC;oBAAS,CAAC;gBACV,YAAY,CAAC,WAAW,IAAI,CAAC,CAAC;YAC/B,CAAC;YACD,IAAI,CAAC,CAAC,KAAK,YAAY,8BAAa,CAAC;gBACpC,MAAM,IAAI,4CAAkB,CAC3B,GAAG,IAAI,+CAA+C,EACtD,IAAI,CACJ,CAAC;YACH,+DAA+D;YAC/D,OAAO,IAAI,8BAAa,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QAC1E,CAAC,CAAC;IACH,CAAC;IAEO,MAAM,CAAU,gBAAgB,GAAmC;QAC1E,gBAAgB;QAChB,EAAE,EAAE,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;QACjC,EAAE,EAAE,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;QACjC,EAAE,EAAE,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;QACjC,EAAE,EAAE,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;QACjC,EAAE,EAAE,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;QACjC,EAAE,EAAE,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;QACjC,EAAE,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE;YAC3B,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;gBAChD,MAAM,IAAI,4CAAkB,CAAC,+BAA+B,EAAE,IAAI,CAAC,CAAC;YACrE,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC;gBAC7B,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC;oBAC9B,MAAM,IAAI,4CAAkB,CAC3B,8FAA8F,EAC9F,IAAI,CACJ,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,8BAAa,CACvB,GAAG,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,MAAM;iBACxD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;iBACjD,IAAI,CAAC,GAAG,CAAC,GAAG,CACd,CAAC;QACH,CAAC;QACD,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,8BAAa,CAAC,GAAG,IAAI,CAAC,IAAI,UAAU,CAAC;QAC3D,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,8BAAa,CAAC,GAAG,IAAI,CAAC,IAAI,UAAU,CAAC;QAC9D,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,8BAAa,CAAC,GAAG,IAAI,CAAC,IAAI,UAAU,CAAC;QAC3D,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,8BAAa,CAAC,GAAG,IAAI,CAAC,IAAI,WAAW,CAAC;QAE7D,YAAY;QACZ,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC;QAC5C,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC;QAC5C,IAAI,EAAE,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC;QACxC,MAAM,EAAE,YAAY,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC5C,MAAM,EAAE,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC;QAC7C,SAAS,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,CAClC,YAAY,CAAC,YAAY,CACxB,IAAI,cAAc,CACjB,aAAa,CAAC,CAAC,CAAC,KAAK,SAAS;YAC7B,CAAC,CAAC,aAAa,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,OAAO,CAC9C,aAAa,CAAC,CAAC,CAAC,CACf,GAAG;YACN,CAAC,CAAC,aAAa,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,OAAO,CAC9C,aAAa,CAAC,CAAC,CAAC,CACf,IAAI,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CACjD,CACD;QACF,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC;QAC/C,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,UAAU,CAAC;QAC9C,UAAU,EAAE,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC;QAClD,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,UAAU,CAAC;QAC9C,kEAAkE;QAClE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC;QAEjD,eAAe;QACf,IAAI,EAAE,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC;QACxC,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC;QAC1C,GAAG,EAAE,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC;QACtC,IAAI,EAAE,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC;QACxC,MAAM,EAAE,YAAY,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC5C,MAAM,EAAE,YAAY,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC5C,iBAAiB,EAAE,YAAY,CAAC,aAAa,CAAC,mBAAmB,CAAC;QAClE,kBAAkB,EAAE,YAAY,CAAC,aAAa,CAAC,oBAAoB,CAAC;QACpE,YAAY,EAAE,YAAY,CAAC,aAAa,CAAC,cAAc,CAAC;QACxD,IAAI,EAAE,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC;QACxC,IAAI,EAAE,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC;QAExC,gBAAgB;QAChB,GAAG,EAAE,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC;QACnC,GAAG,EAAE,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC;QACnC,GAAG,EAAE,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC;QACnC,GAAG,EAAE,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC;QACnC,GAAG,EAAE,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC;QACnC,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC;QAC9C,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC;QAC1C,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC;QAE1C,UAAU;QACV,IAAI,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,CAC7B,YAAY,CAAC,YAAY,CACxB,IAAI,cAAc,CACjB,QAAQ,IAAI,CAAC,IAAI,IAAI,aAAa,CAAC,CAAC,CAAc,GAAG,CACrD,CACD;QAEF,aAAa;QACb,GAAG,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC;QAC/B,GAAG,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC;KAC/B,CAAC;IAEF;;;;OAIG;IACK,MAAM,CAAC,cAAc,CAAC,IAAY;QACzC,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAC1C,YAAY,CAAC,gBAAgB,EAC7B,IAAI,CACJ;YACA,CAAC,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACrC,CAAC,CAAC,SAAS,CAAC;IACd,CAAC;;AApWF,oCAqWC"}

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

@@ -11,12 +11,13 @@
  * query therefore does not change this class, and a change to this class does
  * not change how the query is printed.
  *
- * `Chain<T>`, `ItemChain<T>` and `ExpandChain<T>` are three interfaces over
- * this one class. Only the type that a factory returns differs. `Chain<T>`
- * has every member. `ItemChain<T>` has `select`, `expand`, `toQueryString()`
- * and `toParams()`. `ExpandChain<T>` has `select`, `expand`, `filter`, `top`
- * and `skip`, the options that the server accepts inside `$expand`. At
- * runtime, every instance has every member.
+ * `Chain<T>`, `ItemChain<T>`, `ExpandChain<T>` and `ToOneExpandChain<T>` are
+ * four interfaces over this one class. Only the type that a factory returns
+ * differs. `Chain<T>` has every member. `ItemChain<T>` has `select`, `expand`,
+ * `toQueryString()` and `toParams()`. `ExpandChain<T>` has `select`, `expand`,
+ * `filter`, `top` and `skip`, the options that the server accepts inside the
+ * `$expand` of a to-many relation. `ToOneExpandChain<T>` has the same without
+ * `top` and `skip`. At runtime, every instance has every member.
  */
 import type { Chain, QueryParams } from '../domain/chain/chain.model';
 import type { ItemChain } from '../domain/chain/itemChain.model';
@@ -26,18 +27,27 @@ import type { QueryState } from '../domain/queryState.model';
 export declare class QueryChainService {
     readonly queryState: QueryState;
     /**
-     * Returns a `Proxy` whose every string property is a call that adds that
-     * relation. The relation names exist only in the type system, so there is
-     * nothing to enumerate and no allowlist to check. `then` and `toJSON` throw
-     * `ReservedNameError`, so the object never passes for a promise or a JSON
-     * value. The `get` trap is an arrow function, so `this` is the
-     * `QueryChainService` and not the handler.
+     * Returns a `Proxy` whose every string property is a member that remembers
+     * its path. A call on a member adds the relation at that path; a read from
+     * it gives the member one segment further. The relation names exist only in
+     * the type system, so there is nothing to enumerate and no allowlist to
+     * check. `then`, `toJSON`, `toString` and `valueOf` throw
+     * `ReservedNameError`, so the object never passes for a promise, a JSON
+     * value or a primitive, and a coercion adds no relation.
      *
      * `chain.expand.parent((parent) => parent.select('name'))` gives
-     * `$expand=parent($select=name)`. See docs/maintainer/architecture.md, How
-     * `Proxy` works here.
+     * `$expand=parent($select=name)`, and `chain.expand.address.supplier()`
+     * gives `$expand=address/supplier`. See docs/maintainer/architecture.md,
+     * How `Proxy` works here.
      */
     get expand(): unknown;
+    /**
+     * The `Proxy` behind `expand` and behind each member read from it. The root
+     * target is a plain object, so `chain.expand` itself is not callable; every
+     * other target is the call that adds the relation at `path`. The traps are
+     * arrow functions, so `this` is the `QueryChainService` and not the handler.
+     */
+    private expandPath;
     select(...keys: string[] | [(scope: unknown) => unknown]): this;
     filter(build: (scope: unknown, operators: Operators) => Predicate): this;
     search(term: string, columns: (scope: unknown) => Node | readonly Node[]): this;

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

@@ -13,37 +13,51 @@ class QueryChainService {
         filters: [],
     };
     /**
-     * Returns a `Proxy` whose every string property is a call that adds that
-     * relation. The relation names exist only in the type system, so there is
-     * nothing to enumerate and no allowlist to check. `then` and `toJSON` throw
-     * `ReservedNameError`, so the object never passes for a promise or a JSON
-     * value. The `get` trap is an arrow function, so `this` is the
-     * `QueryChainService` and not the handler.
+     * Returns a `Proxy` whose every string property is a member that remembers
+     * its path. A call on a member adds the relation at that path; a read from
+     * it gives the member one segment further. The relation names exist only in
+     * the type system, so there is nothing to enumerate and no allowlist to
+     * check. `then`, `toJSON`, `toString` and `valueOf` throw
+     * `ReservedNameError`, so the object never passes for a promise, a JSON
+     * value or a primitive, and a coercion adds no relation.
      *
      * `chain.expand.parent((parent) => parent.select('name'))` gives
-     * `$expand=parent($select=name)`. See docs/maintainer/architecture.md, How
-     * `Proxy` works here.
+     * `$expand=parent($select=name)`, and `chain.expand.address.supplier()`
+     * gives `$expand=address/supplier`. See docs/maintainer/architecture.md,
+     * How `Proxy` works here.
      */
     get expand() {
-        return new Proxy(Object.create(null), {
+        return this.expandPath(Object.create(null), '');
+    }
+    /**
+     * The `Proxy` behind `expand` and behind each member read from it. The root
+     * target is a plain object, so `chain.expand` itself is not callable; every
+     * other target is the call that adds the relation at `path`. The traps are
+     * arrow functions, so `this` is the `QueryChainService` and not the handler.
+     */
+    expandPath(target, path) {
+        return new Proxy(target, {
             get: (_target, property) => {
                 if (typeof property !== 'string')
                     return undefined;
-                if (property === 'then' || property === 'toJSON')
+                if (property === 'then' ||
+                    property === 'toJSON' ||
+                    property === 'toString' ||
+                    property === 'valueOf')
                     throw new reservedName_exception_1.ReservedNameError(property);
                 if (property === 'constructor')
                     return undefined;
-                return (build) => {
+                const name = path ? `${path}/${property}` : property;
+                return this.expandPath((build) => {
                     const child = new QueryChainService();
                     build?.(child);
                     this.queryState.expand.push({
-                        name: property,
+                        name,
                         queryState: child.queryState,
                     });
                     return this;
-                };
+                }, name);
             },
-            has: (_target, property) => typeof property === 'string',
         });
     }
     select(...keys) {

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

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

package/dist/module/query/util/filter/predicate.util.js

@@ -27,6 +27,8 @@ const operand = (predicate) => predicate instanceof PredicateNode && predicate.c
 const combine = (operator, parts) => {
     if (parts.length === 0)
         throw new invalidFilter_exception_1.InvalidFilterError(`${operator}() needs at least one predicate`, operator);
+    if (parts.some((part) => !(part instanceof PredicateNode)))
+        throw new invalidFilter_exception_1.InvalidFilterError(`${operator}() takes predicates, not a bare column`, operator);
     if (parts.length === 1)
         return parts[0];
     return new PredicateNode(parts.map(operand).join(` ${operator} `), true);

package/dist/module/query/util/filter/predicate.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"predicate.util.js","sourceRoot":"","sources":["../../../../../src/module/query/util/filter/predicate.util.ts"],"names":[],"mappings":";;;AASA,qFAA6E;AAE7E,MAAa,aAAa;IAGf;IAEA;IAJD,WAAW,GAAG,IAAa,CAAC;IACrC,YACU,IAAY;IACrB,sEAAsE;IAC7D,YAAqB,KAAK;QAF1B,SAAI,GAAJ,IAAI,CAAQ;QAEZ,cAAS,GAAT,SAAS,CAAiB;IACjC,CAAC;IACJ,GAAG,CAAC,GAAG,MAAmB;QACzB,OAAO,IAAA,eAAO,EAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,EAAE,CAAC,GAAG,MAAmB;QACxB,OAAO,IAAA,eAAO,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IACzC,CAAC;CACD;AAbD,sCAaC;AAED,wEAAwE;AACxE,MAAM,OAAO,GAAG,CAAC,SAAoB,EAAU,EAAE,CAChD,SAAS,YAAY,aAAa,IAAI,SAAS,CAAC,SAAS;IACxD,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,GAAG;IACvB,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC;AAEZ,MAAM,OAAO,GAAG,CACtB,QAAsB,EACtB,KAAkB,EACN,EAAE;IACd,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QACrB,MAAM,IAAI,4CAAkB,CAC3B,GAAG,QAAQ,iCAAiC,EAC5C,QAAQ,CACR,CAAC;IACH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IACxC,OAAO,IAAI,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,QAAQ,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;AAC1E,CAAC,CAAC;AAXW,QAAA,OAAO,WAWlB"}
+{"version":3,"file":"predicate.util.js","sourceRoot":"","sources":["../../../../../src/module/query/util/filter/predicate.util.ts"],"names":[],"mappings":";;;AASA,qFAA6E;AAE7E,MAAa,aAAa;IAGf;IAEA;IAJD,WAAW,GAAG,IAAa,CAAC;IACrC,YACU,IAAY;IACrB,sEAAsE;IAC7D,YAAqB,KAAK;QAF1B,SAAI,GAAJ,IAAI,CAAQ;QAEZ,cAAS,GAAT,SAAS,CAAiB;IACjC,CAAC;IACJ,GAAG,CAAC,GAAG,MAAmB;QACzB,OAAO,IAAA,eAAO,EAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,EAAE,CAAC,GAAG,MAAmB;QACxB,OAAO,IAAA,eAAO,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IACzC,CAAC;CACD;AAbD,sCAaC;AAED,wEAAwE;AACxE,MAAM,OAAO,GAAG,CAAC,SAAoB,EAAU,EAAE,CAChD,SAAS,YAAY,aAAa,IAAI,SAAS,CAAC,SAAS;IACxD,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,GAAG;IACvB,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC;AAEZ,MAAM,OAAO,GAAG,CACtB,QAAsB,EACtB,KAAkB,EACN,EAAE;IACd,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QACrB,MAAM,IAAI,4CAAkB,CAC3B,GAAG,QAAQ,iCAAiC,EAC5C,QAAQ,CACR,CAAC;IACH,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,YAAY,aAAa,CAAC,CAAC;QACzD,MAAM,IAAI,4CAAkB,CAC3B,GAAG,QAAQ,wCAAwC,EACnD,QAAQ,CACR,CAAC;IACH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IACxC,OAAO,IAAI,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,QAAQ,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;AAC1E,CAAC,CAAC;AAhBW,QAAA,OAAO,WAgBlB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ballistix.digital/odata-query-builder",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "Typed, fluent OData v4 query-string builder for the dialect @ballistix.digital/typeorm-extensions serves.",
   "license": "MIT",
   "repository": {