oak-domain 2.2.0 → 2.3.1

package/lib/base-app-domain/Modi/Schema.d.ts

@@ -2,7 +2,7 @@ import { String } from "../../types/DataType";
 import { Q_DateValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import * as SubQuery from "../_SubQuery";
-import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "../../types/Entity";
 import { Action, ParticularAction, IState } from "./Action";
 import * as ModiEntity from "../ModiEntity/Schema";
 import * as OperEntity from "../OperEntity/Schema";
@@ -27,7 +27,9 @@ export declare type Schema = EntityShape & {
     extra?: Object | null;
     iState?: IState | null;
     modiEntity$modi?: Array<ModiEntity.Schema>;
+    modiEntity$modi$$aggr?: AggregationResult<ModiEntity.Schema>;
     operEntity$entity?: Array<OperEntity.Schema>;
+    operEntity$entity$$aggr?: AggregationResult<OperEntity.Schema>;
 } & {
     [A in ExpressionKey]?: any;
 };
@@ -49,7 +51,7 @@ export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
 export declare type Projection = {
     "#id"?: NodeId;
     [k: string]: any;
-    id: number;
+    id?: number;
     $$createAt$$?: number;
     $$updateAt$$?: number;
     $$seq$$?: number;
@@ -64,29 +66,13 @@ export declare type Projection = {
     modiEntity$modi?: ModiEntity.Selection & {
         $entity: "modiEntity";
     };
+    modiEntity$modi$$aggr?: ModiEntity.Aggregation & {
+        $entity: "modiEntity";
+    };
     operEntity$entity?: OperEntity.Selection & {
         $entity: "operEntity";
     };
-} & Partial<ExprOp<OpAttr | string>>;
-export declare type ExportProjection = {
-    "#id"?: NodeId;
-    [k: string]: any;
-    id?: string;
-    $$createAt$$?: string;
-    $$updateAt$$?: string;
-    $$seq$$?: string;
-    targetEntity?: string;
-    entity?: string;
-    entityId?: string;
-    action?: string;
-    data?: string;
-    filter?: string;
-    extra?: string;
-    iState?: string;
-    modiEntity$modi?: ModiEntity.Exportation & {
-        $entity: "modiEntity";
-    };
-    operEntity$entity?: OperEntity.Exportation & {
+    operEntity$entity$$aggr?: OperEntity.Aggregation & {
         $entity: "operEntity";
     };
 } & Partial<ExprOp<OpAttr | string>>;
@@ -121,7 +107,7 @@ export declare type SortNode = {
 export declare type Sorter = SortNode[];
 export declare type SelectOperation<P extends Object = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
 export declare type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
-export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
+export declare type Aggregation = Omit<DeduceAggregation<Schema, Projection, Filter, Sorter>, "id">;
 export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId">> & ({
     entity?: string;
     entityId?: string;
@@ -150,6 +136,7 @@ export declare type EntityDef = {
     OpSchema: OpSchema;
     Action: OakMakeAction<Action> | string;
     Selection: Selection;
+    Aggregation: Aggregation;
     Operation: Operation;
     Create: CreateOperation;
     Update: UpdateOperation;

package/lib/base-app-domain/ModiEntity/Schema.d.ts

@@ -2,7 +2,7 @@ import { String, ForeignKey } from "../../types/DataType";
 import { Q_DateValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import * as SubQuery from "../_SubQuery";
-import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
 import { AppendOnlyAction } from "../../actions/action";
 import * as Modi from "../Modi/Schema";
 import * as User from "../User/Schema";
@@ -36,7 +36,7 @@ export declare type Filter<E = Q_EnumValue<"user" | string>> = MakeFilter<AttrFi
 export declare type Projection = {
     "#id"?: NodeId;
     [k: string]: any;
-    id: number;
+    id?: number;
     $$createAt$$?: number;
     $$updateAt$$?: number;
     $$seq$$?: number;
@@ -46,19 +46,6 @@ export declare type Projection = {
     entityId?: number;
     user?: User.Projection;
 } & Partial<ExprOp<OpAttr | string>>;
-export declare type ExportProjection = {
-    "#id"?: NodeId;
-    [k: string]: any;
-    id?: string;
-    $$createAt$$?: string;
-    $$updateAt$$?: string;
-    $$seq$$?: string;
-    modiId?: string;
-    modi?: Modi.ExportProjection;
-    entity?: string;
-    entityId?: string;
-    user?: User.ExportProjection;
-} & Partial<ExprOp<OpAttr | string>>;
 declare type ModiEntityIdProjection = OneOf<{
     id: number;
 }>;
@@ -96,7 +83,7 @@ export declare type SortNode = {
 export declare type Sorter = SortNode[];
 export declare type SelectOperation<P extends Object = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
 export declare type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
-export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
+export declare type Aggregation = Omit<DeduceAggregation<Schema, Projection, Filter, Sorter>, "id">;
 export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId" | "modiId">> & (({
     modiId?: never;
     modi: Modi.CreateSingleOperation;
@@ -166,6 +153,7 @@ export declare type EntityDef = {
     OpSchema: OpSchema;
     Action: OakMakeAction<AppendOnlyAction> | string;
     Selection: Selection;
+    Aggregation: Aggregation;
     Operation: Operation;
     Create: CreateOperation;
     Update: UpdateOperation;

package/lib/base-app-domain/Oper/Schema.d.ts

@@ -2,7 +2,7 @@ import { String, ForeignKey } from "../../types/DataType";
 import { Q_DateValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import * as SubQuery from "../_SubQuery";
-import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "../../types/Entity";
 import { AppendOnlyAction } from "../../actions/action";
 import * as User from "../User/Schema";
 import * as OperEntity from "../OperEntity/Schema";
@@ -22,6 +22,7 @@ export declare type Schema = EntityShape & {
     operatorId?: ForeignKey<"user"> | null;
     operator?: User.Schema | null;
     operEntity$oper?: Array<OperEntity.Schema>;
+    operEntity$oper$$aggr?: AggregationResult<OperEntity.Schema>;
 } & {
     [A in ExpressionKey]?: any;
 };
@@ -41,7 +42,7 @@ export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
 export declare type Projection = {
     "#id"?: NodeId;
     [k: string]: any;
-    id: number;
+    id?: number;
     $$createAt$$?: number;
     $$updateAt$$?: number;
     $$seq$$?: number;
@@ -54,21 +55,7 @@ export declare type Projection = {
     operEntity$oper?: OperEntity.Selection & {
         $entity: "operEntity";
     };
-} & Partial<ExprOp<OpAttr | string>>;
-export declare type ExportProjection = {
-    "#id"?: NodeId;
-    [k: string]: any;
-    id?: string;
-    $$createAt$$?: string;
-    $$updateAt$$?: string;
-    $$seq$$?: string;
-    action?: string;
-    data?: string;
-    filter?: string;
-    extra?: string;
-    operatorId?: string;
-    operator?: User.ExportProjection;
-    operEntity$oper?: OperEntity.Exportation & {
+    operEntity$oper$$aggr?: OperEntity.Aggregation & {
         $entity: "operEntity";
     };
 } & Partial<ExprOp<OpAttr | string>>;
@@ -102,7 +89,7 @@ export declare type SortNode = {
 export declare type Sorter = SortNode[];
 export declare type SelectOperation<P extends Object = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
 export declare type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
-export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
+export declare type Aggregation = Omit<DeduceAggregation<Schema, Projection, Filter, Sorter>, "id">;
 export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "operatorId">> & (({
     operatorId?: never;
     operator?: User.CreateSingleOperation;
@@ -148,6 +135,7 @@ export declare type EntityDef = {
     OpSchema: OpSchema;
     Action: OakMakeAction<AppendOnlyAction> | string;
     Selection: Selection;
+    Aggregation: Aggregation;
     Operation: Operation;
     Create: CreateOperation;
     Update: UpdateOperation;

package/lib/base-app-domain/OperEntity/Schema.d.ts

@@ -2,7 +2,7 @@ import { String, ForeignKey } from "../../types/DataType";
 import { Q_DateValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import * as SubQuery from "../_SubQuery";
-import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
 import { AppendOnlyAction } from "../../actions/action";
 import * as Oper from "../Oper/Schema";
 import * as Modi from "../Modi/Schema";
@@ -39,7 +39,7 @@ export declare type Filter<E = Q_EnumValue<"modi" | "user" | string>> = MakeFilt
 export declare type Projection = {
     "#id"?: NodeId;
     [k: string]: any;
-    id: number;
+    id?: number;
     $$createAt$$?: number;
     $$updateAt$$?: number;
     $$seq$$?: number;
@@ -50,20 +50,6 @@ export declare type Projection = {
     modi?: Modi.Projection;
     user?: User.Projection;
 } & Partial<ExprOp<OpAttr | string>>;
-export declare type ExportProjection = {
-    "#id"?: NodeId;
-    [k: string]: any;
-    id?: string;
-    $$createAt$$?: string;
-    $$updateAt$$?: string;
-    $$seq$$?: string;
-    operId?: string;
-    oper?: Oper.ExportProjection;
-    entity?: string;
-    entityId?: string;
-    modi?: Modi.ExportProjection;
-    user?: User.ExportProjection;
-} & Partial<ExprOp<OpAttr | string>>;
 declare type OperEntityIdProjection = OneOf<{
     id: number;
 }>;
@@ -106,7 +92,7 @@ export declare type SortNode = {
 export declare type Sorter = SortNode[];
 export declare type SelectOperation<P extends Object = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
 export declare type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
-export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
+export declare type Aggregation = Omit<DeduceAggregation<Schema, Projection, Filter, Sorter>, "id">;
 export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId" | "operId">> & (({
     operId?: never;
     oper: Oper.CreateSingleOperation;
@@ -183,6 +169,7 @@ export declare type EntityDef = {
     OpSchema: OpSchema;
     Action: OakMakeAction<AppendOnlyAction> | string;
     Selection: Selection;
+    Aggregation: Aggregation;
     Operation: Operation;
     Create: CreateOperation;
     Update: UpdateOperation;

package/lib/base-app-domain/User/Schema.d.ts

@@ -2,7 +2,7 @@ import { String, Text } from "../../types/DataType";
 import { Q_DateValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import * as SubQuery from "../_SubQuery";
-import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "../../types/Entity";
 import { GenericAction, RelationAction } from "../../actions/action";
 import * as Oper from "../Oper/Schema";
 import * as OperEntity from "../OperEntity/Schema";
@@ -18,8 +18,11 @@ export declare type Schema = EntityShape & {
     nickname?: String<64> | null;
     password?: Text | null;
     oper$operator?: Array<Oper.Schema>;
+    oper$operator$$aggr?: AggregationResult<Oper.Schema>;
     operEntity$entity?: Array<OperEntity.Schema>;
+    operEntity$entity$$aggr?: AggregationResult<OperEntity.Schema>;
     modiEntity$entity?: Array<ModiEntity.Schema>;
+    modiEntity$entity$$aggr?: AggregationResult<ModiEntity.Schema>;
 } & {
     [A in ExpressionKey]?: any;
 };
@@ -36,7 +39,7 @@ export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
 export declare type Projection = {
     "#id"?: NodeId;
     [k: string]: any;
-    id: number;
+    id?: number;
     $$createAt$$?: number;
     $$updateAt$$?: number;
     $$seq$$?: number;
@@ -46,30 +49,19 @@ export declare type Projection = {
     oper$operator?: Oper.Selection & {
         $entity: "oper";
     };
+    oper$operator$$aggr?: Oper.Aggregation & {
+        $entity: "oper";
+    };
     operEntity$entity?: OperEntity.Selection & {
         $entity: "operEntity";
     };
+    operEntity$entity$$aggr?: OperEntity.Aggregation & {
+        $entity: "operEntity";
+    };
     modiEntity$entity?: ModiEntity.Selection & {
         $entity: "modiEntity";
     };
-} & Partial<ExprOp<OpAttr | string>>;
-export declare type ExportProjection = {
-    "#id"?: NodeId;
-    [k: string]: any;
-    id?: string;
-    $$createAt$$?: string;
-    $$updateAt$$?: string;
-    $$seq$$?: string;
-    name?: string;
-    nickname?: string;
-    password?: string;
-    oper$operator?: Oper.Exportation & {
-        $entity: "oper";
-    };
-    operEntity$entity?: OperEntity.Exportation & {
-        $entity: "operEntity";
-    };
-    modiEntity$entity?: ModiEntity.Exportation & {
+    modiEntity$entity$$aggr?: ModiEntity.Aggregation & {
         $entity: "modiEntity";
     };
 } & Partial<ExprOp<OpAttr | string>>;
@@ -100,7 +92,7 @@ export declare type SortNode = {
 export declare type Sorter = SortNode[];
 export declare type SelectOperation<P extends Object = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
 export declare type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
-export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
+export declare type Aggregation = Omit<DeduceAggregation<Schema, Projection, Filter, Sorter>, "id">;
 export declare type CreateOperationData = FormCreateData<OpSchema> & {
     oper$operator?: OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">[]> | Array<OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">>>;
     operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
@@ -127,6 +119,7 @@ export declare type EntityDef = {
     OpSchema: OpSchema;
     Action: OakMakeAction<GenericAction | RelationAction> | string;
     Selection: Selection;
+    Aggregation: Aggregation;
     Operation: Operation;
     Create: CreateOperation;
     Update: UpdateOperation;

package/lib/checkers/index.d.ts

@@ -1,5 +1,5 @@
 import { EntityDict } from '../base-app-domain';
 import { AsyncContext } from '../store/AsyncRowStore';
 import { SyncContext } from '../store/SyncRowStore';
-import { StorageSchema, EntityDict as BaseEntityDict } from '../types';
-export declare function createDynamicCheckers<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED> | SyncContext<ED>>(schema: StorageSchema<ED>): import("../types").RowChecker<ED, keyof ED, Cxt>[];
+import { StorageSchema, EntityDict as BaseEntityDict, Checker } from '../types';
+export declare function createDynamicCheckers<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED> | SyncContext<ED>>(schema: StorageSchema<ED>): Checker<ED, keyof ED, Cxt>[];

package/lib/checkers/index.js

@@ -1,8 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDynamicCheckers = void 0;
+var tslib_1 = require("tslib");
+var checker_1 = require("../store/checker");
 var modi_1 = require("../store/modi");
 function createDynamicCheckers(schema) {
-    return (0, modi_1.createModiRelatedCheckers)(schema);
+    var checkers = [];
+    checkers.push.apply(checkers, tslib_1.__spreadArray([], tslib_1.__read((0, modi_1.createModiRelatedCheckers)(schema)), false));
+    checkers.push.apply(checkers, tslib_1.__spreadArray([], tslib_1.__read((0, checker_1.createRelationHierarchyCheckers)(schema)), false));
+    return checkers;
 }
 exports.createDynamicCheckers = createDynamicCheckers;