oak-domain 5.0.16 → 5.0.17

package/lib/store/IntrinsicCheckers.js

@@ -79,7 +79,7 @@ function createUniqueCheckers(schema) {
                         entity,
                         action: 'create',
                         type: 'logicalData',
-                        priority: types_1.CHECKER_MAX_PRIORITY, // 优先级要放在最低，所有前置的checker/trigger将数据完整之后再在这里检测
+                        priority: types_1.CHECKER_MAX_PRIORITY,
                         checker: (operation, context) => {
                             const { data } = operation;
                             if (data instanceof Array) {
@@ -95,9 +95,9 @@ function createUniqueCheckers(schema) {
                         }
                     }, {
                         entity,
-                        action: 'update', // 只检查update，其它状态转换的action应该不会涉及unique约束的属性
+                        action: 'update',
                         type: 'logicalData',
-                        priority: types_1.CHECKER_MAX_PRIORITY, // 优先级要放在最低，所有前置的checker/trigger将数据完整之后再在这里检测
+                        priority: types_1.CHECKER_MAX_PRIORITY,
                         checker: (operation, context) => {
                             const { data, filter: operationFilter } = operation;
                             if (data) {
@@ -227,7 +227,7 @@ function createActionTransformerCheckers(actionDefDict) {
                     action: 'create',
                     type: 'logical',
                     entity,
-                    priority: 10, // 优先级要高，先于真正的data检查进行
+                    priority: 10,
                     checker: (operation) => {
                         const { data } = operation;
                         if (data instanceof Array) {

package/lib/store/checker.js

@@ -67,7 +67,7 @@ function translateCheckerInAsyncContext(checker, schema) {
                                 blockTrigger: true,
                             });
                             const e = new Exception_1.OakRowInconsistencyException(errMsg);
-                            e.addData(entity2, rows2);
+                            e.addData(entity2, rows2, context.getSchema());
                             throw e;
                         }
                         else {
@@ -265,7 +265,7 @@ function createRemoveCheckers(schema) {
                             promises.push(result.then(([row]) => {
                                 if (row) {
                                     const err = new Exception_1.OakRowInconsistencyException(`您无法删除存在有效数据「${e}」关联的行`);
-                                    err.addData(e, [row]);
+                                    err.addData(e, [row], context.getSchema());
                                     throw err;
                                 }
                             }));
@@ -274,7 +274,7 @@ function createRemoveCheckers(schema) {
                             const [row] = result;
                             if (row) {
                                 const err = new Exception_1.OakRowInconsistencyException(`您无法删除存在有效数据「${e}」关联的行`);
-                                err.addData(e, [row]);
+                                err.addData(e, [row], context.getSchema());
                                 throw err;
                             }
                         }
@@ -300,7 +300,7 @@ function createRemoveCheckers(schema) {
                             promises.push(result.then(([row]) => {
                                 if (row) {
                                     const e = new Exception_1.OakRowInconsistencyException(`您无法删除存在有效数据「${otm}」关联的行`);
-                                    e.addData(otm, [row]);
+                                    e.addData(otm, [row], context.getSchema());
                                     throw e;
                                 }
                             }));
@@ -317,7 +317,7 @@ function createRemoveCheckers(schema) {
                                     }
                                 };
                                 const e = new Exception_1.OakRowInconsistencyException(`您无法删除存在有效数据「${otm}」关联的行`);
-                                e.addData(otm, [row]);
+                                e.addData(otm, [row], context.getSchema());
                                 throw e;
                             }
                         }

package/lib/store/filter.js

@@ -425,6 +425,7 @@ function unionFilterSegment(entity, schema, ...filters) {
                                 ['#sqp']: sqpOp1,
                             })
                         });
+                        return true;
                     }
                     else {
                         // not in情况子查询变成and
@@ -434,6 +435,7 @@ function unionFilterSegment(entity, schema, ...filters) {
                                 ['#sqp']: sqpOp1,
                             })
                         });
+                        return true;
                     }
                 }
             }

package/lib/types/Connector.d.ts

@@ -2,8 +2,9 @@
 import { IncomingHttpHeaders } from "http";
 import { SyncContext } from "../store/SyncRowStore";
 import { EntityDict, OpRecord } from "./Entity";
+import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { OakException } from "./Exception";
-export interface Connector<ED extends EntityDict, FrontCxt extends SyncContext<ED>> {
+export interface Connector<ED extends EntityDict & BaseEntityDict, FrontCxt extends SyncContext<ED>> {
     callAspect: (name: string, params: any, context?: FrontCxt) => Promise<{
         result: any;
         opRecords?: OpRecord<ED>[];

package/lib/types/Exception.d.ts

@@ -1,8 +1,10 @@
+import { StorageSchema } from ".";
 import { EntityDict, OpRecord } from "./Entity";
-export declare class OakException<ED extends EntityDict> extends Error {
+import { EntityDict as BaseEntityDict } from '../base-app-domain';
+export declare class OakException<ED extends EntityDict & BaseEntityDict> extends Error {
     opRecords: OpRecord<ED>[];
     constructor(message?: string);
-    addData<T extends keyof ED>(entity: T, rows: Partial<ED[T]['OpSchema']>[]): void;
+    addData<T extends keyof ED>(entity: T, rows: Partial<ED[T]['Schema']>[], schema: StorageSchema<ED>): void;
     setOpRecords(opRecords: OpRecord<ED>[]): void;
     getSerialData(): {
         name: string;
@@ -17,19 +19,19 @@ export declare class OakException<ED extends EntityDict> extends Error {
     tag2?: boolean;
     tag3?: any;
 }
-export declare class OakMakeSureByMySelfException<ED extends EntityDict> extends OakException<ED> {
+export declare class OakMakeSureByMySelfException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }
-export declare class OakDataException<ED extends EntityDict> extends OakException<ED> {
+export declare class OakDataException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }
-export declare class OakNoRelationDefException<ED extends EntityDict, T extends keyof ED> extends OakDataException<ED> {
+export declare class OakNoRelationDefException<ED extends EntityDict & BaseEntityDict, T extends keyof ED> extends OakDataException<ED> {
     entity: T;
     actions: ED[T]['Action'][];
     constructor(entity: T, actions: ED[T]['Action'][], msg?: string);
     toString(): string;
 }
-export declare class OakOperExistedException<ED extends EntityDict> extends OakDataException<ED> {
+export declare class OakOperExistedException<ED extends EntityDict & BaseEntityDict> extends OakDataException<ED> {
 }
-export declare class OakRowUnexistedException<ED extends EntityDict> extends OakDataException<ED> {
+export declare class OakRowUnexistedException<ED extends EntityDict & BaseEntityDict> extends OakDataException<ED> {
     private rows;
     constructor(rows: Array<{
         entity: any;
@@ -44,9 +46,9 @@ export declare class OakRowUnexistedException<ED extends EntityDict> extends Oak
 /**
  * 可接受的、由用户操作造成的异常
  */
-export declare class OakUserException<ED extends EntityDict> extends OakException<ED> {
+export declare class OakUserException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }
-export declare class OakUniqueViolationException<ED extends EntityDict> extends OakUserException<ED> {
+export declare class OakUniqueViolationException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
     rows: Array<{
         id?: string;
         attrs: string[];
@@ -56,7 +58,7 @@ export declare class OakUniqueViolationException<ED extends EntityDict> extends
         attrs: string[];
     }>, message?: string);
 }
-export declare class OakImportDataParseException<ED extends EntityDict> extends OakUserException<ED> {
+export declare class OakImportDataParseException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
     line: number;
     header?: string;
     constructor(message: string, line: number, header?: string);
@@ -64,21 +66,21 @@ export declare class OakImportDataParseException<ED extends EntityDict> extends
 /**
  * 网络中断异常
  */
-export declare class OakNetworkException<ED extends EntityDict> extends OakException<ED> {
+export declare class OakNetworkException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }
-export declare class OakServerProxyException<ED extends EntityDict> extends OakException<ED> {
+export declare class OakServerProxyException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }
 /**
  * 数据不一致异常，系统认为现有的数据不允许相应的动作时抛此异常
  *
  */
-export declare class OakRowInconsistencyException<ED extends EntityDict> extends OakUserException<ED> {
+export declare class OakRowInconsistencyException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
     toString(): string;
 }
 /**
  * 当输入的数据非法时抛此异常，attributes表示非法的属性
  */
-export declare class OakInputIllegalException<ED extends EntityDict> extends OakUserException<ED> {
+export declare class OakInputIllegalException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
     private attributes;
     private entity;
     constructor(entity: keyof ED, attributes: string[], message?: string);
@@ -90,19 +92,19 @@ export declare class OakInputIllegalException<ED extends EntityDict> extends Oak
 /**
  * 属性为空时抛的异常
  */
-export declare class OakAttrNotNullException<ED extends EntityDict> extends OakInputIllegalException<ED> {
+export declare class OakAttrNotNullException<ED extends EntityDict & BaseEntityDict> extends OakInputIllegalException<ED> {
     constructor(entity: keyof ED, attributes: string[], message?: string);
 }
 /**
  * 属性不允许更新抛的异常，前端可以用这个异常来处理update时对应属性的露出
  */
-export declare class OakAttrCantUpdateException<ED extends EntityDict> extends OakInputIllegalException<ED> {
+export declare class OakAttrCantUpdateException<ED extends EntityDict & BaseEntityDict> extends OakInputIllegalException<ED> {
     constructor(entity: keyof ED, attributes: string[], message?: string);
 }
 /**
  * 用户权限不够时抛的异常
  */
-export declare class OakUserUnpermittedException<ED extends EntityDict, T extends keyof ED> extends OakUserException<ED> {
+export declare class OakUserUnpermittedException<ED extends EntityDict & BaseEntityDict, T extends keyof ED> extends OakUserException<ED> {
     private entity;
     private operation;
     constructor(entity: T, operation: ED[T]['Selection'] | ED[T]['Operation'], message?: string);
@@ -111,7 +113,7 @@ export declare class OakUserUnpermittedException<ED extends EntityDict, T extend
 /**
  * 用户查询权限不够抛出异常
  */
-export declare class OakUserInvisibleException<ED extends EntityDict, T extends keyof ED> extends OakUserException<ED> {
+export declare class OakUserInvisibleException<ED extends EntityDict & BaseEntityDict, T extends keyof ED> extends OakUserException<ED> {
     private entity;
     private operation;
     constructor(entity: T, operation: ED[T]['Selection'] | ED[T]['Operation'], message?: string);
@@ -120,19 +122,19 @@ export declare class OakUserInvisibleException<ED extends EntityDict, T extends
 /**
  * 用户未登录抛的异常
  */
-export declare class OakUnloggedInException<ED extends EntityDict> extends OakUserException<ED> {
+export declare class OakUnloggedInException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
     constructor(message?: string);
 }
 /**
  * 用户未登录抛的异常
  */
-export declare class OakRowLockedException<ED extends EntityDict> extends OakUserException<ED> {
+export declare class OakRowLockedException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
     constructor(message?: string);
 }
 /**
  * 要插入行时，发现已经有相同的行数据
  */
-export declare class OakCongruentRowExists<ED extends EntityDict, T extends keyof ED> extends OakUserException<ED> {
+export declare class OakCongruentRowExists<ED extends EntityDict & BaseEntityDict, T extends keyof ED> extends OakUserException<ED> {
     private data;
     private entity;
     constructor(entity: T, data: ED[T]['OpSchema'], message?: string);
@@ -143,13 +145,13 @@ export declare class OakCongruentRowExists<ED extends EntityDict, T extends keyo
 /**
  * 死锁抛的异常
  */
-export declare class OakDeadlock<ED extends EntityDict> extends OakUserException<ED> {
+export declare class OakDeadlock<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
     constructor(message?: string | undefined);
 }
 /**
  * 前置条件不满足抛的异常
  */
-export declare class OakPreConditionUnsetException<ED extends EntityDict> extends OakUserException<ED> {
+export declare class OakPreConditionUnsetException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
     entity?: keyof ED;
     code?: string;
     constructor(message?: string | undefined, entity?: keyof ED | undefined, code?: string | undefined);
@@ -158,14 +160,14 @@ export declare class OakPreConditionUnsetException<ED extends EntityDict> extend
 /**
  * 调用外部接口抛出的异常
  */
-export declare class OakExternalException<ED extends EntityDict> extends OakUserException<ED> {
+export declare class OakExternalException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
     code?: string;
     source: string;
     data?: any;
     constructor(source: string, code?: string, message?: string, data?: any);
     toString(): string;
 }
-export declare function makeException<ED extends EntityDict>(data: {
+export declare function makeException<ED extends EntityDict & BaseEntityDict>(data: {
     name: string;
     message?: string;
     opRecords: OpRecord<ED>[];

package/lib/types/Exception.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakMakeSureByMySelfException = exports.OakException = void 0;
+const relation_1 = require("../store/relation");
+const lodash_1 = require("../utils/lodash");
 class OakException extends Error {
     opRecords;
     constructor(message) {
@@ -17,17 +19,54 @@ class OakException extends Error {
         }
         this.opRecords = [];
     }
-    addData(entity, rows) {
-        const record = {
-            a: 's',
-            d: {
-                [entity]: {},
+    addData(entity, rows, schema) {
+        const rowDict = {};
+        const addToRowDict = (entity, row) => {
+            if (!rowDict[entity]) {
+                rowDict[entity] = {
+                    [row.id]: row,
+                };
             }
+            else {
+                if (rowDict[entity][row.id]) {
+                    Object.assign(rowDict[entity][row.id], row);
+                }
+                else {
+                    rowDict[entity][row.id] = row;
+                }
+            }
+        };
+        const addInner = (entity, row) => {
+            const ownAttrs = [];
+            for (const attr in row) {
+                const rel = (0, relation_1.judgeRelation)(schema, entity, attr);
+                if (rel === 1) {
+                    ownAttrs.push(attr);
+                }
+                else if (rel === 2) {
+                    addInner(attr, row[attr]);
+                }
+                else if (typeof rel === 'string') {
+                    addInner(rel, row[attr]);
+                }
+                else if (rel instanceof Array) {
+                    (row[attr]).forEach((ele) => addInner(rel[0], ele));
+                }
+            }
+            addToRowDict(entity, (0, lodash_1.pick)(row, ownAttrs));
         };
         for (const row of rows) {
-            record.d[entity][row.id] = row;
+            addInner(entity, row);
+        }
+        for (const entity in rowDict) {
+            const record = {
+                a: 's',
+                d: {
+                    [entity]: rowDict[entity],
+                }
+            };
+            this.opRecords.push(record);
         }
-        this.opRecords.push(record);
     }
     setOpRecords(opRecords) {
         this.opRecords = opRecords;

package/lib/utils/SimpleConnector.d.ts

@@ -2,8 +2,9 @@
 import { IncomingHttpHeaders } from "http";
 import { SyncContext } from '../store/SyncRowStore';
 import { Connector, EntityDict, OakException, OpRecord } from "../types";
+import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { AccessConfiguration } from '../types/Configuration';
-export default class SimpleConnector<ED extends EntityDict, FrontCxt extends SyncContext<ED>> implements Connector<ED, FrontCxt> {
+export default class SimpleConnector<ED extends EntityDict & BaseEntityDict, FrontCxt extends SyncContext<ED>> implements Connector<ED, FrontCxt> {
     static ASPECT_ROUTER: string;
     static BRIDGE_ROUTER: string;
     static SUBSCRIBE_ROUTER: string;

package/lib/utils/assert.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * 防止assert打包体积过大，从这里引用
  */

package/lib/utils/relationPath.js

@@ -60,7 +60,7 @@ function destructRelationPath(schema, entity, path, relationFilter, recursive) {
                         },
                         filter: relationFilter,
                     } // as ED['userRelation']['Selection']
-                }, // as ED[keyof ED]['Selection']['data'],
+                },
                 getData: (d) => {
                     return d.userRelation$entity;
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.0.16",
+    "version": "5.0.17",
     "author": {
         "name": "XuChang"
     },

package/src/entities/ModiEntity.ts

@@ -1,26 +1,26 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { Schema as Modi } from './Modi';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    modi: Modi,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '更新对象连接',
-            attr: {
-                modi: '更新',
-                entity: '关联对象',
-                entityId: '关联对象id',
-            },
-        },
-    },
-    configuration: {
-        actionType: 'appendOnly',
-    }
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { Schema as Modi } from './Modi';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    modi: Modi,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '更新对象连接',
+            attr: {
+                modi: '更新',
+                entity: '关联对象',
+                entityId: '关联对象id',
+            },
+        },
+    },
+    configuration: {
+        actionType: 'appendOnly',
+    }
+};

package/src/entities/OperEntity.ts

@@ -1,27 +1,27 @@
-import { String } from '../types/DataType';
-import { EntityShape, Configuration } from '../types/Entity';
-import { LocaleDef } from '../types/Locale';
-import { Schema as Oper } from './Oper';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    oper: Oper,
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '操作对象连接',
-            attr: {
-                oper: '操作',
-                entity: '关联对象',
-                entityId: '关联对象id',
-            },
-        },
-    },
-    configuration: {
-        actionType: 'appendOnly',
-    }
-};
+import { String } from '../types/DataType';
+import { EntityShape, Configuration } from '../types/Entity';
+import { LocaleDef } from '../types/Locale';
+import { Schema as Oper } from './Oper';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    oper: Oper,
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '操作对象连接',
+            attr: {
+                oper: '操作',
+                entity: '关联对象',
+                entityId: '关联对象id',
+            },
+        },
+    },
+    configuration: {
+        actionType: 'appendOnly',
+    }
+};

package/src/entities/Relation.ts

@@ -1,43 +1,43 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    entity: String<32>;
-    entityId?: String<64>;        // 可以为空
-    name?: String<32>;
-    display?: String<32>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权',
-            attr: {
-                name: '关系',
-                entity: '目标对象',
-                entityId: '目标对象id',
-                display: '显示值',
-            },
-        },
-    },
-    indexes: [
-        {
-            name: 'index_targetEntity_entityId_name',
-            attributes: [
-                {
-                    name: 'entity',
-                },
-                {
-                    name: 'entityId',
-                },
-                {
-                    name: 'name',
-                }
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ]
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    entity: String<32>;
+    entityId?: String<64>;        // 可以为空
+    name?: String<32>;
+    display?: String<32>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                name: '关系',
+                entity: '目标对象',
+                entityId: '目标对象id',
+                display: '显示值',
+            },
+        },
+    },
+    indexes: [
+        {
+            name: 'index_targetEntity_entityId_name',
+            attributes: [
+                {
+                    name: 'entity',
+                },
+                {
+                    name: 'entityId',
+                },
+                {
+                    name: 'name',
+                }
+            ],
+            config: {
+                unique: true,
+            },
+        },
+    ]
+};

package/src/entities/UserEntityClaim.ts

@@ -1,30 +1,30 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-import { Schema as UserEntityGrant } from './UserEntityGrant';
-import { Schema as User } from './User';
-import { Schema as Relation } from './Relation';
-import { Schema as UserRelation } from './UserRelation';
-
-export interface Schema extends EntityShape {
-    ueg: UserEntityGrant;
-    user: User;
-    relation: Relation;
-    claimEntityId: String<64>;
-    userRelation: UserRelation;
-};
-
-const entityDesc: EntityDesc<Schema, ''> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权领取',
-            attr: {
-                ueg: '授权',
-                user: '用户',
-                relation: '关系',
-                claimEntityId: '对象Id',
-                userRelation: '用户关系',
-            },
-        },
-    },
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+import { Schema as UserEntityGrant } from './UserEntityGrant';
+import { Schema as User } from './User';
+import { Schema as Relation } from './Relation';
+import { Schema as UserRelation } from './UserRelation';
+
+export interface Schema extends EntityShape {
+    ueg: UserEntityGrant;
+    user: User;
+    relation: Relation;
+    claimEntityId: String<64>;
+    userRelation: UserRelation;
+};
+
+const entityDesc: EntityDesc<Schema, ''> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权领取',
+            attr: {
+                ueg: '授权',
+                user: '用户',
+                relation: '关系',
+                claimEntityId: '对象Id',
+                userRelation: '用户关系',
+            },
+        },
+    },
 };

package/src/entities/UserEntityGrant.ts

@@ -1,24 +1,24 @@
-import { String } from '../types/DataType';
-import { EntityShape } from '../types/Entity';
-import { EntityDesc } from '../types/EntityDesc';
-
-type RelationIds = string[];
-
-export interface Schema extends EntityShape {
-    relationEntity: String<32>;
-    relationEntityFilter: Object;
-    relationIds: RelationIds;
-};
-
-const entityDesc: EntityDesc<Schema, ''> = {
-    locales: {
-        zh_CN: {
-            name: '用户授权',
-            attr: {
-                relationIds: '关系',
-                relationEntity: '关联对象',
-                relationEntityFilter: '对象限定条件',
-            },
-        },
-    },
-};
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+import { EntityDesc } from '../types/EntityDesc';
+
+type RelationIds = string[];
+
+export interface Schema extends EntityShape {
+    relationEntity: String<32>;
+    relationEntityFilter: Object;
+    relationIds: RelationIds;
+};
+
+const entityDesc: EntityDesc<Schema, ''> = {
+    locales: {
+        zh_CN: {
+            name: '用户授权',
+            attr: {
+                relationIds: '关系',
+                relationEntity: '关联对象',
+                relationEntityFilter: '对象限定条件',
+            },
+        },
+    },
+};

package/src/entities/UserRelation.ts

@@ -1,50 +1,50 @@
-import { String } from '../types/DataType';
-import { LocaleDef } from '../types/Locale';
-import { EntityShape } from '../types/Entity';
-import { Index } from '../types/Storage';
-import { Schema as User } from './User';
-import { Schema as Relation } from './Relation';
-import { EntityDesc } from '../types/EntityDesc';
-
-export interface Schema extends EntityShape {
-    user: User;
-    relation: Relation;
-    entity: String<32>;
-    entityId: String<64>;
-};
-
-const entityDesc: EntityDesc<Schema> = {
-    locales: {
-        zh_CN: {
-            name: '用户对象关系',
-            attr: {
-                user: '关系',
-                relation: '目标关系',
-                entity: '目标对象',
-                entityId: '目标对象ID',
-            },
-        },
-    },
-    indexes: [
-        {
-            name: 'index_user_entity_entityId_relation',
-            attributes: [
-                {
-                    name: 'user',
-                },
-                {
-                    name: 'entity',
-                },
-                {
-                    name: 'entityId',
-                },
-                {
-                    name: 'relation',
-                },
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ]
-};
+import { String } from '../types/DataType';
+import { LocaleDef } from '../types/Locale';
+import { EntityShape } from '../types/Entity';
+import { Index } from '../types/Storage';
+import { Schema as User } from './User';
+import { Schema as Relation } from './Relation';
+import { EntityDesc } from '../types/EntityDesc';
+
+export interface Schema extends EntityShape {
+    user: User;
+    relation: Relation;
+    entity: String<32>;
+    entityId: String<64>;
+};
+
+const entityDesc: EntityDesc<Schema> = {
+    locales: {
+        zh_CN: {
+            name: '用户对象关系',
+            attr: {
+                user: '关系',
+                relation: '目标关系',
+                entity: '目标对象',
+                entityId: '目标对象ID',
+            },
+        },
+    },
+    indexes: [
+        {
+            name: 'index_user_entity_entityId_relation',
+            attributes: [
+                {
+                    name: 'user',
+                },
+                {
+                    name: 'entity',
+                },
+                {
+                    name: 'entityId',
+                },
+                {
+                    name: 'relation',
+                },
+            ],
+            config: {
+                unique: true,
+            },
+        },
+    ]
+};