oak-domain 3.0.2 → 3.0.4

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

@@ -1,24 +1,26 @@
-import { ForeignKey } from "../../types/DataType";
-import { Q_DateValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey, SubQueryPredicateMetadata } from "../../types/Demand";
+import { JsonProjection } from "../../types/DataType";
+import { Q_DateValue, 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 } from "../../types/Entity";
-import { Action, ParticularAction } from "./Action";
+import { GenericAction } from "../../actions/action";
 import { String } from "../../types/DataType";
 import { EntityShape } from "../../types/Entity";
-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 declare type OpSchema = EntityShape & {
-    entity: String<32>;
-    entityId: String<64>;
-    relationId: ForeignKey<"relation">;
+type RelationIds = string[];
+export type OpSchema = EntityShape & {
+    relationEntity: String<32>;
+    relationEntityFilter: Object;
+    relationIds: RelationIds;
 };
-export declare type OpAttr = keyof OpSchema;
-export declare type Schema = EntityShape & {
-    entity: String<32>;
-    entityId: String<64>;
-    relationId: ForeignKey<"relation">;
-    relation: Relation.Schema;
+export type OpAttr = keyof OpSchema;
+export type Schema = EntityShape & {
+    relationEntity: String<32>;
+    relationEntityFilter: Object;
+    relationIds: RelationIds;
+    userEntityClaim$ueg?: Array<UserEntityClaim.Schema>;
+    userEntityClaim$ueg$$aggr?: AggregationResult<UserEntityClaim.Schema>;
     modiEntity$entity?: Array<ModiEntity.Schema>;
     modiEntity$entity$$aggr?: AggregationResult<ModiEntity.Schema>;
     operEntity$entity?: Array<OperEntity.Schema>;
@@ -26,30 +28,35 @@ export declare type Schema = EntityShape & {
 } & {
     [A in ExpressionKey]?: any;
 };
-declare type AttrFilter = {
+type AttrFilter = {
     id: Q_StringValue;
     $$createAt$$: Q_DateValue;
     $$seq$$: Q_StringValue;
     $$updateAt$$: Q_DateValue;
-    entity: Q_StringValue;
-    entityId: Q_StringValue;
-    relationId: Q_StringValue;
-    relation: Relation.Filter;
+    relationEntity: Q_StringValue;
+    relationEntityFilter: Object;
+    relationIds: JsonFilter<RelationIds>;
+    userEntityClaim$ueg: UserEntityClaim.Filter & SubQueryPredicateMetadata;
     modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata;
     operEntity$entity: 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;
     $$createAt$$?: number;
     $$updateAt$$?: number;
     $$seq$$?: number;
-    entity?: number;
-    entityId?: number;
-    relationId?: number;
-    relation?: Relation.Projection;
+    relationEntity?: number;
+    relationEntityFilter?: number | Object;
+    relationIds?: number | JsonProjection<RelationIds>;
+    userEntityClaim$ueg?: UserEntityClaim.Selection & {
+        $entity: "userEntityClaim";
+    };
+    userEntityClaim$ueg$$aggr?: UserEntityClaim.Aggregation & {
+        $entity: "userEntityClaim";
+    };
     modiEntity$entity?: ModiEntity.Selection & {
         $entity: "modiEntity";
     };
@@ -63,13 +70,10 @@ export declare type Projection = {
         $entity: "operEntity";
     };
 } & Partial<ExprOp<OpAttr | string>>;
-declare type UserEntityGrantIdProjection = OneOf<{
+type UserEntityGrantIdProjection = OneOf<{
     id: number;
 }>;
-declare type RelationIdProjection = OneOf<{
-    relationId: number;
-}>;
-export declare type SortAttr = {
+export type SortAttr = {
     id: number;
 } | {
     $$createAt$$: number;
@@ -78,72 +82,43 @@ export declare type SortAttr = {
 } | {
     $$updateAt$$: number;
 } | {
-    entity: number;
-} | {
-    entityId: number;
-} | {
-    relationId: number;
+    relationEntity: number;
 } | {
-    relation: Relation.SortAttr;
+    relationIds: number;
 } | {
     [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" | "relationId">> & (({
-    relationId?: never;
-    relation: Relation.CreateSingleOperation;
-} | {
-    relationId: ForeignKey<"relation">;
-    relation?: Relation.UpdateOperation;
-} | {
-    relationId: ForeignKey<"relation">;
-})) & ({
-    entity?: string;
-    entityId?: string;
-    [K: string]: any;
-}) & {
+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 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, "relationId">> & (({
-    relation: Relation.CreateSingleOperation;
-    relationId?: never;
-} | {
-    relation: Relation.UpdateOperation;
-    relationId?: never;
-} | {
-    relation: Relation.RemoveOperation;
-    relationId?: never;
-} | {
-    relation?: never;
-    relationId?: ForeignKey<"relation"> | null;
-})) & {
+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 declare type UpdateOperation = OakOperation<"update" | ParticularAction | string, UpdateOperationData, Filter, Sorter>;
-export declare type RemoveOperationData = {} & (({
-    relation?: Relation.UpdateOperation | Relation.RemoveOperation;
-}));
-export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
-export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation;
-export declare type RelationIdSubQuery = Selection<RelationIdProjection>;
-export declare type UserEntityGrantIdSubQuery = Selection<UserEntityGrantIdProjection>;
-export declare type EntityDef = {
+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<Action> | string;
+    Action: OakMakeAction<GenericAction> | string;
     Selection: Selection;
     Aggregation: Aggregation;
     Operation: Operation;
@@ -152,6 +127,5 @@ export declare type EntityDef = {
     Remove: RemoveOperation;
     CreateSingle: CreateSingleOperation;
     CreateMulti: CreateMultipleOperation;
-    ParticularAction: ParticularAction;
 };
 export {};

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

@@ -1,29 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.desc = void 0;
-var Action_1 = require("./Action");
+const action_1 = require("../../actions/action");
 exports.desc = {
     attributes: {
-        entity: {
+        relationEntity: {
             notNull: true,
             type: "varchar",
             params: {
                 length: 32
             }
         },
-        entityId: {
+        relationEntityFilter: {
             notNull: true,
-            type: "varchar",
-            params: {
-                length: 64
-            }
+            type: "object"
         },
-        relationId: {
+        relationIds: {
             notNull: true,
-            type: "ref",
-            ref: "relation"
+            type: "object"
         }
     },
     actionType: "crud",
-    actions: Action_1.actions
+    actions: action_1.genericActions
 };

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

@@ -7,22 +7,25 @@ import { String } from "../../types/DataType";
 import { EntityShape } from "../../types/Entity";
 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 declare type OpSchema = EntityShape & {
+export type OpSchema = EntityShape & {
     userId: ForeignKey<"user">;
     relationId: ForeignKey<"relation">;
     entity: String<32>;
     entityId: String<64>;
 };
-export declare type OpAttr = keyof OpSchema;
-export declare type Schema = EntityShape & {
+export type OpAttr = keyof OpSchema;
+export type Schema = EntityShape & {
     userId: ForeignKey<"user">;
     relationId: ForeignKey<"relation">;
     entity: String<32>;
     entityId: String<64>;
     user: User.Schema;
     relation: Relation.Schema;
+    userEntityClaim$userRelation?: Array<UserEntityClaim.Schema>;
+    userEntityClaim$userRelation$$aggr?: AggregationResult<UserEntityClaim.Schema>;
     modiEntity$entity?: Array<ModiEntity.Schema>;
     modiEntity$entity$$aggr?: AggregationResult<ModiEntity.Schema>;
     operEntity$entity?: Array<OperEntity.Schema>;
@@ -30,7 +33,7 @@ export declare type Schema = EntityShape & {
 } & {
     [A in ExpressionKey]?: any;
 };
-declare type AttrFilter = {
+type AttrFilter = {
     id: Q_StringValue;
     $$createAt$$: Q_DateValue;
     $$seq$$: Q_StringValue;
@@ -41,11 +44,12 @@ declare type AttrFilter = {
     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 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;
@@ -58,6 +62,12 @@ export declare type Projection = {
     relation?: Relation.Projection;
     entity?: number;
     entityId?: number;
+    userEntityClaim$userRelation?: UserEntityClaim.Selection & {
+        $entity: "userEntityClaim";
+    };
+    userEntityClaim$userRelation$$aggr?: UserEntityClaim.Aggregation & {
+        $entity: "userEntityClaim";
+    };
     modiEntity$entity?: ModiEntity.Selection & {
         $entity: "modiEntity";
     };
@@ -71,16 +81,16 @@ export declare type Projection = {
         $entity: "operEntity";
     };
 } & Partial<ExprOp<OpAttr | string>>;
-declare type UserRelationIdProjection = OneOf<{
+type UserRelationIdProjection = OneOf<{
     id: number;
 }>;
-declare type UserIdProjection = OneOf<{
+type UserIdProjection = OneOf<{
     userId: number;
 }>;
-declare type RelationIdProjection = OneOf<{
+type RelationIdProjection = OneOf<{
     relationId: number;
 }>;
-export declare type SortAttr = {
+export type SortAttr = {
     id: number;
 } | {
     $$createAt$$: number;
@@ -103,21 +113,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" | "userId" | "relationId">> & (({
+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;
@@ -126,59 +137,62 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
     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 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, "userId" | "relationId">> & (({
-    user: 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, "userId" | "relationId">> & (({
+    user?: User.CreateSingleOperation;
     userId?: never;
 } | {
-    user: User.UpdateOperation;
+    user?: User.UpdateOperation;
     userId?: never;
 } | {
-    user: User.RemoveOperation;
+    user?: User.RemoveOperation;
     userId?: never;
 } | {
     user?: never;
-    userId?: ForeignKey<"user"> | null;
+    userId?: ForeignKey<"user">;
 }) & ({
-    relation: Relation.CreateSingleOperation;
+    relation?: Relation.CreateSingleOperation;
     relationId?: never;
 } | {
-    relation: Relation.UpdateOperation;
+    relation?: Relation.UpdateOperation;
     relationId?: never;
 } | {
-    relation: Relation.RemoveOperation;
+    relation?: Relation.RemoveOperation;
     relationId?: never;
 } | {
     relation?: never;
-    relationId?: ForeignKey<"relation"> | null;
+    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 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 = {} & (({
     user?: User.UpdateOperation | User.RemoveOperation;
 }) & ({
     relation?: Relation.UpdateOperation | Relation.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 RelationIdSubQuery = Selection<RelationIdProjection>;
-export declare type UserRelationIdSubQuery = Selection<UserRelationIdProjection>;
-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 RelationIdSubQuery = Selection<RelationIdProjection>;
+export type UserRelationIdSubQuery = Selection<UserRelationIdProjection>;
+export type EntityDef = {
     Schema: Schema;
     OpSchema: OpSchema;
     Action: OakMakeAction<GenericAction> | string;

package/lib/base-app-domain/UserRelation/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: {
         userId: {
@@ -36,21 +36,21 @@ exports.desc = {
             name: 'index_user_entity_entityId_relation',
             attributes: [
                 {
-                    name: "userId"
+                    name: "userId",
                 },
                 {
-                    name: 'entity'
+                    name: 'entity',
                 },
                 {
-                    name: 'entityId'
+                    name: 'entityId',
                 },
                 {
-                    name: "relationId"
+                    name: "relationId",
                 },
             ],
             config: {
-                unique: true
-            }
+                unique: true,
+            },
         }
     ]
 };

package/lib/base-app-domain/_SubQuery.d.ts

@@ -4,12 +4,14 @@ import * as Modi from "./Modi/Schema";
 import * as ModiEntity from "./ModiEntity/Schema";
 import * as Oper from "./Oper/Schema";
 import * as OperEntity from "./OperEntity/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 ActionAuthIdSubQuery = {
+export type ActionAuthIdSubQuery = {
     [K in "$in" | "$nin"]?: (ModiEntity.ActionAuthIdSubQuery & {
         entity: "modiEntity";
     }) | (OperEntity.ActionAuthIdSubQuery & {
@@ -18,7 +20,7 @@ export declare type ActionAuthIdSubQuery = {
         entity: "actionAuth";
     }) | any;
 };
-export declare type I18nIdSubQuery = {
+export type I18nIdSubQuery = {
     [K in "$in" | "$nin"]?: (ModiEntity.I18nIdSubQuery & {
         entity: "modiEntity";
     }) | (OperEntity.I18nIdSubQuery & {
@@ -27,37 +29,50 @@ export declare type I18nIdSubQuery = {
         entity: "i18n";
     }) | any;
 };
-export declare type ModiIdSubQuery = {
+export type ModiIdSubQuery = {
     [K in "$in" | "$nin"]?: (ModiEntity.ModiIdSubQuery & {
         entity: "modiEntity";
     }) | (Modi.ModiIdSubQuery & {
         entity: "modi";
     }) | any;
 };
-export declare type ModiEntityIdSubQuery = {
+export type ModiEntityIdSubQuery = {
     [K in "$in" | "$nin"]?: (ModiEntity.ModiEntityIdSubQuery & {
         entity: "modiEntity";
     }) | any;
 };
-export declare type OperIdSubQuery = {
+export type OperIdSubQuery = {
     [K in "$in" | "$nin"]?: (OperEntity.OperIdSubQuery & {
         entity: "operEntity";
     }) | (Oper.OperIdSubQuery & {
         entity: "oper";
     }) | any;
 };
-export declare type OperEntityIdSubQuery = {
+export type OperEntityIdSubQuery = {
     [K in "$in" | "$nin"]?: (OperEntity.OperEntityIdSubQuery & {
         entity: "operEntity";
     }) | any;
 };
-export declare type RelationIdSubQuery = {
+export type PathIdSubQuery = {
+    [K in "$in" | "$nin"]?: (ActionAuth.PathIdSubQuery & {
+        entity: "actionAuth";
+    }) | (RelationAuth.PathIdSubQuery & {
+        entity: "relationAuth";
+    }) | (ModiEntity.PathIdSubQuery & {
+        entity: "modiEntity";
+    }) | (OperEntity.PathIdSubQuery & {
+        entity: "operEntity";
+    }) | (Path.PathIdSubQuery & {
+        entity: "path";
+    }) | any;
+};
+export type RelationIdSubQuery = {
     [K in "$in" | "$nin"]?: (ActionAuth.RelationIdSubQuery & {
         entity: "actionAuth";
     }) | (RelationAuth.RelationIdSubQuery & {
         entity: "relationAuth";
-    }) | (UserEntityGrant.RelationIdSubQuery & {
-        entity: "userEntityGrant";
+    }) | (UserEntityClaim.RelationIdSubQuery & {
+        entity: "userEntityClaim";
     }) | (UserRelation.RelationIdSubQuery & {
         entity: "userRelation";
     }) | (ModiEntity.RelationIdSubQuery & {
@@ -68,7 +83,7 @@ export declare type RelationIdSubQuery = {
         entity: "relation";
     }) | any;
 };
-export declare type RelationAuthIdSubQuery = {
+export type RelationAuthIdSubQuery = {
     [K in "$in" | "$nin"]?: (ModiEntity.RelationAuthIdSubQuery & {
         entity: "modiEntity";
     }) | (OperEntity.RelationAuthIdSubQuery & {
@@ -77,11 +92,13 @@ export declare type RelationAuthIdSubQuery = {
         entity: "relationAuth";
     }) | any;
 };
-export declare type UserIdSubQuery = {
+export type UserIdSubQuery = {
     [K in "$in" | "$nin"]?: (Oper.UserIdSubQuery & {
         entity: "oper";
     }) | (User.UserIdSubQuery & {
         entity: "user";
+    }) | (UserEntityClaim.UserIdSubQuery & {
+        entity: "userEntityClaim";
     }) | (UserRelation.UserIdSubQuery & {
         entity: "userRelation";
     }) | (ModiEntity.UserIdSubQuery & {
@@ -92,8 +109,19 @@ export declare type UserIdSubQuery = {
         entity: "user";
     }) | any;
 };
-export declare type UserEntityGrantIdSubQuery = {
-    [K in "$in" | "$nin"]?: (ModiEntity.UserEntityGrantIdSubQuery & {
+export type UserEntityClaimIdSubQuery = {
+    [K in "$in" | "$nin"]?: (ModiEntity.UserEntityClaimIdSubQuery & {
+        entity: "modiEntity";
+    }) | (OperEntity.UserEntityClaimIdSubQuery & {
+        entity: "operEntity";
+    }) | (UserEntityClaim.UserEntityClaimIdSubQuery & {
+        entity: "userEntityClaim";
+    }) | any;
+};
+export type UserEntityGrantIdSubQuery = {
+    [K in "$in" | "$nin"]?: (UserEntityClaim.UserEntityGrantIdSubQuery & {
+        entity: "userEntityClaim";
+    }) | (ModiEntity.UserEntityGrantIdSubQuery & {
         entity: "modiEntity";
     }) | (OperEntity.UserEntityGrantIdSubQuery & {
         entity: "operEntity";
@@ -101,8 +129,10 @@ export declare type UserEntityGrantIdSubQuery = {
         entity: "userEntityGrant";
     }) | any;
 };
-export declare type UserRelationIdSubQuery = {
-    [K in "$in" | "$nin"]?: (ModiEntity.UserRelationIdSubQuery & {
+export type UserRelationIdSubQuery = {
+    [K in "$in" | "$nin"]?: (UserEntityClaim.UserRelationIdSubQuery & {
+        entity: "userEntityClaim";
+    }) | (ModiEntity.UserRelationIdSubQuery & {
         entity: "modiEntity";
     }) | (OperEntity.UserRelationIdSubQuery & {
         entity: "operEntity";

package/lib/base-app-domain/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./EntityDict"), exports);
 tslib_1.__exportStar(require("./Storage"), exports);
 tslib_1.__exportStar(require("./ActionDefDict"), exports);

package/lib/checkers/index.js

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