oak-domain 2.6.6 → 2.6.7

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

@@ -5,7 +5,6 @@ import * as SubQuery from "../_SubQuery";
 import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "../../types/Entity";
 import { Action, ParticularAction, IState } from "./Action";
 import * as ModiEntity from "../ModiEntity/Schema";
-import * as OperEntity from "../OperEntity/Schema";
 export declare type OpSchema = EntityShape & {
     targetEntity: String<32>;
     entity: String<32>;
@@ -28,8 +27,6 @@ export declare type Schema = EntityShape & {
     iState?: IState | null;
     modiEntity$modi?: Array<ModiEntity.Schema>;
     modiEntity$modi$$aggr?: AggregationResult<ModiEntity.Schema>;
-    operEntity$entity?: Array<OperEntity.Schema>;
-    operEntity$entity$$aggr?: AggregationResult<OperEntity.Schema>;
 } & {
     [A in ExpressionKey]?: any;
 };
@@ -69,12 +66,6 @@ export declare type Projection = {
     modiEntity$modi$$aggr?: ModiEntity.Aggregation & {
         $entity: "modiEntity";
     };
-    operEntity$entity?: OperEntity.Selection & {
-        $entity: "operEntity";
-    };
-    operEntity$entity$$aggr?: OperEntity.Aggregation & {
-        $entity: "operEntity";
-    };
 } & Partial<ExprOp<OpAttr | string>>;
 declare type ModiIdProjection = OneOf<{
     id: number;
@@ -114,7 +105,6 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
     [K: string]: any;
 }) & {
     modiEntity$modi?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "modi" | "modiId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "modi" | "modiId">>>;
-    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>>;
@@ -122,7 +112,6 @@ export declare type CreateOperation = CreateSingleOperation | CreateMultipleOper
 export declare type UpdateOperationData = FormUpdateData<OpSchema> & {
     [k: string]: any;
     modiEntity$modi?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "modi" | "modiId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "modi" | "modiId">>>;
-    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 = {};

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

@@ -12,6 +12,7 @@ export declare type OpSchema = EntityShape & {
     filter?: Object | null;
     extra?: Object | null;
     operatorId?: ForeignKey<"user"> | null;
+    targetEntity: String<32>;
 };
 export declare type OpAttr = keyof OpSchema;
 export declare type Schema = EntityShape & {
@@ -20,6 +21,7 @@ export declare type Schema = EntityShape & {
     filter?: Object | null;
     extra?: Object | null;
     operatorId?: ForeignKey<"user"> | null;
+    targetEntity: String<32>;
     operator?: User.Schema | null;
     operEntity$oper?: Array<OperEntity.Schema>;
     operEntity$oper$$aggr?: AggregationResult<OperEntity.Schema>;
@@ -37,6 +39,7 @@ declare type AttrFilter = {
     extra: Object;
     operatorId: Q_StringValue | SubQuery.UserIdSubQuery;
     operator: User.Filter;
+    targetEntity: Q_StringValue;
 };
 export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
 export declare type Projection = {
@@ -52,6 +55,7 @@ export declare type Projection = {
     extra?: number;
     operatorId?: number;
     operator?: User.Projection;
+    targetEntity?: number;
     operEntity$oper?: OperEntity.Selection & {
         $entity: "operEntity";
     };
@@ -79,6 +83,8 @@ export declare type SortAttr = {
     operatorId: number;
 } | {
     operator: User.SortAttr;
+} | {
+    targetEntity: number;
 } | {
     [k: string]: any;
 } | OneOf<ExprOp<OpAttr | string>>;

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

@@ -22,6 +22,12 @@ exports.desc = {
         operatorId: {
             type: "ref",
             ref: "user"
+        },
+        targetEntity: {
+            type: "varchar",
+            params: {
+                length: 32
+            }
         }
     },
     actionType: "appendOnly",

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

@@ -5,21 +5,19 @@ import * as SubQuery from "../_SubQuery";
 import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
 import { AppendOnlyAction } from "../../actions/action";
 import * as Oper from "../Oper/Schema";
-import * as Modi from "../Modi/Schema";
 import * as User from "../User/Schema";
 import * as UserEntityGrant from "../UserEntityGrant/Schema";
 export declare type OpSchema = EntityShape & {
     operId: ForeignKey<"oper">;
-    entity: "modi" | "user" | "userEntityGrant" | string;
+    entity: "user" | "userEntityGrant" | string;
     entityId: String<64>;
 };
 export declare type OpAttr = keyof OpSchema;
 export declare type Schema = EntityShape & {
     operId: ForeignKey<"oper">;
-    entity: "modi" | "user" | "userEntityGrant" | string;
+    entity: "user" | "userEntityGrant" | string;
     entityId: String<64>;
     oper: Oper.Schema;
-    modi?: Modi.Schema;
     user?: User.Schema;
     userEntityGrant?: UserEntityGrant.Schema;
 } & {
@@ -34,11 +32,10 @@ declare type AttrFilter<E> = {
     oper: Oper.Filter;
     entity: E;
     entityId: Q_StringValue;
-    modi: Modi.Filter;
     user: User.Filter;
     userEntityGrant: UserEntityGrant.Filter;
 };
-export declare type Filter<E = Q_EnumValue<"modi" | "user" | "userEntityGrant" | string>> = MakeFilter<AttrFilter<E> & ExprOp<OpAttr | string>>;
+export declare type Filter<E = Q_EnumValue<"user" | "userEntityGrant" | string>> = MakeFilter<AttrFilter<E> & ExprOp<OpAttr | string>>;
 export declare type Projection = {
     "#id"?: NodeId;
     [k: string]: any;
@@ -50,7 +47,6 @@ export declare type Projection = {
     oper?: Oper.Projection;
     entity?: number;
     entityId?: number;
-    modi?: Modi.Projection;
     user?: User.Projection;
     userEntityGrant?: UserEntityGrant.Projection;
 } & Partial<ExprOp<OpAttr | string>>;
@@ -60,9 +56,6 @@ declare type OperEntityIdProjection = OneOf<{
 declare type OperIdProjection = OneOf<{
     operId: number;
 }>;
-declare type ModiIdProjection = OneOf<{
-    entityId: number;
-}>;
 declare type UserIdProjection = OneOf<{
     entityId: number;
 }>;
@@ -85,8 +78,6 @@ export declare type SortAttr = {
     entity: number;
 } | {
     entityId: number;
-} | {
-    modi: Modi.SortAttr;
 } | {
     user: User.SortAttr;
 } | {
@@ -108,17 +99,6 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
 } | {
     operId: String<64>;
 })) & ({
-    entity?: never;
-    entityId?: never;
-    modi: Modi.CreateSingleOperation;
-} | {
-    entity: "modi";
-    entityId: String<64>;
-    modi: Modi.UpdateOperation;
-} | {
-    entity: "modi";
-    entityId: String<64>;
-} | {
     entity?: never;
     entityId?: never;
     user: User.CreateSingleOperation;
@@ -155,10 +135,6 @@ export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity"
     oper?: never;
     operId?: String<64> | null;
 })) & ({
-    modi?: Modi.CreateSingleOperation | Modi.UpdateOperation | Modi.RemoveOperation;
-    entityId?: never;
-    entity?: never;
-} | {
     user?: User.CreateSingleOperation | User.UpdateOperation | User.RemoveOperation;
     entityId?: never;
     entity?: never;
@@ -167,15 +143,13 @@ export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity"
     entityId?: never;
     entity?: never;
 } | {
-    entity?: ("modi" | "user" | "userEntityGrant" | string) | null;
+    entity?: ("user" | "userEntityGrant" | string) | null;
     entityId?: String<64> | null;
 }) & {
     [k: string]: any;
 };
 export declare type UpdateOperation = OakOperation<"update" | string, UpdateOperationData, Filter, Sorter>;
 export declare type RemoveOperationData = {} & ({
-    modi?: Modi.UpdateOperation | Modi.RemoveOperation;
-} | {
     user?: User.UpdateOperation | User.RemoveOperation;
 } | {
     userEntityGrant?: UserEntityGrant.UpdateOperation | UserEntityGrant.RemoveOperation;
@@ -185,7 +159,6 @@ export declare type RemoveOperationData = {} & ({
 export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
 export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation;
 export declare type OperIdSubQuery = Selection<OperIdProjection>;
-export declare type ModiIdSubQuery = Selection<ModiIdProjection>;
 export declare type UserIdSubQuery = Selection<UserIdProjection>;
 export declare type UserEntityGrantIdSubQuery = Selection<UserEntityGrantIdProjection>;
 export declare type OperEntityIdSubQuery = Selection<OperEntityIdProjection>;

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

@@ -13,7 +13,7 @@ exports.desc = {
             params: {
                 length: 32
             },
-            ref: ["modi", "user", "userEntityGrant"]
+            ref: ["user", "userEntityGrant"]
         },
         entityId: {
             type: "varchar",

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

@@ -6,8 +6,8 @@ import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOper
 import { Action, ParticularAction, UserState } from "./Action";
 import { RelationAction } from "../../actions/action";
 import * as Oper from "../Oper/Schema";
-import * as OperEntity from "../OperEntity/Schema";
 import * as ModiEntity from "../ModiEntity/Schema";
+import * as OperEntity from "../OperEntity/Schema";
 export declare type OpSchema = EntityShape & {
     name?: String<16> | null;
     nickname?: String<64> | null;
@@ -27,10 +27,10 @@ export declare type Schema = EntityShape & {
     oper$operator$$aggr?: AggregationResult<Oper.Schema>;
     user$ref?: Array<Schema>;
     user$ref$$aggr?: AggregationResult<Schema>;
-    operEntity$entity?: Array<OperEntity.Schema>;
-    operEntity$entity$$aggr?: AggregationResult<OperEntity.Schema>;
     modiEntity$entity?: Array<ModiEntity.Schema>;
     modiEntity$entity$$aggr?: AggregationResult<ModiEntity.Schema>;
+    operEntity$entity?: Array<OperEntity.Schema>;
+    operEntity$entity$$aggr?: AggregationResult<OperEntity.Schema>;
 } & {
     [A in ExpressionKey]?: any;
 };
@@ -72,18 +72,18 @@ export declare type Projection = {
     user$ref$$aggr?: Aggregation & {
         $entity: "user";
     };
-    operEntity$entity?: OperEntity.Selection & {
-        $entity: "operEntity";
-    };
-    operEntity$entity$$aggr?: OperEntity.Aggregation & {
-        $entity: "operEntity";
-    };
     modiEntity$entity?: ModiEntity.Selection & {
         $entity: "modiEntity";
     };
     modiEntity$entity$$aggr?: ModiEntity.Aggregation & {
         $entity: "modiEntity";
     };
+    operEntity$entity?: OperEntity.Selection & {
+        $entity: "operEntity";
+    };
+    operEntity$entity$$aggr?: OperEntity.Aggregation & {
+        $entity: "operEntity";
+    };
 } & Partial<ExprOp<OpAttr | string>>;
 declare type UserIdProjection = OneOf<{
     id: number;
@@ -131,8 +131,8 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "refId">
 })) & {
     oper$operator?: OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">[]> | Array<OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">>>;
     user$ref?: OakOperation<UpdateOperation["action"], Omit<UpdateOperationData, "ref" | "refId">, Filter> | OakOperation<"create", Omit<CreateOperationData, "ref" | "refId">[]> | Array<OakOperation<"create", Omit<CreateOperationData, "ref" | "refId">> | OakOperation<UpdateOperation["action"], Omit<UpdateOperationData, "ref" | "refId">, Filter>>;
-    operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
     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>>;
@@ -153,8 +153,8 @@ export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "refId">
     [k: string]: any;
     oper$operator?: OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">[]> | Array<OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">>>;
     user$ref?: UpdateOperation | RemoveOperation | OakOperation<"create", Omit<CreateOperationData, "ref" | "refId">[]> | Array<OakOperation<"create", Omit<CreateOperationData, "ref" | "refId">> | UpdateOperation | RemoveOperation>;
-    operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
     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 | RelationAction | string, UpdateOperationData, Filter, Sorter>;
 export declare type RemoveOperationData = {} & (({

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

@@ -4,8 +4,8 @@ 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 OperEntity from "../OperEntity/Schema";
 import * as ModiEntity from "../ModiEntity/Schema";
+import * as OperEntity from "../OperEntity/Schema";
 export declare type OpSchema = EntityShape & {
     entity: String<32>;
     entityId: String<64>;
@@ -16,10 +16,10 @@ export declare type Schema = EntityShape & {
     entity: String<32>;
     entityId: String<64>;
     relation: String<32>;
-    operEntity$entity?: Array<OperEntity.Schema>;
-    operEntity$entity$$aggr?: AggregationResult<OperEntity.Schema>;
     modiEntity$entity?: Array<ModiEntity.Schema>;
     modiEntity$entity$$aggr?: AggregationResult<ModiEntity.Schema>;
+    operEntity$entity?: Array<OperEntity.Schema>;
+    operEntity$entity$$aggr?: AggregationResult<OperEntity.Schema>;
 } & {
     [A in ExpressionKey]?: any;
 };
@@ -43,18 +43,18 @@ export declare type Projection = {
     entity?: number;
     entityId?: number;
     relation?: number;
-    operEntity$entity?: OperEntity.Selection & {
-        $entity: "operEntity";
-    };
-    operEntity$entity$$aggr?: OperEntity.Aggregation & {
-        $entity: "operEntity";
-    };
     modiEntity$entity?: ModiEntity.Selection & {
         $entity: "modiEntity";
     };
     modiEntity$entity$$aggr?: ModiEntity.Aggregation & {
         $entity: "modiEntity";
     };
+    operEntity$entity?: OperEntity.Selection & {
+        $entity: "operEntity";
+    };
+    operEntity$entity$$aggr?: OperEntity.Aggregation & {
+        $entity: "operEntity";
+    };
 } & Partial<ExprOp<OpAttr | string>>;
 declare type UserEntityGrantIdProjection = OneOf<{
     id: number;
@@ -89,16 +89,16 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity"
     entityId?: string;
     [K: string]: any;
 }) & {
-    operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
     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> & {
     [k: string]: any;
-    operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
     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 = {};

package/lib/compiler/env.d.ts

@@ -5,6 +5,7 @@ export declare const ENTITY_PATH_IN_OAK_DOMAIN: () => string;
 export declare const TYPE_PATH_IN_OAK_DOMAIN: (level?: number) => string;
 export declare const ACTION_CONSTANT_IN_OAK_DOMAIN: (level?: number) => string;
 export declare const RESERVED_ENTITIES: string[];
+export declare const ENTITY_NAME_MAX_LENGTH = 32;
 export declare const STRING_LITERAL_MAX_LENGTH = 24;
 export declare const NUMERICAL_LITERL_DEFAULT_PRECISION = 8;
 export declare const NUMERICAL_LITERL_DEFAULT_SCALE = 2;

package/lib/compiler/env.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.INT_LITERL_DEFAULT_WIDTH = exports.NUMERICAL_LITERL_DEFAULT_SCALE = exports.NUMERICAL_LITERL_DEFAULT_PRECISION = exports.STRING_LITERAL_MAX_LENGTH = exports.RESERVED_ENTITIES = exports.ACTION_CONSTANT_IN_OAK_DOMAIN = exports.TYPE_PATH_IN_OAK_DOMAIN = exports.ENTITY_PATH_IN_OAK_DOMAIN = exports.ENTITY_PATH_IN_OAK_GENERAL_BUSINESS = exports.LIB_PATH = exports.LIB_OAK_DOMAIN = void 0;
+exports.INT_LITERL_DEFAULT_WIDTH = exports.NUMERICAL_LITERL_DEFAULT_SCALE = exports.NUMERICAL_LITERL_DEFAULT_PRECISION = exports.STRING_LITERAL_MAX_LENGTH = exports.ENTITY_NAME_MAX_LENGTH = exports.RESERVED_ENTITIES = exports.ACTION_CONSTANT_IN_OAK_DOMAIN = exports.TYPE_PATH_IN_OAK_DOMAIN = exports.ENTITY_PATH_IN_OAK_DOMAIN = exports.ENTITY_PATH_IN_OAK_GENERAL_BUSINESS = exports.LIB_PATH = exports.LIB_OAK_DOMAIN = void 0;
 exports.LIB_OAK_DOMAIN = 'oak-domain';
 var LIB_OAK_GENERAL_BUSINESS = 'oak-general-business';
 var LIB_PATH = function () { return 'lib'; };
@@ -33,6 +33,7 @@ exports.ACTION_CONSTANT_IN_OAK_DOMAIN = ACTION_CONSTANT_IN_OAK_DOMAIN;
 // export const OUTPUT_PATH = 'app-domain/entities';
 exports.RESERVED_ENTITIES = ['Schema', 'Filter', 'Query', 'SubQuery', 'Entity', 'Selection', 'Operation', 'File', 'Common',
     'Locale', 'Projection', 'Data'];
+exports.ENTITY_NAME_MAX_LENGTH = 32;
 exports.STRING_LITERAL_MAX_LENGTH = 24;
 exports.NUMERICAL_LITERL_DEFAULT_PRECISION = 8;
 exports.NUMERICAL_LITERL_DEFAULT_SCALE = 2;

package/lib/compiler/schemalBuilder.js

@@ -344,6 +344,18 @@ function getStringEnumValues(filename, program, obj, node) {
         }
     }
 }
+function checkNameLegal(filename, attrName, upperCase) {
+    (0, assert_1.default)(attrName.length <= env_1.ENTITY_NAME_MAX_LENGTH, "\u6587\u4EF6\u300C".concat(filename, "\u300D\uFF1A\u300C").concat(attrName, "\u300D\u7684\u540D\u79F0\u5B9A\u4E49\u8FC7\u957F\uFF0C\u4E0D\u80FD\u8D85\u8FC7\u300C").concat(env_1.ENTITY_NAME_MAX_LENGTH, "\u300D\u957F\u5EA6"));
+    if (upperCase) {
+        (0, assert_1.default)(/[A-Z][a-z|A-Z|0-9]+/i.test(attrName), "\u6587\u4EF6\u300C".concat(filename, "\u300D\uFF1A\u300C").concat(attrName, "\u300D\u7684\u540D\u79F0\u5FC5\u987B\u4EE5\u5927\u5199\u5B57\u6BCD\u5F00\u59CB\uFF0C\u4E14\u53EA\u80FD\u5305\u542B\u5B57\u6BCD\u548C\u6570\u5B57"));
+    }
+    else if (upperCase === false) {
+        (0, assert_1.default)(/[a-z][a-z|A-Z|0-9]+/i.test(attrName), "\u6587\u4EF6\u300C".concat(filename, "\u300D\uFF1A\u300C").concat(attrName, "\u300D\u7684\u540D\u79F0\u5FC5\u987B\u4EE5\u5C0F\u5199\u5B57\u6BCD\u5F00\u59CB\uFF0C\u4E14\u53EA\u80FD\u5305\u542B\u5B57\u6BCD\u548C\u6570\u5B57"));
+    }
+    else {
+        (0, assert_1.default)(/[a-z|A-Z][a-z|A-Z|0-9]+/i.test(attrName), "\u6587\u4EF6\u300C".concat(filename, "\u300D\uFF1A\u300C").concat(attrName, "\u300D\u7684\u540D\u79F0\u5FC5\u987B\u4EE5\u5B57\u6BCD\u5F00\u59CB\uFF0C\u4E14\u53EA\u80FD\u5305\u542B\u5B57\u6BCD\u548C\u6570\u5B57"));
+    }
+}
 function analyzeEntity(filename, path, program, relativePath) {
     var _a;
     var fullPath = "".concat(path, "/").concat(filename);
@@ -355,6 +367,7 @@ function analyzeEntity(filename, path, program, relativePath) {
         // removeFromRelationShip(moduleName);
         console.warn("\u51FA\u73B0\u4E86\u540C\u540D\u7684Entity\u5B9A\u4E49\u300C".concat(moduleName, "\u300D\uFF0C\u5C06\u4F7F\u7528").concat(fullPath, "\u53D6\u4EE3\u6389\u9ED8\u8BA4\u5BF9\u8C61\uFF0C\u8BF7\u68C0\u67E5\u65B0\u7684\u5BF9\u8C61\u7ED3\u6784\u53CA\u76F8\u5173\u5E38\u91CF\u5B9A\u4E49\u4E0E\u539F\u6709\u7684\u517C\u5BB9\uFF0C\u5426\u5219\u539F\u6709\u5BF9\u8C61\u7684\u76F8\u5173\u903B\u8F91\u4F1A\u51FA\u73B0\u4E0D\u53EF\u77E5\u5F02\u5E38"));
     }
+    checkNameLegal(filename, moduleName, true);
     var referencedSchemas = [];
     var schemaAttrs = [];
     var hasFulltextIndex = false;
@@ -406,6 +419,7 @@ function analyzeEntity(filename, path, program, relativePath) {
                     var _a, _b;
                     var _c = attrNode, type = _c.type, name = _c.name, questionToken = _c.questionToken;
                     var attrName = name.text;
+                    checkNameLegal(filename, attrName, false);
                     if (ts.isTypeReferenceNode(type)
                         && ts.isIdentifier(type.typeName)) {
                         if ((referencedSchemas.includes(type.typeName.text) || type.typeName.text === 'Schema')) {
@@ -516,27 +530,27 @@ function analyzeEntity(filename, path, program, relativePath) {
                         _a[moduleName] = 1,
                         _a));
                 }
+                else if (hasEntityAttr_1 || hasEntityIdAttr_1) {
+                    throw new Error("\u6587\u4EF6\u300C".concat(filename, "\u300D\uFF1A\u5C5E\u6027 \u5B9A\u4E49\u4E2D\u53EA\u5305\u542B").concat(hasEntityAttr_1 ? 'entity' : 'entityId', "\uFF0C\u4E0D\u7B26\u5408\u5B9A\u4E49\u89C4\u8303\u3002entity/entityId\u5FC5\u987B\u8054\u5408\u51FA\u73B0\uFF0C\u4EE3\u8868\u4E0D\u5B9A\u5BF9\u8C61\u7684\u53CD\u5411\u6307\u9488"));
+                }
                 beforeSchema = false;
-                // 对于不是Oper的对象，全部建立和OperEntity的反指关系
-                if (!['Oper', 'OperEntity', 'ModiEntity'].includes(moduleName)) {
-                    if (ReversePointerRelations['OperEntity'] && !ReversePointerRelations['OperEntity'].includes(moduleName)) {
-                        ReversePointerRelations['OperEntity'].push(moduleName);
+                // 对于不是Modi和Oper的对象，全部建立和ModiEntity的反指关系
+                if (!['Modi', 'Oper', 'OperEntity', 'ModiEntity'].includes(moduleName) && !toModi) {
+                    if (ReversePointerRelations['ModiEntity'] && !ReversePointerRelations['ModiEntity'].includes(moduleName)) {
+                        ReversePointerRelations['ModiEntity'].push(moduleName);
                     }
                     else {
                         (0, lodash_1.assign)(ReversePointerRelations, (_b = {},
-                            _b['OperEntity'] = [moduleName],
+                            _b['ModiEntity'] = [moduleName],
                             _b));
                     }
-                    // 对于不是Modi的对象，全部建立和ModiEntity的反指关系
-                    if (!['Modi'].includes(moduleName) && !toModi) {
-                        if (ReversePointerRelations['ModiEntity'] && !ReversePointerRelations['ModiEntity'].includes(moduleName)) {
-                            ReversePointerRelations['ModiEntity'].push(moduleName);
-                        }
-                        else {
-                            (0, lodash_1.assign)(ReversePointerRelations, (_c = {},
-                                _c['ModiEntity'] = [moduleName],
-                                _c));
-                        }
+                    if (ReversePointerRelations['OperEntity'] && !ReversePointerRelations['OperEntity'].includes(moduleName)) {
+                        ReversePointerRelations['OperEntity'].push(moduleName);
+                    }
+                    else {
+                        (0, lodash_1.assign)(ReversePointerRelations, (_c = {},
+                            _c['OperEntity'] = [moduleName],
+                            _c));
                     }
                 }
             }

package/lib/entities/Oper.d.ts

@@ -7,4 +7,5 @@ export interface Schema extends EntityShape {
     filter?: Object;
     extra?: Object;
     operator?: User;
+    targetEntity: String<32>;
 }

package/lib/entities/Oper.js

@@ -13,6 +13,7 @@ var locale = {
             filter: '选择条件',
             extra: '其它',
             operator: '操作者',
+            targetEntity: '关联对象',
         },
     },
 };

package/lib/store/AsyncRowStore.d.ts

@@ -2,7 +2,7 @@
 import { EntityDict, RowStore, OperateOption, OperationResult, SelectOption, Context, TxnOption, OpRecord, AggregationResult } from "../types";
 import { IncomingHttpHeaders } from "http";
 export declare abstract class AsyncContext<ED extends EntityDict> implements Context {
-    private rowStore;
+    rowStore: AsyncRowStore<ED, this>;
     private uuid?;
     opRecords: OpRecord<ED>[];
     private scene?;
@@ -12,6 +12,10 @@ export declare abstract class AsyncContext<ED extends EntityDict> implements Con
         commit: Array<() => Promise<void>>;
         rollback: Array<() => Promise<void>>;
     };
+    /**
+     * 在返回结果前调用，对数据行进行一些预处理，比如将一些敏感的列隐藏
+     */
+    abstract refineOpRecords(): Promise<void>;
     constructor(store: AsyncRowStore<ED, AsyncContext<ED>>, headers?: IncomingHttpHeaders);
     setHeaders(headers: IncomingHttpHeaders): void;
     getHeader(key: string): string | string[] | undefined;

package/lib/store/CascadeStore.d.ts

@@ -1,6 +1,6 @@
 import { EntityDict, OperateOption, SelectOption, OperationResult, AggregationResult } from "../types/Entity";
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
-import { RowStore } from '../types/RowStore';
+import { OperationRewriter, RowStore, SelectionRewriter } from '../types/RowStore';
 import { StorageSchema } from '../types/Storage';
 import { SyncContext } from "./SyncRowStore";
 import { AsyncContext } from "./AsyncRowStore";
@@ -9,6 +9,12 @@ export declare abstract class CascadeStore<ED extends EntityDict & BaseEntityDic
     constructor(storageSchema: StorageSchema<ED>);
     protected abstract supportManyToOneJoin(): boolean;
     protected abstract supportMultipleCreate(): boolean;
+    private selectionRewriters;
+    private operationRewriters;
+    private reinforceSelection;
+    private reinforceOperation;
+    registerOperationRewriter(rewriter: OperationRewriter<ED>): void;
+    registerSelectionRewriter(rewriter: SelectionRewriter<ED>): void;
     protected abstract selectAbjointRow<T extends keyof ED, OP extends SelectOption, Cxt extends SyncContext<ED>>(entity: T, selection: ED[T]['Selection'], context: Cxt, option: OP): Partial<ED[T]['Schema']>[];
     protected abstract updateAbjointRow<T extends keyof ED, OP extends OperateOption, Cxt extends SyncContext<ED>>(entity: T, operation: ED[T]['Operation'], context: Cxt, option: OP): number;
     protected abstract selectAbjointRowAsync<T extends keyof ED, OP extends SelectOption, Cxt extends AsyncContext<ED>>(entity: T, selection: ED[T]['Selection'], context: Cxt, option: OP): Promise<Partial<ED[T]['Schema']>[]>;