oak-domain 3.0.3 → 3.0.4

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

@@ -5,7 +5,7 @@ import { Action, ParticularAction, IState } from "./Action";
 import { String } from "../../types/DataType";
 import { EntityShape } from "../../types/Entity";
 import * as ModiEntity from "../ModiEntity/Schema";
-export declare type OpSchema = EntityShape & {
+export type OpSchema = EntityShape & {
     targetEntity: String<32>;
     entity: String<32>;
     entityId: String<64>;
@@ -15,8 +15,8 @@ export declare type OpSchema = EntityShape & {
     extra?: Object | null;
     iState?: IState | null;
 };
-export declare type OpAttr = keyof OpSchema;
-export declare type Schema = EntityShape & {
+export type OpAttr = keyof OpSchema;
+export type Schema = EntityShape & {
     targetEntity: String<32>;
     entity: String<32>;
     entityId: String<64>;
@@ -30,7 +30,7 @@ export declare type Schema = EntityShape & {
 } & {
     [A in ExpressionKey]?: any;
 };
-declare type AttrFilter = {
+type AttrFilter = {
     id: Q_StringValue;
     $$createAt$$: Q_DateValue;
     $$seq$$: Q_StringValue;
@@ -45,8 +45,8 @@ declare type AttrFilter = {
     iState: Q_EnumValue<IState>;
     modiEntity$modi: ModiEntity.Filter & SubQueryPredicateMetadata;
 };
-export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
-export declare type Projection = {
+export type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
+export type Projection = {
     "#id"?: NodeId;
     [k: string]: any;
     id?: number;
@@ -68,10 +68,10 @@ export declare type Projection = {
         $entity: "modiEntity";
     };
 } & Partial<ExprOp<OpAttr | string>>;
-declare type ModiIdProjection = OneOf<{
+type ModiIdProjection = OneOf<{
     id: number;
 }>;
-export declare type SortAttr = {
+export type SortAttr = {
     id: number;
 } | {
     $$createAt$$: number;
@@ -92,34 +92,34 @@ export declare type SortAttr = {
 } | {
     [k: string]: any;
 } | OneOf<ExprOp<OpAttr | string>>;
-export declare type SortNode = {
+export type SortNode = {
     $attr: SortAttr;
     $direction?: "asc" | "desc";
 };
-export declare type Sorter = SortNode[];
-export declare type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
-export declare type Selection<P extends Object = Projection> = SelectOperation<P>;
-export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
-export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId">> & ({
+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 declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
-export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
-export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
-export declare type UpdateOperationData = FormUpdateData<OpSchema> & {
+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 declare type UpdateOperation = OakOperation<"update" | ParticularAction | string, UpdateOperationData, Filter, Sorter>;
-export declare type RemoveOperationData = {};
-export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
-export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation;
-export declare type ModiIdSubQuery = Selection<ModiIdProjection>;
-export declare type EntityDef = {
+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;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.desc = void 0;
-var Action_1 = require("./Action");
+const Action_1 = require("./Action");
 exports.desc = {
     attributes: {
         targetEntity: {
@@ -55,9 +55,9 @@ exports.desc = {
             attributes: [
                 {
                     name: 'iState',
-                    direction: 'ASC'
+                    direction: 'ASC',
                 }
-            ]
+            ],
         }
     ]
 };

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

@@ -8,51 +8,57 @@ import { EntityShape } from "../../types/Entity";
 import * as Modi from "../Modi/Schema";
 import * as ActionAuth from "../ActionAuth/Schema";
 import * as I18n from "../I18n/Schema";
+import * as Path from "../Path/Schema";
 import * as Relation from "../Relation/Schema";
 import * as RelationAuth from "../RelationAuth/Schema";
 import * as User from "../User/Schema";
+import * as UserEntityClaim from "../UserEntityClaim/Schema";
 import * as UserEntityGrant from "../UserEntityGrant/Schema";
 import * as UserRelation from "../UserRelation/Schema";
-export declare type OpSchema = EntityShape & {
+export type OpSchema = EntityShape & {
     modiId: ForeignKey<"modi">;
-    entity: "actionAuth" | "i18n" | "relation" | "relationAuth" | "user" | "userEntityGrant" | "userRelation" | string;
+    entity: "actionAuth" | "i18n" | "path" | "relation" | "relationAuth" | "user" | "userEntityClaim" | "userEntityGrant" | "userRelation" | string;
     entityId: String<64>;
 };
-export declare type OpAttr = keyof OpSchema;
-export declare type Schema = EntityShape & {
+export type OpAttr = keyof OpSchema;
+export type Schema = EntityShape & {
     modiId: ForeignKey<"modi">;
-    entity: "actionAuth" | "i18n" | "relation" | "relationAuth" | "user" | "userEntityGrant" | "userRelation" | string;
+    entity: "actionAuth" | "i18n" | "path" | "relation" | "relationAuth" | "user" | "userEntityClaim" | "userEntityGrant" | "userRelation" | string;
     entityId: String<64>;
     modi: Modi.Schema;
     actionAuth?: ActionAuth.Schema;
     i18n?: I18n.Schema;
+    path?: Path.Schema;
     relation?: Relation.Schema;
     relationAuth?: RelationAuth.Schema;
     user?: User.Schema;
+    userEntityClaim?: UserEntityClaim.Schema;
     userEntityGrant?: UserEntityGrant.Schema;
     userRelation?: UserRelation.Schema;
 } & {
     [A in ExpressionKey]?: any;
 };
-declare type AttrFilter = {
+type AttrFilter = {
     id: Q_StringValue;
     $$createAt$$: Q_DateValue;
     $$seq$$: Q_StringValue;
     $$updateAt$$: Q_DateValue;
     modiId: Q_StringValue;
     modi: Modi.Filter;
-    entity: Q_EnumValue<"actionAuth" | "i18n" | "relation" | "relationAuth" | "user" | "userEntityGrant" | "userRelation" | string>;
+    entity: Q_EnumValue<"actionAuth" | "i18n" | "path" | "relation" | "relationAuth" | "user" | "userEntityClaim" | "userEntityGrant" | "userRelation" | string>;
     entityId: Q_StringValue;
     actionAuth: ActionAuth.Filter;
     i18n: I18n.Filter;
+    path: Path.Filter;
     relation: Relation.Filter;
     relationAuth: RelationAuth.Filter;
     user: User.Filter;
+    userEntityClaim: UserEntityClaim.Filter;
     userEntityGrant: UserEntityGrant.Filter;
     userRelation: UserRelation.Filter;
 };
-export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
-export declare type Projection = {
+export type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
+export type Projection = {
     "#id"?: NodeId;
     [k: string]: any;
     id?: number;
@@ -65,40 +71,48 @@ export declare type Projection = {
     entityId?: number;
     actionAuth?: ActionAuth.Projection;
     i18n?: I18n.Projection;
+    path?: Path.Projection;
     relation?: Relation.Projection;
     relationAuth?: RelationAuth.Projection;
     user?: User.Projection;
+    userEntityClaim?: UserEntityClaim.Projection;
     userEntityGrant?: UserEntityGrant.Projection;
     userRelation?: UserRelation.Projection;
 } & Partial<ExprOp<OpAttr | string>>;
-declare type ModiEntityIdProjection = OneOf<{
+type ModiEntityIdProjection = OneOf<{
     id: number;
 }>;
-declare type ModiIdProjection = OneOf<{
+type ModiIdProjection = OneOf<{
     modiId: number;
 }>;
-declare type ActionAuthIdProjection = OneOf<{
+type ActionAuthIdProjection = OneOf<{
     entityId: number;
 }>;
-declare type I18nIdProjection = OneOf<{
+type I18nIdProjection = OneOf<{
     entityId: number;
 }>;
-declare type RelationIdProjection = OneOf<{
+type PathIdProjection = OneOf<{
     entityId: number;
 }>;
-declare type RelationAuthIdProjection = OneOf<{
+type RelationIdProjection = OneOf<{
     entityId: number;
 }>;
-declare type UserIdProjection = OneOf<{
+type RelationAuthIdProjection = OneOf<{
     entityId: number;
 }>;
-declare type UserEntityGrantIdProjection = OneOf<{
+type UserIdProjection = OneOf<{
     entityId: number;
 }>;
-declare type UserRelationIdProjection = OneOf<{
+type UserEntityClaimIdProjection = OneOf<{
     entityId: number;
 }>;
-export declare type SortAttr = {
+type UserEntityGrantIdProjection = OneOf<{
+    entityId: number;
+}>;
+type UserRelationIdProjection = OneOf<{
+    entityId: number;
+}>;
+export type SortAttr = {
     id: number;
 } | {
     $$createAt$$: number;
@@ -118,12 +132,16 @@ export declare type SortAttr = {
     actionAuth: ActionAuth.SortAttr;
 } | {
     i18n: I18n.SortAttr;
+} | {
+    path: Path.SortAttr;
 } | {
     relation: Relation.SortAttr;
 } | {
     relationAuth: RelationAuth.SortAttr;
 } | {
     user: User.SortAttr;
+} | {
+    userEntityClaim: UserEntityClaim.SortAttr;
 } | {
     userEntityGrant: UserEntityGrant.SortAttr;
 } | {
@@ -131,21 +149,22 @@ export declare type SortAttr = {
 } | {
     [k: string]: any;
 } | OneOf<ExprOp<OpAttr | string>>;
-export declare type SortNode = {
+export type SortNode = {
     $attr: SortAttr;
     $direction?: "asc" | "desc";
 };
-export declare type Sorter = SortNode[];
-export declare type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
-export declare type Selection<P extends Object = Projection> = SelectOperation<P>;
-export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
-export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId" | "modiId">> & (({
+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" | "modiId">> & (({
     modiId?: never;
     modi: Modi.CreateSingleOperation;
 } | {
     modiId: ForeignKey<"modi">;
     modi?: Modi.UpdateOperation;
 } | {
+    modi?: never;
     modiId: ForeignKey<"modi">;
 })) & ({
     entity?: never;
@@ -154,13 +173,27 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
 } | {
     entity: "actionAuth";
     entityId: ForeignKey<"ActionAuth">;
-    actionAuth: ActionAuth.UpdateOperation;
+    actionAuth?: ActionAuth.UpdateOperation;
 } | {
     entity: "actionAuth";
     entityId: ForeignKey<"ActionAuth">;
+    actionAuth?: never;
 } | {
     entity: "i18n";
     entityId: ForeignKey<"I18n">;
+    i18n?: never;
+} | {
+    entity?: never;
+    entityId?: never;
+    path: Path.CreateSingleOperation;
+} | {
+    entity: "path";
+    entityId: ForeignKey<"Path">;
+    path?: Path.UpdateOperation;
+} | {
+    entity: "path";
+    entityId: ForeignKey<"Path">;
+    path?: never;
 } | {
     entity?: never;
     entityId?: never;
@@ -168,10 +201,11 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
 } | {
     entity: "relation";
     entityId: ForeignKey<"Relation">;
-    relation: Relation.UpdateOperation;
+    relation?: Relation.UpdateOperation;
 } | {
     entity: "relation";
     entityId: ForeignKey<"Relation">;
+    relation?: never;
 } | {
     entity?: never;
     entityId?: never;
@@ -179,10 +213,11 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
 } | {
     entity: "relationAuth";
     entityId: ForeignKey<"RelationAuth">;
-    relationAuth: RelationAuth.UpdateOperation;
+    relationAuth?: RelationAuth.UpdateOperation;
 } | {
     entity: "relationAuth";
     entityId: ForeignKey<"RelationAuth">;
+    relationAuth?: never;
 } | {
     entity?: never;
     entityId?: never;
@@ -190,10 +225,23 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
 } | {
     entity: "user";
     entityId: ForeignKey<"User">;
-    user: User.UpdateOperation;
+    user?: User.UpdateOperation;
 } | {
     entity: "user";
     entityId: ForeignKey<"User">;
+    user?: never;
+} | {
+    entity?: never;
+    entityId?: never;
+    userEntityClaim: UserEntityClaim.CreateSingleOperation;
+} | {
+    entity: "userEntityClaim";
+    entityId: ForeignKey<"UserEntityClaim">;
+    userEntityClaim?: UserEntityClaim.UpdateOperation;
+} | {
+    entity: "userEntityClaim";
+    entityId: ForeignKey<"UserEntityClaim">;
+    userEntityClaim?: never;
 } | {
     entity?: never;
     entityId?: never;
@@ -201,10 +249,11 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
 } | {
     entity: "userEntityGrant";
     entityId: ForeignKey<"UserEntityGrant">;
-    userEntityGrant: UserEntityGrant.UpdateOperation;
+    userEntityGrant?: UserEntityGrant.UpdateOperation;
 } | {
     entity: "userEntityGrant";
     entityId: ForeignKey<"UserEntityGrant">;
+    userEntityGrant?: never;
 } | {
     entity?: never;
     entityId?: never;
@@ -212,34 +261,39 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
 } | {
     entity: "userRelation";
     entityId: ForeignKey<"UserRelation">;
-    userRelation: UserRelation.UpdateOperation;
+    userRelation?: UserRelation.UpdateOperation;
 } | {
     entity: "userRelation";
     entityId: ForeignKey<"UserRelation">;
+    userRelation?: never;
 } | {
     entity?: string;
     entityId?: string;
     [K: string]: any;
 });
-export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
-export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
-export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
-export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "entityId" | "modiId">> & (({
-    modi: Modi.CreateSingleOperation;
+export type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
+export type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
+export type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
+export type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "entityId" | "modiId">> & (({
+    modi?: Modi.CreateSingleOperation;
     modiId?: never;
 } | {
-    modi: Modi.UpdateOperation;
+    modi?: Modi.UpdateOperation;
     modiId?: never;
 } | {
-    modi: Modi.RemoveOperation;
+    modi?: Modi.RemoveOperation;
     modiId?: never;
 } | {
     modi?: never;
-    modiId?: ForeignKey<"modi"> | null;
+    modiId?: ForeignKey<"modi">;
 })) & ({
     actionAuth?: ActionAuth.CreateSingleOperation | ActionAuth.UpdateOperation | ActionAuth.RemoveOperation;
     entityId?: never;
     entity?: never;
+} | {
+    path?: Path.CreateSingleOperation | Path.UpdateOperation | Path.RemoveOperation;
+    entityId?: never;
+    entity?: never;
 } | {
     relation?: Relation.CreateSingleOperation | Relation.UpdateOperation | Relation.RemoveOperation;
     entityId?: never;
@@ -252,6 +306,10 @@ export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity"
     user?: User.CreateSingleOperation | User.UpdateOperation | User.RemoveOperation;
     entityId?: never;
     entity?: never;
+} | {
+    userEntityClaim?: UserEntityClaim.CreateSingleOperation | UserEntityClaim.UpdateOperation | UserEntityClaim.RemoveOperation;
+    entityId?: never;
+    entity?: never;
 } | {
     userEntityGrant?: UserEntityGrant.CreateSingleOperation | UserEntityGrant.UpdateOperation | UserEntityGrant.RemoveOperation;
     entityId?: never;
@@ -261,22 +319,35 @@ export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity"
     entityId?: never;
     entity?: never;
 } | {
-    entity?: ("actionAuth" | "i18n" | "relation" | "relationAuth" | "user" | "userEntityGrant" | "userRelation" | string) | null;
-    entityId?: ForeignKey<"ActionAuth" | "I18n" | "Relation" | "RelationAuth" | "User" | "UserEntityGrant" | "UserRelation"> | null;
+    entity?: ("actionAuth" | "i18n" | "path" | "relation" | "relationAuth" | "user" | "userEntityClaim" | "userEntityGrant" | "userRelation" | string) | null;
+    entityId?: ForeignKey<"ActionAuth" | "I18n" | "Path" | "Relation" | "RelationAuth" | "User" | "UserEntityClaim" | "UserEntityGrant" | "UserRelation"> | null;
+    actionAuth?: never;
+    i18n?: never;
+    path?: never;
+    relation?: never;
+    relationAuth?: never;
+    user?: never;
+    userEntityClaim?: never;
+    userEntityGrant?: never;
+    userRelation?: never;
 }) & {
     [k: string]: any;
 };
-export declare type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>;
-export declare type RemoveOperationData = {} & (({
+export type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>;
+export type RemoveOperationData = {} & (({
     modi?: Modi.UpdateOperation | Modi.RemoveOperation;
 })) & ({
     actionAuth?: ActionAuth.UpdateOperation | ActionAuth.RemoveOperation;
+} | {
+    path?: Path.UpdateOperation | Path.RemoveOperation;
 } | {
     relation?: Relation.UpdateOperation | Relation.RemoveOperation;
 } | {
     relationAuth?: RelationAuth.UpdateOperation | RelationAuth.RemoveOperation;
 } | {
     user?: User.UpdateOperation | User.RemoveOperation;
+} | {
+    userEntityClaim?: UserEntityClaim.UpdateOperation | UserEntityClaim.RemoveOperation;
 } | {
     userEntityGrant?: UserEntityGrant.UpdateOperation | UserEntityGrant.RemoveOperation;
 } | {
@@ -284,18 +355,20 @@ export declare type RemoveOperationData = {} & (({
 } | {
     [k: string]: any;
 });
-export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
-export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation;
-export declare type ModiIdSubQuery = Selection<ModiIdProjection>;
-export declare type ActionAuthIdSubQuery = Selection<ActionAuthIdProjection>;
-export declare type I18nIdSubQuery = Selection<I18nIdProjection>;
-export declare type RelationIdSubQuery = Selection<RelationIdProjection>;
-export declare type RelationAuthIdSubQuery = Selection<RelationAuthIdProjection>;
-export declare type UserIdSubQuery = Selection<UserIdProjection>;
-export declare type UserEntityGrantIdSubQuery = Selection<UserEntityGrantIdProjection>;
-export declare type UserRelationIdSubQuery = Selection<UserRelationIdProjection>;
-export declare type ModiEntityIdSubQuery = Selection<ModiEntityIdProjection>;
-export declare type EntityDef = {
+export type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
+export type Operation = CreateOperation | UpdateOperation | RemoveOperation;
+export type ModiIdSubQuery = Selection<ModiIdProjection>;
+export type ActionAuthIdSubQuery = Selection<ActionAuthIdProjection>;
+export type I18nIdSubQuery = Selection<I18nIdProjection>;
+export type PathIdSubQuery = Selection<PathIdProjection>;
+export type RelationIdSubQuery = Selection<RelationIdProjection>;
+export type RelationAuthIdSubQuery = Selection<RelationAuthIdProjection>;
+export type UserIdSubQuery = Selection<UserIdProjection>;
+export type UserEntityClaimIdSubQuery = Selection<UserEntityClaimIdProjection>;
+export type UserEntityGrantIdSubQuery = Selection<UserEntityGrantIdProjection>;
+export type UserRelationIdSubQuery = Selection<UserRelationIdProjection>;
+export type ModiEntityIdSubQuery = Selection<ModiEntityIdProjection>;
+export type EntityDef = {
     Schema: Schema;
     OpSchema: OpSchema;
     Action: OakMakeAction<AppendOnlyAction> | string;

package/lib/base-app-domain/ModiEntity/Storage.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.desc = void 0;
-var action_1 = require("../../actions/action");
+const action_1 = require("../../actions/action");
 exports.desc = {
     attributes: {
         modiId: {
@@ -15,7 +15,7 @@ exports.desc = {
             params: {
                 length: 32
             },
-            ref: ["actionAuth", "i18n", "relation", "relationAuth", "user", "userEntityGrant", "userRelation"]
+            ref: ["actionAuth", "i18n", "path", "relation", "relationAuth", "user", "userEntityClaim", "userEntityGrant", "userRelation"]
         },
         entityId: {
             notNull: true,

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

@@ -7,7 +7,7 @@ import { String } from "../../types/DataType";
 import { EntityShape } from "../../types/Entity";
 import * as User from "../User/Schema";
 import * as OperEntity from "../OperEntity/Schema";
-export declare type OpSchema = EntityShape & {
+export type OpSchema = EntityShape & {
     action: String<16>;
     data: Object;
     filter?: Object | null;
@@ -15,8 +15,8 @@ export declare type OpSchema = EntityShape & {
     operatorId?: ForeignKey<"user"> | null;
     targetEntity: String<32>;
 };
-export declare type OpAttr = keyof OpSchema;
-export declare type Schema = EntityShape & {
+export type OpAttr = keyof OpSchema;
+export type Schema = EntityShape & {
     action: String<16>;
     data: Object;
     filter?: Object | null;
@@ -29,7 +29,7 @@ export declare type Schema = EntityShape & {
 } & {
     [A in ExpressionKey]?: any;
 };
-declare type AttrFilter = {
+type AttrFilter = {
     id: Q_StringValue;
     $$createAt$$: Q_DateValue;
     $$seq$$: Q_StringValue;
@@ -43,8 +43,8 @@ declare type AttrFilter = {
     targetEntity: Q_StringValue;
     operEntity$oper: OperEntity.Filter & SubQueryPredicateMetadata;
 };
-export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
-export declare type Projection = {
+export type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
+export type Projection = {
     "#id"?: NodeId;
     [k: string]: any;
     id?: number;
@@ -65,13 +65,13 @@ export declare type Projection = {
         $entity: "operEntity";
     };
 } & Partial<ExprOp<OpAttr | string>>;
-declare type OperIdProjection = OneOf<{
+type OperIdProjection = OneOf<{
     id: number;
 }>;
-declare type UserIdProjection = OneOf<{
+type UserIdProjection = OneOf<{
     operatorId: number;
 }>;
-export declare type SortAttr = {
+export type SortAttr = {
     id: number;
 } | {
     $$createAt$$: number;
@@ -90,36 +90,37 @@ export declare type SortAttr = {
 } | {
     [k: string]: any;
 } | OneOf<ExprOp<OpAttr | string>>;
-export declare type SortNode = {
+export type SortNode = {
     $attr: SortAttr;
     $direction?: "asc" | "desc";
 };
-export declare type Sorter = SortNode[];
-export declare type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
-export declare type Selection<P extends Object = Projection> = SelectOperation<P>;
-export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
-export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "operatorId">> & (({
+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">> & (({
     operatorId?: never;
     operator?: User.CreateSingleOperation;
 } | {
     operatorId: ForeignKey<"operator">;
     operator?: User.UpdateOperation;
 } | {
+    operator?: never;
     operatorId?: ForeignKey<"operator">;
 })) & {
     operEntity$oper?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "oper" | "operId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "oper" | "operId">>>;
 };
-export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
-export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
-export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
-export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "operatorId">> & (({
-    operator: User.CreateSingleOperation;
+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">> & (({
+    operator?: User.CreateSingleOperation;
     operatorId?: never;
 } | {
-    operator: User.UpdateOperation;
+    operator?: User.UpdateOperation;
     operatorId?: never;
 } | {
-    operator: User.RemoveOperation;
+    operator?: User.RemoveOperation;
     operatorId?: never;
 } | {
     operator?: never;
@@ -128,15 +129,15 @@ export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "operato
     [k: string]: any;
     operEntity$oper?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "oper" | "operId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "oper" | "operId">>>;
 };
-export declare type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>;
-export declare type RemoveOperationData = {} & (({
+export type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>;
+export type RemoveOperationData = {} & (({
     operator?: User.UpdateOperation | User.RemoveOperation;
 }));
-export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
-export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation;
-export declare type UserIdSubQuery = Selection<UserIdProjection>;
-export declare type OperIdSubQuery = Selection<OperIdProjection>;
-export declare type EntityDef = {
+export type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
+export type Operation = CreateOperation | UpdateOperation | RemoveOperation;
+export type UserIdSubQuery = Selection<UserIdProjection>;
+export type OperIdSubQuery = Selection<OperIdProjection>;
+export type EntityDef = {
     Schema: Schema;
     OpSchema: OpSchema;
     Action: OakMakeAction<AppendOnlyAction> | string;