oak-domain 5.1.16 → 5.1.17

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

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

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

@@ -1,136 +1,19 @@
-import { JsonProjection } from "../../types/DataType";
-import { Q_DateValue, Q_NumberValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey, JsonFilter, 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 UserEntityClaim from "../UserEntityClaim/Schema";
-import * as ModiEntity from "../ModiEntity/Schema";
-import * as OperEntity from "../OperEntity/Schema";
-type RelationIds = string[];
-export type OpSchema = EntityShape & {
-    relationEntity: String<32>;
-    relationEntityFilter: Object;
-    relationIds: RelationIds;
-};
-export type OpAttr = keyof OpSchema;
-type UserEntityClaim$uegAggr = "userEntityClaim$ueg$$aggr" | "userEntityClaim$ueg$$0$$aggr" | "userEntityClaim$ueg$$1$$aggr" | "userEntityClaim$ueg$$2$$aggr" | "userEntityClaim$ueg$$3$$aggr" | "userEntityClaim$ueg$$4$$aggr" | "userEntityClaim$ueg$$5$$aggr" | "userEntityClaim$ueg$$6$$aggr" | "userEntityClaim$ueg$$7$$aggr" | "userEntityClaim$ueg$$8$$aggr" | "userEntityClaim$ueg$$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 & {
-    userEntityClaim$ueg?: Array<UserEntityClaim.Schema>;
-    modiEntity$entity?: Array<ModiEntity.Schema>;
-    operEntity$entity?: Array<OperEntity.Schema>;
-} & {
-    [A in ExpressionKey]?: any;
-} & {
-    [A in UserEntityClaim$uegAggr]?: AggregationResult<UserEntityClaim.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;
-    relationEntity: Q_StringValue;
-    relationEntityFilter: Object;
-    relationIds: JsonFilter<RelationIds>;
-    userEntityClaim$ueg: UserEntityClaim.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;
-    relationEntity?: number;
-    relationEntityFilter?: number | Object;
-    relationIds?: number | JsonProjection<RelationIds>;
-    userEntityClaim$ueg?: UserEntityClaim.Selection & {
-        $entity: "userEntityClaim";
-    };
-    modiEntity$entity?: ModiEntity.Selection & {
-        $entity: "modiEntity";
-    };
-    operEntity$entity?: OperEntity.Selection & {
-        $entity: "operEntity";
-    };
-} & Partial<ExprOp<OpAttr | string>> & {
-    [A in UserEntityClaim$uegAggr]?: UserEntityClaim.Aggregation & {
-        $entity: "userEntityClaim";
-    };
-} & {
-    [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & {
-        $entity: "modiEntity";
-    };
-} & {
-    [A in OperEntity$entityAggr]?: OperEntity.Aggregation & {
-        $entity: "operEntity";
-    };
-};
-type UserEntityGrantIdProjection = OneOf<{
-    id: number;
-}>;
-export type SortAttr = {
-    id: number;
-} | {
-    $$createAt$$: number;
-} | {
-    $$seq$$: number;
-} | {
-    $$updateAt$$: number;
-} | {
-    relationEntity: number;
-} | {
-    relationIds: 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> & {
-    userEntityClaim$ueg?: OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "ueg" | "uegId">, Omit<UserEntityClaim.Filter, "ueg" | "uegId">> | OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "ueg" | "uegId">[]> | Array<OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "ueg" | "uegId">> | OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "ueg" | "uegId">, Omit<UserEntityClaim.Filter, "ueg" | "uegId">>>;
-    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;
-    userEntityClaim$ueg?: OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "ueg" | "uegId">, Omit<UserEntityClaim.Filter, "ueg" | "uegId">> | OakOperation<UserEntityClaim.RemoveOperation["action"], Omit<UserEntityClaim.RemoveOperationData, "ueg" | "uegId">, Omit<UserEntityClaim.Filter, "ueg" | "uegId">> | OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "ueg" | "uegId">[]> | Array<OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "ueg" | "uegId">> | OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "ueg" | "uegId">, Omit<UserEntityClaim.Filter, "ueg" | "uegId">> | OakOperation<UserEntityClaim.RemoveOperation["action"], Omit<UserEntityClaim.RemoveOperationData, "ueg" | "uegId">, Omit<UserEntityClaim.Filter, "ueg" | "uegId">>>;
-    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 UserEntityGrantIdSubQuery = Selection<UserEntityGrantIdProjection>;
-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 { UserEntityGrant } from "../EntityDict";
+export type Schema = UserEntityGrant["Schema"];
+export type Action = UserEntityGrant["Action"];
+export type Projection = UserEntityGrant["Projection"];
+export type Filter = UserEntityGrant["Filter"];
+export type SortNode = UserEntityGrant["SortNode"];
+export type Sorter = UserEntityGrant["Sorter"];
+export type Selection = UserEntityGrant["Selection"];
+export type Aggregation = UserEntityGrant["Aggregation"];
+export type CreateOperationData = UserEntityGrant["CreateOperationData"];
+export type CreateSingle = UserEntityGrant["CreateSingle"];
+export type CreateMulti = UserEntityGrant["CreateMulti"];
+export type Create = UserEntityGrant["Create"];
+export type UpdateOperationData = UserEntityGrant["UpdateOperationData"];
+export type Update = UserEntityGrant["Update"];
+export type RemoveOperationData = UserEntityGrant["RemoveOperationData"];
+export type Remove = UserEntityGrant["Remove"];
+export type Operation = UserEntityGrant["Operation"];

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

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

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

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

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

@@ -1,212 +1,19 @@
-import { ForeignKey } from "../../types/DataType";
-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 User from "../User/Schema";
-import * as Relation from "../Relation/Schema";
-import * as UserEntityClaim from "../UserEntityClaim/Schema";
-import * as ModiEntity from "../ModiEntity/Schema";
-import * as OperEntity from "../OperEntity/Schema";
-export type OpSchema = EntityShape & {
-    userId: ForeignKey<"user">;
-    relationId: ForeignKey<"relation">;
-    entity: String<32>;
-    entityId: String<64>;
-};
-export type OpAttr = keyof OpSchema;
-type UserEntityClaim$userRelationAggr = "userEntityClaim$userRelation$$aggr" | "userEntityClaim$userRelation$$0$$aggr" | "userEntityClaim$userRelation$$1$$aggr" | "userEntityClaim$userRelation$$2$$aggr" | "userEntityClaim$userRelation$$3$$aggr" | "userEntityClaim$userRelation$$4$$aggr" | "userEntityClaim$userRelation$$5$$aggr" | "userEntityClaim$userRelation$$6$$aggr" | "userEntityClaim$userRelation$$7$$aggr" | "userEntityClaim$userRelation$$8$$aggr" | "userEntityClaim$userRelation$$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 & {
-    user: User.Schema;
-    relation: Relation.Schema;
-    userEntityClaim$userRelation?: Array<UserEntityClaim.Schema>;
-    modiEntity$entity?: Array<ModiEntity.Schema>;
-    operEntity$entity?: Array<OperEntity.Schema>;
-} & {
-    [A in ExpressionKey]?: any;
-} & {
-    [A in UserEntityClaim$userRelationAggr]?: AggregationResult<UserEntityClaim.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;
-    userId: Q_StringValue;
-    user: User.Filter;
-    relationId: Q_StringValue;
-    relation: Relation.Filter;
-    entity: Q_StringValue;
-    entityId: Q_StringValue;
-    userEntityClaim$userRelation: UserEntityClaim.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;
-    userId?: number;
-    user?: User.Projection;
-    relationId?: number;
-    relation?: Relation.Projection;
-    entity?: number;
-    entityId?: number;
-    userEntityClaim$userRelation?: UserEntityClaim.Selection & {
-        $entity: "userEntityClaim";
-    };
-    modiEntity$entity?: ModiEntity.Selection & {
-        $entity: "modiEntity";
-    };
-    operEntity$entity?: OperEntity.Selection & {
-        $entity: "operEntity";
-    };
-} & Partial<ExprOp<OpAttr | string>> & {
-    [A in UserEntityClaim$userRelationAggr]?: UserEntityClaim.Aggregation & {
-        $entity: "userEntityClaim";
-    };
-} & {
-    [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & {
-        $entity: "modiEntity";
-    };
-} & {
-    [A in OperEntity$entityAggr]?: OperEntity.Aggregation & {
-        $entity: "operEntity";
-    };
-};
-type UserRelationIdProjection = OneOf<{
-    id: number;
-}>;
-type UserIdProjection = OneOf<{
-    userId: number;
-}>;
-type RelationIdProjection = OneOf<{
-    relationId: number;
-}>;
-export type SortAttr = {
-    id: number;
-} | {
-    $$createAt$$: number;
-} | {
-    $$seq$$: number;
-} | {
-    $$updateAt$$: number;
-} | {
-    userId: number;
-} | {
-    user: User.SortAttr;
-} | {
-    relationId: number;
-} | {
-    relation: Relation.SortAttr;
-} | {
-    entity: number;
-} | {
-    entityId: 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" | "userId" | "relationId">> & (({
-    userId?: never;
-    user: User.CreateSingleOperation;
-} | {
-    userId: ForeignKey<"user">;
-    user?: User.UpdateOperation;
-} | {
-    user?: never;
-    userId: ForeignKey<"user">;
-}) & ({
-    relationId?: never;
-    relation: Relation.CreateSingleOperation;
-} | {
-    relationId: ForeignKey<"relation">;
-    relation?: Relation.UpdateOperation;
-} | {
-    relation?: never;
-    relationId: ForeignKey<"relation">;
-})) & ({
-    entity?: string;
-    entityId?: string;
-    [K: string]: any;
-}) & {
-    userEntityClaim$userRelation?: OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "userRelation" | "userRelationId">, Omit<UserEntityClaim.Filter, "userRelation" | "userRelationId">> | OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "userRelation" | "userRelationId">[]> | Array<OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "userRelation" | "userRelationId">> | OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "userRelation" | "userRelationId">, Omit<UserEntityClaim.Filter, "userRelation" | "userRelationId">>>;
-    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<Omit<OpSchema, "userId" | "relationId">> & (({
-    user?: User.CreateSingleOperation;
-    userId?: never;
-} | {
-    user?: User.UpdateOperation;
-    userId?: never;
-} | {
-    user?: User.RemoveOperation;
-    userId?: never;
-} | {
-    user?: never;
-    userId?: ForeignKey<"user">;
-}) & ({
-    relation?: Relation.CreateSingleOperation;
-    relationId?: never;
-} | {
-    relation?: Relation.UpdateOperation;
-    relationId?: never;
-} | {
-    relation?: Relation.RemoveOperation;
-    relationId?: never;
-} | {
-    relation?: never;
-    relationId?: ForeignKey<"relation">;
-})) & {
-    [k: string]: any;
-    userEntityClaim$userRelation?: OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "userRelation" | "userRelationId">, Omit<UserEntityClaim.Filter, "userRelation" | "userRelationId">> | OakOperation<UserEntityClaim.RemoveOperation["action"], Omit<UserEntityClaim.RemoveOperationData, "userRelation" | "userRelationId">, Omit<UserEntityClaim.Filter, "userRelation" | "userRelationId">> | OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "userRelation" | "userRelationId">[]> | Array<OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "userRelation" | "userRelationId">> | OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "userRelation" | "userRelationId">, Omit<UserEntityClaim.Filter, "userRelation" | "userRelationId">> | OakOperation<UserEntityClaim.RemoveOperation["action"], Omit<UserEntityClaim.RemoveOperationData, "userRelation" | "userRelationId">, Omit<UserEntityClaim.Filter, "userRelation" | "userRelationId">>>;
-    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 = {} & (({
-    user?: User.UpdateOperation | User.RemoveOperation;
-}) & ({
-    relation?: Relation.UpdateOperation | Relation.RemoveOperation;
-}));
-export type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
-export type Operation = CreateOperation | UpdateOperation | RemoveOperation;
-export type UserIdSubQuery = Selection<UserIdProjection>;
-export type RelationIdSubQuery = Selection<RelationIdProjection>;
-export type UserRelationIdSubQuery = Selection<UserRelationIdProjection>;
-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 { UserRelation } from "../EntityDict";
+export type Schema = UserRelation["Schema"];
+export type Action = UserRelation["Action"];
+export type Projection = UserRelation["Projection"];
+export type Filter = UserRelation["Filter"];
+export type SortNode = UserRelation["SortNode"];
+export type Sorter = UserRelation["Sorter"];
+export type Selection = UserRelation["Selection"];
+export type Aggregation = UserRelation["Aggregation"];
+export type CreateOperationData = UserRelation["CreateOperationData"];
+export type CreateSingle = UserRelation["CreateSingle"];
+export type CreateMulti = UserRelation["CreateMulti"];
+export type Create = UserRelation["Create"];
+export type UpdateOperationData = UserRelation["UpdateOperationData"];
+export type Update = UserRelation["Update"];
+export type RemoveOperationData = UserRelation["RemoveOperationData"];
+export type Remove = UserRelation["Remove"];
+export type Operation = UserRelation["Operation"];

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

@@ -0,0 +1,47 @@
+import { ForeignKey } from "../../types/DataType";
+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 & {
+    userId: ForeignKey<"user">;
+    relationId: ForeignKey<"relation">;
+    entity: String<32>;
+    entityId: String<64>;
+} & {
+    [A in ExpressionKey]?: any;
+};
+export type OpAttr = keyof OpSchema;
+export type OpFilter = {
+    id: Q_StringValue;
+    $$createAt$$: Q_DateValue;
+    $$seq$$: Q_NumberValue;
+    $$updateAt$$: Q_DateValue;
+    userId: Q_StringValue;
+    relationId: Q_StringValue;
+    entity: Q_StringValue;
+    entityId: Q_StringValue;
+} & ExprOp<OpAttr | string>;
+export type OpProjection = {
+    "#id"?: NodeId;
+    [k: string]: any;
+    id?: number;
+    $$createAt$$?: number;
+    $$updateAt$$?: number;
+    $$seq$$?: number;
+    userId?: number;
+    relationId?: number;
+    entity?: number;
+    entityId?: number;
+} & Partial<ExprOp<OpAttr | string>>;
+export type OpSortAttr = Partial<{
+    id: number;
+    $$createAt$$: number;
+    $$seq$$: number;
+    $$updateAt$$: number;
+    entity: number;
+    entityId: number;
+    [k: string]: any;
+} | ExprOp<OpAttr | string>>;
+export type OpAction = OakMakeAction<GenericAction | string>;
+export type OpUpdateAction = "update" | string;

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

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

package/lib/compiler/localeBuilder.d.ts

@@ -9,6 +9,7 @@ export default class LocaleBuilder {
     pwd: string;
     locales: Record<string, [string, string, string, object]>;
     hash: Hash;
+    projectName?: string;
     constructor(asLib?: boolean);
     /**
      * 将locales输出成为data/i18n.ts中的数据

package/lib/compiler/localeBuilder.js

@@ -32,6 +32,7 @@ class LocaleBuilder {
     pwd;
     locales; // key: namespace, value: [module, position, language, data]
     hash;
+    projectName;
     constructor(asLib) {
         const pwd = process.cwd();
         this.pwd = pwd;
@@ -52,8 +53,9 @@ class LocaleBuilder {
      * 如果有Dependency需要引出来
      */
     outputDataFile() {
+        const appDomainDir = this.projectName === 'oak-domain' ? 'base-app-domain' : 'oak-app-domain';
         const statements = [
-            factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("CreateOperationData"), factory.createIdentifier("I18n"))])), factory.createStringLiteral("../oak-app-domain/I18n/Schema"), undefined)
+            factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("CreateOperationData"), factory.createIdentifier("I18n"))])), factory.createStringLiteral(`../${appDomainDir}/I18n/Schema`), undefined)
         ];
         // 改为在初始化时合并
         /*  if (this.dependencies) {
@@ -111,7 +113,11 @@ class LocaleBuilder {
         /* } */
         const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
         const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, false, ts.ScriptKind.TS));
-        const filename = (0, path_1.join)(this.pwd, 'src', 'data', 'i18n.ts');
+        const dataDir = (0, path_1.join)(this.pwd, 'src', 'data');
+        if (!fs_1.default.existsSync(dataDir)) {
+            fs_1.default.mkdirSync(dataDir);
+        }
+        const filename = (0, path_1.join)(dataDir, 'i18n.ts');
         const result2 = (0, string_1.unescapeUnicode)(`// 本文件为自动编译产生，请勿直接修改\n\n${result}`);
         fs_1.default.writeFileSync(filename, result2, { flag: 'w' });
     }
@@ -168,6 +174,7 @@ class LocaleBuilder {
     buildProject(root, src, watch) {
         const packageJson = (0, path_1.join)(root, 'package.json');
         const { name } = require(packageJson);
+        this.projectName = name;
         const pagePath = (0, path_1.join)(src ? 'src' : 'es', 'pages');
         const pageAbsolutePath = (0, path_1.join)(root, pagePath); //编译i18时font中的componentPath缺少根目录导致编译不出
         if (fs_1.default.existsSync(pageAbsolutePath)) {

package/lib/compiler/schemalBuilder.d.ts

@@ -24,4 +24,5 @@ export declare function registerFixedDestinationPathMap(map: Record<string, stri
  */
 export declare function registerDeducedRelationMap(map: Record<string, string>): void;
 export declare function analyzeEntities(inputDir: string, relativePath?: string): void;
+export declare function buildSchemaBackup(outputDir: string): void;
 export declare function buildSchema(outputDir: string): void;