oak-domain 5.1.16 → 5.1.18

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

@@ -1,129 +1,19 @@
-import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey, SubQueryPredicateMetadata } from "../../types/Demand";
-import { OneOf } from "../../types/Polyfill";
-import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult, EntityShape } from "../../types/Entity";
-import { GenericAction } from "../../actions/action";
-import { String } from "../../types/DataType";
-import * as ModiEntity from "../ModiEntity/Schema";
-import * as OperEntity from "../OperEntity/Schema";
-export type OpSchema = EntityShape & {
-    module: String<64>;
-    position: String<188>;
-    namespace: String<256>;
-    language: String<32>;
-    data: Object;
-};
-export type OpAttr = keyof OpSchema;
-type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr";
-type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr";
-export type Schema = OpSchema & {
-    modiEntity$entity?: Array<ModiEntity.Schema>;
-    operEntity$entity?: Array<OperEntity.Schema>;
-} & {
-    [A in ExpressionKey]?: any;
-} & {
-    [A in ModiEntity$entityAggr]?: AggregationResult<ModiEntity.Schema>;
-} & {
-    [A in OperEntity$entityAggr]?: AggregationResult<OperEntity.Schema>;
-};
-type AttrFilter = {
-    id: Q_StringValue;
-    $$createAt$$: Q_DateValue;
-    $$seq$$: Q_NumberValue;
-    $$updateAt$$: Q_DateValue;
-    module: Q_StringValue;
-    position: Q_StringValue;
-    namespace: Q_StringValue;
-    language: Q_StringValue;
-    data: Object;
-    modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata;
-    operEntity$entity: OperEntity.Filter & SubQueryPredicateMetadata;
-};
-export type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
-export type Projection = {
-    "#id"?: NodeId;
-    [k: string]: any;
-    id?: number;
-    $$createAt$$?: number;
-    $$updateAt$$?: number;
-    $$seq$$?: number;
-    module?: number;
-    position?: number;
-    namespace?: number;
-    language?: number;
-    data?: number | Object;
-    modiEntity$entity?: ModiEntity.Selection & {
-        $entity: "modiEntity";
-    };
-    operEntity$entity?: OperEntity.Selection & {
-        $entity: "operEntity";
-    };
-} & Partial<ExprOp<OpAttr | string>> & {
-    [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & {
-        $entity: "modiEntity";
-    };
-} & {
-    [A in OperEntity$entityAggr]?: OperEntity.Aggregation & {
-        $entity: "operEntity";
-    };
-};
-type I18nIdProjection = OneOf<{
-    id: number;
-}>;
-export type SortAttr = {
-    id: number;
-} | {
-    $$createAt$$: number;
-} | {
-    $$seq$$: number;
-} | {
-    $$updateAt$$: number;
-} | {
-    module: number;
-} | {
-    position: number;
-} | {
-    namespace: number;
-} | {
-    language: number;
-} | {
-    [k: string]: any;
-} | OneOf<ExprOp<OpAttr | string>>;
-export type SortNode = {
-    $attr: SortAttr;
-    $direction?: "asc" | "desc";
-};
-export type Sorter = SortNode[];
-export type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
-export type Selection<P extends Object = Projection> = SelectOperation<P>;
-export type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
-export type CreateOperationData = FormCreateData<OpSchema> & {
-    modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
-    operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
-};
-export type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
-export type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
-export type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
-export type UpdateOperationData = FormUpdateData<OpSchema> & {
-    [k: string]: any;
-    modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
-    operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
-};
-export type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>;
-export type RemoveOperationData = {};
-export type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
-export type Operation = CreateOperation | UpdateOperation | RemoveOperation;
-export type I18nIdSubQuery = Selection<I18nIdProjection>;
-export type EntityDef = {
-    Schema: Schema;
-    OpSchema: OpSchema;
-    Action: OakMakeAction<GenericAction> | string;
-    Selection: Selection;
-    Aggregation: Aggregation;
-    Operation: Operation;
-    Create: CreateOperation;
-    Update: UpdateOperation;
-    Remove: RemoveOperation;
-    CreateSingle: CreateSingleOperation;
-    CreateMulti: CreateMultipleOperation;
-};
-export {};
+export * from "./_baseSchema";
+import { I18n } from "../EntityDict";
+export type Schema = I18n["Schema"];
+export type Action = I18n["Action"];
+export type Projection = I18n["Projection"];
+export type Filter = I18n["Filter"];
+export type SortNode = I18n["SortNode"];
+export type Sorter = I18n["Sorter"];
+export type Selection = I18n["Selection"];
+export type Aggregation = I18n["Aggregation"];
+export type CreateOperationData = I18n["CreateOperationData"];
+export type CreateSingle = I18n["CreateSingle"];
+export type CreateMulti = I18n["CreateMulti"];
+export type Create = I18n["Create"];
+export type UpdateOperationData = I18n["UpdateOperationData"];
+export type Update = I18n["Update"];
+export type RemoveOperationData = I18n["RemoveOperationData"];
+export type Remove = I18n["Remove"];
+export type Operation = I18n["Operation"];

package/lib/base-app-domain/I18n/Schema.js

@@ -1,2 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./_baseSchema"), exports);

package/lib/base-app-domain/I18n/_baseSchema.d.ts

@@ -0,0 +1,51 @@
+import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, ExprOp, ExpressionKey } from "../../types/Demand";
+import { MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
+import { GenericAction } from "../../actions/action";
+import { String } from "../../types/DataType";
+export type OpSchema = EntityShape & {
+    module: String<64>;
+    position: String<188>;
+    namespace: String<256>;
+    language: String<32>;
+    data: Object;
+} & {
+    [A in ExpressionKey]?: any;
+};
+export type OpAttr = keyof OpSchema;
+export type OpFilter = {
+    id: Q_StringValue;
+    $$createAt$$: Q_DateValue;
+    $$seq$$: Q_NumberValue;
+    $$updateAt$$: Q_DateValue;
+    module: Q_StringValue;
+    position: Q_StringValue;
+    namespace: Q_StringValue;
+    language: Q_StringValue;
+    data: Object;
+} & ExprOp<OpAttr | string>;
+export type OpProjection = {
+    "#id"?: NodeId;
+    [k: string]: any;
+    id?: number;
+    $$createAt$$?: number;
+    $$updateAt$$?: number;
+    $$seq$$?: number;
+    module?: number;
+    position?: number;
+    namespace?: number;
+    language?: number;
+    data?: number | Object;
+} & Partial<ExprOp<OpAttr | string>>;
+export type OpSortAttr = Partial<{
+    id: number;
+    $$createAt$$: number;
+    $$seq$$: number;
+    $$updateAt$$: number;
+    module: number;
+    position: number;
+    namespace: number;
+    language: number;
+    [k: string]: any;
+} | ExprOp<OpAttr | string>>;
+export type OpAction = OakMakeAction<GenericAction | string>;
+export type OpUpdateAction = "update" | string;

package/lib/base-app-domain/I18n/_baseSchema.js

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

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

@@ -1,141 +1,19 @@
-import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey, SubQueryPredicateMetadata } from "../../types/Demand";
-import { OneOf } from "../../types/Polyfill";
-import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult, EntityShape } from "../../types/Entity";
-import { Action, ParticularAction } from "./Action";
-import { String } from "../../types/DataType";
-import * as Oper from "../Oper/Schema";
-import * as ModiEntity from "../ModiEntity/Schema";
-import * as OperEntity from "../OperEntity/Schema";
-export type OpSchema = EntityShape & {
-    entity: String<32>;
-    entityId: String<64>;
-    iState: "normal" | "rollbacked";
-};
-export type OpAttr = keyof OpSchema;
-type Oper$logAggr = "oper$log$$aggr" | "oper$log$$0$$aggr" | "oper$log$$1$$aggr" | "oper$log$$2$$aggr" | "oper$log$$3$$aggr" | "oper$log$$4$$aggr" | "oper$log$$5$$aggr" | "oper$log$$6$$aggr" | "oper$log$$7$$aggr" | "oper$log$$8$$aggr" | "oper$log$$9$$aggr";
-type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr";
-type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr";
-export type Schema = OpSchema & {
-    oper$log?: Array<Oper.Schema>;
-    modiEntity$entity?: Array<ModiEntity.Schema>;
-    operEntity$entity?: Array<OperEntity.Schema>;
-} & {
-    [A in ExpressionKey]?: any;
-} & {
-    [A in Oper$logAggr]?: AggregationResult<Oper.Schema>;
-} & {
-    [A in ModiEntity$entityAggr]?: AggregationResult<ModiEntity.Schema>;
-} & {
-    [A in OperEntity$entityAggr]?: AggregationResult<OperEntity.Schema>;
-};
-type AttrFilter = {
-    id: Q_StringValue;
-    $$createAt$$: Q_DateValue;
-    $$seq$$: Q_NumberValue;
-    $$updateAt$$: Q_DateValue;
-    entity: Q_StringValue;
-    entityId: Q_StringValue;
-    iState: Q_EnumValue<"normal" | "rollbacked">;
-    oper$log: Oper.Filter & SubQueryPredicateMetadata;
-    modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata;
-    operEntity$entity: OperEntity.Filter & SubQueryPredicateMetadata;
-};
-export type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
-export type Projection = {
-    "#id"?: NodeId;
-    [k: string]: any;
-    id?: number;
-    $$createAt$$?: number;
-    $$updateAt$$?: number;
-    $$seq$$?: number;
-    entity?: number;
-    entityId?: number;
-    iState?: number;
-    oper$log?: Oper.Selection & {
-        $entity: "oper";
-    };
-    modiEntity$entity?: ModiEntity.Selection & {
-        $entity: "modiEntity";
-    };
-    operEntity$entity?: OperEntity.Selection & {
-        $entity: "operEntity";
-    };
-} & Partial<ExprOp<OpAttr | string>> & {
-    [A in Oper$logAggr]?: Oper.Aggregation & {
-        $entity: "oper";
-    };
-} & {
-    [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & {
-        $entity: "modiEntity";
-    };
-} & {
-    [A in OperEntity$entityAggr]?: OperEntity.Aggregation & {
-        $entity: "operEntity";
-    };
-};
-type LogIdProjection = OneOf<{
-    id: number;
-}>;
-export type SortAttr = {
-    id: number;
-} | {
-    $$createAt$$: number;
-} | {
-    $$seq$$: number;
-} | {
-    $$updateAt$$: number;
-} | {
-    entity: number;
-} | {
-    entityId: number;
-} | {
-    iState: number;
-} | {
-    [k: string]: any;
-} | OneOf<ExprOp<OpAttr | string>>;
-export type SortNode = {
-    $attr: SortAttr;
-    $direction?: "asc" | "desc";
-};
-export type Sorter = SortNode[];
-export type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
-export type Selection<P extends Object = Projection> = SelectOperation<P>;
-export type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
-export type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId">> & ({
-    entity?: string;
-    entityId?: string;
-    [K: string]: any;
-}) & {
-    oper$log?: OakOperation<Oper.UpdateOperation["action"], Omit<Oper.UpdateOperationData, "log" | "logId">, Omit<Oper.Filter, "log" | "logId">> | OakOperation<"create", Omit<Oper.CreateOperationData, "log" | "logId">[]> | Array<OakOperation<"create", Omit<Oper.CreateOperationData, "log" | "logId">> | OakOperation<Oper.UpdateOperation["action"], Omit<Oper.UpdateOperationData, "log" | "logId">, Omit<Oper.Filter, "log" | "logId">>>;
-    modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
-    operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
-};
-export type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
-export type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
-export type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
-export type UpdateOperationData = FormUpdateData<OpSchema> & {
-    [k: string]: any;
-    oper$log?: OakOperation<Oper.UpdateOperation["action"], Omit<Oper.UpdateOperationData, "log" | "logId">, Omit<Oper.Filter, "log" | "logId">> | OakOperation<Oper.RemoveOperation["action"], Omit<Oper.RemoveOperationData, "log" | "logId">, Omit<Oper.Filter, "log" | "logId">> | OakOperation<"create", Omit<Oper.CreateOperationData, "log" | "logId">[]> | Array<OakOperation<"create", Omit<Oper.CreateOperationData, "log" | "logId">> | OakOperation<Oper.UpdateOperation["action"], Omit<Oper.UpdateOperationData, "log" | "logId">, Omit<Oper.Filter, "log" | "logId">> | OakOperation<Oper.RemoveOperation["action"], Omit<Oper.RemoveOperationData, "log" | "logId">, Omit<Oper.Filter, "log" | "logId">>>;
-    modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
-    operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
-};
-export type UpdateOperation = OakOperation<"update" | ParticularAction | string, UpdateOperationData, Filter, Sorter>;
-export type RemoveOperationData = {};
-export type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
-export type Operation = CreateOperation | UpdateOperation | RemoveOperation;
-export type LogIdSubQuery = Selection<LogIdProjection>;
-export type EntityDef = {
-    Schema: Schema;
-    OpSchema: OpSchema;
-    Action: OakMakeAction<Action> | string;
-    Selection: Selection;
-    Aggregation: Aggregation;
-    Operation: Operation;
-    Create: CreateOperation;
-    Update: UpdateOperation;
-    Remove: RemoveOperation;
-    CreateSingle: CreateSingleOperation;
-    CreateMulti: CreateMultipleOperation;
-    ParticularAction: ParticularAction;
-};
-export {};
+export * from "./_baseSchema";
+import { Log } from "../EntityDict";
+export type Schema = Log["Schema"];
+export type Action = Log["Action"];
+export type Projection = Log["Projection"];
+export type Filter = Log["Filter"];
+export type SortNode = Log["SortNode"];
+export type Sorter = Log["Sorter"];
+export type Selection = Log["Selection"];
+export type Aggregation = Log["Aggregation"];
+export type CreateOperationData = Log["CreateOperationData"];
+export type CreateSingle = Log["CreateSingle"];
+export type CreateMulti = Log["CreateMulti"];
+export type Create = Log["Create"];
+export type UpdateOperationData = Log["UpdateOperationData"];
+export type Update = Log["Update"];
+export type RemoveOperationData = Log["RemoveOperationData"];
+export type Remove = Log["Remove"];
+export type Operation = Log["Operation"];

package/lib/base-app-domain/Log/Schema.js

@@ -1,2 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./_baseSchema"), exports);

package/lib/base-app-domain/Log/Style.d.ts

@@ -1,3 +1,3 @@
-import { EntityDef } from "./Schema";
+import { Action, OpSchema } from "./Schema";
 import { StyleDef } from "../../types/Style";
-export declare const style: StyleDef<EntityDef["OpSchema"], EntityDef["Action"]>;
+export declare const style: StyleDef<OpSchema, Action>;

package/lib/base-app-domain/Log/_baseSchema.d.ts

@@ -0,0 +1,44 @@
+import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, ExprOp, ExpressionKey } from "../../types/Demand";
+import { MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
+import { Action, ParticularAction } from "./Action";
+import { String } from "../../types/DataType";
+export type OpSchema = EntityShape & {
+    entity: String<32>;
+    entityId: String<64>;
+    iState: "normal" | "rollbacked";
+} & {
+    [A in ExpressionKey]?: any;
+};
+export type OpAttr = keyof OpSchema;
+export type OpFilter = {
+    id: Q_StringValue;
+    $$createAt$$: Q_DateValue;
+    $$seq$$: Q_NumberValue;
+    $$updateAt$$: Q_DateValue;
+    entity: Q_StringValue;
+    entityId: Q_StringValue;
+    iState: Q_EnumValue<"normal" | "rollbacked">;
+} & ExprOp<OpAttr | string>;
+export type OpProjection = {
+    "#id"?: NodeId;
+    [k: string]: any;
+    id?: number;
+    $$createAt$$?: number;
+    $$updateAt$$?: number;
+    $$seq$$?: number;
+    entity?: number;
+    entityId?: number;
+    iState?: number;
+} & Partial<ExprOp<OpAttr | string>>;
+export type OpSortAttr = Partial<{
+    id: number;
+    $$createAt$$: number;
+    $$seq$$: number;
+    $$updateAt$$: number;
+    entity: number;
+    entityId: number;
+    iState: number;
+    [k: string]: any;
+} | ExprOp<OpAttr | string>>;
+export type OpAction = OakMakeAction<Action | string>;
+export type OpUpdateAction = "update" | ParticularAction | string;

package/lib/base-app-domain/Log/_baseSchema.js

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

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

@@ -1,130 +1,19 @@
-import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey, SubQueryPredicateMetadata } from "../../types/Demand";
-import { OneOf } from "../../types/Polyfill";
-import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult, EntityShape } from "../../types/Entity";
-import { Action, ParticularAction, IState } from "./Action";
-import { String } from "../../types/DataType";
-import * as ModiEntity from "../ModiEntity/Schema";
-export type OpSchema = EntityShape & {
-    targetEntity: String<32>;
-    entity: String<32>;
-    entityId: String<64>;
-    action: String<24>;
-    data: Object;
-    filter?: Object | null;
-    extra?: Object | null;
-    iState?: IState | null;
-};
-export type OpAttr = keyof OpSchema;
-type ModiEntity$modiAggr = "modiEntity$modi$$aggr" | "modiEntity$modi$$0$$aggr" | "modiEntity$modi$$1$$aggr" | "modiEntity$modi$$2$$aggr" | "modiEntity$modi$$3$$aggr" | "modiEntity$modi$$4$$aggr" | "modiEntity$modi$$5$$aggr" | "modiEntity$modi$$6$$aggr" | "modiEntity$modi$$7$$aggr" | "modiEntity$modi$$8$$aggr" | "modiEntity$modi$$9$$aggr";
-export type Schema = OpSchema & {
-    modiEntity$modi?: Array<ModiEntity.Schema>;
-} & {
-    [A in ExpressionKey]?: any;
-} & {
-    [A in ModiEntity$modiAggr]?: AggregationResult<ModiEntity.Schema>;
-};
-type AttrFilter = {
-    id: Q_StringValue;
-    $$createAt$$: Q_DateValue;
-    $$seq$$: Q_NumberValue;
-    $$updateAt$$: Q_DateValue;
-    targetEntity: Q_StringValue;
-    entity: Q_StringValue;
-    entityId: Q_StringValue;
-    action: Q_StringValue;
-    data: Object;
-    filter: Object;
-    extra: Object;
-    iState: Q_EnumValue<IState>;
-    modiEntity$modi: ModiEntity.Filter & SubQueryPredicateMetadata;
-};
-export type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
-export type Projection = {
-    "#id"?: NodeId;
-    [k: string]: any;
-    id?: number;
-    $$createAt$$?: number;
-    $$updateAt$$?: number;
-    $$seq$$?: number;
-    targetEntity?: number;
-    entity?: number;
-    entityId?: number;
-    action?: number;
-    data?: number | Object;
-    filter?: number | Object;
-    extra?: number | Object;
-    iState?: number;
-    modiEntity$modi?: ModiEntity.Selection & {
-        $entity: "modiEntity";
-    };
-} & Partial<ExprOp<OpAttr | string>> & {
-    [A in ModiEntity$modiAggr]?: ModiEntity.Aggregation & {
-        $entity: "modiEntity";
-    };
-};
-type ModiIdProjection = OneOf<{
-    id: number;
-}>;
-export type SortAttr = {
-    id: number;
-} | {
-    $$createAt$$: number;
-} | {
-    $$seq$$: number;
-} | {
-    $$updateAt$$: number;
-} | {
-    targetEntity: number;
-} | {
-    entity: number;
-} | {
-    entityId: number;
-} | {
-    action: number;
-} | {
-    iState: number;
-} | {
-    [k: string]: any;
-} | OneOf<ExprOp<OpAttr | string>>;
-export type SortNode = {
-    $attr: SortAttr;
-    $direction?: "asc" | "desc";
-};
-export type Sorter = SortNode[];
-export type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
-export type Selection<P extends Object = Projection> = SelectOperation<P>;
-export type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
-export type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId">> & ({
-    entity?: string;
-    entityId?: string;
-    [K: string]: any;
-}) & {
-    modiEntity$modi?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "modi" | "modiId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "modi" | "modiId">>>;
-};
-export type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
-export type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
-export type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
-export type UpdateOperationData = FormUpdateData<OpSchema> & {
-    [k: string]: any;
-    modiEntity$modi?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "modi" | "modiId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "modi" | "modiId">>>;
-};
-export type UpdateOperation = OakOperation<"update" | ParticularAction | string, UpdateOperationData, Filter, Sorter>;
-export type RemoveOperationData = {};
-export type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
-export type Operation = CreateOperation | UpdateOperation | RemoveOperation;
-export type ModiIdSubQuery = Selection<ModiIdProjection>;
-export type EntityDef = {
-    Schema: Schema;
-    OpSchema: OpSchema;
-    Action: OakMakeAction<Action> | string;
-    Selection: Selection;
-    Aggregation: Aggregation;
-    Operation: Operation;
-    Create: CreateOperation;
-    Update: UpdateOperation;
-    Remove: RemoveOperation;
-    CreateSingle: CreateSingleOperation;
-    CreateMulti: CreateMultipleOperation;
-    ParticularAction: ParticularAction;
-};
-export {};
+export * from "./_baseSchema";
+import { Modi } from "../EntityDict";
+export type Schema = Modi["Schema"];
+export type Action = Modi["Action"];
+export type Projection = Modi["Projection"];
+export type Filter = Modi["Filter"];
+export type SortNode = Modi["SortNode"];
+export type Sorter = Modi["Sorter"];
+export type Selection = Modi["Selection"];
+export type Aggregation = Modi["Aggregation"];
+export type CreateOperationData = Modi["CreateOperationData"];
+export type CreateSingle = Modi["CreateSingle"];
+export type CreateMulti = Modi["CreateMulti"];
+export type Create = Modi["Create"];
+export type UpdateOperationData = Modi["UpdateOperationData"];
+export type Update = Modi["Update"];
+export type RemoveOperationData = Modi["RemoveOperationData"];
+export type Remove = Modi["Remove"];
+export type Operation = Modi["Operation"];

package/lib/base-app-domain/Modi/Schema.js

@@ -1,2 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./_baseSchema"), exports);

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

@@ -1,3 +1,3 @@
-import { EntityDef } from "./Schema";
+import { Action, OpSchema } from "./Schema";
 import { StyleDef } from "../../types/Style";
-export declare const style: StyleDef<EntityDef["OpSchema"], EntityDef["Action"]>;
+export declare const style: StyleDef<OpSchema, Action>;