oak-domain 5.1.0 → 5.1.1

package/lib/store/AsyncRowStore.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AsyncContext = void 0;
 const tslib_1 = require("tslib");
+const types_1 = require("../types");
 const action_1 = require("../actions/action");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const filter_1 = require("./filter");
@@ -81,9 +82,14 @@ class AsyncContext {
                 break;
             }
             case 'remove': {
+                const deleteAt = data[types_1.DeleteAtAttribute];
+                (0, assert_1.default)(deleteAt);
                 this.opRecords.push({
                     id,
                     a: 'r',
+                    d: {
+                        [types_1.DeleteAtAttribute]: deleteAt,
+                    },
                     e: entity,
                     f: filter,
                 });

package/lib/store/CascadeStore.d.ts

@@ -67,7 +67,7 @@ export declare abstract class CascadeStore<ED extends EntityDict & BaseEntityDic
         afterFns: (() => R)[];
     };
     protected preProcessDataCreated<T extends keyof ED>(entity: T, data: ED[T]['Create']['data']): void;
-    protected preProcessDataUpdated(data: Record<string, any>): void;
+    protected preProcessDataUpdated(action: string, data: Record<string, any>, async?: true): void;
     judgeRelation(entity: keyof ED, attr: string): string | 1 | 2 | string[] | 0 | -1;
     /**
      * 和具体的update过程无关的例程放在这里，包括对later动作的处理、对oper的记录以及对record的收集等

package/lib/store/CascadeStore.js

@@ -22,7 +22,7 @@ class CascadeStore extends RowStore_1.RowStore {
     selectionRewriters = [];
     operationRewriters = [];
     async reinforceSelectionAsync(entity, selection, context, option, isAggr) {
-        if (!isAggr && !selection.distinct) {
+        if (!isAggr && !selection.distinct && !option.dontCollect) {
             this.reinforceSelectionInner(entity, selection, context);
         }
         const rewriterPromises = this.selectionRewriters.map(ele => ele(this.getSchema(), entity, selection, context, option, isAggr));
@@ -289,7 +289,11 @@ class CascadeStore extends RowStore_1.RowStore {
                                         id: 1,
                                         name: 1,
                                         display: 1,
-                                    }
+                                        [Entity_1.CreateAtAttribute]: 1,
+                                        [Entity_1.UpdateAtAttribute]: 1,
+                                    },
+                                    [Entity_1.CreateAtAttribute]: 1,
+                                    [Entity_1.UpdateAtAttribute]: 1,
                                 },
                                 filter: {
                                     userId,
@@ -1012,8 +1016,8 @@ class CascadeStore extends RowStore_1.RowStore {
                 }
             }
             Object.assign(data2, {
-                [Entity_1.CreateAtAttribute]: now,
-                [Entity_1.UpdateAtAttribute]: now,
+                [Entity_1.CreateAtAttribute]: data2[Entity_1.CreateAtAttribute] || now,
+                [Entity_1.UpdateAtAttribute]: data2[Entity_1.UpdateAtAttribute] || now,
                 [Entity_1.DeleteAtAttribute]: null,
             });
         };
@@ -1025,9 +1029,18 @@ class CascadeStore extends RowStore_1.RowStore {
         }
     }
     // 对更新的数据，去掉所有的undefined属性
-    preProcessDataUpdated(data) {
+    preProcessDataUpdated(action, data, async) {
         const undefinedKeys = Object.keys(data).filter(ele => data[ele] === undefined);
         undefinedKeys.forEach(ele => (0, lodash_1.unset)(data, ele));
+        // 优化一下，如果不更新任何属性，则不实际执行
+        const now = Date.now();
+        // 后台应该还是以实际操作时间为准，前台以传入的updateAt来界定操作的产生“时间”，这里可用来避免同一次更新被算做多次
+        if ((Object.keys(data).length > 0 || action !== 'update') && (!data[Entity_1.UpdateAtAttribute] || async)) {
+            data[Entity_1.UpdateAtAttribute] = now;
+        }
+        if (action === 'remove' && (!data[Entity_1.DeleteAtAttribute] || async)) {
+            data[Entity_1.DeleteAtAttribute] = now;
+        }
     }
     judgeRelation(entity, attr) {
         return (0, relation_1.judgeRelation)(this.storageSchema, entity, attr);
@@ -1257,7 +1270,7 @@ class CascadeStore extends RowStore_1.RowStore {
                     });
                 }
                 if (data) {
-                    this.preProcessDataUpdated(data);
+                    this.preProcessDataUpdated(action, data, true);
                 }
                 if (option.modiParentEntity && !['modi', 'modiEntity'].includes(entity)) {
                     // 延时更新，变成对modi的插入
@@ -1270,16 +1283,15 @@ class CascadeStore extends RowStore_1.RowStore {
                         if (updateAttrCount === 0) {
                             return {};
                         }
+                        // 尝试和当前targetEntity的最后一条create/update进行合并，优化modi的条数
                         const upsertModis = await this.selectAbjointRowAsync('modi', {
                             data: {
                                 id: 1,
                                 data: 1,
+                                action: 1,
                             },
                             filter: {
                                 targetEntity: entity,
-                                action: {
-                                    $in: ['create', 'update'],
-                                },
                                 entity: option.modiParentEntity,
                                 entityId: option.modiParentId,
                                 iState: 'active',
@@ -1301,17 +1313,19 @@ class CascadeStore extends RowStore_1.RowStore {
                             count: 1,
                         }, context, option);
                         if (upsertModis.length > 0) {
-                            const { data: originData, id: originId } = upsertModis[0];
-                            modiUpsert = {
-                                id: 'dummy',
-                                action: 'update',
-                                data: {
-                                    data: Object.assign({}, originData, data),
-                                },
-                                filter: {
-                                    id: originId,
-                                }
-                            };
+                            const { data: originData, id: originId, action } = upsertModis[0];
+                            if (['create', 'update'].includes(action)) {
+                                modiUpsert = {
+                                    id: 'dummy',
+                                    action: 'update',
+                                    data: {
+                                        data: Object.assign({}, originData, data),
+                                    },
+                                    filter: {
+                                        id: originId,
+                                    }
+                                };
+                            }
                         }
                     }
                     if (!modiUpsert) {
@@ -1394,22 +1408,18 @@ class CascadeStore extends RowStore_1.RowStore {
                             context.saveOpRecord(entity, {
                                 id: operId,
                                 action,
-                                data: {},
+                                data: data,
                                 filter: {
                                     id: {
                                         $in: ids,
                                     }
-                                }
+                                },
                             });
                         }
                     }
                     else {
                         const updateAttrCount = Object.keys(data).length;
                         if (updateAttrCount > 0) {
-                            // 优化一下，如果不更新任何属性，则不实际执行
-                            Object.assign(data, {
-                                [Entity_1.UpdateAtAttribute]: now,
-                            });
                             if (!option.dontCollect) {
                                 context.saveOpRecord(entity, {
                                     id: operId,
@@ -1423,11 +1433,6 @@ class CascadeStore extends RowStore_1.RowStore {
                                 });
                             }
                         }
-                        else if (action !== 'update') {
-                            // 如果不是update动作而是用户自定义的动作，这里还是要记录oper
-                            await createOper();
-                            return {};
-                        }
                         else {
                             return {};
                         }
@@ -1483,15 +1488,10 @@ class CascadeStore extends RowStore_1.RowStore {
                 if (action === 'remove') {
                 }
                 else {
+                    this.preProcessDataUpdated(action, data);
                     const updateAttrCount = Object.keys(data).length;
-                    if (updateAttrCount > 0) {
+                    if (updateAttrCount == 0) {
                         // 优化一下，如果不更新任何属性，则不实际执行
-                        Object.assign(data, {
-                            $$updateAt$$: now,
-                        });
-                        this.preProcessDataUpdated(data);
-                    }
-                    else {
                         return 0;
                     }
                 }

package/lib/store/IntrinsicCheckers.js

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

package/lib/store/RelationAuth.js

@@ -60,6 +60,7 @@ class RelationAuth {
             const relationAuths = context.select('relationAuth', {
                 data: {
                     id: 1,
+                    pathId: 1,
                     path: {
                         id: 1,
                         sourceEntity: 1,
@@ -732,6 +733,7 @@ class RelationAuth {
             const actionAuths = context.select('actionAuth', {
                 data: {
                     id: 1,
+                    pathId: 1,
                     path: {
                         id: 1,
                         value: 1,
@@ -830,15 +832,21 @@ class RelationAuth {
                             value: 1,
                             recursive: 1,
                         },
+                        pathId: 1,
                         deActions: 1,
+                        relationId: 1,
                         relation: {
                             id: 1,
+                            entity: 1,
+                            entityId: 1,
                             userRelation$relation: {
                                 $entity: 'userRelation',
                                 data: {
                                     id: 1,
                                     entity: 1,
                                     entityId: 1,
+                                    userId: 1,
+                                    relationId: 1,
                                 },
                                 filter: {
                                     userId: context.getCurrentUserId(),
@@ -1123,6 +1131,7 @@ async function getUserRelationsByActions(params, context) {
     const actionAuths = await context.select('actionAuth', {
         data: {
             id: 1,
+            pathId: 1,
             path: {
                 id: 1,
                 value: 1,

package/lib/store/relation.d.ts

@@ -9,4 +9,4 @@ import { StorageSchema } from "../types/Storage";
  * @param row
  * @returns
  */
-export declare function judgeRelation<ED extends EntityDict & BaseEntityDict>(schema: StorageSchema<ED>, entity: keyof ED, attr: string, allowUnrecoganized?: boolean): string | 1 | 2 | string[] | 0 | -1;
+export declare function judgeRelation<ED extends EntityDict & BaseEntityDict>(schema: StorageSchema<ED>, entity: keyof ED, attr: string, allowUnrecognized?: boolean): string | 1 | 2 | string[] | 0 | -1;

package/lib/store/relation.js

@@ -13,7 +13,7 @@ const Entity_1 = require("../types/Entity");
  * @param row
  * @returns
  */
-function judgeRelation(schema, entity, attr, allowUnrecoganized) {
+function judgeRelation(schema, entity, attr, allowUnrecognized) {
     const { [entity]: { attributes } } = schema;
     if (attr.startsWith(Demand_1.EXPRESSION_PREFIX) || attr.startsWith('#')) {
         // 表达式属性或者metadata
@@ -27,8 +27,8 @@ function judgeRelation(schema, entity, attr, allowUnrecoganized) {
         const firstDelimiter = attr.indexOf('$');
         const entity2 = attr.slice(0, firstDelimiter);
         (0, assert_1.default)(schema.hasOwnProperty(entity2));
-        const secondDelemiter = attr.indexOf('$', firstDelimiter + 1);
-        const foreignKey = attr.slice(firstDelimiter + 1, secondDelemiter > 0 ? secondDelemiter : attr.length);
+        const secondDelimiter = attr.indexOf('$', firstDelimiter + 1);
+        const foreignKey = attr.slice(firstDelimiter + 1, secondDelimiter > 0 ? secondDelimiter : attr.length);
         const { [entity2]: { attributes: attributes2 } } = schema;
         if (foreignKey === 'entity') {
             // 基于反指对象的反向关联
@@ -63,7 +63,7 @@ function judgeRelation(schema, entity, attr, allowUnrecoganized) {
         if (Entity_1.initinctiveAttributes.includes(attr)) {
             return 1;
         }
-        else if (allowUnrecoganized) {
+        else if (allowUnrecognized) {
             return -1;
         }
         else {

package/lib/types/Auth.d.ts

@@ -4,7 +4,7 @@ import { SyncContext } from "../store/SyncRowStore";
 import { EntityDict, OperateOption, SelectOption } from "../types/Entity";
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { ModiTurn } from './Trigger';
-export type CheckerType = 'row' | 'data' | 'logical' | 'logicalData';
+export type CheckerType = 'row' | 'data' | 'logical' | 'logicalData' | 'relation';
 /**
  * conditionalFilter是指该action发生时，operation所操作的行中有满足conditionalFilter的行
  * 被转化成trigger的filter条件，详细可看trigger中的说明

package/lib/types/Entity.d.ts

@@ -162,6 +162,9 @@ export type UpdateOpResult<ED extends EntityDict, T extends keyof ED> = {
 export type RemoveOpResult<ED extends EntityDict, T extends keyof ED> = {
     id: string;
     a: 'r';
+    d: {
+        [DeleteAtAttribute]: number;
+    };
     e: T;
     f?: Filter;
 };

package/lib/types/Exception.d.ts

@@ -169,6 +169,12 @@ export declare class OakExternalException<ED extends EntityDict & BaseEntityDict
     constructor(source: string, code?: string, message?: string, data?: any);
     toString(): string;
 }
+/**
+ * socket连接异常
+ */
+export declare class OakSocketConnectException<ED extends EntityDict & BaseEntityDict> extends OakUserException<ED> {
+    constructor(message?: string);
+}
 export declare function makeException<ED extends EntityDict & BaseEntityDict>(data: {
     name: string;
     message?: string;

package/lib/types/Exception.js

@@ -1,6 +1,6 @@
 "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.OakPartialSuccess = exports.OakMakeSureByMySelfException = exports.OakException = void 0;
+exports.makeException = exports.OakSocketConnectException = 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.OakPartialSuccess = exports.OakMakeSureByMySelfException = exports.OakException = void 0;
 const relation_1 = require("../store/relation");
 const lodash_1 = require("../utils/lodash");
 class OakException extends Error {
@@ -385,6 +385,16 @@ class OakExternalException extends OakUserException {
     }
 }
 exports.OakExternalException = OakExternalException;
+/**
+ * socket连接异常
+ */
+class OakSocketConnectException extends OakUserException {
+    constructor(message) {
+        super(message || '连接出现问题，请尝试刷新页面');
+    }
+}
+exports.OakSocketConnectException = OakSocketConnectException;
+;
 function makeException(data) {
     const { name } = data;
     let e = undefined;
@@ -473,6 +483,10 @@ function makeException(data) {
             e = new OakServerProxyException(data.message);
             break;
         }
+        case 'OakSocketConnectException': {
+            e = new OakSocketConnectException(data.message);
+            break;
+        }
         default:
             return;
     }

package/lib/types/Trigger.js

@@ -17,6 +17,7 @@ exports.CHECKER_PRIORITY_MAP = {
     logical: 33,
     row: 51,
     data: 61,
+    relation: 56
 };
 ;
 ;

package/lib/utils/assert.d.ts

@@ -1,3 +1,4 @@
+/// <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.1.0",
+    "version": "5.1.1",
     "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,
+            },
+        },
+    ]
+};