oak-domain 5.0.11 → 5.0.13

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

@@ -12,6 +12,7 @@ export type OpSchema = EntityShape & {
     value: String<256>;
     recursive: Boolean;
     sourceEntity: String<32>;
+    desc?: String<256> | null;
 };
 export type OpAttr = keyof OpSchema;
 export type Schema = EntityShape & {
@@ -19,6 +20,7 @@ export type Schema = EntityShape & {
     value: String<256>;
     recursive: Boolean;
     sourceEntity: String<32>;
+    desc?: String<256> | null;
     actionAuth$path?: Array<ActionAuth.Schema>;
     actionAuth$path$$aggr?: AggregationResult<ActionAuth.Schema>;
     relationAuth$path?: Array<RelationAuth.Schema>;
@@ -39,6 +41,7 @@ type AttrFilter = {
     value: Q_StringValue;
     recursive: Q_BooleanValue;
     sourceEntity: Q_StringValue;
+    desc: Q_StringValue;
     actionAuth$path: ActionAuth.Filter & SubQueryPredicateMetadata;
     relationAuth$path: RelationAuth.Filter & SubQueryPredicateMetadata;
     modiEntity$entity: ModiEntity.Filter & SubQueryPredicateMetadata;
@@ -56,6 +59,7 @@ export type Projection = {
     value?: number;
     recursive?: number;
     sourceEntity?: number;
+    desc?: number;
     actionAuth$path?: ActionAuth.Selection & {
         $entity: "actionAuth";
     };
@@ -100,6 +104,8 @@ export type SortAttr = {
     recursive: number;
 } | {
     sourceEntity: number;
+} | {
+    desc: number;
 } | {
     [k: string]: any;
 } | OneOf<ExprOp<OpAttr | string>>;

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

@@ -28,6 +28,12 @@ exports.desc = {
             params: {
                 length: 32
             }
+        },
+        desc: {
+            type: "varchar",
+            params: {
+                length: 256
+            }
         }
     },
     static: true,

package/lib/compiler/dependencyBuilder.js

@@ -96,11 +96,13 @@ function destructVariableDeclaration(vd) {
     (0, assert_1.default)(ts.isIdentifier(vd.name));
     (0, assert_1.default)(vd.name.text.startsWith('total'));
     const on = (0, string_1.firstLetterLowerCase)(vd.name.text.slice(5));
-    const { initializer } = vd;
-    (0, assert_1.default)(ts.isCallExpression(initializer));
-    (0, assert_1.default)(ts.isIdentifier(initializer.expression) && initializer.expression.text === 'mergeConcatMany');
-    (0, assert_1.default)(initializer.arguments.length === 1);
-    const [arg] = initializer.arguments;
+    const { initializer: nonNullExpression } = vd;
+    (0, assert_1.default)(ts.isNonNullExpression(nonNullExpression));
+    const { expression: callExpression } = nonNullExpression;
+    (0, assert_1.default)(ts.isCallExpression(callExpression));
+    (0, assert_1.default)(ts.isIdentifier(callExpression.expression) && callExpression.expression.text === 'mergeConcatMany');
+    (0, assert_1.default)(callExpression.arguments.length === 1);
+    const [arg] = callExpression.arguments;
     (0, assert_1.default)(ts.isAsExpression(arg));
     const { expression } = arg;
     (0, assert_1.default)(ts.isArrayLiteralExpression(expression));
@@ -276,17 +278,17 @@ function outputRuntimeCxt(dependencies, briefNames, sourceFile, printer, filenam
     (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
     console.log(`构建${filename}文件成功`);
 }
-function outputDependentContext(depGraph, printer, filename) {
+function outputContext(depGraph, sourceFile, printer, filename) {
     // 目前只支持单向依赖，未来可以利用mixin来实现多类的继承
     // assert(depGraph.roots.length <= 1);
     let root = depGraph.ascOrder.length > 0 ? depGraph.ascOrder[depGraph.ascOrder.length - 1] : 'oak-frontend-base';
-    const statements = [
-        factory.createExportDeclaration(undefined, false, factory.createNamedExports([
-            factory.createExportSpecifier(false, undefined, factory.createIdentifier("BackendRuntimeContext")),
-            factory.createExportSpecifier(false, undefined, factory.createIdentifier("FrontendRuntimeContext"))
-        ]), factory.createStringLiteral(root), undefined)
+    const { statements } = sourceFile;
+    const isBackend = filename.includes('BackendRuntimeContext');
+    const statements2 = [
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, factory.createIdentifier(isBackend ? "BaseBackendRuntimeContext" : "BaseFrontendRuntimeContext"), undefined), factory.createStringLiteral(`${root}/es/context/${isBackend ? 'BackendRuntimeContext' : 'FrontendRuntimeContext'}`), undefined),
+        ...statements
     ];
-    const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, false, ts.ScriptKind.TS));
+    const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements2), sourceFile);
     (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
     console.log(`构建${filename}文件成功`);
 }
@@ -480,17 +482,6 @@ function outputIntializeDev(cwd, dependencies, briefNames, sourceFile, printer,
                 objectDict.common = [variableName];
             }
         }
-        // render
-        if ((0, fs_1.existsSync)(join(destDir, 'configuration', 'render.js'))) {
-            const variableName = `${briefNames[idx]}Render`;
-            importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, factory.createIdentifier(variableName), undefined), factory.createStringLiteral(join(dep, destDirName, 'configuration', 'render')), undefined));
-            if (objectDict.render) {
-                objectDict.render.push(variableName);
-            }
-            else {
-                objectDict.render = [variableName];
-            }
-        }
         // features
         if ((0, fs_1.existsSync)(join(destDir, 'features'))) {
             importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
@@ -689,20 +680,6 @@ function outputIntializeFeatures(cwd, dependencies, briefNames, sourceFile, prin
                 factory.createTypeReferenceNode('EntityDict')
             ])))
         });
-        Object.assign(funcStmt.body, {
-            statements: [
-                ...features.map((ele, idx) => {
-                    const args = [
-                        factory.createIdentifier("features"),
-                    ];
-                    if (dependencies[idx] === 'oak-general-business') {
-                        args.push(factory.createIdentifier("accessConfiguration"));
-                    }
-                    return factory.createExpressionStatement(factory.createAwaitExpression(factory.createCallExpression(factory.createIdentifier(`initialize${(0, string_1.firstLetterUpperCase)(ele)}Features`), undefined, args)));
-                }).flat(),
-                ...funcStmt.body.statements,
-            ]
-        });
     }
     const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements2), sourceFile);
     (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
@@ -778,18 +755,6 @@ function tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer) {
         const moduleDir = join(cwd, 'node_modules', dep);
         const moduleTemplateDir = join(moduleDir, 'template');
         if ((0, fs_1.existsSync)(moduleTemplateDir)) {
-            const entitiesDir = join(moduleTemplateDir, 'entities');
-            if ((0, fs_1.existsSync)(entitiesDir)) {
-                // entities目录下的定义直接拷贝过去（如果尚不存在的话）
-                const prjEntitiesDir = join(cwd, 'src', 'entities');
-                const result = (0, fs_1.readdirSync)(entitiesDir);
-                result.forEach((filename) => {
-                    if (!(0, fs_1.existsSync)(join(prjEntitiesDir, filename))) {
-                        console.log(`拷贝${join(entitiesDir, filename)}到${prjEntitiesDir}目录下`);
-                        (0, fs_extra_1.copySync)(join(entitiesDir, filename), join(prjEntitiesDir, filename));
-                    }
-                });
-            }
             // data.ts中规定的初始化数据，拷贝到data目录下，并注入到data/index.ts
             const dataFile = join(moduleTemplateDir, 'data', 'data.ts');
             if ((0, fs_1.existsSync)(dataFile)) {
@@ -868,7 +833,9 @@ function buildDependency(rebuild) {
         join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'RuntimeCxt.ts'),
         join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'DependentExceptions.ts'),
         join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'polyfill.d.ts'),
-        join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'features/index.ts')
+        join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'features/index.ts'),
+        join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'BackendRuntimeContext.ts'),
+        join(cwd, 'node_modules', env_1.OAK_CLI_MODULE_NAME, 'templateFiles', 'FrontendRuntimeContext.ts')
     ];
     const program = ts.createProgram(templateFileList, {});
     const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
@@ -895,13 +862,6 @@ function buildDependency(rebuild) {
             outputIntializeFeatures(cwd, dependencies, briefNames, program.getSourceFile(templateFileList[2]), printer, initFeaturesFile);
         }
     }
-    const dependentContextFile = join(cwd, 'src', 'context', 'DependentContext.ts');
-    if ((0, fs_1.existsSync)(dependentContextFile) && !rebuild) {
-        console.log(`[${dependentContextFile}]文件已经存在，无需构建启动文件`);
-    }
-    else {
-        outputDependentContext(depGraph, printer, dependentContextFile);
-    }
     const runtimeCxtFile = join(cwd, 'src', 'types', 'RuntimeCxt.ts');
     if ((0, fs_1.existsSync)(runtimeCxtFile) && !rebuild) {
         console.log(`[${runtimeCxtFile}]文件已经存在，无需构建启动文件`);
@@ -930,6 +890,20 @@ function buildDependency(rebuild) {
     else {
         outputFeatureIndex(dependencies, briefNames, program.getSourceFile(templateFileList[6]), printer, featureIndexFile, isModule);
     }
+    let contextFile = join(cwd, 'src', 'context', 'BackendRuntimeContext.ts');
+    if ((0, fs_1.existsSync)(contextFile) && !rebuild) {
+        console.log(`[${contextFile}]文件已经存在，无需构建启动文件`);
+    }
+    else {
+        outputContext(depGraph, program.getSourceFile(templateFileList[7]), printer, contextFile);
+    }
+    contextFile = join(cwd, 'src', 'context', 'FrontendRuntimeContext.ts');
+    if ((0, fs_1.existsSync)(contextFile) && !rebuild) {
+        console.log(`[${contextFile}]文件已经存在，无需构建启动文件`);
+    }
+    else {
+        outputContext(depGraph, program.getSourceFile(templateFileList[8]), printer, contextFile);
+    }
     // 把各个依赖项目的一些初始化的文件拷贝过去
     if (!isModule) {
         tryCopyModuleTemplateFiles(cwd, dependencies, briefNames, printer);

package/lib/compiler/routerBuilder.js

@@ -119,7 +119,7 @@ function makeWebAllRouters(namespaceDir, projectDir, routerFileDir) {
         const children = Object.values(pages).filter((ele) => ele.hasWeb).map(({ path, oakDisablePulldownRefresh }) => {
             const properties = [
                 factory.createPropertyAssignment('path', factory.createStringLiteral(path)),
-                factory.createPropertyAssignment('namespace', factory.createStringLiteral(path2)),
+                factory.createPropertyAssignment('namespace', factory.createStringLiteral(ns)),
                 factory.createPropertyAssignment('meta', factory.createObjectLiteralExpression([
                     factory.createPropertyAssignment('oakDisablePulldownRefresh', oakDisablePulldownRefresh ? factory.createTrue() : factory.createFalse())
                 ])),

package/lib/entities/Path.d.ts

@@ -5,4 +5,5 @@ export interface Schema extends EntityShape {
     value: String<256>;
     recursive: Boolean;
     sourceEntity: String<32>;
+    desc?: String<256>;
 }

package/lib/entities/Path.js

@@ -26,9 +26,10 @@ const entityDesc = {
             name: '关系路径',
             attr: {
                 sourceEntity: '源对象',
-                value: '路径（从dest到source）',
+                value: '路径',
                 destEntity: '目标对象',
-                recursive: '是否递归（目标对象）',
+                recursive: '是否递归',
+                desc: '描述',
             },
         },
     },

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

@@ -352,11 +352,11 @@ function checkAttributeLegal(schema, entity, data) {
                 case 'char':
                 case 'varchar': {
                     if (typeof data[attr] !== 'string') {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'not a string');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is not a string`);
                     }
                     const { length } = params;
                     if (length && data[attr].length > length) {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'too long');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is too long`);
                     }
                     break;
                 }
@@ -367,21 +367,21 @@ function checkAttributeLegal(schema, entity, data) {
                 case 'decimal':
                 case 'money': {
                     if (typeof data[attr] !== 'number') {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'not a number');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is not a number`);
                     }
                     const { min, max } = params || {};
                     if (typeof min === 'number' && data[attr] < min) {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'too small');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is too small`);
                     }
                     if (typeof max === 'number' && data[attr] > max) {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'too big');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is too big`);
                     }
                     break;
                 }
                 case 'enum': {
                     (0, assert_1.default)(enumeration);
                     if (!enumeration.includes(data[attr])) {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'not in enumeration');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], `${entity}: ${attr}'s value "${data[attr]}" is not in enumeration`);
                     }
                     break;
                 }

package/lib/store/filter.js

@@ -22,7 +22,14 @@ function translateCreateDataToFilter(schema, entity, data, allowUnrecoganized) {
                 'array',
                 'object'
             ].includes(schema[entity].attributes[attr]?.type)) {
-                data2[attr] = data[attr];
+                if (data[attr] === null) {
+                    data2[attr] = {
+                        $exists: false,
+                    };
+                }
+                else {
+                    data2[attr] = data[attr];
+                }
             }
         }
     }

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/lib/utils/row.d.ts

@@ -0,0 +1,12 @@
+import { EntityDict } from '../types/Entity';
+import { EntityDict as BaseEntityDict } from '../base-app-domain';
+import { StorageSchema } from '../types';
+export declare function compareRow<ED extends EntityDict & BaseEntityDict, T extends keyof ED>(schema: StorageSchema<ED>, entity: T, row1: Partial<ED[T]['Schema']>, row2: Partial<ED[T]['Schema']>): boolean;
+/**
+ * 比较两行数据是否完全相等
+ * @param entity
+ * @param schema
+ * @param row1
+ * @param row2
+ */
+export declare function compareRows<ED extends EntityDict & BaseEntityDict, T extends keyof ED>(schema: StorageSchema<ED>, entity: T, rows1: Partial<ED[T]['Schema']>[], rows2: Partial<ED[T]['Schema']>[]): boolean;

package/lib/utils/row.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compareRows = exports.compareRow = void 0;
+const tslib_1 = require("tslib");
+const lodash_1 = require("./lodash");
+const relation_1 = require("../store/relation");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+function compareRow(schema, entity, row1, row2) {
+    const attrs1 = Object.keys(row1).filter(ele => !ele.startsWith('$$'));
+    const attrs2 = Object.keys(row2).filter(ele => !ele.startsWith('$$'));
+    if ((0, lodash_1.difference)(attrs1, attrs2).length > 0) {
+        return false;
+    }
+    for (const attr of attrs1) {
+        const rel = (0, relation_1.judgeRelation)(schema, entity, attr);
+        if (rel === 0) {
+            continue;
+        }
+        else if (rel === 1) {
+            if (row1[attr] !== row2[attr]) {
+                return false;
+            }
+        }
+        else if (rel === 2) {
+            if (!compareRow(schema, attr, row1[attr], row2[attr])) {
+                return false;
+            }
+        }
+        else if (typeof rel === 'string') {
+            if (!compareRow(schema, rel, row1[attr], row2[attr])) {
+                return false;
+            }
+        }
+        else {
+            (0, assert_1.default)(rel instanceof Array);
+            // 如果两组对象一样但顺序不一样怎么办？暂时应该不用考虑这种情况，因为只有前台runningTree使用（by Xc)
+            if (!compareRows(schema, rel[0], row1[attr], row2[attr])) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+exports.compareRow = compareRow;
+/**
+ * 比较两行数据是否完全相等
+ * @param entity
+ * @param schema
+ * @param row1
+ * @param row2
+ */
+function compareRows(schema, entity, rows1, rows2) {
+    if (rows1.length !== rows2.length) {
+        return false;
+    }
+    let idx = 0;
+    while (idx < rows1.length) {
+        const row1 = rows1[idx];
+        const row2 = rows2[idx];
+        if (!compareRow(schema, entity, row1, row2)) {
+            return false;
+        }
+        idx++;
+    }
+    return true;
+}
+exports.compareRows = compareRows;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.0.11",
+    "version": "5.0.13",
     "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/Path.ts

@@ -7,6 +7,7 @@ export interface Schema extends EntityShape {
     value: String<256>;
     recursive: Boolean;
     sourceEntity: String<32>;
+    desc?: String<256>;
 };
 
 const entityDesc: EntityDesc<Schema> = {
@@ -34,9 +35,10 @@ const entityDesc: EntityDesc<Schema> = {
             name: '关系路径',
             attr: {
                 sourceEntity: '源对象',
-                value: '路径（从dest到source）',
+                value: '路径',
                 destEntity: '目标对象',
-                recursive: '是否递归（目标对象）',
+                recursive: '是否递归',
+                desc: '描述',
             },
         },
     },

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