oak-domain 3.0.2 → 3.0.4

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

@@ -6,18 +6,18 @@ import { String } from "../../types/DataType";
 import { EntityShape } from "../../types/Entity";
 import * as ActionAuth from "../ActionAuth/Schema";
 import * as RelationAuth from "../RelationAuth/Schema";
-import * as UserEntityGrant from "../UserEntityGrant/Schema";
+import * as UserEntityClaim from "../UserEntityClaim/Schema";
 import * as UserRelation from "../UserRelation/Schema";
 import * as ModiEntity from "../ModiEntity/Schema";
 import * as OperEntity from "../OperEntity/Schema";
-export declare type OpSchema = EntityShape & {
+export type OpSchema = EntityShape & {
     entity: String<32>;
     entityId?: String<64> | null;
     name?: String<32> | null;
     display?: String<32> | null;
 };
-export declare type OpAttr = keyof OpSchema;
-export declare type Schema = EntityShape & {
+export type OpAttr = keyof OpSchema;
+export type Schema = EntityShape & {
     entity: String<32>;
     entityId?: String<64> | null;
     name?: String<32> | null;
@@ -28,8 +28,8 @@ export declare type Schema = EntityShape & {
     relationAuth$sourceRelation$$aggr?: AggregationResult<RelationAuth.Schema>;
     relationAuth$destRelation?: Array<RelationAuth.Schema>;
     relationAuth$destRelation$$aggr?: AggregationResult<RelationAuth.Schema>;
-    userEntityGrant$relation?: Array<UserEntityGrant.Schema>;
-    userEntityGrant$relation$$aggr?: AggregationResult<UserEntityGrant.Schema>;
+    userEntityClaim$relation?: Array<UserEntityClaim.Schema>;
+    userEntityClaim$relation$$aggr?: AggregationResult<UserEntityClaim.Schema>;
     userRelation$relation?: Array<UserRelation.Schema>;
     userRelation$relation$$aggr?: AggregationResult<UserRelation.Schema>;
     modiEntity$entity?: Array<ModiEntity.Schema>;
@@ -39,7 +39,7 @@ export declare type Schema = EntityShape & {
 } & {
     [A in ExpressionKey]?: any;
 };
-declare type AttrFilter = {
+type AttrFilter = {
     id: Q_StringValue;
     $$createAt$$: Q_DateValue;
     $$seq$$: Q_StringValue;
@@ -51,13 +51,13 @@ declare type AttrFilter = {
     actionAuth$relation: ActionAuth.Filter & SubQueryPredicateMetadata;
     relationAuth$sourceRelation: RelationAuth.Filter & SubQueryPredicateMetadata;
     relationAuth$destRelation: RelationAuth.Filter & SubQueryPredicateMetadata;
-    userEntityGrant$relation: UserEntityGrant.Filter & SubQueryPredicateMetadata;
+    userEntityClaim$relation: UserEntityClaim.Filter & SubQueryPredicateMetadata;
     userRelation$relation: UserRelation.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;
@@ -86,11 +86,11 @@ export declare type Projection = {
     relationAuth$destRelation$$aggr?: RelationAuth.Aggregation & {
         $entity: "relationAuth";
     };
-    userEntityGrant$relation?: UserEntityGrant.Selection & {
-        $entity: "userEntityGrant";
+    userEntityClaim$relation?: UserEntityClaim.Selection & {
+        $entity: "userEntityClaim";
     };
-    userEntityGrant$relation$$aggr?: UserEntityGrant.Aggregation & {
-        $entity: "userEntityGrant";
+    userEntityClaim$relation$$aggr?: UserEntityClaim.Aggregation & {
+        $entity: "userEntityClaim";
     };
     userRelation$relation?: UserRelation.Selection & {
         $entity: "userRelation";
@@ -111,10 +111,10 @@ export declare type Projection = {
         $entity: "operEntity";
     };
 } & Partial<ExprOp<OpAttr | string>>;
-declare type RelationIdProjection = OneOf<{
+type RelationIdProjection = OneOf<{
     id: number;
 }>;
-export declare type SortAttr = {
+export type SortAttr = {
     id: number;
 } | {
     $$createAt$$: number;
@@ -133,15 +133,15 @@ 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;
@@ -149,30 +149,30 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
     actionAuth$relation?: OakOperation<ActionAuth.UpdateOperation["action"], Omit<ActionAuth.UpdateOperationData, "relation" | "relationId">, Omit<ActionAuth.Filter, "relation" | "relationId">> | OakOperation<"create", Omit<ActionAuth.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<ActionAuth.CreateOperationData, "relation" | "relationId">> | OakOperation<ActionAuth.UpdateOperation["action"], Omit<ActionAuth.UpdateOperationData, "relation" | "relationId">, Omit<ActionAuth.Filter, "relation" | "relationId">>>;
     relationAuth$sourceRelation?: OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "sourceRelation" | "sourceRelationId">, Omit<RelationAuth.Filter, "sourceRelation" | "sourceRelationId">> | OakOperation<"create", Omit<RelationAuth.CreateOperationData, "sourceRelation" | "sourceRelationId">[]> | Array<OakOperation<"create", Omit<RelationAuth.CreateOperationData, "sourceRelation" | "sourceRelationId">> | OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "sourceRelation" | "sourceRelationId">, Omit<RelationAuth.Filter, "sourceRelation" | "sourceRelationId">>>;
     relationAuth$destRelation?: OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "destRelation" | "destRelationId">, Omit<RelationAuth.Filter, "destRelation" | "destRelationId">> | OakOperation<"create", Omit<RelationAuth.CreateOperationData, "destRelation" | "destRelationId">[]> | Array<OakOperation<"create", Omit<RelationAuth.CreateOperationData, "destRelation" | "destRelationId">> | OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "destRelation" | "destRelationId">, Omit<RelationAuth.Filter, "destRelation" | "destRelationId">>>;
-    userEntityGrant$relation?: OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "relation" | "relationId">, Omit<UserEntityGrant.Filter, "relation" | "relationId">> | OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "relation" | "relationId">> | OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "relation" | "relationId">, Omit<UserEntityGrant.Filter, "relation" | "relationId">>>;
+    userEntityClaim$relation?: OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "relation" | "relationId">, Omit<UserEntityClaim.Filter, "relation" | "relationId">> | OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "relation" | "relationId">> | OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "relation" | "relationId">, Omit<UserEntityClaim.Filter, "relation" | "relationId">>>;
     userRelation$relation?: OakOperation<UserRelation.UpdateOperation["action"], Omit<UserRelation.UpdateOperationData, "relation" | "relationId">, Omit<UserRelation.Filter, "relation" | "relationId">> | OakOperation<"create", Omit<UserRelation.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<UserRelation.CreateOperationData, "relation" | "relationId">> | OakOperation<UserRelation.UpdateOperation["action"], Omit<UserRelation.UpdateOperationData, "relation" | "relationId">, Omit<UserRelation.Filter, "relation" | "relationId">>>;
     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<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;
     actionAuth$relation?: OakOperation<ActionAuth.UpdateOperation["action"], Omit<ActionAuth.UpdateOperationData, "relation" | "relationId">, Omit<ActionAuth.Filter, "relation" | "relationId">> | OakOperation<ActionAuth.RemoveOperation["action"], Omit<ActionAuth.RemoveOperationData, "relation" | "relationId">, Omit<ActionAuth.Filter, "relation" | "relationId">> | OakOperation<"create", Omit<ActionAuth.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<ActionAuth.CreateOperationData, "relation" | "relationId">> | OakOperation<ActionAuth.UpdateOperation["action"], Omit<ActionAuth.UpdateOperationData, "relation" | "relationId">, Omit<ActionAuth.Filter, "relation" | "relationId">> | OakOperation<ActionAuth.RemoveOperation["action"], Omit<ActionAuth.RemoveOperationData, "relation" | "relationId">, Omit<ActionAuth.Filter, "relation" | "relationId">>>;
     relationAuth$sourceRelation?: OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "sourceRelation" | "sourceRelationId">, Omit<RelationAuth.Filter, "sourceRelation" | "sourceRelationId">> | OakOperation<RelationAuth.RemoveOperation["action"], Omit<RelationAuth.RemoveOperationData, "sourceRelation" | "sourceRelationId">, Omit<RelationAuth.Filter, "sourceRelation" | "sourceRelationId">> | OakOperation<"create", Omit<RelationAuth.CreateOperationData, "sourceRelation" | "sourceRelationId">[]> | Array<OakOperation<"create", Omit<RelationAuth.CreateOperationData, "sourceRelation" | "sourceRelationId">> | OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "sourceRelation" | "sourceRelationId">, Omit<RelationAuth.Filter, "sourceRelation" | "sourceRelationId">> | OakOperation<RelationAuth.RemoveOperation["action"], Omit<RelationAuth.RemoveOperationData, "sourceRelation" | "sourceRelationId">, Omit<RelationAuth.Filter, "sourceRelation" | "sourceRelationId">>>;
     relationAuth$destRelation?: OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "destRelation" | "destRelationId">, Omit<RelationAuth.Filter, "destRelation" | "destRelationId">> | OakOperation<RelationAuth.RemoveOperation["action"], Omit<RelationAuth.RemoveOperationData, "destRelation" | "destRelationId">, Omit<RelationAuth.Filter, "destRelation" | "destRelationId">> | OakOperation<"create", Omit<RelationAuth.CreateOperationData, "destRelation" | "destRelationId">[]> | Array<OakOperation<"create", Omit<RelationAuth.CreateOperationData, "destRelation" | "destRelationId">> | OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "destRelation" | "destRelationId">, Omit<RelationAuth.Filter, "destRelation" | "destRelationId">> | OakOperation<RelationAuth.RemoveOperation["action"], Omit<RelationAuth.RemoveOperationData, "destRelation" | "destRelationId">, Omit<RelationAuth.Filter, "destRelation" | "destRelationId">>>;
-    userEntityGrant$relation?: OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "relation" | "relationId">, Omit<UserEntityGrant.Filter, "relation" | "relationId">> | OakOperation<UserEntityGrant.RemoveOperation["action"], Omit<UserEntityGrant.RemoveOperationData, "relation" | "relationId">, Omit<UserEntityGrant.Filter, "relation" | "relationId">> | OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "relation" | "relationId">> | OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "relation" | "relationId">, Omit<UserEntityGrant.Filter, "relation" | "relationId">> | OakOperation<UserEntityGrant.RemoveOperation["action"], Omit<UserEntityGrant.RemoveOperationData, "relation" | "relationId">, Omit<UserEntityGrant.Filter, "relation" | "relationId">>>;
+    userEntityClaim$relation?: OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "relation" | "relationId">, Omit<UserEntityClaim.Filter, "relation" | "relationId">> | OakOperation<UserEntityClaim.RemoveOperation["action"], Omit<UserEntityClaim.RemoveOperationData, "relation" | "relationId">, Omit<UserEntityClaim.Filter, "relation" | "relationId">> | OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<UserEntityClaim.CreateOperationData, "relation" | "relationId">> | OakOperation<UserEntityClaim.UpdateOperation["action"], Omit<UserEntityClaim.UpdateOperationData, "relation" | "relationId">, Omit<UserEntityClaim.Filter, "relation" | "relationId">> | OakOperation<UserEntityClaim.RemoveOperation["action"], Omit<UserEntityClaim.RemoveOperationData, "relation" | "relationId">, Omit<UserEntityClaim.Filter, "relation" | "relationId">>>;
     userRelation$relation?: OakOperation<UserRelation.UpdateOperation["action"], Omit<UserRelation.UpdateOperationData, "relation" | "relationId">, Omit<UserRelation.Filter, "relation" | "relationId">> | OakOperation<UserRelation.RemoveOperation["action"], Omit<UserRelation.RemoveOperationData, "relation" | "relationId">, Omit<UserRelation.Filter, "relation" | "relationId">> | OakOperation<"create", Omit<UserRelation.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<UserRelation.CreateOperationData, "relation" | "relationId">> | OakOperation<UserRelation.UpdateOperation["action"], Omit<UserRelation.UpdateOperationData, "relation" | "relationId">, Omit<UserRelation.Filter, "relation" | "relationId">> | OakOperation<UserRelation.RemoveOperation["action"], Omit<UserRelation.RemoveOperationData, "relation" | "relationId">, Omit<UserRelation.Filter, "relation" | "relationId">>>;
     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 declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
-export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation;
-export declare type RelationIdSubQuery = Selection<RelationIdProjection>;
-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 RelationIdSubQuery = Selection<RelationIdProjection>;
+export type EntityDef = {
     Schema: Schema;
     OpSchema: OpSchema;
     Action: OakMakeAction<GenericAction> | string;

package/lib/base-app-domain/Relation/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: {
         entity: {
@@ -37,18 +37,18 @@ exports.desc = {
             name: 'index_targetEntity_entityId_name',
             attributes: [
                 {
-                    name: 'entity'
+                    name: 'entity',
                 },
                 {
-                    name: 'entityId'
+                    name: 'entityId',
                 },
                 {
-                    name: 'name'
+                    name: 'name',
                 }
             ],
             config: {
-                unique: true
-            }
+                unique: true,
+            },
         }
     ]
 };

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

@@ -1,10 +1,2 @@
-import { AuthCascadePath, AuthDeduceRelationMap } from "../types/Entity";
-import { EntityDict } from "./EntityDict";
 import { CreateOperationData as Relation } from "./Relation/Schema";
-export declare const ActionCascadePathGraph: AuthCascadePath<EntityDict>[];
-export declare const RelationCascadePathGraph: AuthCascadePath<EntityDict>[];
 export declare const relations: Relation[];
-export declare const deducedRelationMap: AuthDeduceRelationMap<EntityDict>;
-export declare const selectFreeEntities: (keyof EntityDict)[];
-export declare const updateFreeEntities: (keyof EntityDict)[];
-export declare const createFreeEntities: (keyof EntityDict)[];

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

@@ -1,10 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFreeEntities = exports.updateFreeEntities = exports.selectFreeEntities = exports.deducedRelationMap = exports.relations = exports.RelationCascadePathGraph = exports.ActionCascadePathGraph = void 0;
-exports.ActionCascadePathGraph = [];
-exports.RelationCascadePathGraph = [];
+exports.relations = void 0;
 exports.relations = [];
-exports.deducedRelationMap = {};
-exports.selectFreeEntities = [];
-exports.updateFreeEntities = [];
-exports.createFreeEntities = [];

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

@@ -3,22 +3,23 @@ import { Q_DateValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey,
 import { OneOf } from "../../types/Polyfill";
 import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult } from "../../types/Entity";
 import { GenericAction } from "../../actions/action";
-import { String } from "../../types/DataType";
 import { EntityShape } from "../../types/Entity";
 import * as Relation from "../Relation/Schema";
+import * as Path from "../Path/Schema";
 import * as ModiEntity from "../ModiEntity/Schema";
 import * as OperEntity from "../OperEntity/Schema";
-export declare type OpSchema = EntityShape & {
+export type OpSchema = EntityShape & {
     sourceRelationId: ForeignKey<"relation">;
-    path: String<256>;
+    pathId: ForeignKey<"path">;
     destRelationId: ForeignKey<"relation">;
 };
-export declare type OpAttr = keyof OpSchema;
-export declare type Schema = EntityShape & {
+export type OpAttr = keyof OpSchema;
+export type Schema = EntityShape & {
     sourceRelationId: ForeignKey<"relation">;
-    path: String<256>;
+    pathId: ForeignKey<"path">;
     destRelationId: ForeignKey<"relation">;
     sourceRelation: Relation.Schema;
+    path: Path.Schema;
     destRelation: Relation.Schema;
     modiEntity$entity?: Array<ModiEntity.Schema>;
     modiEntity$entity$$aggr?: AggregationResult<ModiEntity.Schema>;
@@ -27,21 +28,22 @@ 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;
     sourceRelationId: Q_StringValue;
     sourceRelation: Relation.Filter;
-    path: Q_StringValue;
+    pathId: Q_StringValue;
+    path: Path.Filter;
     destRelationId: Q_StringValue;
     destRelation: Relation.Filter;
     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;
@@ -50,7 +52,8 @@ export declare type Projection = {
     $$seq$$?: number;
     sourceRelationId?: number;
     sourceRelation?: Relation.Projection;
-    path?: number;
+    pathId?: number;
+    path?: Path.Projection;
     destRelationId?: number;
     destRelation?: Relation.Projection;
     modiEntity$entity?: ModiEntity.Selection & {
@@ -66,14 +69,17 @@ export declare type Projection = {
         $entity: "operEntity";
     };
 } & Partial<ExprOp<OpAttr | string>>;
-declare type RelationAuthIdProjection = OneOf<{
+type RelationAuthIdProjection = OneOf<{
     id: number;
 }>;
-declare type RelationIdProjection = OneOf<{
+type RelationIdProjection = OneOf<{
     sourceRelationId: number;
     destRelationId: number;
 }>;
-export declare type SortAttr = {
+type PathIdProjection = OneOf<{
+    pathId: number;
+}>;
+export type SortAttr = {
     id: number;
 } | {
     $$createAt$$: number;
@@ -86,7 +92,9 @@ export declare type SortAttr = {
 } | {
     sourceRelation: Relation.SortAttr;
 } | {
-    path: number;
+    pathId: number;
+} | {
+    path: Path.SortAttr;
 } | {
     destRelationId: number;
 } | {
@@ -94,22 +102,32 @@ 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, "sourceRelationId" | "destRelationId">> & (({
+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, "sourceRelationId" | "pathId" | "destRelationId">> & (({
     sourceRelationId?: never;
     sourceRelation: Relation.CreateSingleOperation;
 } | {
     sourceRelationId: ForeignKey<"sourceRelation">;
     sourceRelation?: Relation.UpdateOperation;
 } | {
+    sourceRelation?: never;
     sourceRelationId: ForeignKey<"sourceRelation">;
+}) & ({
+    pathId?: never;
+    path: Path.CreateSingleOperation;
+} | {
+    pathId: ForeignKey<"path">;
+    path?: Path.UpdateOperation;
+} | {
+    path?: never;
+    pathId: ForeignKey<"path">;
 }) & ({
     destRelationId?: never;
     destRelation: Relation.CreateSingleOperation;
@@ -117,54 +135,70 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "sourceR
     destRelationId: ForeignKey<"destRelation">;
     destRelation?: Relation.UpdateOperation;
 } | {
+    destRelation?: never;
     destRelationId: ForeignKey<"destRelation">;
 })) & {
     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, "sourceRelationId" | "destRelationId">> & (({
-    sourceRelation: Relation.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, "sourceRelationId" | "pathId" | "destRelationId">> & (({
+    sourceRelation?: Relation.CreateSingleOperation;
     sourceRelationId?: never;
 } | {
-    sourceRelation: Relation.UpdateOperation;
+    sourceRelation?: Relation.UpdateOperation;
     sourceRelationId?: never;
 } | {
-    sourceRelation: Relation.RemoveOperation;
+    sourceRelation?: Relation.RemoveOperation;
     sourceRelationId?: never;
 } | {
     sourceRelation?: never;
-    sourceRelationId?: ForeignKey<"sourceRelation"> | null;
+    sourceRelationId?: ForeignKey<"sourceRelation">;
 }) & ({
-    destRelation: Relation.CreateSingleOperation;
+    path?: Path.CreateSingleOperation;
+    pathId?: never;
+} | {
+    path?: Path.UpdateOperation;
+    pathId?: never;
+} | {
+    path?: Path.RemoveOperation;
+    pathId?: never;
+} | {
+    path?: never;
+    pathId?: ForeignKey<"path">;
+}) & ({
+    destRelation?: Relation.CreateSingleOperation;
     destRelationId?: never;
 } | {
-    destRelation: Relation.UpdateOperation;
+    destRelation?: Relation.UpdateOperation;
     destRelationId?: never;
 } | {
-    destRelation: Relation.RemoveOperation;
+    destRelation?: Relation.RemoveOperation;
     destRelationId?: never;
 } | {
     destRelation?: never;
-    destRelationId?: ForeignKey<"destRelation"> | null;
+    destRelationId?: ForeignKey<"destRelation">;
 })) & {
     [k: string]: any;
     modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
     operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
 };
-export 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 = {} & (({
     sourceRelation?: Relation.UpdateOperation | Relation.RemoveOperation;
+}) & ({
+    path?: Path.UpdateOperation | Path.RemoveOperation;
 }) & ({
     destRelation?: 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 RelationAuthIdSubQuery = Selection<RelationAuthIdProjection>;
-export declare type EntityDef = {
+export type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
+export type Operation = CreateOperation | UpdateOperation | RemoveOperation;
+export type RelationIdSubQuery = Selection<RelationIdProjection>;
+export type PathIdSubQuery = Selection<PathIdProjection>;
+export type RelationAuthIdSubQuery = Selection<RelationAuthIdProjection>;
+export type EntityDef = {
     Schema: Schema;
     OpSchema: OpSchema;
     Action: OakMakeAction<GenericAction> | string;

package/lib/base-app-domain/RelationAuth/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: {
         sourceRelationId: {
@@ -9,12 +9,10 @@ exports.desc = {
             type: "ref",
             ref: "relation"
         },
-        path: {
+        pathId: {
             notNull: true,
-            type: "varchar",
-            params: {
-                length: 256
-            }
+            type: "ref",
+            ref: "path"
         },
         destRelationId: {
             notNull: true,
@@ -29,18 +27,18 @@ exports.desc = {
             name: 'index_entity_relation_path',
             attributes: [
                 {
-                    name: "sourceRelationId"
+                    name: "sourceRelationId",
                 },
                 {
-                    name: 'path'
+                    name: "pathId",
                 },
                 {
-                    name: "destRelationId"
+                    name: "destRelationId",
                 },
             ],
             config: {
-                unique: true
-            }
+                unique: true,
+            },
         }
     ]
 };

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

@@ -1,17 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storageSchema = void 0;
-var Storage_1 = require("./ActionAuth/Storage");
-var Storage_2 = require("./I18n/Storage");
-var Storage_3 = require("./Modi/Storage");
-var Storage_4 = require("./ModiEntity/Storage");
-var Storage_5 = require("./Oper/Storage");
-var Storage_6 = require("./OperEntity/Storage");
-var Storage_7 = require("./Relation/Storage");
-var Storage_8 = require("./RelationAuth/Storage");
-var Storage_9 = require("./User/Storage");
-var Storage_10 = require("./UserEntityGrant/Storage");
-var Storage_11 = require("./UserRelation/Storage");
+const Storage_1 = require("./ActionAuth/Storage");
+const Storage_2 = require("./I18n/Storage");
+const Storage_3 = require("./Modi/Storage");
+const Storage_4 = require("./ModiEntity/Storage");
+const Storage_5 = require("./Oper/Storage");
+const Storage_6 = require("./OperEntity/Storage");
+const Storage_7 = require("./Path/Storage");
+const Storage_8 = require("./Relation/Storage");
+const Storage_9 = require("./RelationAuth/Storage");
+const Storage_10 = require("./User/Storage");
+const Storage_11 = require("./UserEntityClaim/Storage");
+const Storage_12 = require("./UserEntityGrant/Storage");
+const Storage_13 = require("./UserRelation/Storage");
 exports.storageSchema = {
     actionAuth: Storage_1.desc,
     i18n: Storage_2.desc,
@@ -19,9 +21,11 @@ exports.storageSchema = {
     modiEntity: Storage_4.desc,
     oper: Storage_5.desc,
     operEntity: Storage_6.desc,
-    relation: Storage_7.desc,
-    relationAuth: Storage_8.desc,
-    user: Storage_9.desc,
-    userEntityGrant: Storage_10.desc,
-    userRelation: Storage_11.desc
+    path: Storage_7.desc,
+    relation: Storage_8.desc,
+    relationAuth: Storage_9.desc,
+    user: Storage_10.desc,
+    userEntityClaim: Storage_11.desc,
+    userEntityGrant: Storage_12.desc,
+    userRelation: Storage_13.desc
 };

package/lib/base-app-domain/User/Action.d.ts

@@ -1,10 +1,10 @@
 import { ActionDef } from "../../types/Action";
 import { GenericAction, RelationAction } from "../../actions/action";
-export declare type UserAction = 'mergeTo' | string;
-export declare type UserState = 'normal' | 'merged' | string;
-export declare type ParticularAction = UserAction;
+export type UserAction = 'mergeTo' | string;
+export type UserState = 'normal' | 'merged' | string;
+export type ParticularAction = UserAction;
 export declare const actions: string[];
-export declare type Action = GenericAction | ParticularAction | RelationAction | string;
+export type Action = GenericAction | ParticularAction | RelationAction | string;
 export declare const ActionDefDict: {
     userState: ActionDef<string, string>;
 };

package/lib/base-app-domain/User/Action.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionDefDict = exports.actions = void 0;
 exports.actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "grant", "revoke", "mergeTo"];
-var UserActionDef = {
+const UserActionDef = {
     stm: {
-        mergeTo: ['normal', 'merged']
-    }
+        mergeTo: ['normal', 'merged'],
+    },
 };
 exports.ActionDefDict = {
     userState: UserActionDef