oak-domain 3.0.3 → 4.0.0

package/lib/triggers/index.js

@@ -1,8 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDynamicTriggers = void 0;
-var modi_1 = require("../store/modi");
-function createDynamicTriggers(schema) {
-    return (0, modi_1.createModiRelatedTriggers)(schema);
-}
-exports.createDynamicTriggers = createDynamicTriggers;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDynamicTriggers = void 0;
+const modi_1 = require("../store/modi");
+function createDynamicTriggers(schema) {
+    return (0, modi_1.createModiRelatedTriggers)(schema);
+}
+exports.createDynamicTriggers = createDynamicTriggers;

package/lib/types/Action.d.ts

@@ -1,20 +1,20 @@
-import { CascadeRelationItem, EntityDict } from "./Entity";
-import { GenericAction } from '../actions/action';
-export declare type Action = string;
-export declare type State = string;
-export declare type ActionDef<A extends Action, S extends State> = {
-    stm: {
-        [a in A]: [p: S | S[], n: S];
-    };
-    is?: S;
-};
-export declare type ActionDictOfEntityDict<E extends EntityDict> = {
-    [T in keyof E]?: {
-        [A in keyof E[T]['OpSchema']]?: ActionDef<string, string>;
-    };
-};
-export declare type CascadeActionItem = CascadeRelationItem;
-export declare type CascadeActionAuth<A extends Action = ''> = {
-    [K in A | GenericAction]?: CascadeActionItem | (CascadeActionItem | CascadeActionItem[])[];
-};
-export declare type ActionOnRemove = 'setNull' | 'remove';
+import { CascadeRelationItem, EntityDict } from "./Entity";
+import { GenericAction } from '../actions/action';
+export type Action = string;
+export type State = string;
+export type ActionDef<A extends Action, S extends State> = {
+    stm: {
+        [a in A]: [p: S | S[], n: S];
+    };
+    is?: S;
+};
+export type ActionDictOfEntityDict<E extends EntityDict> = {
+    [T in keyof E]?: {
+        [A in keyof E[T]['OpSchema']]?: ActionDef<string, string>;
+    };
+};
+export type CascadeActionItem = CascadeRelationItem;
+export type CascadeActionAuth<A extends Action = ''> = {
+    [K in A | GenericAction]?: CascadeActionItem | (CascadeActionItem | CascadeActionItem[])[];
+};
+export type ActionOnRemove = 'setNull' | 'remove';

package/lib/types/AppLoader.d.ts

@@ -1,11 +1,17 @@
-import { AsyncContext, AsyncRowStore } from "../store/AsyncRowStore";
-import { EntityDict } from "./Entity";
-export declare abstract class AppLoader<ED extends EntityDict, Cxt extends AsyncContext<ED>> {
-    protected path: string;
-    constructor(path: string);
-    abstract execAspect(name: string, context: Cxt, params?: any): Promise<any>;
-    abstract initialize(dropIfExists?: boolean): Promise<void>;
-    abstract mount(): Promise<void>;
-    abstract unmount(): Promise<void>;
-    abstract getStore(): AsyncRowStore<ED, Cxt>;
-}
+/// <reference types="node" />
+import { IncomingHttpHeaders } from "http";
+import { AsyncContext, AsyncRowStore } from "../store/AsyncRowStore";
+import { EntityDict, OpRecord } from "./Entity";
+export declare abstract class AppLoader<ED extends EntityDict, Cxt extends AsyncContext<ED>> {
+    protected path: string;
+    constructor(path: string);
+    abstract execAspect(name: string, header?: IncomingHttpHeaders, contextString?: string, params?: any): Promise<{
+        opRecords?: OpRecord<ED>[];
+        message?: string;
+        result: any;
+    }>;
+    abstract initialize(dropIfExists?: boolean): Promise<void>;
+    abstract mount(): Promise<void>;
+    abstract unmount(): Promise<void>;
+    abstract getStore(): AsyncRowStore<ED, Cxt>;
+}

package/lib/types/AppLoader.js

@@ -1,10 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppLoader = void 0;
-var AppLoader = /** @class */ (function () {
-    function AppLoader(path) {
-        this.path = path;
-    }
-    return AppLoader;
-}());
-exports.AppLoader = AppLoader;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppLoader = void 0;
+class AppLoader {
+    path;
+    constructor(path) {
+        this.path = path;
+    }
+}
+exports.AppLoader = AppLoader;

package/lib/types/Aspect.d.ts

@@ -1,4 +1,4 @@
-import { EntityDict, SubDataDef } from "./Entity";
+import { EntityDict } from "./Entity";
 import { OpRecord } from "./Entity";
 import { AsyncContext } from "../store/AsyncRowStore";
 export interface Aspect<ED extends EntityDict, Cxt extends AsyncContext<ED>> {
@@ -10,6 +10,4 @@ export interface AspectWrapper<ED extends EntityDict, Cxt extends AsyncContext<E
         opRecords?: OpRecord<ED>[];
         message?: string | null;
     }>;
-    sub: (data: Array<SubDataDef<ED, keyof ED>>, callback: (records: OpRecord<ED>[], ids: string[]) => void) => Promise<void>;
-    unsub: (ids: string[]) => Promise<void>;
 }

package/lib/types/Auth.d.ts

@@ -1,74 +1,70 @@
-import { CascadeActionAuth, CascadeRelationAuth, ActionOnRemove, SyncOrAsync } from ".";
-import { AsyncContext } from "../store/AsyncRowStore";
-import { SyncContext } from "../store/SyncRowStore";
-import { EntityDict, OperateOption, SelectOption } from "../types/Entity";
-export declare type CheckerType = 'relation' | 'row' | 'data' | 'logical' | 'logicalRelation';
-/**
- * conditionalFilter是指该action发生时，operation所操作的行中有满足conditionalFilter的行
- * 被转化成trigger的filter条件，详细可看trigger中的说明
- */
-export declare type DataChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
-    priority?: number;
-    type: 'data';
-    entity: T;
-    action: Omit<ED[T]['Action'], 'remove'> | Array<Omit<ED[T]['Action'], 'remove'>>;
-    checker: (data: ED[T]['Create']['data'] | ED[T]['Update']['data'], context: Cxt) => SyncOrAsync<any>;
-    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Selection']['filter']>);
-};
-export declare type RowChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
-    priority?: number;
-    type: 'row';
-    entity: T;
-    action: Omit<ED[T]['Action'], 'create'> | Array<Omit<ED[T]['Action'], 'create'>>;
-    filter: ED[T]['Selection']['filter'] | ((operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => SyncOrAsync<ED[T]['Selection']['filter']>);
-    errMsg?: string;
-    inconsistentRows?: {
-        entity: keyof ED;
-        selection: (filter?: ED[T]['Selection']['filter']) => ED[keyof ED]['Selection'];
-    };
-    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Update']['filter']>);
-};
-export declare type RelationChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
-    priority?: number;
-    type: 'relation';
-    entity: T;
-    when?: 'after';
-    action: ED[T]['Action'] | Array<ED[T]['Action']>;
-    relationFilter: (operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => SyncOrAsync<ED[T]['Selection']['filter']>;
-    errMsg: string | ((operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option?: OperateOption | SelectOption) => string);
-    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Selection']['filter']>);
-};
-export declare type LogicalChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
-    priority?: number;
-    type: 'logical';
-    when?: 'after';
-    entity: T;
-    action: ED[T]['Action'] | Array<ED[T]['Action']>;
-    checker: (operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => SyncOrAsync<any>;
-    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Update']['filter']>);
-};
-export declare type LogicalRelationChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
-    priority?: number;
-    type: 'logicalRelation';
-    when?: 'after';
-    entity: T;
-    action: ED[T]['Action'] | Array<ED[T]['Action']>;
-    checker: (operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => any | Promise<any>;
-    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Update']['filter']>);
-};
-export declare type Checker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = DataChecker<ED, T, Cxt> | RowChecker<ED, T, Cxt> | RelationChecker<ED, T, Cxt> | LogicalChecker<ED, T, Cxt> | LogicalRelationChecker<ED, T, Cxt>;
-export declare type AuthDef<ED extends EntityDict, T extends keyof ED> = {
-    relationAuth?: CascadeRelationAuth<NonNullable<ED[T]['Relation']>>;
-    actionAuth?: CascadeActionAuth<ED[T]['Action']>;
-    cascadeRemove?: {
-        [E in (keyof ED | keyof ED[T]['Schema'] | '@entity')]?: ActionOnRemove;
-    };
-};
-export declare type CascadeRemoveDefDict<ED extends EntityDict> = {
-    [T in keyof ED]?: {
-        [E in (keyof ED | keyof ED[T]['Schema'] | '@entity')]?: ActionOnRemove;
-    };
-};
-export declare type AuthDefDict<ED extends EntityDict> = {
-    [K in keyof ED]?: AuthDef<ED, K>;
-};
+import { CascadeActionAuth, CascadeRelationAuth, ActionOnRemove, SyncOrAsync } from ".";
+import { AsyncContext } from "../store/AsyncRowStore";
+import { SyncContext } from "../store/SyncRowStore";
+import { EntityDict, OperateOption, SelectOption } from "../types/Entity";
+import { ModiTurn } from './Trigger';
+export type CheckerType = 'relation' | 'row' | 'data' | 'logical' | 'logicalRelation' | 'logicalData';
+/**
+ * conditionalFilter是指该action发生时，operation所操作的行中有满足conditionalFilter的行
+ * 被转化成trigger的filter条件，详细可看trigger中的说明
+ */
+export type DataChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
+    priority?: number;
+    type: 'data';
+    entity: T;
+    mt?: ModiTurn;
+    action: Omit<ED[T]['Action'], 'remove'> | Array<Omit<ED[T]['Action'], 'remove'>>;
+    checker: (data: ED[T]['Create']['data'] | ED[T]['Update']['data'], context: Cxt) => SyncOrAsync<any>;
+    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Selection']['filter']>);
+};
+export type RowChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
+    priority?: number;
+    type: 'row';
+    entity: T;
+    mt?: ModiTurn;
+    action: Omit<ED[T]['Action'], 'create'> | Array<Omit<ED[T]['Action'], 'create'>>;
+    filter: ED[T]['Selection']['filter'] | ((operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => SyncOrAsync<ED[T]['Selection']['filter']>);
+    errMsg?: string;
+    inconsistentRows?: {
+        entity: keyof ED;
+        selection: (filter?: ED[T]['Selection']['filter']) => ED[keyof ED]['Selection'];
+    };
+    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Update']['filter']>);
+};
+export type RelationChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
+    priority?: number;
+    type: 'relation';
+    entity: T;
+    mt?: ModiTurn;
+    when?: 'after';
+    action: ED[T]['Action'] | Array<ED[T]['Action']>;
+    relationFilter: (operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => SyncOrAsync<ED[T]['Selection']['filter']>;
+    errMsg: string | ((operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option?: OperateOption | SelectOption) => string);
+    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Selection']['filter']>);
+};
+export type LogicalChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {
+    priority?: number;
+    type: 'logical' | 'logicalData' | 'logicalRelation';
+    when?: 'after';
+    mt?: ModiTurn;
+    entity: T;
+    action: ED[T]['Action'] | Array<ED[T]['Action']>;
+    checker: (operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => SyncOrAsync<any>;
+    conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Update']['filter']>);
+};
+export type Checker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = DataChecker<ED, T, Cxt> | RowChecker<ED, T, Cxt> | RelationChecker<ED, T, Cxt> | LogicalChecker<ED, T, Cxt>;
+export type AuthDef<ED extends EntityDict, T extends keyof ED> = {
+    relationAuth?: CascadeRelationAuth<NonNullable<ED[T]['Relation']>>;
+    actionAuth?: CascadeActionAuth<ED[T]['Action']>;
+    cascadeRemove?: {
+        [E in (keyof ED | keyof ED[T]['Schema'] | '@entity')]?: ActionOnRemove;
+    };
+};
+export type CascadeRemoveDefDict<ED extends EntityDict> = {
+    [T in keyof ED]?: {
+        [E in (keyof ED | keyof ED[T]['Schema'] | '@entity')]?: ActionOnRemove;
+    };
+};
+export type AuthDefDict<ED extends EntityDict> = {
+    [K in keyof ED]?: AuthDef<ED, K>;
+};

package/lib/types/Cluster.d.ts

@@ -0,0 +1,5 @@
+export type ClusterInfo = {
+    usingCluster: boolean;
+    instanceId?: number;
+    instanceCount?: number;
+};

package/lib/types/Cluster.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/Connector.d.ts

@@ -1,34 +1,38 @@
-/// <reference types="node" />
-import { IncomingHttpHeaders } from "http";
-import { AsyncContext, AsyncRowStore } from "../store/AsyncRowStore";
-import { SyncContext } from "../store/SyncRowStore";
-import { EntityDict, OpRecord } from "./Entity";
-import { OakException } from "./Exception";
-export declare abstract class Connector<ED extends EntityDict, BackCxt extends AsyncContext<ED>, FrontCxt extends SyncContext<ED>> {
-    abstract callAspect(name: string, params: any, context: FrontCxt): Promise<{
-        result: any;
-        opRecords?: OpRecord<ED>[];
-        message?: string | null;
-    }>;
-    abstract getRouter(): string;
-    abstract parseRequest(headers: IncomingHttpHeaders, body: any, store: AsyncRowStore<ED, BackCxt>): Promise<{
-        name: string;
-        params: any;
-        context: BackCxt;
-    }>;
-    abstract serializeResult(result: any, context: BackCxt, headers: IncomingHttpHeaders, body: any): Promise<{
-        body: any;
-        headers?: Record<string, any>;
-    }>;
-    abstract serializeException(exception: OakException<ED>, headers: IncomingHttpHeaders, body: any): {
-        body: any;
-        headers?: Record<string, any>;
-    };
-    abstract getSubscribeRouter(): string;
-    abstract getBridgeRouter(): string;
-    abstract makeBridgeUrl(url: string, headers?: Record<string, string>): string;
-    abstract parseBridgeRequestQuery(urlParams: string): {
-        url: string;
-        headers?: Record<string, string>;
-    };
-}
+/// <reference types="node" />
+import { IncomingHttpHeaders } from "http";
+import { SyncContext } from "../store/SyncRowStore";
+import { EntityDict, OpRecord } from "./Entity";
+import { OakException } from "./Exception";
+export interface Connector<ED extends EntityDict, FrontCxt extends SyncContext<ED>> {
+    callAspect: (name: string, params: any, context: FrontCxt) => Promise<{
+        result: any;
+        opRecords?: OpRecord<ED>[];
+        message?: string | null;
+    }>;
+    getRouter: () => string;
+    parseRequestHeaders: (headers: IncomingHttpHeaders) => {
+        contextString?: string;
+        aspectName: string;
+    };
+    serializeResult: (result: any, opRecords: OpRecord<ED>[], headers: IncomingHttpHeaders, body: any, message?: string) => Promise<{
+        body: any;
+        headers?: Record<string, any>;
+    }>;
+    serializeException: (exception: OakException<ED>, headers: IncomingHttpHeaders, body: any) => {
+        body: any;
+        headers?: Record<string, any>;
+    };
+    getSubscribeRouter: () => string;
+    getSubscribePointRouter: () => string;
+    getSubscribePoint: () => Promise<{
+        url: string;
+        path: string;
+    }>;
+    getBridgeRouter: () => string;
+    makeBridgeUrl: (url: string, headers?: Record<string, string>) => string;
+    getEndpointRouter: () => string;
+    parseBridgeRequestQuery: (urlParams: string) => {
+        url: string;
+        headers?: Record<string, string>;
+    };
+}

package/lib/types/Connector.js

@@ -1,9 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Connector = void 0;
-var Connector = /** @class */ (function () {
-    function Connector() {
-    }
-    return Connector;
-}());
-exports.Connector = Connector;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/DataType.d.ts

@@ -1,24 +1,25 @@
-import { Geo, SingleGeo } from "./Geo";
-export declare type Int<L extends 1 | 2 | 4 | 8> = number;
-export declare type Uint<L extends 1 | 2 | 4 | 8> = number;
-export declare type Double<P extends number, S extends number> = number;
-export declare type Float<P extends number, S extends number> = number;
-export declare type String<L extends number> = string;
-export declare type Text = string;
-export declare type Image = string;
-export declare type File = string;
-export declare type Datetime = number | Date;
-export declare type Day = number | Date;
-export declare type Time = number | Date;
-export declare type Boolean = boolean;
-export declare type Price = number;
-export declare type PrimaryKey = string;
-export declare type ForeignKey<E extends string> = string;
-export declare type Sequence = string;
-export { Geo, SingleGeo } from './Geo';
-export declare type DataTypes = number | string | Datetime | Day | Time | Geo | Object | SingleGeo;
-export declare const types: string[];
-export declare const unIndexedTypes: string[];
-export declare type JsonProjection<O extends object> = {
-    [k in keyof O]?: NonNullable<O[k]> extends object ? JsonProjection<NonNullable<O[k]>> | number : number;
-};
+import { Geo, SingleGeo } from "./Geo";
+export type Int<L extends 1 | 2 | 4 | 8> = number;
+export type Uint<L extends 1 | 2 | 4 | 8> = number;
+export type Double<P extends number, S extends number> = number;
+export type Float<P extends number, S extends number> = number;
+export type Decimal<P extends number, S extends number> = number;
+export type String<L extends number> = string;
+export type Text = string;
+export type Image = string;
+export type File = string;
+export type Datetime = number | Date;
+export type Day = number | Date;
+export type Time = number | Date;
+export type Boolean = boolean;
+export type Price = number;
+export type PrimaryKey = string;
+export type ForeignKey<E extends string> = string;
+export type Sequence = number;
+export { Geo, SingleGeo } from './Geo';
+export type DataTypes = number | string | Datetime | Day | Time | Geo | Object | SingleGeo;
+export declare const types: string[];
+export declare const unIndexedTypes: string[];
+export type JsonProjection<O extends object> = {
+    [k in keyof O]?: NonNullable<O[k]> extends object ? JsonProjection<NonNullable<O[k]>> | number : number;
+};

package/lib/types/DataType.js

@@ -1,6 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.unIndexedTypes = exports.types = void 0;
-exports.types = ['Int', 'Uint', 'Double', 'Float', 'String', 'Text', 'Datetime', 'Day', 'Time',
-    'Boolean', 'Image', 'File', 'Geo', 'SingleGeo', 'Price'];
-exports.unIndexedTypes = ['Text', 'Image', 'File', 'Object'];
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unIndexedTypes = exports.types = void 0;
+exports.types = ['Int', 'Uint', 'Double', 'Float', 'String', 'Text', 'Datetime', 'Day', 'Time',
+    'Boolean', 'Image', 'File', 'Geo', 'SingleGeo', 'Price', 'Decimal'];
+exports.unIndexedTypes = ['Text', 'Image', 'File', 'Object'];

package/lib/types/Demand.d.ts

@@ -1,88 +1,88 @@
-import { RefOrExpression } from "./Expression";
-import { OneOf } from "./Polyfill";
-export declare const EXPRESSION_PREFIX = "$expr";
-export declare type NodeId = `node-${number}`;
-export declare type ExpressionKey = '$expr' | '$expr1' | '$expr2' | '$expr3' | '$expr4' | '$expr5' | '$expr6' | '$expr7' | '$expr8' | '$expr9' | '$expr10' | '$expr11' | '$expr12' | '$expr13' | '$expr14' | '$expr15' | '$expr16' | '$expr17' | '$expr18' | '$expr19' | '$expr20';
-export declare type ExprOp<A> = {
-    [K in ExpressionKey]: RefOrExpression<A>;
-};
-export declare type Q_NumberComparisonValue = number | OneOf<{
-    $gt: number;
-    $lt: number;
-    $gte: number;
-    $lte: number;
-    $eq: number;
-    $ne: number;
-    $in: number[];
-    $nin: number[];
-    $between: [number, number];
-}>;
-export declare type Q_StringComparisonValue = string | OneOf<{
-    $gt: string;
-    $lt: string;
-    $gte: string;
-    $lte: string;
-    $eq: string;
-    $ne: string;
-    $startsWith: string;
-    $endsWith: string;
-    $includes: string;
-    $in: string[];
-    $nin: string[];
-}>;
-export declare type Q_BooleanComparisonValue = boolean;
-export declare type Q_DateComparisonValue = Q_NumberComparisonValue;
-export declare type Q_EnumComparisonValue<E> = E | OneOf<{
-    $in: E[];
-    $nin: E[];
-    $ne: E;
-}>;
-export declare type Q_ExistsValue = {
-    $exists: boolean;
-};
-export declare type Q_NumberValue = Q_NumberComparisonValue | Q_ExistsValue;
-export declare type Q_StringValue = Q_StringComparisonValue | Q_ExistsValue;
-export declare type Q_BooleanValue = Q_BooleanComparisonValue | Q_ExistsValue;
-export declare type Q_DateValue = Q_DateComparisonValue | Q_ExistsValue;
-export declare type Q_EnumValue<E> = Q_EnumComparisonValue<E> | Q_ExistsValue;
-export declare type Q_State<S> = S | {
-    $in: S[];
-} | {
-    $nin: S[];
-} | Q_ExistsValue;
-export declare type Q_FullTextValue = {
-    $search: string;
-    $language?: 'zh_CN' | 'en_US';
-};
-export declare type Q_FullTextKey = '$text';
-export declare type FulltextFilter = {
-    [F in Q_FullTextKey]?: Q_FullTextValue;
-};
-declare type Q_LogicKey = '$and' | '$or';
-declare type Q_LinearLogicKey = '$not';
-export declare type MakeFilterWrapper<F extends Object> = {
-    [Q in Q_LogicKey]?: Array<MakeFilterWrapper<F>>;
-} & {
-    [Q in Q_LinearLogicKey]?: MakeFilterWrapper<F>;
-} & Partial<F>;
-export declare type MakeFilter<F extends Object> = {
-    '#id'?: NodeId;
-} & MakeFilterWrapper<F>;
-export declare type RefAttr<A> = {
-    '#attr': A;
-} | {
-    '#refId': NodeId;
-    '#refAttr': string;
-};
-export declare function isRefAttrNode<A>(node: any): node is RefAttr<A>;
-export declare type JsonFilter<O extends any> = O extends Array<infer P> ? (JsonFilter<P> | undefined)[] | {
-    $contains?: P | P[];
-    $overlaps?: P | P[];
-} : O extends number ? Q_NumberValue : O extends string ? Q_StringValue : O extends boolean ? Q_BooleanValue : O extends Record<string, any> ? {
-    [A in keyof O]?: JsonFilter<O[A]>;
-} : never;
-export declare type SubQueryPredicateMetadata = {
-    '#sqp'?: 'in' | 'not in' | 'all' | 'not all';
-};
-export declare const SUB_QUERY_PREDICATE_KEYWORD = "#sqp";
-export {};
+import { RefOrExpression } from "./Expression";
+import { OneOf } from "./Polyfill";
+export declare const EXPRESSION_PREFIX = "$expr";
+export type NodeId = `node-${number}`;
+export type ExpressionKey = '$expr' | '$expr1' | '$expr2' | '$expr3' | '$expr4' | '$expr5' | '$expr6' | '$expr7' | '$expr8' | '$expr9' | '$expr10' | '$expr11' | '$expr12' | '$expr13' | '$expr14' | '$expr15' | '$expr16' | '$expr17' | '$expr18' | '$expr19' | '$expr20';
+export type ExprOp<A> = {
+    [K in ExpressionKey]: RefOrExpression<A>;
+};
+export type Q_NumberComparisonValue = number | OneOf<{
+    $gt: number;
+    $lt: number;
+    $gte: number;
+    $lte: number;
+    $eq: number;
+    $ne: number;
+    $in: number[];
+    $nin: number[];
+    $between: [number, number];
+}>;
+export type Q_StringComparisonValue = string | OneOf<{
+    $gt: string;
+    $lt: string;
+    $gte: string;
+    $lte: string;
+    $eq: string;
+    $ne: string;
+    $startsWith: string;
+    $endsWith: string;
+    $includes: string;
+    $in: string[];
+    $nin: string[];
+}>;
+export type Q_BooleanComparisonValue = boolean;
+export type Q_DateComparisonValue = Q_NumberComparisonValue;
+export type Q_EnumComparisonValue<E> = E | OneOf<{
+    $in: E[];
+    $nin: E[];
+    $ne: E;
+}>;
+export type Q_ExistsValue = {
+    $exists: boolean;
+};
+export type Q_NumberValue = Q_NumberComparisonValue | Q_ExistsValue;
+export type Q_StringValue = Q_StringComparisonValue | Q_ExistsValue;
+export type Q_BooleanValue = Q_BooleanComparisonValue | Q_ExistsValue;
+export type Q_DateValue = Q_DateComparisonValue | Q_ExistsValue;
+export type Q_EnumValue<E> = Q_EnumComparisonValue<E> | Q_ExistsValue;
+export type Q_State<S> = S | {
+    $in: S[];
+} | {
+    $nin: S[];
+} | Q_ExistsValue;
+export type Q_FullTextValue = {
+    $search: string;
+    $language?: 'zh_CN' | 'en_US';
+};
+export type Q_FullTextKey = '$text';
+export type FulltextFilter = {
+    [F in Q_FullTextKey]?: Q_FullTextValue;
+};
+type Q_LogicKey = '$and' | '$or';
+type Q_LinearLogicKey = '$not';
+export type MakeFilterWrapper<F extends Object> = {
+    [Q in Q_LogicKey]?: Array<MakeFilterWrapper<F>>;
+} & {
+    [Q in Q_LinearLogicKey]?: MakeFilterWrapper<F>;
+} & Partial<F>;
+export type MakeFilter<F extends Object> = {
+    '#id'?: NodeId;
+} & MakeFilterWrapper<F>;
+export type RefAttr<A> = {
+    '#attr': A;
+} | {
+    '#refId': NodeId;
+    '#refAttr': string;
+};
+export declare function isRefAttrNode<A>(node: any): node is RefAttr<A>;
+export type JsonFilter<O extends any> = O extends Array<infer P> ? (JsonFilter<P> | undefined)[] | {
+    $contains?: P | P[];
+    $overlaps?: P | P[];
+} : O extends number ? Q_NumberValue : O extends string ? Q_StringValue : O extends boolean ? Q_BooleanValue : O extends Record<string, any> ? {
+    [A in keyof O]?: JsonFilter<O[A]>;
+} : never;
+export type SubQueryPredicateMetadata = {
+    '#sqp'?: 'in' | 'not in' | 'all' | 'not all';
+};
+export declare const SUB_QUERY_PREDICATE_KEYWORD = "#sqp";
+export {};