oak-domain 5.1.16 → 5.1.17

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

@@ -1,201 +1,19 @@
-import { ForeignKey } from "../../types/DataType";
-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, Datetime } from "../../types/DataType";
-import * as User from "../User/Schema";
-import * as Log from "../Log/Schema";
-import * as OperEntity from "../OperEntity/Schema";
-export type OpSchema = EntityShape & {
-    action: String<24>;
-    data: Object;
-    filter?: Object | null;
-    extra?: Object | null;
-    operatorId?: ForeignKey<"user"> | null;
-    targetEntity: String<32>;
-    bornAt?: Datetime | null;
-    logId?: ForeignKey<"log"> | null;
-    undoData?: Object | null;
-    iState?: IState | null;
-};
-export type OpAttr = keyof OpSchema;
-type OperEntity$operAggr = "operEntity$oper$$aggr" | "operEntity$oper$$0$$aggr" | "operEntity$oper$$1$$aggr" | "operEntity$oper$$2$$aggr" | "operEntity$oper$$3$$aggr" | "operEntity$oper$$4$$aggr" | "operEntity$oper$$5$$aggr" | "operEntity$oper$$6$$aggr" | "operEntity$oper$$7$$aggr" | "operEntity$oper$$8$$aggr" | "operEntity$oper$$9$$aggr";
-export type Schema = OpSchema & {
-    operator?: User.Schema | null;
-    log?: Log.Schema | null;
-    operEntity$oper?: Array<OperEntity.Schema>;
-} & {
-    [A in ExpressionKey]?: any;
-} & {
-    [A in OperEntity$operAggr]?: AggregationResult<OperEntity.Schema>;
-};
-type AttrFilter = {
-    id: Q_StringValue;
-    $$createAt$$: Q_DateValue;
-    $$seq$$: Q_NumberValue;
-    $$updateAt$$: Q_DateValue;
-    action: Q_StringValue;
-    data: Object;
-    filter: Object;
-    extra: Object;
-    operatorId: Q_StringValue;
-    operator: User.Filter;
-    targetEntity: Q_StringValue;
-    bornAt: Q_DateValue;
-    logId: Q_StringValue;
-    log: Log.Filter;
-    undoData: Object;
-    iState: Q_EnumValue<IState>;
-    operEntity$oper: 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;
-    action?: number;
-    data?: number | Object;
-    filter?: number | Object;
-    extra?: number | Object;
-    operatorId?: number;
-    operator?: User.Projection;
-    targetEntity?: number;
-    bornAt?: number;
-    logId?: number;
-    log?: Log.Projection;
-    undoData?: number | Object;
-    iState?: number;
-    operEntity$oper?: OperEntity.Selection & {
-        $entity: "operEntity";
-    };
-} & Partial<ExprOp<OpAttr | string>> & {
-    [A in OperEntity$operAggr]?: OperEntity.Aggregation & {
-        $entity: "operEntity";
-    };
-};
-type OperIdProjection = OneOf<{
-    id: number;
-}>;
-type UserIdProjection = OneOf<{
-    operatorId: number;
-}>;
-type LogIdProjection = OneOf<{
-    logId: number;
-}>;
-export type SortAttr = {
-    id: number;
-} | {
-    $$createAt$$: number;
-} | {
-    $$seq$$: number;
-} | {
-    $$updateAt$$: number;
-} | {
-    action: number;
-} | {
-    operatorId: number;
-} | {
-    operator: User.SortAttr;
-} | {
-    targetEntity: number;
-} | {
-    bornAt: number;
-} | {
-    logId: number;
-} | {
-    log: Log.SortAttr;
-} | {
-    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, "operatorId" | "logId">> & (({
-    operatorId?: never;
-    operator?: User.CreateSingleOperation;
-} | {
-    operatorId: ForeignKey<"operator">;
-    operator?: User.UpdateOperation;
-} | {
-    operator?: never;
-    operatorId?: ForeignKey<"operator">;
-}) & ({
-    logId?: never;
-    log?: Log.CreateSingleOperation;
-} | {
-    logId: ForeignKey<"log">;
-    log?: Log.UpdateOperation;
-} | {
-    log?: never;
-    logId?: ForeignKey<"log">;
-})) & {
-    operEntity$oper?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "oper" | "operId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "oper" | "operId">>>;
-};
-export type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
-export type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
-export type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
-export type UpdateOperationData = FormUpdateData<Omit<OpSchema, "operatorId" | "logId">> & (({
-    operator?: User.CreateSingleOperation;
-    operatorId?: never;
-} | {
-    operator?: User.UpdateOperation;
-    operatorId?: never;
-} | {
-    operator?: User.RemoveOperation;
-    operatorId?: never;
-} | {
-    operator?: never;
-    operatorId?: ForeignKey<"operator"> | null;
-}) & ({
-    log?: Log.CreateSingleOperation;
-    logId?: never;
-} | {
-    log?: Log.UpdateOperation;
-    logId?: never;
-} | {
-    log?: Log.RemoveOperation;
-    logId?: never;
-} | {
-    log?: never;
-    logId?: ForeignKey<"log"> | null;
-})) & {
-    [k: string]: any;
-    operEntity$oper?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "oper" | "operId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "oper" | "operId">>>;
-};
-export type UpdateOperation = OakOperation<"update" | ParticularAction | string, UpdateOperationData, Filter, Sorter>;
-export type RemoveOperationData = {} & (({
-    operator?: User.UpdateOperation | User.RemoveOperation;
-}) & ({
-    log?: Log.UpdateOperation | Log.RemoveOperation;
-}));
-export type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
-export type Operation = CreateOperation | UpdateOperation | RemoveOperation;
-export type UserIdSubQuery = Selection<UserIdProjection>;
-export type LogIdSubQuery = Selection<LogIdProjection>;
-export type OperIdSubQuery = Selection<OperIdProjection>;
-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 { Oper } from "../EntityDict";
+export type Schema = Oper["Schema"];
+export type Action = Oper["Action"];
+export type Projection = Oper["Projection"];
+export type Filter = Oper["Filter"];
+export type SortNode = Oper["SortNode"];
+export type Sorter = Oper["Sorter"];
+export type Selection = Oper["Selection"];
+export type Aggregation = Oper["Aggregation"];
+export type CreateOperationData = Oper["CreateOperationData"];
+export type CreateSingle = Oper["CreateSingle"];
+export type CreateMulti = Oper["CreateMulti"];
+export type Create = Oper["Create"];
+export type UpdateOperationData = Oper["UpdateOperationData"];
+export type Update = Oper["Update"];
+export type RemoveOperationData = Oper["RemoveOperationData"];
+export type Remove = Oper["Remove"];
+export type Operation = Oper["Operation"];

package/lib/base-app-domain/Oper/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/Oper/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/Oper/_baseSchema.d.ts

@@ -0,0 +1,67 @@
+import { ForeignKey } from "../../types/DataType";
+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, IState } from "./Action";
+import { String, Datetime } from "../../types/DataType";
+export type OpSchema = EntityShape & {
+    action: String<24>;
+    data: Object;
+    filter?: Object | null;
+    extra?: Object | null;
+    operatorId?: ForeignKey<"user"> | null;
+    targetEntity: String<32>;
+    bornAt?: Datetime | null;
+    logId?: ForeignKey<"log"> | null;
+    undoData?: Object | null;
+    iState?: IState | null;
+} & {
+    [A in ExpressionKey]?: any;
+};
+export type OpAttr = keyof OpSchema;
+export type OpFilter = {
+    id: Q_StringValue;
+    $$createAt$$: Q_DateValue;
+    $$seq$$: Q_NumberValue;
+    $$updateAt$$: Q_DateValue;
+    action: Q_StringValue;
+    data: Object;
+    filter: Object;
+    extra: Object;
+    operatorId: Q_StringValue;
+    targetEntity: Q_StringValue;
+    bornAt: Q_DateValue;
+    logId: Q_StringValue;
+    undoData: Object;
+    iState: Q_EnumValue<IState>;
+} & ExprOp<OpAttr | string>;
+export type OpProjection = {
+    "#id"?: NodeId;
+    [k: string]: any;
+    id?: number;
+    $$createAt$$?: number;
+    $$updateAt$$?: number;
+    $$seq$$?: number;
+    action?: number;
+    data?: number | Object;
+    filter?: number | Object;
+    extra?: number | Object;
+    operatorId?: number;
+    targetEntity?: number;
+    bornAt?: number;
+    logId?: number;
+    undoData?: number | Object;
+    iState?: number;
+} & Partial<ExprOp<OpAttr | string>>;
+export type OpSortAttr = Partial<{
+    id: number;
+    $$createAt$$: number;
+    $$seq$$: number;
+    $$updateAt$$: number;
+    action: number;
+    targetEntity: number;
+    bornAt: 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/Oper/_baseSchema.js

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