oak-domain 5.1.1 → 5.1.3

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

@@ -1,7 +1,5 @@
 export declare const actionDefDict: {
-    log: {
-        iState: import("../types").ActionDef<string, string>;
-    };
+    log: {};
     modi: {
         iState: import("../types").ActionDef<string, string>;
     };

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

@@ -1,12 +1,6 @@
-import { ActionDef } from "../../types/Action";
 import { GenericAction } from "../../actions/action";
-export type IState = 'normal' | 'rollbacked' | string;
-export type State = IState | string;
 export type IAction = 'undo' | 'redo' | string;
 export type ParticularAction = IAction;
 export declare const actions: string[];
-export declare const IActionDef: ActionDef<IAction, IState>;
 export type Action = GenericAction | ParticularAction | string;
-export declare const actionDefDict: {
-    iState: ActionDef<string, string>;
-};
+export declare const actionDefDict: {};

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

@@ -1,14 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.actionDefDict = exports.IActionDef = exports.actions = void 0;
+exports.actionDefDict = exports.actions = void 0;
 exports.actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "undo", "redo"];
-exports.IActionDef = {
-    stm: {
-        undo: ['normal', 'rollbacked'],
-        redo: ['rollbacked', 'normal'],
-    },
-    is: 'normal',
-};
-exports.actionDefDict = {
-    iState: exports.IActionDef
-};
+exports.actionDefDict = {};

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

@@ -1,7 +1,7 @@
 import { Q_DateValue, Q_NumberValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey, SubQueryPredicateMetadata } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, AggregationResult, EntityShape } from "../../types/Entity";
-import { Action, ParticularAction, IState } from "./Action";
+import { Action, ParticularAction } from "./Action";
 import { String } from "../../types/DataType";
 import * as Oper from "../Oper/Schema";
 import * as ModiEntity from "../ModiEntity/Schema";
@@ -9,13 +9,13 @@ import * as OperEntity from "../OperEntity/Schema";
 export type OpSchema = EntityShape & {
     entity: String<32>;
     entityId: String<64>;
-    iState?: IState | null;
+    iState: "normal" | "rollbacked";
 };
 export type OpAttr = keyof OpSchema;
 export type Schema = EntityShape & {
     entity: String<32>;
     entityId: String<64>;
-    iState?: IState | null;
+    iState: "normal" | "rollbacked";
     oper$log?: Array<Oper.Schema>;
     oper$log$$aggr?: AggregationResult<Oper.Schema>;
     modiEntity$entity?: Array<ModiEntity.Schema>;
@@ -32,7 +32,7 @@ type AttrFilter = {
     $$updateAt$$: Q_DateValue;
     entity: Q_StringValue;
     entityId: Q_StringValue;
-    iState: Q_EnumValue<IState>;
+    iState: Q_EnumValue<"normal" | "rollbacked">;
     oper$log: Oper.Filter & SubQueryPredicateMetadata;
     modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata;
     operEntity$entity: OperEntity.Filter & SubQueryPredicateMetadata;

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

@@ -19,6 +19,7 @@ exports.desc = {
             }
         },
         iState: {
+            notNull: true,
             type: "enum",
             enumeration: ["normal", "rollbacked"]
         }

package/lib/base-app-domain/Log/Style.js

@@ -6,10 +6,4 @@ exports.style = {
         undo: '',
         redo: '',
     },
-    color: {
-        iState: {
-            normal: '#229954',
-            rollbacked: '#2C3E50',
-        },
-    },
 };

package/lib/entities/Log.d.ts

@@ -1,16 +1,11 @@
-import { ActionDef } from '../types/Action';
 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>;
+    iState: 'normal' | 'rollbacked';
 }
-export type IState = 'normal' | 'rollbacked';
-export type State = IState;
 export type IAction = 'undo' | 'redo';
 export type Action = IAction;
-export declare const IActionDef: ActionDef<IAction, IState>;
-export declare const entityDesc: EntityDesc<Schema, Action, '', {
-    iState: IState;
-}>;
+export declare const entityDesc: EntityDesc<Schema, Action>;

package/lib/entities/Log.js

@@ -1,14 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.entityDesc = exports.IActionDef = void 0;
+exports.entityDesc = void 0;
 ;
-exports.IActionDef = {
-    stm: {
-        undo: ['normal', 'rollbacked'],
-        redo: ['rollbacked', 'normal'],
-    },
-    is: 'normal',
-};
 exports.entityDesc = {
     locales: {
         zh_CN: {
@@ -35,11 +28,5 @@ exports.entityDesc = {
             undo: '',
             redo: '',
         },
-        color: {
-            iState: {
-                normal: '#229954',
-                rollbacked: '#2C3E50',
-            },
-        },
     },
 };

package/lib/store/CascadeStore.js

@@ -22,8 +22,8 @@ class CascadeStore extends RowStore_1.RowStore {
     selectionRewriters = [];
     operationRewriters = [];
     async reinforceSelectionAsync(entity, selection, context, option, isAggr) {
-        if (!isAggr && !selection.distinct && !option.dontCollect) {
-            this.reinforceSelectionInner(entity, selection, context);
+        if (!isAggr && !selection.distinct) {
+            this.reinforceSelectionInner(entity, selection, context, option);
         }
         const rewriterPromises = this.selectionRewriters.map(ele => ele(this.getSchema(), entity, selection, context, option, isAggr));
         if (rewriterPromises.length > 0) {
@@ -32,14 +32,14 @@ class CascadeStore extends RowStore_1.RowStore {
     }
     reinforceSelectionSync(entity, selection, context, option, isAggr) {
         if (!isAggr && !selection.distinct) {
-            this.reinforceSelectionInner(entity, selection, context);
+            this.reinforceSelectionInner(entity, selection, context, option);
         }
         this.selectionRewriters.forEach(ele => {
             const result = ele(this.getSchema(), entity, selection, context, option, isAggr);
             (0, assert_1.default)(!(result instanceof Promise));
         });
     }
-    reinforceSelectionInner(entity, selection, context) {
+    reinforceSelectionInner(entity, selection, context, option) {
         const { filter, data, sorter } = selection;
         const assignNecessaryProjectionAttrs = (projectionNode, attrs) => {
             attrs.forEach((attr) => {
@@ -240,7 +240,7 @@ class CascadeStore extends RowStore_1.RowStore {
                             else {
                                 assignNecessaryProjectionAttrs(data, ['entity', 'entityId']);
                             }
-                            this.reinforceSelectionInner(rel[0], projectionNode[attr], context);
+                            this.reinforceSelectionInner(rel[0], projectionNode[attr], context, option);
                         }
                     }
                 }
@@ -272,7 +272,7 @@ class CascadeStore extends RowStore_1.RowStore {
             // 如果对象上有relation关系，在此将本用户相关的relation和actionAuth全部取出
             // 还要将actionAuth上没有relation关系但destEntity为本对象的行也全部取出，这些是指向userId的可能路径
             // 放在这里有点怪异，暂先这样
-            if (context instanceof AsyncRowStore_1.AsyncContext) {
+            if (context instanceof AsyncRowStore_1.AsyncContext && !option.dontCollect) {
                 const userId = context.getCurrentUserId(true);
                 if (userId && !entities_1.SYSTEM_RESERVE_ENTITIES.includes(entity2)) {
                     if (this.getSchema()[entity2].relation && !projectionNode.userRelation$entity) {
@@ -335,10 +335,12 @@ class CascadeStore extends RowStore_1.RowStore {
         const cascadeSelectionFns = [];
         const supportMtoJoin = this.supportManyToOneJoin();
         const { toModi } = this.getSchema()[entity];
+        const projection = {};
         (0, assert_1.default)(typeof projection2 === 'object');
         for (const attr in projection2) {
             const relation = (0, relation_1.judgeRelation)(this.storageSchema, entity, attr);
             if (relation === 1 || relation == 0) {
+                projection[attr] = projection2[attr];
             }
             else if (relation === 2) {
                 // 基于entity/entityId的多对一
@@ -368,6 +370,7 @@ class CascadeStore extends RowStore_1.RowStore {
                     subCascadeSelectionFns.forEach(ele => cascadeSelectionFns.push((result) => {
                         return ele(result.map(ele2 => ele2[attr]).filter(ele2 => !!ele2));
                     }));
+                    projection[attr] = subProjection;
                 }
                 else {
                     cascadeSelectionFns.push((result) => {
@@ -455,6 +458,7 @@ class CascadeStore extends RowStore_1.RowStore {
                     subCascadeSelectionFns.forEach(ele => cascadeSelectionFns.push((result) => {
                         return ele(result.map(ele2 => ele2[attr]).filter(ele2 => !!ele2));
                     }));
+                    projection[attr] = subProjection;
                 }
                 else {
                     cascadeSelectionFns.push((result) => {
@@ -644,7 +648,7 @@ class CascadeStore extends RowStore_1.RowStore {
             }
         }
         return {
-            projection: projection2,
+            projection,
             cascadeSelectionFns,
         };
     }
@@ -702,7 +706,7 @@ class CascadeStore extends RowStore_1.RowStore {
                 option2.modiParentEntity = entity;
             }
         }
-        if (toLog && action !== 'create') {
+        if (toLog && action !== 'create' && !option.dontCreateOper) {
             // 此对象（及其下辖的cascade更新都需要记录log)            
             (0, assert_1.default)(typeof filter.id === 'string');
             (0, assert_1.default)(!option2.logId, 'undo无法支持嵌套');
@@ -714,6 +718,7 @@ class CascadeStore extends RowStore_1.RowStore {
                         id: (0, uuid_1.generateNewId)(),
                         data: {
                             id: logId,
+                            iState: 'normal',
                         },
                         action: 'create',
                     }
@@ -1225,7 +1230,7 @@ class CascadeStore extends RowStore_1.RowStore {
                             };
                             const closeRootMode = context.openRootMode();
                             await this.cascadeUpdateAsync('oper', createOper, context, {
-                                dontCollect: true,
+                                dontCollect: !option.logId, // 如果是在创建log，则把oper收集回去
                             });
                             closeRootMode();
                         }
@@ -1269,6 +1274,10 @@ class CascadeStore extends RowStore_1.RowStore {
                         });
                     });
                 }
+                if (ids.length === 0) {
+                    // 如果没有行需要更新/删除，直接返回
+                    return {};
+                }
                 if (data) {
                     this.preProcessDataUpdated(action, data, true);
                 }
@@ -1398,7 +1407,7 @@ class CascadeStore extends RowStore_1.RowStore {
                             };
                             const closeRootMode = context.openRootMode();
                             await this.cascadeUpdateAsync('oper', createOper, context, {
-                                dontCollect: true,
+                                dontCollect: !option.logId, // 如果是在创建log，则把oper收集回去
                             });
                             closeRootMode();
                         }

package/lib/store/triggers.js

@@ -46,7 +46,6 @@ async function undoLog(log, context) {
                     filter: filter,
                 }, {
                     blockTrigger: true,
-                    dontCollect: true,
                     dontCreateOper: true,
                 });
                 break;
@@ -61,7 +60,6 @@ async function undoLog(log, context) {
                         data: undoData[id],
                     }, {
                         blockTrigger: true,
-                        dontCollect: true,
                         dontCreateOper: true,
                     });
                 }
@@ -81,7 +79,6 @@ async function undoLog(log, context) {
                         }
                     }, {
                         blockTrigger: true,
-                        dontCollect: true,
                         dontCreateOper: true,
                     });
                 }
@@ -89,20 +86,24 @@ async function undoLog(log, context) {
             }
         }
     }
-    await context.operate('oper', {
+    await context.operate('log', {
         id: 'dummy',
         action: 'undo',
         data: {
             iState: 'rollbacked',
+            oper$log: {
+                id: 'dummy',
+                action: 'undo',
+                data: {
+                    iState: 'rollbacked',
+                },
+            },
         },
         filter: {
-            id: {
-                $in: oper$log.map(ele => ele.id)
-            }
-        }
+            id: log.id,
+        },
     }, {
         blockTrigger: true,
-        dontCollect: true,
         dontCreateOper: true,
     });
 }
@@ -124,7 +125,6 @@ async function redoLog(log, context) {
                     data: data,
                 }, {
                     blockTrigger: true,
-                    dontCollect: true,
                     dontCreateOper: true,
                 });
                 break;
@@ -137,7 +137,6 @@ async function redoLog(log, context) {
                     filter: filter,
                 }, {
                     blockTrigger: true,
-                    dontCollect: true,
                     dontCreateOper: true,
                 });
                 break;
@@ -150,27 +149,30 @@ async function redoLog(log, context) {
                     filter: filter,
                 }, {
                     blockTrigger: true,
-                    dontCollect: true,
                     dontCreateOper: true,
                 });
                 break;
             }
         }
     }
-    await context.operate('oper', {
+    await context.operate('log', {
         id: 'dummy',
         action: 'redo',
         data: {
             iState: 'normal',
+            oper$log: {
+                id: 'dummy',
+                action: 'redo',
+                data: {
+                    iState: 'normal',
+                },
+            },
         },
         filter: {
-            id: {
-                $in: oper$log.map(ele => ele.id)
-            }
-        }
+            id: log.id,
+        },
     }, {
         blockTrigger: true,
-        dontCollect: true,
         dontCreateOper: true,
     });
 }
@@ -201,11 +203,12 @@ exports.logTriggers = [
                     },
                     entity: 1,
                     entityId: 1,
+                    [types_1.SeqAttribute]: 1,
                 },
                 filter: {
                     id: ids[0],
                 },
-            }, {});
+            }, { dontCollect: true });
             const logs = await context.select('log', {
                 data: {
                     id: 1,
@@ -217,8 +220,13 @@ exports.logTriggers = [
                             action: 1,
                             targetEntity: 1,
                             filter: 1,
+                            iState: 1,
                         },
                     },
+                    iState: 1,
+                    entity: 1,
+                    entityId: 1,
+                    [types_1.SeqAttribute]: 1,
                 },
                 filter: {
                     iState: 'normal',
@@ -271,11 +279,12 @@ exports.logTriggers = [
                     iState: 1,
                     entity: 1,
                     entityId: 1,
+                    [types_1.SeqAttribute]: 1,
                 },
                 filter: {
                     id: ids[0],
                 },
-            }, {});
+            }, { dontCollect: true });
             const logs = await context.select('log', {
                 data: {
                     id: 1,
@@ -287,8 +296,13 @@ exports.logTriggers = [
                             action: 1,
                             targetEntity: 1,
                             filter: 1,
+                            iState: 1,
                         },
                     },
+                    iState: 1,
+                    entity: 1,
+                    entityId: 1,
+                    [types_1.SeqAttribute]: 1,
                 },
                 filter: {
                     iState: 'rollbacked',
@@ -345,7 +359,7 @@ exports.logTriggers = [
                     iState: 'rollbacked',
                 },
             }, {});
-            return (result.oper.remove || 0) + (result2.log.remove || 0);
+            return (result.oper?.remove || 0) + (result2.log?.remove || 0);
         }
     }
 ];

package/lib/types/Connector.d.ts

@@ -21,7 +21,9 @@ export interface Connector<ED extends EntityDict & BaseEntityDict, FrontCxt exte
         headers?: Record<string, any>;
     }>;
     serializeException: (exception: OakException<ED>, headers: IncomingHttpHeaders, body: any) => {
-        body: any;
+        body: {
+            exception: string;
+        };
         headers?: Record<string, any>;
     };
     getSubscribeRouter: () => string;

package/lib/types/Sync.d.ts

@@ -51,7 +51,7 @@ export interface SyncRemoteConfigBase<ED extends EntityDict & BaseEntityDict, Cx
     pushEntities?: Array<PushEntityDef<ED, keyof ED, Cxt>>;
     pullEntities?: Array<PullEntityDef<ED, keyof ED, Cxt>>;
 }
-interface SyncRemoteConfig<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> extends SyncRemoteConfigBase<ED, Cxt> {
+export interface SyncRemoteConfig<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> extends SyncRemoteConfigBase<ED, Cxt> {
     getPushInfo: (context: Cxt, option: {
         remoteEntityId: string;
         userId: string;
@@ -60,6 +60,20 @@ interface SyncRemoteConfig<ED extends EntityDict & BaseEntityDict, Cxt extends A
         selfId: string;
         remoteEntityId: string;
     }) => Promise<RemotePullInfo>;
+    /**
+     * 同步失败回调
+     */
+    onFailed?: (result: {
+        remoteEntity: keyof ED;
+        remoteEntityId: string;
+        data: {
+            entity: keyof ED;
+            action: ED[keyof ED]['Action'];
+            data: ED[keyof ED]['Operation']['data'];
+            rowIds: string[];
+        }[];
+        reason: Error;
+    }, context: Cxt) => Promise<void>;
 }
 export interface SyncSelfConfigBase<ED extends EntityDict & BaseEntityDict> {
     endpoint?: string;

package/lib/utils/SimpleConnector.d.ts

@@ -60,8 +60,9 @@ export default class SimpleConnector<ED extends EntityDict & BaseEntityDict, Fro
         headers?: Record<string, any> | undefined;
     }>;
     serializeException(exception: OakException<ED>, headers: IncomingHttpHeaders, body: any): {
-        body: any;
-        headers?: Record<string, any> | undefined;
+        body: {
+            exception: string;
+        };
     };
     getBridgeRouter(): string;
     /**

package/package.json

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

package/src/entities/Log.ts

@@ -6,24 +6,14 @@ import { EntityDesc } from '../types/EntityDesc';
 export interface Schema extends EntityShape {
     entity: String<32>;             // 关联的目标对象
     entityId: String<64>;           // 关联的目标对象id
+    iState: 'normal' | 'rollbacked';
 };
 
-export type IState = 'normal' | 'rollbacked';
-export type State = IState;
 export type IAction = 'undo' | 'redo';
 export type Action = IAction;
-export const IActionDef: ActionDef<IAction, IState> = {
-    stm: {
-        undo: ['normal', 'rollbacked'],
-        redo: ['rollbacked', 'normal'],
-    },
-    is: 'normal',
-};
 
 
-export const entityDesc: EntityDesc<Schema, Action, '', {
-    iState: IState,
-}> = {
+export const entityDesc: EntityDesc<Schema, Action> = {
     locales: {
         zh_CN: {
             name: '日志',
@@ -49,11 +39,5 @@ export const entityDesc: EntityDesc<Schema, Action, '', {
             undo: '',
             redo: '',
         },
-        color: {
-            iState: {
-                normal: '#229954',
-                rollbacked: '#2C3E50',
-            },
-        },
     },
 };

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,
+            },
+        },
+    ]
+};