UserEntityGrant的修正

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

@@ -6,6 +6,7 @@ import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOper
 import { GenericAction } from "../../actions/action";
 import * as ActionAuth from "../ActionAuth/Schema";
 import * as RelationAuth from "../RelationAuth/Schema";
+import * as UserEntityGrant from "../UserEntityGrant/Schema";
 import * as UserRelation from "../UserRelation/Schema";
 import * as ModiEntity from "../ModiEntity/Schema";
 import * as OperEntity from "../OperEntity/Schema";
@@ -27,6 +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>;
     userRelation$relation?: Array<UserRelation.Schema>;
     userRelation$relation$$aggr?: AggregationResult<UserRelation.Schema>;
     modiEntity$entity?: Array<ModiEntity.Schema>;
@@ -76,6 +79,12 @@ export declare type Projection = {
     relationAuth$destRelation$$aggr?: RelationAuth.Aggregation & {
         $entity: "relationAuth";
     };
+    userEntityGrant$relation?: UserEntityGrant.Selection & {
+        $entity: "userEntityGrant";
+    };
+    userEntityGrant$relation$$aggr?: UserEntityGrant.Aggregation & {
+        $entity: "userEntityGrant";
+    };
     userRelation$relation?: UserRelation.Selection & {
         $entity: "userRelation";
     };
@@ -133,6 +142,7 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
     actionAuth$relation?: OakOperation<ActionAuth.UpdateOperation["action"], Omit<ActionAuth.UpdateOperationData, "relation" | "relationId">, ActionAuth.Filter> | OakOperation<"create", Omit<ActionAuth.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<ActionAuth.CreateOperationData, "relation" | "relationId">> | OakOperation<ActionAuth.UpdateOperation["action"], Omit<ActionAuth.UpdateOperationData, "relation" | "relationId">, ActionAuth.Filter>>;
     relationAuth$sourceRelation?: OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "sourceRelation" | "sourceRelationId">, RelationAuth.Filter> | OakOperation<"create", Omit<RelationAuth.CreateOperationData, "sourceRelation" | "sourceRelationId">[]> | Array<OakOperation<"create", Omit<RelationAuth.CreateOperationData, "sourceRelation" | "sourceRelationId">> | OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "sourceRelation" | "sourceRelationId">, RelationAuth.Filter>>;
     relationAuth$destRelation?: OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "destRelation" | "destRelationId">, RelationAuth.Filter> | OakOperation<"create", Omit<RelationAuth.CreateOperationData, "destRelation" | "destRelationId">[]> | Array<OakOperation<"create", Omit<RelationAuth.CreateOperationData, "destRelation" | "destRelationId">> | OakOperation<RelationAuth.UpdateOperation["action"], Omit<RelationAuth.UpdateOperationData, "destRelation" | "destRelationId">, RelationAuth.Filter>>;
+    userEntityGrant$relation?: OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "relation" | "relationId">, UserEntityGrant.Filter> | OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "relation" | "relationId">> | OakOperation<UserEntityGrant.UpdateOperation["action"], Omit<UserEntityGrant.UpdateOperationData, "relation" | "relationId">, UserEntityGrant.Filter>>;
     userRelation$relation?: OakOperation<UserRelation.UpdateOperation["action"], Omit<UserRelation.UpdateOperationData, "relation" | "relationId">, UserRelation.Filter> | OakOperation<"create", Omit<UserRelation.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<UserRelation.CreateOperationData, "relation" | "relationId">> | OakOperation<UserRelation.UpdateOperation["action"], Omit<UserRelation.UpdateOperationData, "relation" | "relationId">, UserRelation.Filter>>;
     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">>>;
@@ -145,6 +155,7 @@ export declare type UpdateOperationData = FormUpdateData<OpSchema> & {
     actionAuth$relation?: ActionAuth.UpdateOperation | ActionAuth.RemoveOperation | OakOperation<"create", Omit<ActionAuth.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<ActionAuth.CreateOperationData, "relation" | "relationId">> | ActionAuth.UpdateOperation | ActionAuth.RemoveOperation>;
     relationAuth$sourceRelation?: RelationAuth.UpdateOperation | RelationAuth.RemoveOperation | OakOperation<"create", Omit<RelationAuth.CreateOperationData, "sourceRelation" | "sourceRelationId">[]> | Array<OakOperation<"create", Omit<RelationAuth.CreateOperationData, "sourceRelation" | "sourceRelationId">> | RelationAuth.UpdateOperation | RelationAuth.RemoveOperation>;
     relationAuth$destRelation?: RelationAuth.UpdateOperation | RelationAuth.RemoveOperation | OakOperation<"create", Omit<RelationAuth.CreateOperationData, "destRelation" | "destRelationId">[]> | Array<OakOperation<"create", Omit<RelationAuth.CreateOperationData, "destRelation" | "destRelationId">> | RelationAuth.UpdateOperation | RelationAuth.RemoveOperation>;
+    userEntityGrant$relation?: UserEntityGrant.UpdateOperation | UserEntityGrant.RemoveOperation | OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<UserEntityGrant.CreateOperationData, "relation" | "relationId">> | UserEntityGrant.UpdateOperation | UserEntityGrant.RemoveOperation>;
     userRelation$relation?: UserRelation.UpdateOperation | UserRelation.RemoveOperation | OakOperation<"create", Omit<UserRelation.CreateOperationData, "relation" | "relationId">[]> | Array<OakOperation<"create", Omit<UserRelation.CreateOperationData, "relation" | "relationId">> | UserRelation.UpdateOperation | UserRelation.RemoveOperation>;
     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">>>;

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

@@ -1,21 +1,23 @@
-import { String } from "../../types/DataType";
+import { String, ForeignKey } from "../../types/DataType";
 import { Q_DateValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import * as SubQuery from "../_SubQuery";
 import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "../../types/Entity";
 import { GenericAction } from "../../actions/action";
+import * as Relation from "../Relation/Schema";
 import * as ModiEntity from "../ModiEntity/Schema";
 import * as OperEntity from "../OperEntity/Schema";
 export declare type OpSchema = EntityShape & {
     entity: String<32>;
     entityId: String<64>;
-    relation: String<32>;
+    relationId: ForeignKey<"relation">;
 };
 export declare type OpAttr = keyof OpSchema;
 export declare type Schema = EntityShape & {
     entity: String<32>;
     entityId: String<64>;
-    relation: String<32>;
+    relationId: ForeignKey<"relation">;
+    relation: Relation.Schema;
     modiEntity$entity?: Array<ModiEntity.Schema>;
     modiEntity$entity$$aggr?: AggregationResult<ModiEntity.Schema>;
     operEntity$entity?: Array<OperEntity.Schema>;
@@ -30,7 +32,8 @@ declare type AttrFilter = {
     $$updateAt$$: Q_DateValue;
     entity: Q_StringValue;
     entityId: Q_StringValue;
-    relation: Q_StringValue;
+    relationId: Q_StringValue | SubQuery.RelationIdSubQuery;
+    relation: Relation.Filter;
 };
 export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
 export declare type Projection = {
@@ -42,7 +45,8 @@ export declare type Projection = {
     $$seq$$?: number;
     entity?: number;
     entityId?: number;
-    relation?: number;
+    relationId?: number;
+    relation?: Relation.Projection;
     modiEntity$entity?: ModiEntity.Selection & {
         $entity: "modiEntity";
     };
@@ -59,6 +63,9 @@ export declare type Projection = {
 declare type UserEntityGrantIdProjection = OneOf<{
     id: number;
 }>;
+declare type RelationIdProjection = OneOf<{
+    relationId: number;
+}>;
 export declare type SortAttr = {
     id: number;
 } | {
@@ -72,7 +79,9 @@ export declare type SortAttr = {
 } | {
     entityId: number;
 } | {
-    relation: number;
+    relationId: number;
+} | {
+    relation: Relation.SortAttr;
 } | {
     [k: string]: any;
 } | OneOf<ExprOp<OpAttr | string>>;
@@ -84,7 +93,15 @@ 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> = Omit<SelectOperation<P>, "action">;
 export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
-export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId">> & ({
+export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId" | "relationId">> & (({
+    relationId?: never;
+    relation: Relation.CreateSingleOperation;
+} | {
+    relationId: String<64>;
+    relation?: Relation.UpdateOperation;
+} | {
+    relationId: String<64>;
+})) & ({
     entity?: string;
     entityId?: string;
     [K: string]: any;
@@ -95,15 +112,30 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
 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 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?: String<64> | null;
+})) & {
     [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 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 = {
     Schema: Schema;

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

@@ -18,12 +18,10 @@ exports.desc = {
                 length: 64
             }
         },
-        relation: {
+        relationId: {
             notNull: true,
-            type: "varchar",
+            type: "ref",
-            params: {
+            ref: "relation"
-                length: 32
-            }
         }
     },
     actionType: "crud",

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

@@ -46,6 +46,8 @@ export declare type RelationIdSubQuery = {
         entity: "actionAuth";
     }) | (RelationAuth.RelationIdSubQuery & {
         entity: "relationAuth";
+    }) | (UserEntityGrant.RelationIdSubQuery & {
+        entity: "userEntityGrant";
     }) | (UserRelation.RelationIdSubQuery & {
         entity: "userRelation";
     }) | (ModiEntity.RelationIdSubQuery & {

lib/entities/UserEntityGrant.d.ts

@@ -1,7 +1,8 @@
 import { String } from '../types/DataType';
 import { EntityShape } from '../types/Entity';
+import { Schema as Relation } from './Relation';
 export interface Schema extends EntityShape {
     entity: String<32>;
     entityId: String<64>;
-    relation: String<32>;
+    relation: Relation;
 }

src/entities/UserEntityGrant.ts

@@ -1,11 +1,12 @@
 import { String } from '../types/DataType';
 import { LocaleDef } from '../types/Locale';
 import { EntityShape } from '../types/Entity';
+import { Schema as Relation } from './Relation';
 
 export interface Schema extends EntityShape {
     entity: String<32>;
     entityId: String<64>;
-    relation: String<32>;
+    relation: Relation;
 };
 
 const locale: LocaleDef<