oak-domain 3.0.2 → 3.0.4

package/lib/compiler/schemalBuilder.js

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSchema = exports.analyzeEntities = exports.registerDeducedRelationMap = exports.registerFixedDestinationPathMap = exports.registerIgnoredRelationPathMap = exports.registerFreeEntities = exports.registerIgnoredForeignKeyMap = void 0;
-var tslib_1 = require("tslib");
-var path_1 = tslib_1.__importDefault(require("path"));
-var assert_1 = tslib_1.__importDefault(require("assert"));
-var fs_1 = require("fs");
-var fs_extra_1 = require("fs-extra");
-var lodash_1 = require("lodash");
-var ts = tslib_1.__importStar(require("typescript"));
-var factory = ts.factory;
-var env_1 = require("./env");
-var string_1 = require("../utils/string");
-var Schema = {};
-var OneToMany = {};
-var ManyToOne = {};
-var ReversePointerEntities = {};
-var ReversePointerRelations = {};
-var ActionImportStatements = function () { return [
-    factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("ActionDef"))])), factory.createStringLiteral("".concat((0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(), "Action")), undefined),
-    factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const fs_1 = require("fs");
+const fs_extra_1 = require("fs-extra");
+const lodash_1 = require("lodash");
+const ts = tslib_1.__importStar(require("typescript"));
+const { factory } = ts;
+const env_1 = require("./env");
+const string_1 = require("../utils/string");
+const Schema = {};
+const OneToMany = {};
+const ManyToOne = {};
+const ReversePointerEntities = {};
+const ReversePointerRelations = {};
+const ActionImportStatements = () => [
+    factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("ActionDef"))])), factory.createStringLiteral(`${(0, env_1.TYPE_PATH_IN_OAK_DOMAIN)()}Action`), undefined),
+    factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("GenericAction")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("AppendOnlyAction")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("ReadOnlyAction")),
@@ -26,42 +26,41 @@ var ActionImportStatements = function () { return [
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("ExcludeRemoveAction")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("RelationAction")),
     ])), factory.createStringLiteral((0, env_1.ACTION_CONSTANT_IN_OAK_DOMAIN)()), undefined)
-]; };
-var ActionAsts = {};
-var SchemaAsts = {};
+];
+const ActionAsts = {};
+const SchemaAsts = {};
 function addRelationship(many, one, key, notNull) {
-    var _a, _b;
-    var _c = ManyToOne, _d = many, manySet = _c[_d];
-    var one2 = one === 'Schema' ? many : one;
+    const { [many]: manySet } = ManyToOne;
+    const one2 = one === 'Schema' ? many : one;
     if (manySet) {
         manySet.push([one2, key, notNull]);
     }
     else {
-        (0, lodash_1.assign)(ManyToOne, (_a = {},
-            _a[many] = [[one2, key, notNull]],
-            _a));
+        (0, lodash_1.assign)(ManyToOne, {
+            [many]: [[one2, key, notNull]],
+        });
     }
-    var _e = OneToMany, _f = one2, oneSet = _e[_f];
+    const { [one2]: oneSet } = OneToMany;
     if (oneSet) {
         oneSet.push([many, key, notNull]);
     }
     else {
-        (0, lodash_1.assign)(OneToMany, (_b = {},
-            _b[one2] = [[many, key, notNull]],
-            _b));
+        (0, lodash_1.assign)(OneToMany, {
+            [one2]: [[many, key, notNull]],
+        });
     }
 }
 /**
  * 对relationship去重。一旦发生对象重定义这里就有可能重复
  */
 function uniqRelationships() {
-    for (var entity in ManyToOne) {
-        ManyToOne[entity] = (0, lodash_1.uniqBy)(ManyToOne[entity], function (ele) { return "".concat(ele[0], "-").concat(ele[1]); });
+    for (const entity in ManyToOne) {
+        ManyToOne[entity] = (0, lodash_1.uniqBy)(ManyToOne[entity], (ele) => `${ele[0]}-${ele[1]}`);
     }
-    for (var entity in OneToMany) {
-        OneToMany[entity] = (0, lodash_1.uniqBy)(OneToMany[entity], function (ele) { return "".concat(ele[0], "-").concat(ele[1]); });
+    for (const entity in OneToMany) {
+        OneToMany[entity] = (0, lodash_1.uniqBy)(OneToMany[entity], (ele) => `${ele[0]}-${ele[1]}`);
     }
-    for (var entity in ReversePointerRelations) {
+    for (const entity in ReversePointerRelations) {
         OneToMany[entity] = (0, lodash_1.uniq)(OneToMany[entity]);
     }
 }
@@ -72,9 +71,8 @@ function createForeignRef(entity, foreignKey, ref) {
     return factory.createQualifiedName(factory.createIdentifier(foreignKey), factory.createIdentifier(ref));
 }
 function pushStatementIntoActionAst(moduleName, node, sourceFile) {
-    var _a;
     // let actionNames;
-    var actionDefName;
+    let actionDefName;
     /* if (ts.isTypeAliasDeclaration(node) && node.name.text === 'ParticularAction') {
         const { type } = node;
         if (ts.isUnionTypeNode(type)) {
@@ -95,10 +93,10 @@ function pushStatementIntoActionAst(moduleName, node, sourceFile) {
         }
     } */
     if (ts.isVariableStatement(node)) {
-        var declarations = node.declarationList.declarations;
-        declarations.forEach(function (declaration) {
+        const { declarationList: { declarations } } = node;
+        declarations.forEach((declaration) => {
             if (ts.isIdentifier(declaration.name) && declaration.name.text.endsWith('ActionDef')) {
-                var text = declaration.name.text;
+                const { text } = declaration.name;
                 actionDefName = (0, string_1.firstLetterLowerCase)(text.slice(0, text.length - 9));
             }
         });
@@ -113,29 +111,28 @@ function pushStatementIntoActionAst(moduleName, node, sourceFile) {
         }
     }
     else {
-        (0, lodash_1.assign)(ActionAsts, (_a = {},
-            _a[moduleName] = {
-                statements: tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(ActionImportStatements()), false), [node], false),
-                sourceFile: sourceFile,
+        (0, lodash_1.assign)(ActionAsts, {
+            [moduleName]: {
+                statements: [...ActionImportStatements(), node],
+                sourceFile,
                 importedFrom: {},
                 // actionNames,
                 actionDefNames: actionDefName ? [actionDefName] : [],
-            },
-            _a));
+            }
+        });
     }
 }
 function pushStatementIntoSchemaAst(moduleName, statement, sourceFile) {
-    var _a;
     if (SchemaAsts[moduleName]) {
         SchemaAsts[moduleName].statements.push(statement);
     }
     else {
-        (0, lodash_1.assign)(SchemaAsts, (_a = {},
-            _a[moduleName] = {
+        (0, lodash_1.assign)(SchemaAsts, {
+            [moduleName]: {
                 statements: [statement],
-                sourceFile: sourceFile,
-            },
-            _a));
+                sourceFile,
+            }
+        });
     }
 }
 /**
@@ -144,84 +141,82 @@ function pushStatementIntoSchemaAst(moduleName, statement, sourceFile) {
  * @param actionDefNode
  */
 function checkActionDefNameConsistent(filename, actionDefNode) {
-    var name = actionDefNode.name, type = actionDefNode.type;
+    const { name, type } = actionDefNode;
     (0, assert_1.default)(ts.isTypeReferenceNode(type));
-    var typeArguments = type.typeArguments;
+    const { typeArguments } = type;
     (0, assert_1.default)(typeArguments.length === 2);
-    var _a = tslib_1.__read(typeArguments, 2), actionNode = _a[0], stateNode = _a[1];
-    (0, assert_1.default)(ts.isIdentifier(name), "\u6587\u4EF6".concat(filename, "\u4E2D\u7684ActionDef").concat(name.text, "\u4E0D\u662F\u4E00\u4E2A\u6709\u6548\u7684\u53D8\u91CF"));
-    (0, assert_1.default)(name.text.endsWith('ActionDef'), "\u6587\u4EF6".concat(filename, "\u4E2D\u7684ActionDef").concat(name.text, "\u672A\u4EE5ActionDef\u7ED3\u5C3E"));
-    (0, assert_1.default)(ts.isTypeReferenceNode(actionNode) && ts.isTypeReferenceNode(stateNode), "\u6587\u4EF6".concat(filename, "\u4E2D\u7684ActionDef").concat(name.text, "\u7C7B\u578B\u58F0\u660E\u4E2D\u7684action\u548Cstate\u975E\u6CD5"));
+    const [actionNode, stateNode] = typeArguments;
+    (0, assert_1.default)(ts.isIdentifier(name), `文件${filename}中的ActionDef${name.text}不是一个有效的变量`);
+    (0, assert_1.default)(name.text.endsWith('ActionDef'), `文件${filename}中的ActionDef${name.text}未以ActionDef结尾`);
+    (0, assert_1.default)(ts.isTypeReferenceNode(actionNode) && ts.isTypeReferenceNode(stateNode), `文件${filename}中的ActionDef${name.text}类型声明中的action和state非法`);
     (0, assert_1.default)(ts.isIdentifier(actionNode.typeName) && ts.isIdentifier(stateNode.typeName));
-    (0, assert_1.default)(actionNode.typeName.text.endsWith('Action'), "\u6587\u4EF6".concat(filename, "\u4E2D\u7684ActionDef").concat(name.text, "\u6240\u5F15\u7528\u7684Action").concat(actionNode.typeName, "\u672A\u4EE5Action\u7ED3\u5C3E"));
-    (0, assert_1.default)(stateNode.typeName.text.endsWith('State'), "\u6587\u4EF6".concat(filename, "\u4E2D\u7684ActionDef").concat(name.text, "\u6240\u5F15\u7528\u7684Action").concat(stateNode.typeName, "\u672A\u4EE5Action\u7ED3\u5C3E"));
-    var adfName = name.text.slice(0, name.text.length - 9);
-    var aName = actionNode.typeName.text.slice(0, actionNode.typeName.text.length - 6);
-    var sName = stateNode.typeName.text.slice(0, stateNode.typeName.text.length - 5);
-    (0, assert_1.default)(adfName === aName && aName === sName, "\u6587\u4EF6".concat(filename, "\u4E2D\u7684ActionDef").concat(name.text, "\u4E2DActionDef, Action\u548CState\u7684\u547D\u540D\u89C4\u5219\u4E0D\u4E00\u81F4"));
+    (0, assert_1.default)(actionNode.typeName.text.endsWith('Action'), `文件${filename}中的ActionDef${name.text}所引用的Action${actionNode.typeName}未以Action结尾`);
+    (0, assert_1.default)(stateNode.typeName.text.endsWith('State'), `文件${filename}中的ActionDef${name.text}所引用的Action${stateNode.typeName}未以Action结尾`);
+    const adfName = name.text.slice(0, name.text.length - 9);
+    const aName = actionNode.typeName.text.slice(0, actionNode.typeName.text.length - 6);
+    const sName = stateNode.typeName.text.slice(0, stateNode.typeName.text.length - 5);
+    (0, assert_1.default)(adfName === aName && aName === sName, `文件${filename}中的ActionDef${name.text}中ActionDef, Action和State的命名规则不一致`);
 }
 function checkStringLiteralLegal(filename, obj, text, ele) {
-    (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), "".concat(filename, "\u4E2D\u5F15\u7528\u7684").concat(obj, " ").concat(text, "\u4E2D\u5B58\u5728\u4E0D\u662Fstringliteral\u7684\u7C7B\u578B"));
-    (0, assert_1.default)(!ele.literal.text.includes('$'), "".concat(filename, "\u4E2D\u5F15\u7528\u7684action").concat(text, "\u4E2D\u7684").concat(obj, "\u300C").concat(ele.literal.text, "\u300D\u5305\u542B\u975E\u6CD5\u5B57\u7B26$"));
-    (0, assert_1.default)(ele.literal.text.length > 0, "".concat(filename, "\u4E2D\u5F15\u7528\u7684action").concat(text, "\u4E2D\u7684").concat(obj, "\u300C").concat(ele.literal.text, "\u300D\u957F\u5EA6\u975E\u6CD5"));
-    (0, assert_1.default)(ele.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "".concat(filename, "\u4E2D\u5F15\u7528\u7684").concat(obj, " ").concat(text, "\u4E2D\u7684\u300C").concat(ele.literal.text, "\u300D\u957F\u5EA6\u8FC7\u957F"));
+    (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), `${filename}中引用的${obj} ${text}中存在不是stringliteral的类型`);
+    (0, assert_1.default)(!ele.literal.text.includes('$'), `${filename}中引用的action${text}中的${obj}「${ele.literal.text}」包含非法字符$`);
+    (0, assert_1.default)(ele.literal.text.length > 0, `${filename}中引用的action${text}中的${obj}「${ele.literal.text}」长度非法`);
+    (0, assert_1.default)(ele.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, `${filename}中引用的${obj} ${text}中的「${ele.literal.text}」长度过长`);
     return ele.literal.text;
 }
 function addActionSource(moduleName, name, node) {
-    var _a;
-    var ast = ActionAsts[moduleName];
-    var moduleSpecifier = node.moduleSpecifier;
+    const ast = ActionAsts[moduleName];
+    const { moduleSpecifier } = node;
     // todo 目前应该只会引用oak-domain/src/actions/action里的公共action，未来如果有交叉引用这里代码要修正（如果domain中也有引用action_constants这里应该也会错）
     (0, assert_1.default)(ts.isStringLiteral(moduleSpecifier) && moduleSpecifier.text === (0, env_1.ACTION_CONSTANT_IN_OAK_DOMAIN)());
-    (0, lodash_1.assign)(ast.importedFrom, (_a = {},
-        _a[name.text] = node,
-        _a));
+    (0, lodash_1.assign)(ast.importedFrom, {
+        [name.text]: node,
+    });
 }
 function getStringTextFromUnionStringLiterals(moduleName, filename, node, program) {
-    var _a;
-    var checker = program.getTypeChecker();
-    var symbol = checker.getSymbolAtLocation(node.typeName);
-    var declaration = symbol === null || symbol === void 0 ? void 0 : symbol.getDeclarations()[0];
-    var isImport = false;
+    const checker = program.getTypeChecker();
+    const symbol = checker.getSymbolAtLocation(node.typeName);
+    let declaration = symbol?.getDeclarations()[0];
+    let isImport = false;
     /* const typee = checker.getDeclaredTypeOfSymbol(symbol!);
 
     const declaration = typee.aliasSymbol!.getDeclarations()![0]; */
     if (ts.isImportSpecifier(declaration)) {
         isImport = true;
-        var typee = checker.getDeclaredTypeOfSymbol(symbol);
+        const typee = checker.getDeclaredTypeOfSymbol(symbol);
         declaration = typee.aliasSymbol.getDeclarations()[0];
     }
     (0, assert_1.default)(ts.isTypeAliasDeclaration(declaration));
-    var type = declaration.type, name = declaration.name;
+    const { type, name } = declaration;
     // assert(ts.isUnionTypeNode(type!) || ts.isLiteralTypeNode(type!), `${filename}中引用的action「${(<ts.Identifier>name).text}」的定义不是union和stringLiteral类型`);
     // 如果这个action是从外部导入的，在这里要记下来此entity和这个导入之间的关系
     if (isImport) {
-        var importDeclartion = symbol.getDeclarations()[0].parent.parent.parent;
+        const importDeclartion = symbol.getDeclarations()[0].parent.parent.parent;
         (0, assert_1.default)(ts.isImportDeclaration(importDeclartion));
         addActionSource(moduleName, name, importDeclartion);
     }
     else {
-        var ast = ActionAsts[moduleName];
-        (0, lodash_1.assign)(ast.importedFrom, (_a = {},
-            _a[name.text] = 'local',
-            _a));
+        const ast = ActionAsts[moduleName];
+        (0, lodash_1.assign)(ast.importedFrom, {
+            [name.text]: 'local',
+        });
     }
     if (ts.isUnionTypeNode(type)) {
-        var actions = type.types.map(function (ele) { return checkStringLiteralLegal(filename, 'action', name.text, ele); });
+        const actions = type.types.map(ele => checkStringLiteralLegal(filename, 'action', name.text, ele));
         return actions;
     }
     else {
-        (0, assert_1.default)(ts.isLiteralTypeNode(type), "".concat(filename, "\u4E2D\u5F15\u7528\u7684action\u300C").concat(name.text, "\u300D\u7684\u5B9A\u4E49\u4E0D\u662Funion\u548CstringLiteral\u7C7B\u578B"));
-        var action = checkStringLiteralLegal(filename, 'action', name.text, type);
+        (0, assert_1.default)(ts.isLiteralTypeNode(type), `${filename}中引用的action「${name.text}」的定义不是union和stringLiteral类型`);
+        const action = checkStringLiteralLegal(filename, 'action', name.text, type);
         return [action];
     }
 }
-var RESERVED_ACTION_NAMES = ['GenericAction', 'ParticularAction', 'ExcludeRemoveAction', 'ExcludeUpdateAction', 'ReadOnlyAction', 'AppendOnlyAction', 'RelationAction'];
-var action_1 = require("../actions/action");
-var DataType_1 = require("../types/DataType");
-var Entity_1 = require("../types/Entity");
-var uuid_1 = require("../utils/uuid");
-var OriginActionDict = {
+const RESERVED_ACTION_NAMES = ['GenericAction', 'ParticularAction', 'ExcludeRemoveAction', 'ExcludeUpdateAction', 'ReadOnlyAction', 'AppendOnlyAction', 'RelationAction'];
+const action_1 = require("../actions/action");
+const DataType_1 = require("../types/DataType");
+const Entity_1 = require("../types/Entity");
+const uuid_1 = require("../utils/uuid");
+const OriginActionDict = {
     'crud': 'GenericAction',
     'excludeUpdate': 'ExcludeUpdateAction',
     'excludeRemove': 'ExcludeRemoveAction',
@@ -229,53 +224,52 @@ var OriginActionDict = {
     'readOnly': 'ReadOnlyAction',
 };
 function dealWithActions(moduleName, filename, node, program, sourceFile) {
-    var actionTexts = action_1.genericActions.map(function (ele) { return ele; });
+    const actionTexts = action_1.genericActions.map(ele => ele);
     if (moduleName === 'User') {
-        actionTexts.push.apply(actionTexts, tslib_1.__spreadArray([], tslib_1.__read(action_1.relationActions), false));
+        actionTexts.push(...action_1.relationActions);
     }
     if (ts.isUnionTypeNode(node)) {
-        var actionNames = node.types.map(function (ele) {
+        const actionNames = node.types.map(ele => {
             if (ts.isTypeReferenceNode(ele) && ts.isIdentifier(ele.typeName)) {
                 return ele.typeName.text;
             }
-        }).filter(function (ele) { return !!ele; });
-        (0, assert_1.default)((0, lodash_1.intersection)(actionNames, RESERVED_ACTION_NAMES).length === 0, "".concat(filename, "\u4E2D\u7684Action\u547D\u540D\u4E0D\u80FD\u662F\u300C").concat(RESERVED_ACTION_NAMES.join(','), "\u300D\u4E4B\u4E00"));
-        node.types.forEach(function (ele) {
+        }).filter(ele => !!ele);
+        (0, assert_1.default)((0, lodash_1.intersection)(actionNames, RESERVED_ACTION_NAMES).length === 0, `${filename}中的Action命名不能是「${RESERVED_ACTION_NAMES.join(',')}」之一`);
+        node.types.forEach(ele => {
             if (ts.isTypeReferenceNode(ele)) {
-                actionTexts.push.apply(actionTexts, tslib_1.__spreadArray([], tslib_1.__read(getStringTextFromUnionStringLiterals(moduleName, filename, ele, program)), false));
+                actionTexts.push(...getStringTextFromUnionStringLiterals(moduleName, filename, ele, program));
             }
             else {
-                (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), "\u3010".concat(moduleName, "\u3011action\u7684\u5B9A\u4E49\u65E2\u975EType\u4E5F\u4E0D\u662Fstring"));
+                (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), `【${moduleName}】action的定义既非Type也不是string`);
                 actionTexts.push(ele.literal.text);
             }
         });
     }
     else if (ts.isTypeReferenceNode(node)) {
         if (ts.isIdentifier(node.typeName)) {
-            (0, assert_1.default)(!RESERVED_ACTION_NAMES.includes(node.typeName.text), "".concat(filename, "\u4E2D\u7684Action\u547D\u540D\u4E0D\u80FD\u662F\u300C").concat(RESERVED_ACTION_NAMES.join(','), "\u300D\u4E4B\u4E00"));
+            (0, assert_1.default)(!RESERVED_ACTION_NAMES.includes(node.typeName.text), `${filename}中的Action命名不能是「${RESERVED_ACTION_NAMES.join(',')}」之一`);
         }
-        actionTexts.push.apply(actionTexts, tslib_1.__spreadArray([], tslib_1.__read(getStringTextFromUnionStringLiterals(moduleName, filename, node, program)), false));
+        actionTexts.push(...getStringTextFromUnionStringLiterals(moduleName, filename, node, program));
     }
     else {
-        (0, assert_1.default)(ts.isLiteralTypeNode(node) && ts.isStringLiteral(node.literal), "\u3010".concat(moduleName, "\u3011action\u7684\u5B9A\u4E49\u65E2\u975EType\u4E5F\u4E0D\u662Fstring"));
+        (0, assert_1.default)(ts.isLiteralTypeNode(node) && ts.isStringLiteral(node.literal), `【${moduleName}】action的定义既非Type也不是string`);
         actionTexts.push(node.literal.text);
     }
     // 所有的action定义不能有重名
-    var ActionDict = {};
-    actionTexts.forEach(function (action) {
-        var _a;
-        (0, assert_1.default)(action.length <= env_1.STRING_LITERAL_MAX_LENGTH, "".concat(filename, "\u4E2D\u7684Action\u300C").concat(action, "\u300D\u547D\u540D\u957F\u5EA6\u5927\u4E8E").concat(env_1.STRING_LITERAL_MAX_LENGTH));
-        (0, assert_1.default)(/^[a-z][a-z|A-Z]+$/.test(action), "".concat(filename, "\u4E2D\u7684Action\u300C").concat(action, "\u300D\u547D\u540D\u4E0D\u5408\u6CD5\uFF0C\u5FC5\u987B\u4EE5\u5C0F\u5B57\u5B57\u6BCD\u5F00\u5934\u4E14\u53EA\u80FD\u5305\u542B\u5B57\u6BCD"));
+    const ActionDict = {};
+    actionTexts.forEach((action) => {
+        (0, assert_1.default)(action.length <= env_1.STRING_LITERAL_MAX_LENGTH, `${filename}中的Action「${action}」命名长度大于${env_1.STRING_LITERAL_MAX_LENGTH}`);
+        (0, assert_1.default)(/^[a-z][a-z|A-Z]+$/.test(action), `${filename}中的Action「${action}」命名不合法，必须以小字字母开头且只能包含字母`);
         if (ActionDict.hasOwnProperty(action)) {
-            throw new Error("\u6587\u4EF6".concat(filename, "\u4E2D\uFF0CAction\u5B9A\u4E49\u4E0A\u7684\u3010").concat(action, "\u3011\u52A8\u4F5C\u5B58\u5728\u540C\u540D"));
+            throw new Error(`文件${filename}中，Action定义上的【${action}】动作存在同名`);
         }
         else {
-            (0, lodash_1.assign)(ActionDict, (_a = {},
-                _a[action] = 1,
-                _a));
+            (0, lodash_1.assign)(ActionDict, {
+                [action]: 1,
+            });
         }
     });
-    pushStatementIntoActionAst(moduleName, factory.createVariableStatement([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("actions"), undefined, undefined, factory.createArrayLiteralExpression(actionTexts.map(function (ele) { return factory.createStringLiteral(ele); }), false))], ts.NodeFlags.Const)), sourceFile);
+    pushStatementIntoActionAst(moduleName, factory.createVariableStatement([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("actions"), undefined, undefined, factory.createArrayLiteralExpression(actionTexts.map(ele => factory.createStringLiteral(ele)), false))], ts.NodeFlags.Const)), sourceFile);
 }
 /**
  * entity的引用一定要以 import { Schema as XXX } from '..../XXX'这种形式
@@ -284,124 +278,121 @@ function dealWithActions(moduleName, filename, node, program, sourceFile) {
  * @returns
  */
 function getEntityImported(declaration) {
-    var moduleSpecifier = declaration.moduleSpecifier, importClause = declaration.importClause;
-    var entityImported;
+    const { moduleSpecifier, importClause } = declaration;
+    let entityImported;
     if (ts.isStringLiteral(moduleSpecifier)) {
-        var importedFileName_1 = path_1.default.parse(moduleSpecifier.text).name;
-        var namedBindings = importClause.namedBindings;
+        const { name: importedFileName } = path_1.default.parse(moduleSpecifier.text);
+        const { namedBindings } = importClause;
         if (namedBindings && ts.isNamedImports(namedBindings)) {
-            var elements = namedBindings.elements;
-            if (elements.find(function (ele) { var _a; return ts.isImportSpecifier(ele) && ele.name.text === importedFileName_1 && ((_a = ele.propertyName) === null || _a === void 0 ? void 0 : _a.text) === 'Schema'; })) {
-                entityImported = importedFileName_1;
+            const { elements } = namedBindings;
+            if (elements.find(ele => ts.isImportSpecifier(ele) && ele.name.text === importedFileName && ele.propertyName?.text === 'Schema')) {
+                entityImported = importedFileName;
             }
         }
     }
     return entityImported;
 }
 function checkLocaleEnumAttrs(node, attrs, filename) {
-    var members = node.members;
-    var memberKeys = members.map(function (ele) {
+    const { members } = node;
+    const memberKeys = members.map((ele) => {
         (0, assert_1.default)(ts.isPropertySignature(ele) && ts.isIdentifier(ele.name));
         return ele.name.text;
     });
-    var lack = (0, lodash_1.difference)(attrs, memberKeys);
+    const lack = (0, lodash_1.difference)(attrs, memberKeys);
     if (lack.length > 0) {
-        throw new Error("".concat(filename, "\u4E2D\u7F3A\u5C11\u4E86\u5BF9").concat(lack.join(','), "\u5C5E\u6027\u7684locale\u5B9A\u4E49"));
+        throw new Error(`${filename}中缺少了对${lack.join(',')}属性的locale定义`);
     }
 }
 function checkLocaleExpressionPropertyExists(root, attr, exists, filename) {
-    var properties = root.properties;
-    properties.forEach(function (ele) {
+    const { properties } = root;
+    properties.forEach((ele) => {
         (0, assert_1.default)(ts.isPropertyAssignment(ele) && (ts.isIdentifier(ele.name) || ts.isStringLiteral(ele.name)) && ts.isObjectLiteralExpression(ele.initializer));
-        var p2 = ele.initializer.properties;
-        var pp = p2.find(function (ele2) {
+        const { properties: p2 } = ele.initializer;
+        const pp = p2.find((ele2) => {
             (0, assert_1.default)(ts.isPropertyAssignment(ele2) && ts.isIdentifier(ele2.name));
             return ele2.name.text === attr;
         });
         if (exists && !pp) {
-            throw new Error("".concat(filename, "\u4E2D\u7684locale\u5B9A\u4E49\u4E2D\u7684").concat(ele.name.text, "\u4E2D\u7F3A\u5C11\u4E86").concat(attr, "\u7684\u5B9A\u4E49"));
+            throw new Error(`${filename}中的locale定义中的${ele.name.text}中缺少了${attr}的定义`);
         }
         else if (!exists && pp) {
-            throw new Error("".concat(filename, "\u4E2D\u7684locale\u5B9A\u4E49\u4E2D\u7684").concat(ele.name.text, "\u4E2D\u6709\u591A\u4F59\u7684").concat(attr, "\u5B9A\u4E49"));
+            throw new Error(`${filename}中的locale定义中的${ele.name.text}中有多余的${attr}定义`);
         }
     });
 }
 function getStringEnumValues(filename, program, obj, node) {
-    var _a;
-    var checker = program.getTypeChecker();
-    var symbol = checker.getSymbolAtLocation(node.typeName);
-    var declaration = symbol === null || symbol === void 0 ? void 0 : symbol.getDeclarations()[0];
+    const checker = program.getTypeChecker();
+    const symbol = checker.getSymbolAtLocation(node.typeName);
+    let declaration = symbol?.getDeclarations()[0];
     if (ts.isImportSpecifier(declaration)) {
-        var typee = checker.getDeclaredTypeOfSymbol(symbol);
-        declaration = (_a = typee.aliasSymbol) === null || _a === void 0 ? void 0 : _a.getDeclarations()[0];
+        const typee = checker.getDeclaredTypeOfSymbol(symbol);
+        declaration = typee.aliasSymbol?.getDeclarations()[0];
     }
     if (declaration && ts.isTypeAliasDeclaration(declaration)) {
         if (ts.isUnionTypeNode(declaration.type) && ts.isLiteralTypeNode(declaration.type.types[0])) {
-            return declaration.type.types.map(function (ele) { return checkStringLiteralLegal(filename, obj, declaration.name.text, ele); });
+            return declaration.type.types.map(ele => checkStringLiteralLegal(filename, obj, declaration.name.text, ele));
         }
         if (ts.isLiteralTypeNode(declaration.type)) {
-            var value = checkStringLiteralLegal(filename, obj, declaration.name.text, declaration.type);
+            const value = checkStringLiteralLegal(filename, obj, declaration.name.text, declaration.type);
             return [value];
         }
     }
 }
 function checkNameLegal(filename, attrName, upperCase) {
-    (0, assert_1.default)(attrName.length <= env_1.ENTITY_NAME_MAX_LENGTH, "\u6587\u4EF6\u300C".concat(filename, "\u300D\uFF1A\u300C").concat(attrName, "\u300D\u7684\u540D\u79F0\u5B9A\u4E49\u8FC7\u957F\uFF0C\u4E0D\u80FD\u8D85\u8FC7\u300C").concat(env_1.ENTITY_NAME_MAX_LENGTH, "\u300D\u957F\u5EA6"));
+    (0, assert_1.default)(attrName.length <= env_1.ENTITY_NAME_MAX_LENGTH, `文件「${filename}」：「${attrName}」的名称定义过长，不能超过「${env_1.ENTITY_NAME_MAX_LENGTH}」长度`);
     if (upperCase) {
-        (0, assert_1.default)(/[A-Z][a-z|A-Z|0-9]+/i.test(attrName), "\u6587\u4EF6\u300C".concat(filename, "\u300D\uFF1A\u300C").concat(attrName, "\u300D\u7684\u540D\u79F0\u5FC5\u987B\u4EE5\u5927\u5199\u5B57\u6BCD\u5F00\u59CB\uFF0C\u4E14\u53EA\u80FD\u5305\u542B\u5B57\u6BCD\u548C\u6570\u5B57"));
+        (0, assert_1.default)(/[A-Z][a-z|A-Z|0-9]+/i.test(attrName), `文件「${filename}」：「${attrName}」的名称必须以大写字母开始，且只能包含字母和数字`);
     }
     else if (upperCase === false) {
-        (0, assert_1.default)(/[a-z][a-z|A-Z|0-9]+/i.test(attrName), "\u6587\u4EF6\u300C".concat(filename, "\u300D\uFF1A\u300C").concat(attrName, "\u300D\u7684\u540D\u79F0\u5FC5\u987B\u4EE5\u5C0F\u5199\u5B57\u6BCD\u5F00\u59CB\uFF0C\u4E14\u53EA\u80FD\u5305\u542B\u5B57\u6BCD\u548C\u6570\u5B57"));
+        (0, assert_1.default)(/[a-z][a-z|A-Z|0-9]+/i.test(attrName), `文件「${filename}」：「${attrName}」的名称必须以小写字母开始，且只能包含字母和数字`);
     }
     else {
-        (0, assert_1.default)(/[a-z|A-Z][a-z|A-Z|0-9]+/i.test(attrName), "\u6587\u4EF6\u300C".concat(filename, "\u300D\uFF1A\u300C").concat(attrName, "\u300D\u7684\u540D\u79F0\u5FC5\u987B\u4EE5\u5B57\u6BCD\u5F00\u59CB\uFF0C\u4E14\u53EA\u80FD\u5305\u542B\u5B57\u6BCD\u548C\u6570\u5B57"));
+        (0, assert_1.default)(/[a-z|A-Z][a-z|A-Z|0-9]+/i.test(attrName), `文件「${filename}」：「${attrName}」的名称必须以字母开始，且只能包含字母和数字`);
     }
 }
 function analyzeEntity(filename, path, program, relativePath) {
-    var _a;
-    var fullPath = "".concat(path, "/").concat(filename);
-    var sourceFile = program.getSourceFile(fullPath);
-    var moduleName = filename.split('.')[0];
+    const fullPath = `${path}/${filename}`;
+    const sourceFile = program.getSourceFile(fullPath);
+    const moduleName = filename.split('.')[0];
     if (Schema.hasOwnProperty(moduleName)) {
         delete ActionAsts[moduleName];
         delete SchemaAsts[moduleName];
         // removeFromRelationShip(moduleName);
-        console.warn("\u51FA\u73B0\u4E86\u540C\u540D\u7684Entity\u5B9A\u4E49\u300C".concat(moduleName, "\u300D\uFF0C\u5C06\u4F7F\u7528").concat(fullPath, "\u53D6\u4EE3\u6389\u9ED8\u8BA4\u5BF9\u8C61\uFF0C\u8BF7\u68C0\u67E5\u65B0\u7684\u5BF9\u8C61\u7ED3\u6784\u53CA\u76F8\u5173\u5E38\u91CF\u5B9A\u4E49\u4E0E\u539F\u6709\u7684\u517C\u5BB9\uFF0C\u5426\u5219\u539F\u6709\u5BF9\u8C61\u7684\u76F8\u5173\u903B\u8F91\u4F1A\u51FA\u73B0\u4E0D\u53EF\u77E5\u5F02\u5E38"));
+        console.warn(`出现了同名的Entity定义「${moduleName}」，将使用${fullPath}取代掉默认对象，请检查新的对象结构及相关常量定义与原有的兼容，否则原有对象的相关逻辑会出现不可知异常`);
     }
     checkNameLegal(filename, moduleName, true);
-    var referencedSchemas = [];
-    var schemaAttrs = [];
-    var hasFulltextIndex = false;
-    var indexes;
-    var beforeSchema = true;
-    var hasActionDef = false;
-    var hasRelationDef = false;
-    var hasActionOrStateDef = false;
-    var toModi = false;
-    var actionType = 'crud';
-    var _static = false;
-    var enumAttributes = {};
-    var additionalImports = [];
-    var localeDef = undefined;
+    const referencedSchemas = [];
+    const schemaAttrs = [];
+    let hasFulltextIndex = false;
+    let indexes;
+    let beforeSchema = true;
+    let hasActionDef = false;
+    let hasRelationDef = false;
+    let hasActionOrStateDef = false;
+    let toModi = false;
+    let actionType = 'crud';
+    let _static = false;
+    const enumAttributes = {};
+    const additionalImports = [];
+    let localeDef = undefined;
     // let relationHierarchy: ts.ObjectLiteralExpression | undefined = undefined;
     // let reverseCascadeRelationHierarchy: ts.ObjectLiteralExpression | undefined = undefined;
-    ts.forEachChild(sourceFile, function (node) {
-        var _a, _b, _c, _d, _e, _f;
+    ts.forEachChild(sourceFile, (node) => {
         if (ts.isImportDeclaration(node)) {
-            var entityImported = getEntityImported(node);
+            const entityImported = getEntityImported(node);
             if (entityImported) {
                 referencedSchemas.push(entityImported);
             }
             else {
-                var moduleSpecifier = node.moduleSpecifier, importClause = node.importClause;
+                const { moduleSpecifier, importClause } = node;
                 if (ts.isStringLiteral(moduleSpecifier)) {
-                    var text = moduleSpecifier.text;
+                    const { text } = moduleSpecifier;
                     // 和数据类型相关的会自动引入，这里忽略（见initialStatements）
                     // 如果是相对路径，编译后的路径默认要深一层
-                    var moduleSpecifier2Text = text.startsWith('.') ? (relativePath
+                    const moduleSpecifier2Text = text.startsWith('.') ? (relativePath
                         ? path_1.default.join(relativePath, text).replace(/\\/g, '/')
                         : path_1.default.join('..', text).replace(/\\/g, '/')) : text;
-                    additionalImports.push(factory.updateImportDeclaration(node, undefined, undefined, importClause, factory.createStringLiteral(moduleSpecifier2Text), undefined));
+                    additionalImports.push(factory.updateImportDeclaration(node, undefined, importClause, factory.createStringLiteral(moduleSpecifier2Text), undefined));
                 }
                 else {
                     (0, assert_1.default)(false, '未处理的import方式');
@@ -411,15 +402,14 @@ function analyzeEntity(filename, path, program, relativePath) {
         if (ts.isInterfaceDeclaration(node)) {
             // schema 定义
             if (node.name.text === 'Schema') {
-                (0, assert_1.default)(!localeDef, "\u3010".concat(filename, "\u3011locale\u5B9A\u4E49\u987B\u5728Schema\u4E4B\u540E"));
-                var hasEntityAttr_1 = false;
-                var hasEntityIdAttr_1 = false;
-                var members = node.members, heritageClauses = node.heritageClauses;
+                (0, assert_1.default)(!localeDef, `【${filename}】locale定义须在Schema之后`);
+                let hasEntityAttr = false;
+                let hasEntityIdAttr = false;
+                const { members, heritageClauses } = node;
                 (0, assert_1.default)(['EntityShape'].includes(heritageClauses[0].types[0].expression.text), moduleName);
-                members.forEach(function (attrNode) {
-                    var _a, _b;
-                    var _c = attrNode, type = _c.type, name = _c.name, questionToken = _c.questionToken;
-                    var attrName = name.text;
+                members.forEach((attrNode) => {
+                    const { type, name, questionToken } = attrNode;
+                    const attrName = name.text;
                     checkNameLegal(filename, attrName, false);
                     if (ts.isTypeReferenceNode(type)
                         && ts.isIdentifier(type.typeName)) {
@@ -429,21 +419,21 @@ function analyzeEntity(filename, path, program, relativePath) {
                         }
                         else if (type.typeName.text === 'Array') {
                             // 这是一对多的反向指针的引用，需要特殊处理
-                            var typeArguments = type.typeArguments;
+                            const { typeArguments } = type;
                             (0, assert_1.default)(typeArguments.length === 1
                                 && ts.isTypeReferenceNode(typeArguments[0])
                                 && ts.isIdentifier(typeArguments[0].typeName)
-                                && referencedSchemas.includes(typeArguments[0].typeName.text), "\u300C".concat(filename, "\u300D\u975E\u6CD5\u7684\u5C5E\u6027\u5B9A\u4E49\u300C").concat(attrName, "\u300D"));
-                            var reverseEntity = typeArguments[0].typeName.text;
+                                && referencedSchemas.includes(typeArguments[0].typeName.text), `「${filename}」非法的属性定义「${attrName}」`);
+                            const reverseEntity = typeArguments[0].typeName.text;
                             if (ReversePointerRelations[reverseEntity]) {
                                 if (!ReversePointerRelations[reverseEntity].includes(moduleName)) {
                                     ReversePointerRelations[reverseEntity].push(moduleName);
                                 }
                             }
                             else {
-                                (0, lodash_1.assign)(ReversePointerRelations, (_a = {},
-                                    _a[reverseEntity] = [moduleName],
-                                    _a));
+                                (0, lodash_1.assign)(ReversePointerRelations, {
+                                    [reverseEntity]: [moduleName],
+                                });
                             }
                             if (reverseEntity === 'Modi') {
                                 toModi = true;
@@ -451,88 +441,88 @@ function analyzeEntity(filename, path, program, relativePath) {
                         }
                         else {
                             schemaAttrs.push(attrNode);
-                            var enumStringValues = getStringEnumValues(filename, program, '属性', type);
+                            const enumStringValues = getStringEnumValues(filename, program, '属性', type);
                             if (enumStringValues) {
                                 enumAttributes[attrName] = enumStringValues;
                             }
                         }
                     }
                     else if (ts.isArrayTypeNode(type) && ts.isTypeReferenceNode(type.elementType) && ts.isIdentifier(type.elementType.typeName)) {
-                        var typeName = type.elementType.typeName;
+                        const { typeName } = type.elementType;
                         if (referencedSchemas.includes(typeName.text)) {
                             // 这也是一对多的反指定义 
-                            var reverseEntity = typeName.text;
+                            const reverseEntity = typeName.text;
                             if (ReversePointerRelations[reverseEntity]) {
                                 ReversePointerRelations[reverseEntity].push(moduleName);
                             }
                             else {
-                                (0, lodash_1.assign)(ReversePointerRelations, (_b = {},
-                                    _b[reverseEntity] = [moduleName],
-                                    _b));
+                                (0, lodash_1.assign)(ReversePointerRelations, {
+                                    [reverseEntity]: [moduleName],
+                                });
                             }
                             if (reverseEntity === 'Modi') {
                                 toModi = true;
                             }
                         }
                         else {
-                            throw new Error("\u5BF9\u8C61".concat(moduleName, "\u4E2D\u5B9A\u4E49\u7684\u5C5E\u6027").concat(attrName, "\u662F\u4E0D\u53EF\u8BC6\u522B\u7684\u6570\u7EC4\u7C7B\u522B"));
+                            throw new Error(`对象${moduleName}中定义的属性${attrName}是不可识别的数组类别`);
                         }
                     }
                     else {
                         schemaAttrs.push(attrNode);
                         if (ts.isUnionTypeNode(type) && ts.isLiteralTypeNode(type.types[0]) && ts.isStringLiteral(type.types[0].literal)) {
                             (0, assert_1.default)(ts.isIdentifier(name));
-                            var types = type.types;
-                            var enumValues = types.map(function (ele) { return checkStringLiteralLegal(filename, '属性', name.text, ele); });
+                            const { types } = type;
+                            const enumValues = types.map((ele) => checkStringLiteralLegal(filename, '属性', name.text, ele));
                             enumAttributes[name.text] = enumValues;
                         }
                         else if (ts.isLiteralTypeNode(type) && ts.isStringLiteral(type.literal)) {
                             // 单个字符串的情形，目前应该没有，没测试过，先写着 by Xc 20230221
                             (0, assert_1.default)(ts.isIdentifier(name));
-                            var enumValues = [
+                            const enumValues = [
                                 checkStringLiteralLegal(filename, '属性', name.text, type)
                             ];
                             enumAttributes[name.text] = enumValues;
                         }
                     }
                     if (attrName === 'entity') {
-                        (0, assert_1.default)(ts.isTypeReferenceNode(type) && ts.isIdentifier(type.typeName), "\u300C".concat(moduleName, "\u300D\u4E2Dentity\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<32>\u7C7B\u578B\uFF0Centity\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
-                        var typeArguments = type.typeArguments;
+                        (0, assert_1.default)(ts.isTypeReferenceNode(type) && ts.isIdentifier(type.typeName), `「${moduleName}」中entity属性的定义不是String<32>类型，entity是系统用于表示反指指针的保留属性，请勿他用`);
+                        const { typeArguments } = type;
                         (0, assert_1.default)(type.typeName.text === 'String'
                             && typeArguments
-                            && typeArguments.length === 1, "\u300C".concat(moduleName, "\u300D\u4E2Dentity\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<32>\u7C7B\u578B\uFF0Centity\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
-                        var _d = tslib_1.__read(typeArguments, 1), node_1 = _d[0];
-                        if (ts.isLiteralTypeNode(node_1) && ts.isNumericLiteral(node_1.literal)) {
-                            if (parseInt(node_1.literal.text) > 32) {
-                                (0, assert_1.default)(false, "\u300C".concat(moduleName, "\u300D\u4E2Dentity\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<32>\u7C7B\u578B\uFF0Centity\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
+                            && typeArguments.length === 1, `「${moduleName}」中entity属性的定义不是String<32>类型，entity是系统用于表示反指指针的保留属性，请勿他用`);
+                        const [node] = typeArguments;
+                        if (ts.isLiteralTypeNode(node) && ts.isNumericLiteral(node.literal)) {
+                            if (parseInt(node.literal.text) > 32) {
+                                (0, assert_1.default)(false, `「${moduleName}」中entity属性的定义不是String<32>类型，entity是系统用于表示反指指针的保留属性，请勿他用`);
                             }
                             else {
-                                hasEntityAttr_1 = true;
+                                hasEntityAttr = true;
                             }
                         }
                     }
                     if (attrName === 'entityId') {
-                        (0, assert_1.default)(ts.isTypeReferenceNode(type) && ts.isIdentifier(type.typeName), "\u300C".concat(moduleName, "\u300D\u4E2DentityId\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<64>\u7C7B\u578B\uFF0CentityId\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
-                        var typeArguments = type.typeArguments;
-                        (0, assert_1.default)(type.typeName.text === 'String' && typeArguments && typeArguments.length === 1, "\u300C".concat(moduleName, "\u300D\u4E2DentityId\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<64>\u7C7B\u578B\uFF0CentityId\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
-                        var _e = tslib_1.__read(typeArguments, 1), node_2 = _e[0];
-                        if (ts.isLiteralTypeNode(node_2) && ts.isNumericLiteral(node_2.literal)) {
-                            if (parseInt(node_2.literal.text) !== 64) {
-                                (0, assert_1.default)(false, "\u300C".concat(moduleName, "\u300D\u4E2DentityId\u5C5E\u6027\u7684\u5B9A\u4E49\u4E0D\u662FString<64>\u7C7B\u578B\uFF0CentityId\u662F\u7CFB\u7EDF\u7528\u4E8E\u8868\u793A\u53CD\u6307\u6307\u9488\u7684\u4FDD\u7559\u5C5E\u6027\uFF0C\u8BF7\u52FF\u4ED6\u7528"));
+                        (0, assert_1.default)(ts.isTypeReferenceNode(type) && ts.isIdentifier(type.typeName), `「${moduleName}」中entityId属性的定义不是String<64>类型，entityId是系统用于表示反指指针的保留属性，请勿他用`);
+                        const { typeArguments } = type;
+                        (0, assert_1.default)(type.typeName.text === 'String' && typeArguments && typeArguments.length === 1, `「${moduleName}」中entityId属性的定义不是String<64>类型，entityId是系统用于表示反指指针的保留属性，请勿他用`);
+                        const [node] = typeArguments;
+                        if (ts.isLiteralTypeNode(node) && ts.isNumericLiteral(node.literal)) {
+                            if (parseInt(node.literal.text) !== 64) {
+                                (0, assert_1.default)(false, `「${moduleName}」中entityId属性的定义不是String<64>类型，entityId是系统用于表示反指指针的保留属性，请勿他用`);
                             }
                             else {
-                                hasEntityIdAttr_1 = true;
+                                hasEntityIdAttr = true;
                             }
                         }
                     }
                 });
-                if (hasEntityAttr_1 && hasEntityIdAttr_1) {
-                    (0, lodash_1.assign)(ReversePointerEntities, (_a = {},
-                        _a[moduleName] = 1,
-                        _a));
+                if (hasEntityAttr && hasEntityIdAttr) {
+                    (0, lodash_1.assign)(ReversePointerEntities, {
+                        [moduleName]: 1,
+                    });
                 }
-                else if (hasEntityAttr_1 || hasEntityIdAttr_1) {
-                    throw new Error("\u6587\u4EF6\u300C".concat(filename, "\u300D\uFF1A\u5C5E\u6027 \u5B9A\u4E49\u4E2D\u53EA\u5305\u542B").concat(hasEntityAttr_1 ? 'entity' : 'entityId', "\uFF0C\u4E0D\u7B26\u5408\u5B9A\u4E49\u89C4\u8303\u3002entity/entityId\u5FC5\u987B\u8054\u5408\u51FA\u73B0\uFF0C\u4EE3\u8868\u4E0D\u5B9A\u5BF9\u8C61\u7684\u53CD\u5411\u6307\u9488"));
+                else if (hasEntityAttr || hasEntityIdAttr) {
+                    throw new Error(`文件「${filename}」：属性 定义中只包含${hasEntityAttr ? 'entity' : 'entityId'}，不符合定义规范。entity/entityId必须联合出现，代表不定对象的反向指针`);
                 }
                 beforeSchema = false;
                 // 对于不是Modi和Oper的对象，全部建立和ModiEntity的反指关系
@@ -541,17 +531,17 @@ function analyzeEntity(filename, path, program, relativePath) {
                         ReversePointerRelations['ModiEntity'].push(moduleName);
                     }
                     else {
-                        (0, lodash_1.assign)(ReversePointerRelations, (_b = {},
-                            _b['ModiEntity'] = [moduleName],
-                            _b));
+                        (0, lodash_1.assign)(ReversePointerRelations, {
+                            ['ModiEntity']: [moduleName],
+                        });
                     }
                     if (ReversePointerRelations['OperEntity'] && !ReversePointerRelations['OperEntity'].includes(moduleName)) {
                         ReversePointerRelations['OperEntity'].push(moduleName);
                     }
                     else {
-                        (0, lodash_1.assign)(ReversePointerRelations, (_c = {},
-                            _c['OperEntity'] = [moduleName],
-                            _c));
+                        (0, lodash_1.assign)(ReversePointerRelations, {
+                            ['OperEntity']: [moduleName],
+                        });
                     }
                 }
             }
@@ -563,39 +553,40 @@ function analyzeEntity(filename, path, program, relativePath) {
         if (ts.isTypeAliasDeclaration(node)) {
             // action 定义
             if (node.name.text === 'Action') {
-                (0, assert_1.default)(!localeDef, "\u3010".concat(filename, "\u3011locale\u5B9A\u4E49\u987B\u5728Action\u4E4B\u540E"));
+                (0, assert_1.default)(!localeDef, `【${filename}】locale定义须在Action之后`);
                 hasActionDef = true;
-                var modifiers = [factory.createModifier(ts.SyntaxKind.ExportKeyword)];
-                pushStatementIntoActionAst(moduleName, factory.updateTypeAliasDeclaration(node, node.decorators, modifiers, factory.createIdentifier('ParticularAction'), node.typeParameters, node.type), sourceFile);
+                const modifiers = [factory.createModifier(ts.SyntaxKind.ExportKeyword)];
+                pushStatementIntoActionAst(moduleName, factory.updateTypeAliasDeclaration(node, modifiers, factory.createIdentifier('ParticularAction'), node.typeParameters, node.type), sourceFile);
                 dealWithActions(moduleName, filename, node.type, program, sourceFile);
             }
             else if (node.name.text === 'Relation') {
-                (0, assert_1.default)(!localeDef, "\u3010".concat(filename, "\u3011locale\u5B9A\u4E49\u987B\u5728Relation\u4E4B\u540E"));
-                var relationValues = [];
+                (0, assert_1.default)(!localeDef, `【${filename}】locale定义须在Relation之后`);
+                const relationValues = [];
                 if (ts.isLiteralTypeNode(node.type)) {
                     (0, assert_1.default)(ts.isStringLiteral(node.type.literal));
-                    (0, assert_1.default)(node.type.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "Relation\u5B9A\u4E49\u7684\u5B57\u7B26\u4E32\u957F\u5EA6\u4E0D\u957F\u4E8E".concat(env_1.STRING_LITERAL_MAX_LENGTH, "\uFF08").concat(filename, "\uFF0C").concat(node.type.literal.text, "\uFF09"));
+                    (0, assert_1.default)(node.type.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, `Relation定义的字符串长度不长于${env_1.STRING_LITERAL_MAX_LENGTH}（${filename}，${node.type.literal.text}）`);
                     relationValues.push(node.type.literal.text);
                 }
                 else {
-                    (0, assert_1.default)(ts.isUnionTypeNode(node.type), "Relation\u7684\u5B9A\u4E49\u53EA\u80FD\u662Fstring\u7C7B\u578B\uFF08".concat(filename, "\uFF09"));
-                    relationValues.push.apply(relationValues, tslib_1.__spreadArray([], tslib_1.__read(node.type.types.map(function (ele) {
-                        (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), "Relation\u7684\u5B9A\u4E49\u53EA\u80FD\u662Fstring\u7C7B\u578B\uFF08".concat(filename, "\uFF09"));
-                        (0, assert_1.default)(ele.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "Relation\u5B9A\u4E49\u7684\u5B57\u7B26\u4E32\u957F\u5EA6\u4E0D\u957F\u4E8E".concat(env_1.STRING_LITERAL_MAX_LENGTH, "\uFF08").concat(filename, "\uFF0C").concat(ele.literal.text, "\uFF09"));
+                    (0, assert_1.default)(ts.isUnionTypeNode(node.type), `Relation的定义只能是string类型（${filename}）`);
+                    relationValues.push(...node.type.types.map((ele) => {
+                        (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), `Relation的定义只能是string类型（${filename}）`);
+                        (0, assert_1.default)(ele.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, `Relation定义的字符串长度不长于${env_1.STRING_LITERAL_MAX_LENGTH}（${filename}，${ele.literal.text}）`);
                         return ele.literal.text;
-                    })), false));
+                    }));
                 }
                 // 对UserEntityGrant对象，建立相应的反指关系
-                if (ReversePointerRelations['UserEntityGrant']) {
+                // UserEntityGrant结构改变，不再建立，by Xc 20231101
+                /* if (ReversePointerRelations['UserEntityGrant']) {
                     if (!ReversePointerRelations['UserEntityGrant'].includes(moduleName)) {
                         ReversePointerRelations['UserEntityGrant'].push(moduleName);
                     }
                 }
                 else {
-                    (0, lodash_1.assign)(ReversePointerRelations, (_d = {},
-                        _d['UserEntityGrant'] = [moduleName],
-                        _d));
-                }
+                    assign(ReversePointerRelations, {
+                        ['UserEntityGrant']: [moduleName],
+                    });
+                } */
                 // 对Relation对象建立相应的反指关系
                 if (ReversePointerRelations['Relation']) {
                     if (!ReversePointerRelations['Relation'].includes(moduleName)) {
@@ -603,9 +594,9 @@ function analyzeEntity(filename, path, program, relativePath) {
                     }
                 }
                 else {
-                    (0, lodash_1.assign)(ReversePointerRelations, (_e = {},
-                        _e['Relation'] = [moduleName],
-                        _e));
+                    (0, lodash_1.assign)(ReversePointerRelations, {
+                        ['Relation']: [moduleName],
+                    });
                 }
                 // 对UserRelation对象建立相应的反指关系
                 if (ReversePointerRelations['UserRelation']) {
@@ -614,24 +605,25 @@ function analyzeEntity(filename, path, program, relativePath) {
                     }
                 }
                 else {
-                    (0, lodash_1.assign)(ReversePointerRelations, (_f = {},
-                        _f['UserRelation'] = [moduleName],
-                        _f));
+                    (0, lodash_1.assign)(ReversePointerRelations, {
+                        ['UserRelation']: [moduleName],
+                    });
                 }
                 hasRelationDef = node;
             }
             else if (node.name.text.endsWith('Action') || node.name.text.endsWith('State')) {
-                (0, assert_1.default)(!localeDef, "\u3010".concat(filename, "\u3011locale\u5B9A\u4E49\u987B\u5728Action/State\u4E4B\u540E"));
+                (0, assert_1.default)(!localeDef, `【${filename}】locale定义须在Action/State之后`);
                 hasActionOrStateDef = true;
-                var type = node.type;
+                const { type } = node;
                 if (ts.isUnionTypeNode(type)) {
-                    pushStatementIntoActionAst(moduleName, factory.updateTypeAliasDeclaration(node, node.decorators, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], node.name, node.typeParameters, process.env.COMPLING_AS_LIB ? factory.createUnionTypeNode(tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(type.types), false), [
+                    pushStatementIntoActionAst(moduleName, factory.updateTypeAliasDeclaration(node, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], node.name, node.typeParameters, process.env.COMPLING_AS_LIB ? factory.createUnionTypeNode([
+                        ...type.types,
                         factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
-                    ], false)) : type), sourceFile);
+                    ]) : type), sourceFile);
                 }
                 else {
-                    (0, assert_1.default)(ts.isLiteralTypeNode(type) || ts.isTypeReferenceNode(type), "".concat(moduleName, " - ").concat(node.name));
-                    pushStatementIntoActionAst(moduleName, factory.updateTypeAliasDeclaration(node, node.decorators, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], node.name, node.typeParameters, process.env.COMPLING_AS_LIB ? factory.createUnionTypeNode([
+                    (0, assert_1.default)(ts.isLiteralTypeNode(type) || ts.isTypeReferenceNode(type), `${moduleName} - ${node.name}`);
+                    pushStatementIntoActionAst(moduleName, factory.updateTypeAliasDeclaration(node, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], node.name, node.typeParameters, process.env.COMPLING_AS_LIB ? factory.createUnionTypeNode([
                         type,
                         factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
                     ]) : type), sourceFile);
@@ -643,115 +635,111 @@ function analyzeEntity(filename, path, program, relativePath) {
             }
         }
         if (ts.isVariableStatement(node)) {
-            var declarations = node.declarationList.declarations;
-            var dealWithActionDef_1 = function (declaration) {
+            const { declarationList: { declarations } } = node;
+            const dealWithActionDef = (declaration) => {
                 checkActionDefNameConsistent(filename, declaration);
-                var typeArguments = declaration.type.typeArguments;
+                const { typeArguments } = declaration.type;
                 (0, assert_1.default)(typeArguments.length === 2);
-                var _a = tslib_1.__read(typeArguments, 2), actionNode = _a[0], stateNode = _a[1];
+                const [actionNode, stateNode] = typeArguments;
                 (0, assert_1.default)(ts.isTypeReferenceNode(actionNode));
                 (0, assert_1.default)(ts.isTypeReferenceNode(stateNode));
-                (0, assert_1.default)(getStringEnumValues(filename, program, 'action', actionNode), "\u6587\u4EF6".concat(filename, "\u4E2D\u7684action").concat(actionNode.typeName.text, "\u5B9A\u4E49\u4E0D\u662F\u5B57\u7B26\u4E32\u7C7B\u578B"));
-                var enumStateValues = getStringEnumValues(filename, program, 'state', stateNode);
-                (0, assert_1.default)(enumStateValues, "\u6587\u4EF6".concat(filename, "\u4E2D\u7684state").concat(stateNode.typeName.text, "\u5B9A\u4E49\u4E0D\u662F\u5B57\u7B26\u4E32\u7C7B\u578B"));
+                (0, assert_1.default)(getStringEnumValues(filename, program, 'action', actionNode), `文件${filename}中的action${actionNode.typeName.text}定义不是字符串类型`);
+                const enumStateValues = getStringEnumValues(filename, program, 'state', stateNode);
+                (0, assert_1.default)(enumStateValues, `文件${filename}中的state${stateNode.typeName.text}定义不是字符串类型`);
                 pushStatementIntoActionAst(moduleName, node, sourceFile);
                 (0, assert_1.default)(ts.isIdentifier(declaration.name));
-                var adName = declaration.name.text.slice(0, declaration.name.text.length - 9);
-                var attr = adName.concat('State');
+                const adName = declaration.name.text.slice(0, declaration.name.text.length - 9);
+                const attr = adName.concat('State');
                 schemaAttrs.push(factory.createPropertySignature(undefined, (0, string_1.firstLetterLowerCase)(attr), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(attr)));
                 enumAttributes[(0, string_1.firstLetterLowerCase)(attr)] = enumStateValues;
             };
-            var dealWithIndexes_1 = function (declaration) {
-                var indexNameDict = {};
+            const dealWithIndexes = (declaration) => {
+                const indexNameDict = {};
                 // 检查索引的属性是否合法
-                var elements = declaration.elements;
-                elements.forEach(function (ele) {
-                    var _a;
-                    var isFulltextIndex = false;
+                const { elements } = declaration;
+                elements.forEach((ele) => {
+                    let isFulltextIndex = false;
                     (0, assert_1.default)(ts.isObjectLiteralExpression(ele));
-                    var properties = ele.properties;
-                    var attrProperty = properties.find(function (ele2) {
+                    const { properties } = ele;
+                    const attrProperty = properties.find((ele2) => {
                         (0, assert_1.default)(ts.isPropertyAssignment(ele2));
                         return ele2.name.getText() === 'attributes';
                     });
                     (0, assert_1.default)(ts.isArrayLiteralExpression(attrProperty.initializer));
-                    var nameProperty = properties.find(function (ele2) {
+                    const nameProperty = properties.find((ele2) => {
                         (0, assert_1.default)(ts.isPropertyAssignment(ele2));
                         return ele2.name.getText() === 'name';
                     });
                     (0, assert_1.default)(ts.isStringLiteral(nameProperty.initializer));
-                    var nameText = nameProperty.initializer.text;
+                    const nameText = nameProperty.initializer.text;
                     if (indexNameDict[nameText]) {
-                        throw new Error("\u300C".concat(filename, "\u300D\u7D22\u5F15\u5B9A\u4E49\u91CD\u540D\u300C").concat(nameText, "\u300D"));
+                        throw new Error(`「${filename}」索引定义重名「${nameText}」`);
                     }
-                    (0, lodash_1.assign)(indexNameDict, (_a = {},
-                        _a[nameText] = true,
-                        _a));
-                    var configProperty = properties.find(function (ele2) {
+                    (0, lodash_1.assign)(indexNameDict, {
+                        [nameText]: true,
+                    });
+                    const configProperty = properties.find((ele2) => {
                         (0, assert_1.default)(ts.isPropertyAssignment(ele2));
                         return ele2.name.getText() === 'config';
                     });
                     if (configProperty) {
                         (0, assert_1.default)(ts.isObjectLiteralExpression(configProperty.initializer));
-                        var properties2 = configProperty.initializer.properties;
-                        var typeProperty = properties2.find(function (ele2) {
+                        const { properties: properties2 } = configProperty.initializer;
+                        const typeProperty = properties2.find((ele2) => {
                             (0, assert_1.default)(ts.isPropertyAssignment(ele2));
                             return ele2.name.getText() === 'type';
                         });
                         if (typeProperty && typeProperty.initializer.text === 'fulltext') {
                             // 定义了全文索引
                             if (hasFulltextIndex) {
-                                throw new Error("\u300C".concat(filename, "\u300D\u53EA\u80FD\u5B9A\u4E49\u4E00\u4E2A\u5168\u6587\u7D22\u5F15"));
+                                throw new Error(`「${filename}」只能定义一个全文索引`);
                             }
                             hasFulltextIndex = true;
                             isFulltextIndex = true;
                         }
                     }
-                    var elements = attrProperty.initializer.elements;
+                    const { elements } = attrProperty.initializer;
                     // 每个属性都应该在schema中有值，且对象类型是可索引值
-                    elements.forEach(function (ele2) {
+                    elements.forEach((ele2) => {
                         (0, assert_1.default)(ts.isObjectLiteralExpression(ele2));
-                        var properties2 = ele2.properties;
-                        var nameProperty = properties2.find(function (ele3) {
+                        const { properties: properties2 } = ele2;
+                        const nameProperty = properties2.find((ele3) => {
                             (0, assert_1.default)(ts.isPropertyAssignment(ele3));
                             return ele3.name.getText() === 'name';
                         });
-                        var indexAttrName = nameProperty.initializer.text;
+                        const indexAttrName = nameProperty.initializer.text;
                         if (!Entity_1.initinctiveAttributes.includes(indexAttrName)) {
-                            var schemaNode = schemaAttrs.find(function (ele3) {
+                            const schemaNode = schemaAttrs.find((ele3) => {
                                 (0, assert_1.default)(ts.isPropertySignature(ele3));
                                 return ele3.name.text === indexAttrName;
                             });
                             if (!schemaNode) {
-                                throw new Error("\u300C".concat(filename, "\u300D\u4E2D\u7D22\u5F15\u300C").concat(nameText, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u5B9A\u4E49\u975E\u6CD5"));
+                                throw new Error(`「${filename}」中索引「${nameText}」的属性「${indexAttrName}」定义非法`);
                             }
-                            var type = schemaNode.type, name_1 = schemaNode.name;
-                            var entity = moduleName;
-                            var _a = ManyToOne, _b = entity, manyToOneSet = _a[_b];
+                            const { type, name } = schemaNode;
+                            const entity = moduleName;
+                            const { [entity]: manyToOneSet } = ManyToOne;
                             if (ts.isTypeReferenceNode(type)) {
-                                var typeName = type.typeName;
+                                const { typeName } = type;
                                 if (ts.isIdentifier(typeName)) {
-                                    var text = typeName.text;
-                                    var text2_1 = text === 'Schema' ? entity : text;
-                                    var manyToOneItem = manyToOneSet && manyToOneSet.find(function (_a) {
-                                        var _b = tslib_1.__read(_a, 2), refEntity = _b[0], attrName = _b[1];
-                                        return refEntity === text2_1 && attrName === name_1.text;
-                                    });
+                                    const { text } = typeName;
+                                    const text2 = text === 'Schema' ? entity : text;
+                                    const manyToOneItem = manyToOneSet && manyToOneSet.find(([refEntity, attrName]) => refEntity === text2 && attrName === name.text);
                                     if (!manyToOneItem) {
                                         // 如果不是外键，则不能是Text, File 
                                         if (isFulltextIndex) {
-                                            (0, assert_1.default)(['Text', 'String'].includes(text2_1), "\u300C".concat(filename, "\u300D\u4E2D\u5168\u6587\u7D22\u5F15\u300C").concat(nameText, "\u300D\u5B9A\u4E49\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7C7B\u578B\u975E\u6CD5\uFF0C\u53EA\u80FD\u662FText/String"));
+                                            (0, assert_1.default)(['Text', 'String'].includes(text2), `「${filename}」中全文索引「${nameText}」定义的属性「${indexAttrName}」类型非法，只能是Text/String`);
                                         }
                                         else {
-                                            (0, assert_1.default)(!DataType_1.unIndexedTypes.includes(text2_1), "\u300C".concat(filename, "\u300D\u4E2D\u7D22\u5F15\u300C").concat(nameText, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7684\u7C7B\u578B\u4E3A\u300C").concat(text2_1, "\u300D\uFF0C\u4E0D\u53EF\u7D22\u5F15"));
+                                            (0, assert_1.default)(!DataType_1.unIndexedTypes.includes(text2), `「${filename}」中索引「${nameText}」的属性「${indexAttrName}」的类型为「${text2}」，不可索引`);
                                         }
                                     }
                                     else {
-                                        (0, assert_1.default)(!isFulltextIndex, "\u300C".concat(filename, "\u300D\u4E2D\u5168\u6587\u7D22\u5F15\u300C").concat(nameText, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7C7B\u578B\u975E\u6CD5\uFF0C\u53EA\u80FD\u4E3AText/String"));
+                                        (0, assert_1.default)(!isFulltextIndex, `「${filename}」中全文索引「${nameText}」的属性「${indexAttrName}」类型非法，只能为Text/String`);
                                         // 在这里把外键加上Id，这样storageSchema才能正常通过
                                         // 这里的写法不太好，未来TS版本高了可能会有问题。by Xc 20230131
                                         Object.assign(nameProperty, {
-                                            initializer: factory.createStringLiteral("".concat(indexAttrName, "Id")),
+                                            initializer: factory.createStringLiteral(`${indexAttrName}Id`),
                                         });
                                     }
                                 }
@@ -760,15 +748,15 @@ function analyzeEntity(filename, path, program, relativePath) {
                                 }
                             }
                             else {
-                                (0, assert_1.default)(!isFulltextIndex, "\u300C".concat(filename, "\u300D\u4E2D\u5168\u6587\u7D22\u5F15\u300C").concat(nameText, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7C7B\u578B\u53EA\u80FD\u4E3AText/String"));
-                                (0, assert_1.default)(ts.isUnionTypeNode(type) || ts.isLiteralTypeNode(type), "".concat(entity, "\u4E2D\u7D22\u5F15\u300C").concat(nameText, "\u300D\u7684\u5C5E\u6027").concat(name_1.text, "\u6709\u5B9A\u4E49\u975E\u6CD5"));
+                                (0, assert_1.default)(!isFulltextIndex, `「${filename}」中全文索引「${nameText}」的属性「${indexAttrName}」类型只能为Text/String`);
+                                (0, assert_1.default)(ts.isUnionTypeNode(type) || ts.isLiteralTypeNode(type), `${entity}中索引「${nameText}」的属性${name.text}有定义非法`);
                             }
                         }
                     });
                 });
                 indexes = declaration;
             };
-            var dealWithLocales_1 = function (declaration) {
+            const dealWithLocales = (declaration) => {
                 if (hasActionDef) {
                     // 检查每种locale定义中都应该有'action'域
                     checkLocaleExpressionPropertyExists(declaration, 'action', true, filename);
@@ -783,7 +771,7 @@ function analyzeEntity(filename, path, program, relativePath) {
                 else {
                     checkLocaleExpressionPropertyExists(declaration, 'r', false, filename);
                 }
-                var allEnumStringAttrs = Object.keys(enumAttributes);
+                const allEnumStringAttrs = Object.keys(enumAttributes);
                 if (allEnumStringAttrs.length > 0) {
                     // 检查每种locale定义中都应该有'v'域
                     checkLocaleExpressionPropertyExists(declaration, 'v', true, filename);
@@ -794,11 +782,11 @@ function analyzeEntity(filename, path, program, relativePath) {
                 }
                 localeDef = declaration;
             };
-            var dealWithConfiguration_1 = function (declaration) {
+            const dealWithConfiguration = (declaration) => {
                 // assert(!hasActionDef, `${moduleName}中的Configuration定义在Action之后`);
-                var properties = declaration.properties;
-                var atProperty = properties.find(function (ele) { return ts.isPropertyAssignment(ele) && ts.isIdentifier(ele.name) && ele.name.text === 'actionType'; });
-                var staticProperty = properties.find(function (ele) { return ts.isPropertyAssignment(ele) && ts.isIdentifier(ele.name) && ele.name.text === 'static'; });
+                const { properties } = declaration;
+                const atProperty = properties.find(ele => ts.isPropertyAssignment(ele) && ts.isIdentifier(ele.name) && ele.name.text === 'actionType');
+                const staticProperty = properties.find(ele => ts.isPropertyAssignment(ele) && ts.isIdentifier(ele.name) && ele.name.text === 'static');
                 if (atProperty) {
                     actionType = atProperty.initializer.text;
                 }
@@ -806,9 +794,9 @@ function analyzeEntity(filename, path, program, relativePath) {
                     _static = true; // static如果有值只能为true
                 }
             };
-            declarations.forEach(function (declaration) {
+            declarations.forEach((declaration) => {
                 if (declaration.type && ts.isTypeReferenceNode(declaration.type) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'ActionDef') {
-                    dealWithActionDef_1(declaration);
+                    dealWithActionDef(declaration);
                 }
                 else if (declaration.type && (ts.isArrayTypeNode(declaration.type)
                     && ts.isTypeReferenceNode(declaration.type.elementType)
@@ -821,80 +809,80 @@ function analyzeEntity(filename, path, program, relativePath) {
                         && ts.isIdentifier(declaration.type.typeArguments[0].typeName)
                         && declaration.type.typeArguments[0].typeName.text === 'Index')) {
                     // 对索引Index的定义
-                    console.log("\u300C".concat(filename, "\u300D\u76F4\u63A5\u5B9A\u4E49indexes\u7684\u5199\u6CD5\u5DF2\u7ECF\u8FC7\u65F6\uFF0C\u8BF7\u5B9A\u4E49\u5728entityDesc\u4E2D"));
+                    console.log(`「${filename}」直接定义indexes的写法已经过时，请定义在entityDesc中`);
                     (0, assert_1.default)(ts.isArrayLiteralExpression(declaration.initializer));
-                    dealWithIndexes_1(declaration.initializer);
+                    dealWithIndexes(declaration.initializer);
                 }
                 else if (declaration.type && ts.isTypeReferenceNode(declaration.type) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'LocaleDef') {
                     // locale定义
-                    console.log("\u300C".concat(filename, "\u300D\u76F4\u63A5\u5B9A\u4E49locales\u7684\u5199\u6CD5\u5DF2\u7ECF\u8FC7\u65F6\uFF0C\u8BF7\u5B9A\u4E49\u5728entityDesc\u4E2D"));
-                    var type = declaration.type, initializer = declaration.initializer;
+                    console.log(`「${filename}」直接定义locales的写法已经过时，请定义在entityDesc中`);
+                    const { type, initializer } = declaration;
                     (0, assert_1.default)(ts.isObjectLiteralExpression(initializer));
-                    var properties = initializer.properties;
-                    (0, assert_1.default)(properties.length > 0, "".concat(filename, "\u81F3\u5C11\u9700\u8981\u6709\u4E00\u79CDlocale\u5B9A\u4E49"));
-                    var allEnumStringAttrs = Object.keys(enumAttributes);
-                    var typeArguments = type.typeArguments;
+                    const { properties } = initializer;
+                    (0, assert_1.default)(properties.length > 0, `${filename}至少需要有一种locale定义`);
+                    const allEnumStringAttrs = Object.keys(enumAttributes);
+                    const { typeArguments } = type;
                     (0, assert_1.default)(typeArguments &&
                         ts.isTypeReferenceNode(typeArguments[0])
-                        && ts.isIdentifier(typeArguments[0].typeName) && typeArguments[0].typeName.text === 'Schema', "".concat(filename, "\u4E2D\u7F3A\u5C11locale\u5B9A\u4E49\uFF0C\u6216\u8005locale\u7C7B\u578B\u5B9A\u4E49\u7684\u7B2C\u4E00\u4E2A\u53C2\u6570\u4E0D\u662FSchema"));
+                        && ts.isIdentifier(typeArguments[0].typeName) && typeArguments[0].typeName.text === 'Schema', `${filename}中缺少locale定义，或者locale类型定义的第一个参数不是Schema`);
                     if (hasActionDef) {
                         (0, assert_1.default)(ts.isTypeReferenceNode(typeArguments[1])
-                            && ts.isIdentifier(typeArguments[1].typeName) && typeArguments[1].typeName.text === 'Action', "".concat(filename, "\u4E2Dlocale\u7C7B\u578B\u5B9A\u4E49\u7684\u7B2C\u4E8C\u4E2A\u53C2\u6570\u4E0D\u662FAction"));
+                            && ts.isIdentifier(typeArguments[1].typeName) && typeArguments[1].typeName.text === 'Action', `${filename}中locale类型定义的第二个参数不是Action`);
                     }
                     else {
                         (0, assert_1.default)(ts.isLiteralTypeNode(typeArguments[1])
-                            && ts.isStringLiteral(typeArguments[1].literal), "".concat(filename, "\u4E2Dlocale\u7C7B\u578B\u5B9A\u4E49\u7684\u7B2C\u4E8C\u4E2A\u53C2\u6570\u4E0D\u662F\u5B57\u7B26\u4E32"));
+                            && ts.isStringLiteral(typeArguments[1].literal), `${filename}中locale类型定义的第二个参数不是字符串`);
                     }
                     if (hasRelationDef) {
                         (0, assert_1.default)(ts.isTypeReferenceNode(typeArguments[2])
                             && ts.isIdentifier(typeArguments[2].typeName)
-                            && typeArguments[2].typeName.text === 'Relation', "".concat(filename, "\u4E2D\u7684locale\u7C7B\u578B\u5B9A\u4E49\u7684\u7B2C\u4E09\u4E2A\u53C2\u6570\u4E0D\u662FRelation"));
+                            && typeArguments[2].typeName.text === 'Relation', `${filename}中的locale类型定义的第三个参数不是Relation`);
                     }
                     else {
                         (0, assert_1.default)(ts.isLiteralTypeNode(typeArguments[2])
-                            && ts.isStringLiteral(typeArguments[2].literal), "".concat(filename, "\u4E2Dlocale\u7C7B\u578B\u5B9A\u4E49\u7684\u7B2C\u4E09\u4E2A\u53C2\u6570\u4E0D\u662F\u7A7A\u5B57\u7B26\u4E32"));
+                            && ts.isStringLiteral(typeArguments[2].literal), `${filename}中locale类型定义的第三个参数不是空字符串`);
                     }
                     if (allEnumStringAttrs.length > 0) {
-                        (0, assert_1.default)(ts.isTypeLiteralNode(typeArguments[3]), "".concat(filename, "\u4E2D\u7684locale\u7C7B\u578B\u5B9A\u4E49\u7684\u7B2C\u56DB\u4E2A\u53C2\u6570\u4E0D\u662F{}"));
+                        (0, assert_1.default)(ts.isTypeLiteralNode(typeArguments[3]), `${filename}中的locale类型定义的第四个参数不是{}`);
                         checkLocaleEnumAttrs(typeArguments[3], allEnumStringAttrs, filename);
                     }
                     else {
-                        (0, assert_1.default)(ts.isTypeLiteralNode(typeArguments[3]), "".concat(filename, "\u4E2D\u7684locale\u7C7B\u578B\u5B9A\u4E49\u7684\u7B2C\u56DB\u4E2A\u53C2\u6570\u4E0D\u662F{}"));
-                        (0, assert_1.default)(typeArguments[3].members.length == 0, "".concat(filename, "\u4E2Dlocale\u7C7B\u578B\u5B9A\u4E49\u7684\u7B2C\u56DB\u4E2A\u53C2\u6570\u4E0D\u5E94\u5B58\u5728\u76F8\u5E94\u7684v\u5B9A\u4E49"));
+                        (0, assert_1.default)(ts.isTypeLiteralNode(typeArguments[3]), `${filename}中的locale类型定义的第四个参数不是{}`);
+                        (0, assert_1.default)(typeArguments[3].members.length == 0, `${filename}中locale类型定义的第四个参数不应存在相应的v定义`);
                     }
-                    dealWithLocales_1(initializer);
+                    dealWithLocales(initializer);
                 }
                 else if (declaration.type && ts.isTypeReferenceNode(declaration.type) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'Configuration') {
-                    console.log("\u300C".concat(filename, "\u300D\u76F4\u63A5\u5B9A\u4E49configuration\u7684\u5199\u6CD5\u5DF2\u7ECF\u8FC7\u65F6\uFF0C\u8BF7\u5B9A\u4E49\u5728entityDesc\u4E2D"));
+                    console.log(`「${filename}」直接定义configuration的写法已经过时，请定义在entityDesc中`);
                     (0, assert_1.default)(ts.isObjectLiteralExpression(declaration.initializer));
-                    dealWithConfiguration_1(declaration.initializer);
+                    dealWithConfiguration(declaration.initializer);
                 }
                 else if (declaration.type && ts.isTypeReferenceNode(declaration.type) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'EntityDesc') {
                     (0, assert_1.default)(ts.isObjectLiteralExpression(declaration.initializer));
-                    var properties = declaration.initializer.properties;
-                    var localesProperty = properties.find(function (ele) { return ts.isPropertyAssignment(ele) && ts.isIdentifier(ele.name) && ele.name.text === 'locales'; });
+                    const { properties } = declaration.initializer;
+                    const localesProperty = properties.find(ele => ts.isPropertyAssignment(ele) && ts.isIdentifier(ele.name) && ele.name.text === 'locales');
                     (0, assert_1.default)(ts.isPropertyAssignment(localesProperty));
-                    dealWithLocales_1(localesProperty.initializer);
-                    var indexesProperty = properties.find(function (ele) { return ts.isPropertyAssignment(ele) && ts.isIdentifier(ele.name) && ele.name.text === 'indexes'; });
+                    dealWithLocales(localesProperty.initializer);
+                    const indexesProperty = properties.find(ele => ts.isPropertyAssignment(ele) && ts.isIdentifier(ele.name) && ele.name.text === 'indexes');
                     if (indexesProperty) {
                         (0, assert_1.default)(ts.isPropertyAssignment(indexesProperty));
-                        dealWithIndexes_1(indexesProperty.initializer);
+                        dealWithIndexes(indexesProperty.initializer);
                     }
-                    var configurationProperty = properties.find(function (ele) { return ts.isPropertyAssignment(ele) && ts.isIdentifier(ele.name) && ele.name.text === 'configuration'; });
+                    const configurationProperty = properties.find(ele => ts.isPropertyAssignment(ele) && ts.isIdentifier(ele.name) && ele.name.text === 'configuration');
                     if (configurationProperty) {
                         (0, assert_1.default)(ts.isPropertyAssignment(configurationProperty));
-                        dealWithConfiguration_1(configurationProperty.initializer);
+                        dealWithConfiguration(configurationProperty.initializer);
                     }
                 }
                 else {
-                    throw new Error("".concat(moduleName, "\uFF1A\u4E0D\u80FD\u7406\u89E3\u7684\u5B9A\u4E49\u5185\u5BB9").concat(declaration.name.text));
+                    throw new Error(`${moduleName}：不能理解的定义内容${declaration.name.text}`);
                 }
             });
         }
     });
     // 要等configuration确定了actionType后再处理
     if (hasActionDef) {
-        var actionDefNodes = [
+        const actionDefNodes = [
             factory.createTypeReferenceNode(OriginActionDict[actionType], undefined),
             factory.createTypeReferenceNode('ParticularAction', undefined)
         ];
@@ -904,24 +892,24 @@ function analyzeEntity(filename, path, program, relativePath) {
         if (process.env.COMPLING_AS_LIB) {
             actionDefNodes.push(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
         }
-        pushStatementIntoActionAst(moduleName, factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Action"), undefined, factory.createUnionTypeNode(actionDefNodes)), sourceFile);
+        pushStatementIntoActionAst(moduleName, factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Action"), undefined, factory.createUnionTypeNode(actionDefNodes)), sourceFile);
     }
     if (!hasActionDef && hasActionOrStateDef) {
-        throw new Error("".concat(filename, "\u4E2D\u6709Action\u6216State\u5B9A\u4E49\uFF0C\u4F46\u6CA1\u6709\u5B9A\u4E49\u5B8C\u6574\u7684Action\u7C7B\u578B"));
+        throw new Error(`${filename}中有Action或State定义，但没有定义完整的Action类型`);
     }
     if (hasActionDef && actionType !== 'crud') {
-        throw new Error("".concat(filename, "\u4E2D\u6709Action\u5B9A\u4E49\uFF0C\u4F46\u5374\u5B9A\u4E49\u4E86actionType\u4E0D\u662Fcrud"));
-    }
-    (0, assert_1.default)(schemaAttrs.length > 0, "\u5BF9\u8C61".concat(moduleName, "\u6CA1\u6709\u4EFB\u4F55\u5C5E\u6027\u5B9A\u4E49"));
-    var schema = {
-        schemaAttrs: schemaAttrs,
-        sourceFile: sourceFile,
-        toModi: toModi,
-        actionType: actionType,
+        throw new Error(`${filename}中有Action定义，但却定义了actionType不是crud`);
+    }
+    (0, assert_1.default)(schemaAttrs.length > 0, `对象${moduleName}没有任何属性定义`);
+    const schema = {
+        schemaAttrs,
+        sourceFile,
+        toModi,
+        actionType,
         static: _static,
-        hasRelationDef: hasRelationDef,
-        enumAttributes: enumAttributes,
-        additionalImports: additionalImports,
+        hasRelationDef,
+        enumAttributes,
+        additionalImports,
     };
     if (hasFulltextIndex) {
         (0, lodash_1.assign)(schema, {
@@ -930,11 +918,11 @@ function analyzeEntity(filename, path, program, relativePath) {
     }
     if (indexes) {
         (0, lodash_1.assign)(schema, {
-            indexes: indexes,
+            indexes,
         });
     }
     if (!localeDef) {
-        throw new Error("".concat(filename, "\u4E2D\u7F3A\u5C11\u4E86locale\u5B9A\u4E49"));
+        throw new Error(`${filename}中缺少了locale定义`);
     }
     else {
         (0, lodash_1.assign)(schema, {
@@ -960,9 +948,9 @@ function analyzeEntity(filename, path, program, relativePath) {
         assert(!relationHierarchy, `${filename}中具有relationHierarchy定义但没有Relation定义`);
         assert(!reverseCascadeRelationHierarchy, `${filename}中具有reverseCascadeRelationHierarchy定义但没有Relation定义`)
     } */
-    (0, lodash_1.assign)(Schema, (_a = {},
-        _a[moduleName] = schema,
-        _a));
+    (0, lodash_1.assign)(Schema, {
+        [moduleName]: schema,
+    });
 }
 /**
  * 生成Schema
@@ -971,57 +959,53 @@ function analyzeEntity(filename, path, program, relativePath) {
  * @param entity
  */
 function constructSchema(statements, entity) {
-    var e_1, _a, e_2, _b;
-    var schemaAttrs = Schema[entity].schemaAttrs;
-    var members = [];
-    var members2 = [];
-    var _c = ManyToOne, _d = entity, manyToOneSet = _c[_d];
-    var _e = OneToMany, _f = entity, oneToManySet = _e[_f];
-    var referenceEntities = [];
-    var _loop_1 = function (attr) {
-        var type = attr.type, name_2 = attr.name, questionToken = attr.questionToken;
-        var attrName = name_2.text;
+    const { schemaAttrs } = Schema[entity];
+    const members = [];
+    const members2 = [];
+    const { [entity]: manyToOneSet } = ManyToOne;
+    const { [entity]: oneToManySet } = OneToMany;
+    const referenceEntities = [];
+    for (const attr of schemaAttrs) {
+        const { type, name, questionToken } = attr;
+        const attrName = name.text;
         if (ts.isTypeReferenceNode(type)) {
-            var typeName = type.typeName;
+            const { typeName } = type;
             if (ts.isIdentifier(typeName)) {
-                var text = typeName.text;
-                var text2_2 = text === 'Schema' ? entity : text;
-                var manyToOneItem = manyToOneSet && manyToOneSet.find(function (_a) {
-                    var _b = tslib_1.__read(_a, 2), refEntity = _b[0], attrName = _b[1];
-                    return refEntity === text2_2 && attrName === attrName;
-                });
+                const { text } = typeName;
+                const text2 = text === 'Schema' ? entity : text;
+                const manyToOneItem = manyToOneSet && manyToOneSet.find(([refEntity, attrName]) => refEntity === text2 && attrName === attrName);
                 if (manyToOneItem) {
-                    referenceEntities.push(text2_2);
-                    members2.push(factory.createPropertySignature(undefined, name_2, questionToken, questionToken ? factory.createUnionTypeNode([
-                        factory.createTypeReferenceNode(createForeignRef(entity, text2_2, 'Schema')),
+                    referenceEntities.push(text2);
+                    members2.push(factory.createPropertySignature(undefined, name, questionToken, questionToken ? factory.createUnionTypeNode([
+                        factory.createTypeReferenceNode(createForeignRef(entity, text2, 'Schema')),
                         factory.createLiteralTypeNode(factory.createNull())
-                    ]) : factory.createTypeReferenceNode(createForeignRef(entity, text2_2, 'Schema'))));
-                    var foreignKey = "".concat(attrName, "Id");
+                    ]) : factory.createTypeReferenceNode(createForeignRef(entity, text2, 'Schema'))));
+                    const foreignKey = `${attrName}Id`;
                     members.push(factory.createPropertySignature(undefined, factory.createIdentifier(foreignKey), questionToken, questionToken ? factory.createUnionTypeNode([
                         factory.createTypeReferenceNode(factory.createIdentifier('ForeignKey'), [
-                            factory.createLiteralTypeNode(factory.createStringLiteral((0, string_1.firstLetterLowerCase)(text2_2)))
+                            factory.createLiteralTypeNode(factory.createStringLiteral((0, string_1.firstLetterLowerCase)(text2)))
                         ]),
                         factory.createLiteralTypeNode(factory.createNull())
                     ]) : factory.createTypeReferenceNode(factory.createIdentifier('ForeignKey'), [
-                        factory.createLiteralTypeNode(factory.createStringLiteral((0, string_1.firstLetterLowerCase)(text2_2)))
+                        factory.createLiteralTypeNode(factory.createStringLiteral((0, string_1.firstLetterLowerCase)(text2)))
                     ])));
                 }
                 else {
                     // assert(types.includes(text), `${entity}中的属性${name.toString()}有非法的属性类型定义`);
                     // 处理entity这种特殊情况
                     if (ReversePointerRelations[entity] && attrName === 'entity') {
-                        var entityUnionTypeNode = ReversePointerRelations[entity].map(function (ele) { return factory.createLiteralTypeNode(factory.createStringLiteral((0, string_1.firstLetterLowerCase)(ele))); });
+                        const entityUnionTypeNode = ReversePointerRelations[entity].map(ele => factory.createLiteralTypeNode(factory.createStringLiteral((0, string_1.firstLetterLowerCase)(ele))));
                         if (process.env.COMPLING_AS_LIB) {
                             // 如果是建立 base-domain，还要容纳可能的其它对象引用
                             entityUnionTypeNode.push(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
                         }
-                        members.push(factory.createPropertySignature(undefined, name_2, questionToken, questionToken ? factory.createUnionTypeNode([
+                        members.push(factory.createPropertySignature(undefined, name, questionToken, questionToken ? factory.createUnionTypeNode([
                             factory.createUnionTypeNode(entityUnionTypeNode),
                             factory.createLiteralTypeNode(factory.createNull())
                         ]) : factory.createUnionTypeNode(entityUnionTypeNode)));
                     }
                     else {
-                        members.push(factory.createPropertySignature(undefined, name_2, questionToken, questionToken ? factory.createUnionTypeNode([
+                        members.push(factory.createPropertySignature(undefined, name, questionToken, questionToken ? factory.createUnionTypeNode([
                             type,
                             factory.createLiteralTypeNode(factory.createNull())
                         ]) : type));
@@ -1034,87 +1018,61 @@ function constructSchema(statements, entity) {
             }
         }
         else {
-            (0, assert_1.default)(ts.isUnionTypeNode(type) || ts.isLiteralTypeNode(type), "".concat(entity, "\u6709\u975E\u6CD5\u7684\u5C5E\u6027\u7C7B\u578B\u5B9A\u4E49").concat(name_2.text));
-            members.push(factory.createPropertySignature(undefined, name_2, questionToken, questionToken ? factory.createUnionTypeNode([
+            (0, assert_1.default)(ts.isUnionTypeNode(type) || ts.isLiteralTypeNode(type), `${entity}有非法的属性类型定义${name.text}`);
+            members.push(factory.createPropertySignature(undefined, name, questionToken, questionToken ? factory.createUnionTypeNode([
                 type,
                 factory.createLiteralTypeNode(factory.createNull())
             ]) : type));
         }
-    };
-    try {
-        for (var schemaAttrs_1 = tslib_1.__values(schemaAttrs), schemaAttrs_1_1 = schemaAttrs_1.next(); !schemaAttrs_1_1.done; schemaAttrs_1_1 = schemaAttrs_1.next()) {
-            var attr = schemaAttrs_1_1.value;
-            _loop_1(attr);
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (schemaAttrs_1_1 && !schemaAttrs_1_1.done && (_a = schemaAttrs_1.return)) _a.call(schemaAttrs_1);
-        }
-        finally { if (e_1) throw e_1.error; }
     }
     // 处理reverserPointer
-    var reverseOnes = ReversePointerRelations[entity];
+    const reverseOnes = ReversePointerRelations[entity];
     if (reverseOnes) {
-        reverseOnes.forEach(function (one) {
+        reverseOnes.forEach((one) => {
             referenceEntities.push(one);
             members2.push(factory.createPropertySignature(undefined, (0, string_1.firstLetterLowerCase)(one), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one, 'Schema'))));
         });
     }
-    var foreignKeySet = {};
+    const foreignKeySet = {};
     if (oneToManySet) {
-        try {
-            for (var oneToManySet_1 = tslib_1.__values(oneToManySet), oneToManySet_1_1 = oneToManySet_1.next(); !oneToManySet_1_1.done; oneToManySet_1_1 = oneToManySet_1.next()) {
-                var oneToManyItem = oneToManySet_1_1.value;
-                var _g = tslib_1.__read(oneToManyItem, 2), entityName = _g[0], foreignKey = _g[1];
-                if (referenceEntities.indexOf(entityName) === -1) {
-                    referenceEntities.push(entityName);
-                }
-                if (foreignKeySet.hasOwnProperty(entityName)) {
-                    foreignKeySet[entityName].push(foreignKey);
-                }
-                else {
-                    foreignKeySet[entityName] = [foreignKey];
-                }
+        for (const oneToManyItem of oneToManySet) {
+            const [entityName, foreignKey] = oneToManyItem;
+            if (referenceEntities.indexOf(entityName) === -1) {
+                referenceEntities.push(entityName);
             }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (oneToManySet_1_1 && !oneToManySet_1_1.done && (_b = oneToManySet_1.return)) _b.call(oneToManySet_1);
+            if (foreignKeySet.hasOwnProperty(entityName)) {
+                foreignKeySet[entityName].push(foreignKey);
+            }
+            else {
+                foreignKeySet[entityName] = [foreignKey];
             }
-            finally { if (e_2) throw e_2.error; }
         }
-        var _loop_2 = function (entityName) {
-            var entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
-            foreignKeySet[entityName].forEach(function (foreignKey) {
-                var identifier = "".concat(entityNameLc, "$").concat(foreignKey);
+        for (const entityName in foreignKeySet) {
+            const entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
+            foreignKeySet[entityName].forEach((foreignKey) => {
+                const identifier = `${entityNameLc}$${foreignKey}`;
                 members2.push(factory.createPropertySignature(undefined, identifier, factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(factory.createIdentifier("Array"), [factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'Schema'), undefined)])));
-                var aggrIdentifier = "".concat(entityNameLc, "$").concat(foreignKey, "$$aggr");
+                const aggrIdentifier = `${entityNameLc}$${foreignKey}$$aggr`;
                 members2.push(factory.createPropertySignature(undefined, aggrIdentifier, factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(factory.createIdentifier("AggregationResult"), [factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'Schema'), undefined)])));
             });
-        };
-        for (var entityName in foreignKeySet) {
-            _loop_2(entityName);
         }
     }
-    (0, lodash_1.uniq)(referenceEntities).forEach(function (ele) {
+    (0, lodash_1.uniq)(referenceEntities).forEach((ele) => {
         if (ele !== entity) {
-            statements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamespaceImport(factory.createIdentifier(ele))), factory.createStringLiteral("../".concat(ele, "/Schema"))));
+            statements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamespaceImport(factory.createIdentifier(ele))), factory.createStringLiteral(`../${ele}/Schema`)));
         }
     });
     // 在这里把需要直接拷贝过来的语句写入
     if (SchemaAsts[entity]) {
-        statements.push.apply(statements, tslib_1.__spreadArray([], tslib_1.__read(SchemaAsts[entity].statements), false));
+        statements.push(...SchemaAsts[entity].statements);
     }
-    statements.push(factory.createTypeAliasDeclaration(undefined, [
+    statements.push(factory.createTypeAliasDeclaration([
         factory.createModifier(ts.SyntaxKind.ExportKeyword)
     ], factory.createIdentifier('OpSchema'), undefined, factory.createIntersectionTypeNode([
         factory.createTypeReferenceNode('EntityShape'),
         factory.createTypeLiteralNode(members)
-    ])), factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("OpAttr"), undefined, factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, factory.createTypeReferenceNode(factory.createIdentifier("OpSchema"), undefined))));
-    statements.push(factory.createTypeAliasDeclaration(undefined, [
+    ])), factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("OpAttr"), undefined, factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, factory.createTypeReferenceNode(factory.createIdentifier("OpSchema"), undefined))));
+    statements.push(factory.createTypeAliasDeclaration([
         factory.createModifier(ts.SyntaxKind.ExportKeyword)
     ], factory.createIdentifier('Schema'), undefined, factory.createIntersectionTypeNode([
         factory.createTypeReferenceNode('EntityShape'),
@@ -1129,9 +1087,8 @@ function constructSchema(statements, entity) {
  * @param entity
  */
 function constructFilter(statements, entity) {
-    var e_3, _a, e_4, _b;
-    var _c = Schema[entity], schemaAttrs = _c.schemaAttrs, fulltextIndex = _c.fulltextIndex, enumAttributes = _c.enumAttributes;
-    var members = [
+    const { schemaAttrs, fulltextIndex, enumAttributes } = Schema[entity];
+    const members = [
         // id: Q_StringValue
         factory.createPropertySignature(undefined, factory.createIdentifier('id'), undefined, factory.createUnionTypeNode([
             factory.createTypeReferenceNode(factory.createIdentifier('Q_StringValue')),
@@ -1149,19 +1106,19 @@ function constructFilter(statements, entity) {
         // $$updateAt$$: Q_DateValue
         factory.createPropertySignature(undefined, factory.createIdentifier('$$updateAt$$'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('Q_DateValue')))
     ];
-    var _d = ManyToOne, _e = entity, manyToOneSet = _d[_e];
-    var entityUnionTypeNodes = ReversePointerRelations[entity] && ReversePointerRelations[entity].map(function (ele) { return factory.createLiteralTypeNode(factory.createStringLiteral((0, string_1.firstLetterLowerCase)(ele))); });
+    const { [entity]: manyToOneSet } = ManyToOne;
+    const entityUnionTypeNodes = ReversePointerRelations[entity] && ReversePointerRelations[entity].map(ele => factory.createLiteralTypeNode(factory.createStringLiteral((0, string_1.firstLetterLowerCase)(ele))));
     if (process.env.COMPLING_AS_LIB) {
         entityUnionTypeNodes && entityUnionTypeNodes.push(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
     }
-    var _loop_3 = function (attr) {
-        var _j = attr, type = _j.type, name_3 = _j.name;
-        var attrName = name_3.text;
+    for (const attr of schemaAttrs) {
+        const { type, name } = attr;
+        const attrName = name.text;
         if (ts.isTypeReferenceNode(type)) {
-            var typeName = type.typeName;
+            const { typeName } = type;
             if (ts.isIdentifier(typeName)) {
-                var text = typeName.text;
-                var type2 = void 0;
+                const { text } = typeName;
+                let type2;
                 switch (text) {
                     case 'String':
                     case 'Text':
@@ -1181,7 +1138,8 @@ function constructFilter(statements, entity) {
                     case 'Uint':
                     case 'Float':
                     case 'Double':
-                    case 'Price': {
+                    case 'Price':
+                    case 'Decimal': {
                         type2 = factory.createTypeReferenceNode(factory.createIdentifier('Q_NumberValue'));
                         break;
                     }
@@ -1203,15 +1161,12 @@ function constructFilter(statements, entity) {
                         break;
                     }
                     default: {
-                        var text2_3 = text === 'Schema' ? entity : text;
-                        var manyToOneItem = manyToOneSet && manyToOneSet.find(function (_a) {
-                            var _b = tslib_1.__read(_a, 1), refEntity = _b[0];
-                            return refEntity === text2_3;
-                        });
+                        const text2 = text === 'Schema' ? entity : text;
+                        const manyToOneItem = manyToOneSet && manyToOneSet.find(([refEntity]) => refEntity === text2);
                         if (manyToOneItem) {
                             // 外键可能落到相应的子查询中
-                            members.push(factory.createPropertySignature(undefined, "".concat(name_3.text, "Id"), undefined, factory.createTypeReferenceNode(factory.createIdentifier('Q_StringValue'))));
-                            type2 = factory.createTypeReferenceNode(createForeignRef(entity, text2_3, 'Filter'));
+                            members.push(factory.createPropertySignature(undefined, `${name.text}Id`, undefined, factory.createTypeReferenceNode(factory.createIdentifier('Q_StringValue'))));
+                            type2 = factory.createTypeReferenceNode(createForeignRef(entity, text2, 'Filter'));
                         }
                         else if (enumAttributes && enumAttributes[attrName] || ts.isUnionTypeNode(type)) {
                             // 这里应该都是引用某个UnionType类型的定义了，如何判断？
@@ -1229,81 +1184,53 @@ function constructFilter(statements, entity) {
                     }
                 }
                 if (type2) {
-                    members.push(factory.createPropertySignature(undefined, name_3, undefined, type2));
+                    members.push(factory.createPropertySignature(undefined, name, undefined, type2));
                 }
             }
         }
         else if (ts.isUnionTypeNode(type) && ts.isLiteralTypeNode(type.types[0]) || ts.isLiteralTypeNode(type)) {
-            members.push(factory.createPropertySignature(undefined, name_3, undefined, factory.createTypeReferenceNode(factory.createIdentifier('Q_EnumValue'), [
+            members.push(factory.createPropertySignature(undefined, name, undefined, factory.createTypeReferenceNode(factory.createIdentifier('Q_EnumValue'), [
                 type
             ])));
         }
         else {
             // 此时应当是引用本地定义的shape
             (0, assert_1.default)(type);
-            members.push(factory.createPropertySignature(undefined, name_3, undefined, factory.createTypeReferenceNode(factory.createIdentifier('JsonFilter'), [
+            members.push(factory.createPropertySignature(undefined, name, undefined, factory.createTypeReferenceNode(factory.createIdentifier('JsonFilter'), [
                 type
             ])));
         }
-    };
-    try {
-        for (var schemaAttrs_2 = tslib_1.__values(schemaAttrs), schemaAttrs_2_1 = schemaAttrs_2.next(); !schemaAttrs_2_1.done; schemaAttrs_2_1 = schemaAttrs_2.next()) {
-            var attr = schemaAttrs_2_1.value;
-            _loop_3(attr);
-        }
-    }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
-    finally {
-        try {
-            if (schemaAttrs_2_1 && !schemaAttrs_2_1.done && (_a = schemaAttrs_2.return)) _a.call(schemaAttrs_2);
-        }
-        finally { if (e_3) throw e_3.error; }
     }
     // type AttrFilter = {};
     if (ReversePointerRelations[entity]) {
         // 有反向指针，将反向指针关联的对象的Filter也注入
-        ReversePointerRelations[entity].forEach(function (ele) {
-            return members.push(factory.createPropertySignature(undefined, (0, string_1.firstLetterLowerCase)(ele), undefined, factory.createTypeReferenceNode(createForeignRef(entity, ele, 'Filter'))));
-        });
+        ReversePointerRelations[entity].forEach(ele => members.push(factory.createPropertySignature(undefined, (0, string_1.firstLetterLowerCase)(ele), undefined, factory.createTypeReferenceNode(createForeignRef(entity, ele, 'Filter')))));
     }
     // 一对多的生成子查询
-    var _f = OneToMany, _g = entity, oneToManySet = _f[_g];
+    const { [entity]: oneToManySet } = OneToMany;
     if (oneToManySet) {
-        var foreignKeySet = {};
-        try {
-            for (var oneToManySet_2 = tslib_1.__values(oneToManySet), oneToManySet_2_1 = oneToManySet_2.next(); !oneToManySet_2_1.done; oneToManySet_2_1 = oneToManySet_2.next()) {
-                var oneToManyItem = oneToManySet_2_1.value;
-                var _h = tslib_1.__read(oneToManyItem, 2), entityName = _h[0], foreignKey = _h[1];
-                if (foreignKeySet.hasOwnProperty(entityName)) {
-                    foreignKeySet[entityName].push(foreignKey);
-                }
-                else {
-                    foreignKeySet[entityName] = [foreignKey];
-                }
+        const foreignKeySet = {};
+        for (const oneToManyItem of oneToManySet) {
+            const [entityName, foreignKey] = oneToManyItem;
+            if (foreignKeySet.hasOwnProperty(entityName)) {
+                foreignKeySet[entityName].push(foreignKey);
             }
-        }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
-        finally {
-            try {
-                if (oneToManySet_2_1 && !oneToManySet_2_1.done && (_b = oneToManySet_2.return)) _b.call(oneToManySet_2);
+            else {
+                foreignKeySet[entityName] = [foreignKey];
             }
-            finally { if (e_4) throw e_4.error; }
         }
-        var _loop_4 = function (entityName) {
-            var entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
-            foreignKeySet[entityName].forEach(function (foreignKey) {
-                var identifier = "".concat(entityNameLc, "$").concat(foreignKey);
+        for (const entityName in foreignKeySet) {
+            const entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
+            foreignKeySet[entityName].forEach((foreignKey) => {
+                const identifier = `${entityNameLc}$${foreignKey}`;
                 members.push(factory.createPropertySignature(undefined, identifier, undefined, factory.createIntersectionTypeNode([
                     factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'Filter'), undefined),
                     factory.createTypeReferenceNode('SubQueryPredicateMetadata')
                 ])));
             });
-        };
-        for (var entityName in foreignKeySet) {
-            _loop_4(entityName);
         }
     }
-    statements.push(factory.createTypeAliasDeclaration(undefined, undefined, factory.createIdentifier('AttrFilter'), undefined, factory.createTypeLiteralNode(members)));
+    statements.push(factory.createTypeAliasDeclaration(undefined, factory.createIdentifier('AttrFilter'), undefined, factory.createTypeLiteralNode(members)));
     /**
      *
     export type Filter = AttrFilter | Partial<ExprOp<OpSchema> | {
@@ -1313,7 +1240,7 @@ function constructFilter(statements, entity) {
         }>;
 
      */
-    var types = [
+    const types = [
         factory.createTypeReferenceNode(factory.createIdentifier("AttrFilter")),
         factory.createTypeReferenceNode(factory.createIdentifier("ExprOp"), [
             process.env.COMPLING_AS_LIB ?
@@ -1328,7 +1255,7 @@ function constructFilter(statements, entity) {
     if (fulltextIndex) {
         types.push(factory.createTypeReferenceNode('FulltextFilter'));
     }
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Filter"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("MakeFilter"), [factory.createIntersectionTypeNode(types)])));
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Filter"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("MakeFilter"), [factory.createIntersectionTypeNode(types)])));
 }
 /**
  * 构造Projection和OneAttrProjection
@@ -1336,26 +1263,24 @@ function constructFilter(statements, entity) {
  * @param entity
  */
 function constructProjection(statements, entity) {
-    var _a, e_5, _b, e_6, _c;
-    var _d = Schema[entity], schemaAttrs = _d.schemaAttrs, enumAttributes = _d.enumAttributes;
-    var properties = [
+    const { schemaAttrs, enumAttributes } = Schema[entity];
+    const properties = [
         ['id', false],
         ['$$createAt$$', false],
         ['$$updateAt$$', false],
         ['$$seq$$', false],
     ];
-    var foreignKeyProperties = (_a = {},
-        _a[entity] = [''],
-        _a);
-    var _e = ManyToOne, _f = entity, manyToOneSet = _e[_f];
-    var _loop_5 = function (attr) {
-        var _k;
-        var _l = attr, type = _l.type, name_4 = _l.name;
-        var attrName = name_4.text;
+    const foreignKeyProperties = {
+        [entity]: [''],
+    };
+    const { [entity]: manyToOneSet } = ManyToOne;
+    for (const attr of schemaAttrs) {
+        const { type, name } = attr;
+        const attrName = name.text;
         if (ts.isTypeReferenceNode(type)) {
-            var typeName = type.typeName;
+            const { typeName } = type;
             if (ts.isIdentifier(typeName)) {
-                var text = typeName.text;
+                const { text } = typeName;
                 switch (text) {
                     case 'String':
                     case 'Text':
@@ -1369,49 +1294,47 @@ function constructProjection(statements, entity) {
                     case 'File':
                     case 'SingleGeo':
                     case 'Geo':
-                    case 'Price': {
-                        properties.push([name_4, false]);
+                    case 'Price':
+                    case 'Decimal': {
+                        properties.push([name, false]);
                         break;
                     }
                     case 'Object': {
-                        properties.push([name_4, false, factory.createUnionTypeNode([
+                        properties.push([name, false, factory.createUnionTypeNode([
                                 factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword),
                                 factory.createTypeReferenceNode(factory.createIdentifier("Object"), undefined)
                             ])]);
                         break;
                     }
                     default: {
-                        var text2_4 = text === 'Schema' ? entity : text;
-                        var manyToOneItem = manyToOneSet && manyToOneSet.find(function (_a) {
-                            var _b = tslib_1.__read(_a, 1), refEntity = _b[0];
-                            return refEntity === text2_4;
-                        });
+                        const text2 = text === 'Schema' ? entity : text;
+                        const manyToOneItem = manyToOneSet && manyToOneSet.find(([refEntity]) => refEntity === text2);
                         if (manyToOneItem) {
                             // 外键投影
-                            properties.push(["".concat(attrName, "Id"), false, undefined], [name_4, false, factory.createTypeReferenceNode(createForeignRef(entity, text2_4, 'Projection')) /* , factory.createTypeReferenceNode(
+                            properties.push([`${attrName}Id`, false, undefined], [name, false, factory.createTypeReferenceNode(createForeignRef(entity, text2, 'Projection')) /* , factory.createTypeReferenceNode(
                                     createForeignRef(entity, text2, 'ExportProjection')
                                 ) */
                             ]);
-                            if (foreignKeyProperties.hasOwnProperty(text2_4)) {
-                                foreignKeyProperties[text2_4].push(attrName);
+                            if (foreignKeyProperties.hasOwnProperty(text2)) {
+                                foreignKeyProperties[text2].push(attrName);
                             }
                             else {
-                                (0, lodash_1.assign)(foreignKeyProperties, (_k = {},
-                                    _k[text2_4] = [attrName],
-                                    _k));
+                                (0, lodash_1.assign)(foreignKeyProperties, {
+                                    [text2]: [attrName],
+                                });
                             }
                         }
                         else {
                             if (!enumAttributes || !enumAttributes[attrName]) {
                                 // 引用的非enum类型shape
-                                properties.push([name_4, false, factory.createUnionTypeNode([
+                                properties.push([name, false, factory.createUnionTypeNode([
                                         factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword),
                                         factory.createTypeReferenceNode(factory.createIdentifier("JsonProjection"), [type])
                                     ])]);
                             }
                             else {
                                 // 引用的enum类型shape
-                                properties.push([name_4, false, undefined]);
+                                properties.push([name, false, undefined]);
                             }
                         }
                     }
@@ -1425,34 +1348,20 @@ function constructProjection(statements, entity) {
             // 增加了本身object的shape定义
             // assert(ts.isUnionTypeNode(type!) && ts.isLiteralTypeNode(type.types[0]) || ts.isLiteralTypeNode(type!));
             if (enumAttributes && enumAttributes[attrName] || ts.isUnionTypeNode(type) && ts.isLiteralTypeNode(type.types[0])) {
-                properties.push([name_4, false, undefined]);
+                properties.push([name, false, undefined]);
             }
             else {
                 // 如果是非枚举类型的其它对象的union定义，加上JsonProjection
-                properties.push([name_4, false, factory.createUnionTypeNode([
+                properties.push([name, false, factory.createUnionTypeNode([
                         factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword),
                         factory.createTypeReferenceNode(factory.createIdentifier("JsonProjection"), [type])
                     ])]);
             }
         }
-    };
-    try {
-        for (var schemaAttrs_3 = tslib_1.__values(schemaAttrs), schemaAttrs_3_1 = schemaAttrs_3.next(); !schemaAttrs_3_1.done; schemaAttrs_3_1 = schemaAttrs_3.next()) {
-            var attr = schemaAttrs_3_1.value;
-            _loop_5(attr);
-        }
-    }
-    catch (e_5_1) { e_5 = { error: e_5_1 }; }
-    finally {
-        try {
-            if (schemaAttrs_3_1 && !schemaAttrs_3_1.done && (_b = schemaAttrs_3.return)) _b.call(schemaAttrs_3);
-        }
-        finally { if (e_5) throw e_5.error; }
     }
     if (ReversePointerRelations[entity]) {
-        ReversePointerRelations[entity].forEach(function (one) {
-            var _a;
-            var text2 = one === 'Schema' ? entity : one;
+        ReversePointerRelations[entity].forEach((one) => {
+            const text2 = one === 'Schema' ? entity : one;
             properties.push([(0, string_1.firstLetterLowerCase)(one), false, factory.createTypeReferenceNode(createForeignRef(entity, one, 'Projection')) /* , factory.createTypeReferenceNode(
                     createForeignRef(entity, one, 'ExportProjection')
                 ) */
@@ -1461,40 +1370,30 @@ function constructProjection(statements, entity) {
                 foreignKeyProperties[text2].push('entity');
             }
             else {
-                (0, lodash_1.assign)(foreignKeyProperties, (_a = {},
-                    _a[text2] = ['entity'],
-                    _a));
+                (0, lodash_1.assign)(foreignKeyProperties, {
+                    [text2]: ['entity'],
+                });
             }
         });
     }
     // 一对多的projection
-    var _g = OneToMany, _h = entity, oneToManySet = _g[_h];
+    const { [entity]: oneToManySet } = OneToMany;
     if (oneToManySet) {
-        var foreignKeySet = {};
-        try {
-            for (var oneToManySet_3 = tslib_1.__values(oneToManySet), oneToManySet_3_1 = oneToManySet_3.next(); !oneToManySet_3_1.done; oneToManySet_3_1 = oneToManySet_3.next()) {
-                var oneToManyItem = oneToManySet_3_1.value;
-                var _j = tslib_1.__read(oneToManyItem, 2), entityName = _j[0], foreignKey = _j[1];
-                if (foreignKeySet.hasOwnProperty(entityName)) {
-                    foreignKeySet[entityName].push(foreignKey);
-                }
-                else {
-                    foreignKeySet[entityName] = [foreignKey];
-                }
+        const foreignKeySet = {};
+        for (const oneToManyItem of oneToManySet) {
+            const [entityName, foreignKey] = oneToManyItem;
+            if (foreignKeySet.hasOwnProperty(entityName)) {
+                foreignKeySet[entityName].push(foreignKey);
             }
-        }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
-        finally {
-            try {
-                if (oneToManySet_3_1 && !oneToManySet_3_1.done && (_c = oneToManySet_3.return)) _c.call(oneToManySet_3);
+            else {
+                foreignKeySet[entityName] = [foreignKey];
             }
-            finally { if (e_6) throw e_6.error; }
         }
-        var _loop_6 = function (entityName) {
-            var entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
-            foreignKeySet[entityName].forEach(function (foreignKey) {
-                var identifier = "".concat(entityNameLc, "$").concat(foreignKey);
-                var aggrIdentifier = "".concat(entityNameLc, "$").concat(foreignKey, "$$aggr");
+        for (const entityName in foreignKeySet) {
+            const entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
+            foreignKeySet[entityName].forEach((foreignKey) => {
+                const identifier = `${entityNameLc}$${foreignKey}`;
+                const aggrIdentifier = `${entityNameLc}$${foreignKey}$$aggr`;
                 properties.push([identifier, false,
                     factory.createIntersectionTypeNode([
                         factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'Selection'), undefined),
@@ -1525,12 +1424,9 @@ function constructProjection(statements, entity) {
                     ])
                 ]);
             });
-        };
-        for (var entityName in foreignKeySet) {
-            _loop_6(entityName);
         }
     }
-    var exprNode = factory.createTypeReferenceNode(factory.createIdentifier("Partial"), [
+    const exprNode = factory.createTypeReferenceNode(factory.createIdentifier("Partial"), [
         factory.createTypeReferenceNode(factory.createIdentifier("ExprOp"), [
             process.env.COMPLING_AS_LIB ?
                 factory.createUnionTypeNode([
@@ -1540,16 +1436,15 @@ function constructProjection(statements, entity) {
                 factory.createTypeReferenceNode(factory.createIdentifier('OpAttr'))
         ])
     ]);
-    var MetaPropertySignatures = [
+    const MetaPropertySignatures = [
         factory.createPropertySignature(undefined, factory.createStringLiteral("#id"), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode('NodeId'))
     ];
     if (process.env.COMPLING_AS_LIB) {
-        MetaPropertySignatures.push(factory.createIndexSignature(undefined, undefined, [factory.createParameterDeclaration(undefined, undefined, undefined, factory.createIdentifier("k"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)));
+        MetaPropertySignatures.push(factory.createIndexSignature(undefined, [factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier("k"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)));
     }
     // Projection，正常查询的投影
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Projection"), undefined, factory.createIntersectionTypeNode([
-        factory.createTypeLiteralNode(MetaPropertySignatures.concat(properties.map(function (_a) {
-            var _b = tslib_1.__read(_a, 3), n = _b[0], q = _b[1], v = _b[2];
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Projection"), undefined, factory.createIntersectionTypeNode([
+        factory.createTypeLiteralNode(MetaPropertySignatures.concat(properties.map(([n, q, v]) => {
             return factory.createPropertySignature(undefined, n, q ? undefined : factory.createToken(ts.SyntaxKind.QuestionToken), v || factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword));
         }))),
         exprNode,
@@ -1582,10 +1477,10 @@ function constructProjection(statements, entity) {
         )
     ); */
     // ${Entity}Projection，外键查询的专用投影
-    for (var foreignKey in foreignKeyProperties) {
-        var identifier = "".concat(foreignKey, "IdProjection");
-        statements.push(factory.createTypeAliasDeclaration(undefined, undefined, factory.createIdentifier(identifier), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OneOf"), [
-            factory.createTypeLiteralNode(foreignKeyProperties[foreignKey].map(function (attr) { return factory.createPropertySignature(undefined, attr ? factory.createIdentifier("".concat(attr, "Id")) : 'id', undefined, factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword)); }))
+    for (const foreignKey in foreignKeyProperties) {
+        const identifier = `${foreignKey}IdProjection`;
+        statements.push(factory.createTypeAliasDeclaration(undefined, factory.createIdentifier(identifier), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OneOf"), [
+            factory.createTypeLiteralNode(foreignKeyProperties[foreignKey].map((attr) => factory.createPropertySignature(undefined, attr ? factory.createIdentifier(`${attr}Id`) : 'id', undefined, factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword))))
         ])));
     }
 }
@@ -1595,7 +1490,7 @@ function constructProjection(statements, entity) {
  * @param entity
  */
 function constructQuery(statements, entity) {
-    var entityLc = (0, string_1.firstLetterLowerCase)(entity);
+    const entityLc = (0, string_1.firstLetterLowerCase)(entity);
     /* statements.push(
         factory.createTypeAliasDeclaration(
             undefined,
@@ -1697,15 +1592,11 @@ function constructQuery(statements, entity) {
         )
     ); */
     // 对每个可能的外键的子查询，建立相应的${Entity}IdSubQuery    
-    var _a = ManyToOne, _b = entity, manyToOneSet = _a[_b];
-    var manyToSelf = false;
+    const { [entity]: manyToOneSet } = ManyToOne;
+    let manyToSelf = false;
     if (manyToOneSet) {
-        (0, lodash_1.uniqBy)(manyToOneSet, function (_a) {
-            var _b = tslib_1.__read(_a, 1), a = _b[0];
-            return a;
-        }).forEach(function (_a) {
-            var _b = tslib_1.__read(_a, 2), oneEntity = _b[0], foreignKey = _b[1];
-            statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("".concat(oneEntity, "IdSubQuery")), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Selection"), [factory.createTypeReferenceNode(factory.createIdentifier("".concat(oneEntity, "IdProjection")), undefined)])));
+        (0, lodash_1.uniqBy)(manyToOneSet, ([a]) => a).forEach(([oneEntity, foreignKey]) => {
+            statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier(`${oneEntity}IdSubQuery`), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Selection"), [factory.createTypeReferenceNode(factory.createIdentifier(`${oneEntity}IdProjection`), undefined)])));
             if (oneEntity === entity) {
                 manyToSelf = true;
             }
@@ -1713,7 +1604,7 @@ function constructQuery(statements, entity) {
     }
     // 主键可能产生的子查询
     if (!manyToSelf) {
-        statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("".concat(entity, "IdSubQuery")), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Selection"), [factory.createTypeReferenceNode(factory.createIdentifier("".concat(entity, "IdProjection")), undefined)])));
+        statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier(`${entity}IdSubQuery`), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Selection"), [factory.createTypeReferenceNode(factory.createIdentifier(`${entity}IdProjection`), undefined)])));
     }
 }
 /**
@@ -1722,9 +1613,8 @@ function constructQuery(statements, entity) {
  * @param entity
  */
 function constructSorter(statements, entity) {
-    var e_7, _a;
-    var schemaAttrs = Schema[entity].schemaAttrs;
-    var members = [
+    const { schemaAttrs } = Schema[entity];
+    const members = [
         // id: 1
         factory.createTypeLiteralNode([factory.createPropertySignature(undefined, factory.createIdentifier("id"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword))]),
         // $$createAt$$: 1
@@ -1734,14 +1624,14 @@ function constructSorter(statements, entity) {
         // $$updateAt$$: 1
         factory.createTypeLiteralNode([factory.createPropertySignature(undefined, factory.createIdentifier("$$updateAt$$"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword))]),
     ];
-    var _b = ManyToOne, _c = entity, manyToOneSet = _b[_c];
-    var _loop_7 = function (attr) {
-        var _d = attr, type = _d.type, name_5 = _d.name, questionToken = _d.questionToken;
+    const { [entity]: manyToOneSet } = ManyToOne;
+    for (const attr of schemaAttrs) {
+        const { type, name, questionToken } = attr;
         if (ts.isTypeReferenceNode(type)) {
-            var typeName = type.typeName;
+            const { typeName } = type;
             if (ts.isIdentifier(typeName)) {
-                var text = typeName.text;
-                var type2 = void 0;
+                const { text } = typeName;
+                let type2;
                 switch (text) {
                     case 'String':
                     case 'Text':
@@ -1757,14 +1647,11 @@ function constructSorter(statements, entity) {
                         break;
                     }
                     default: {
-                        var text2_5 = text === 'Schema' ? entity : text;
-                        var manyToOneItem = manyToOneSet && manyToOneSet.find(function (_a) {
-                            var _b = tslib_1.__read(_a, 1), refEntity = _b[0];
-                            return refEntity === text2_5;
-                        });
+                        const text2 = text === 'Schema' ? entity : text;
+                        const manyToOneItem = manyToOneSet && manyToOneSet.find(([refEntity]) => refEntity === text2);
                         if (manyToOneItem) {
-                            type2 = factory.createTypeReferenceNode(createForeignRef(entity, text2_5, 'SortAttr'));
-                            members.push(factory.createTypeLiteralNode([factory.createPropertySignature(undefined, factory.createIdentifier("".concat(name_5.text, "Id")), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword))]));
+                            type2 = factory.createTypeReferenceNode(createForeignRef(entity, text2, 'SortAttr'));
+                            members.push(factory.createTypeLiteralNode([factory.createPropertySignature(undefined, factory.createIdentifier(`${name.text}Id`), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword))]));
                         }
                         else if (!['Object'].includes(text)) {
                             // todo 对State的专门处理
@@ -1773,37 +1660,24 @@ function constructSorter(statements, entity) {
                     }
                 }
                 if (type2) {
-                    members.push(factory.createTypeLiteralNode([factory.createPropertySignature(undefined, name_5, undefined, type2)]));
+                    members.push(factory.createTypeLiteralNode([factory.createPropertySignature(undefined, name, undefined, type2)]));
                 }
             }
         }
         else if (ts.isUnionTypeNode(type) && ts.isLiteralTypeNode(type.types[0]) || ts.isLiteralTypeNode(type)) {
-            members.push(factory.createTypeLiteralNode([factory.createPropertySignature(undefined, name_5, undefined, factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword))]));
+            members.push(factory.createTypeLiteralNode([factory.createPropertySignature(undefined, name, undefined, factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword))]));
         }
         else {
             // 本地规定的shape，非结构化属性不参与排序
         }
-    };
-    try {
-        for (var schemaAttrs_4 = tslib_1.__values(schemaAttrs), schemaAttrs_4_1 = schemaAttrs_4.next(); !schemaAttrs_4_1.done; schemaAttrs_4_1 = schemaAttrs_4.next()) {
-            var attr = schemaAttrs_4_1.value;
-            _loop_7(attr);
-        }
-    }
-    catch (e_7_1) { e_7 = { error: e_7_1 }; }
-    finally {
-        try {
-            if (schemaAttrs_4_1 && !schemaAttrs_4_1.done && (_a = schemaAttrs_4.return)) _a.call(schemaAttrs_4);
-        }
-        finally { if (e_7) throw e_7.error; }
     }
     if (ReversePointerRelations[entity]) {
-        ReversePointerRelations[entity].forEach(function (one) {
+        ReversePointerRelations[entity].forEach((one) => {
             members.push(factory.createTypeLiteralNode([factory.createPropertySignature(undefined, (0, string_1.firstLetterLowerCase)(one), undefined, factory.createTypeReferenceNode(createForeignRef(entity, one, 'SortAttr')))]));
         });
     }
     if (process.env.COMPLING_AS_LIB) {
-        members.push(factory.createTypeLiteralNode([factory.createIndexSignature(undefined, undefined, [factory.createParameterDeclaration(undefined, undefined, undefined, factory.createIdentifier("k"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword))]));
+        members.push(factory.createTypeLiteralNode([factory.createIndexSignature(undefined, [factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier("k"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword))]));
     }
     members.push(factory.createTypeReferenceNode(factory.createIdentifier("OneOf"), [factory.createTypeReferenceNode(factory.createIdentifier("ExprOp"), [
             process.env.COMPLING_AS_LIB ?
@@ -1829,14 +1703,14 @@ function constructSorter(statements, entity) {
             [k: string]: any;
         } | OneOf<ExprOp<OpAttr>>
      */
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("SortAttr"), undefined, factory.createUnionTypeNode(members)));
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("SortAttr"), undefined, factory.createUnionTypeNode(members)));
     /**
      * export type SortNode = {
         $attr: SortAttr;
         $direction?: 'asc' | 'desc';
     };
      */
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("SortNode"), undefined, factory.createTypeLiteralNode([
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("SortNode"), undefined, factory.createTypeLiteralNode([
         factory.createPropertySignature(undefined, factory.createIdentifier("$attr"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("SortAttr"), undefined)),
         factory.createPropertySignature(undefined, factory.createIdentifier("$direction"), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode([
             factory.createLiteralTypeNode(factory.createStringLiteral("asc")),
@@ -1846,70 +1720,50 @@ function constructSorter(statements, entity) {
     /**
      * export type Sorter = SortNode[];
      */
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Sorter"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("SortNode"), undefined))));
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Sorter"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("SortNode"), undefined))));
 }
 function constructFullAttrs(statements, entity) {
-    var e_8, _a, e_9, _b;
-    var _c = ManyToOne, _d = entity, manyToOneSet = _c[_d];
-    var _e = OneToMany, _f = entity, oneToManySet = _e[_f];
+    const { [entity]: manyToOneSet } = ManyToOne;
+    const { [entity]: oneToManySet } = OneToMany;
     if (manyToOneSet && manyToOneSet.length) {
-        var mtoAttrs = [];
-        try {
-            for (var manyToOneSet_1 = tslib_1.__values(manyToOneSet), manyToOneSet_1_1 = manyToOneSet_1.next(); !manyToOneSet_1_1.done; manyToOneSet_1_1 = manyToOneSet_1.next()) {
-                var item = manyToOneSet_1_1.value;
-                var _g = tslib_1.__read(item, 2), one = _g[0], key = _g[1];
-                if (one === entity) {
-                    // 递归引用自身，因为typescript本身不支持递归，因此这里做一个显式的三层递归应该够用了
-                    mtoAttrs.push(factory.createTemplateLiteralType(factory.createTemplateHead("".concat(key, "."), "".concat(key, ".")), [factory.createTemplateLiteralTypeSpan(factory.createTypeReferenceNode(factory.createIdentifier("OpAttr"), undefined), factory.createTemplateTail("", ""))]), factory.createTemplateLiteralType(factory.createTemplateHead("".concat(key, ".").concat(key, "."), "".concat(key, ".").concat(key, ".")), [factory.createTemplateLiteralTypeSpan(factory.createTypeReferenceNode(factory.createIdentifier("OpAttr"), undefined), factory.createTemplateTail("", ""))]), factory.createTemplateLiteralType(factory.createTemplateHead("".concat(key, ".").concat(key, ".").concat(key, "."), "".concat(key, ".").concat(key, ".").concat(key, ".")), [factory.createTemplateLiteralTypeSpan(factory.createTypeReferenceNode(factory.createIdentifier("OpAttr"), undefined), factory.createTemplateTail("", ""))]));
-                }
-                else {
-                    mtoAttrs.push(factory.createTemplateLiteralType(factory.createTemplateHead("".concat(key, "."), "".concat(key, ".")), [factory.createTemplateLiteralTypeSpan(factory.createTypeReferenceNode(factory.createQualifiedName(factory.createIdentifier(one), factory.createIdentifier("NativeAttr")), undefined), factory.createTemplateTail("", ""))
-                    ]));
-                }
+        const mtoAttrs = [];
+        for (const item of manyToOneSet) {
+            const [one, key] = item;
+            if (one === entity) {
+                // 递归引用自身，因为typescript本身不支持递归，因此这里做一个显式的三层递归应该够用了
+                mtoAttrs.push(factory.createTemplateLiteralType(factory.createTemplateHead(`${key}.`, `${key}.`), [factory.createTemplateLiteralTypeSpan(factory.createTypeReferenceNode(factory.createIdentifier("OpAttr"), undefined), factory.createTemplateTail("", ""))]), factory.createTemplateLiteralType(factory.createTemplateHead(`${key}.${key}.`, `${key}.${key}.`), [factory.createTemplateLiteralTypeSpan(factory.createTypeReferenceNode(factory.createIdentifier("OpAttr"), undefined), factory.createTemplateTail("", ""))]), factory.createTemplateLiteralType(factory.createTemplateHead(`${key}.${key}.${key}.`, `${key}.${key}.${key}.`), [factory.createTemplateLiteralTypeSpan(factory.createTypeReferenceNode(factory.createIdentifier("OpAttr"), undefined), factory.createTemplateTail("", ""))]));
             }
-        }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
-        finally {
-            try {
-                if (manyToOneSet_1_1 && !manyToOneSet_1_1.done && (_a = manyToOneSet_1.return)) _a.call(manyToOneSet_1);
+            else {
+                mtoAttrs.push(factory.createTemplateLiteralType(factory.createTemplateHead(`${key}.`, `${key}.`), [factory.createTemplateLiteralTypeSpan(factory.createTypeReferenceNode(factory.createQualifiedName(factory.createIdentifier(one), factory.createIdentifier("NativeAttr")), undefined), factory.createTemplateTail("", ""))
+                ]));
             }
-            finally { if (e_8) throw e_8.error; }
         }
-        statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("NativeAttr"), undefined, factory.createUnionTypeNode(tslib_1.__spreadArray([
-            factory.createTypeReferenceNode(factory.createIdentifier("OpAttr"), undefined)
-        ], tslib_1.__read(mtoAttrs), false))));
+        statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("NativeAttr"), undefined, factory.createUnionTypeNode([
+            factory.createTypeReferenceNode(factory.createIdentifier("OpAttr"), undefined),
+            ...mtoAttrs
+        ])));
     }
     else {
-        statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("NativeAttr"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OpAttr"), undefined)));
+        statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("NativeAttr"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OpAttr"), undefined)));
     }
-    var foreignKeySet = {};
+    const foreignKeySet = {};
     if (oneToManySet && oneToManySet.length > 0) {
-        try {
-            for (var oneToManySet_4 = tslib_1.__values(oneToManySet), oneToManySet_4_1 = oneToManySet_4.next(); !oneToManySet_4_1.done; oneToManySet_4_1 = oneToManySet_4.next()) {
-                var oneToManyItem = oneToManySet_4_1.value;
-                var _h = tslib_1.__read(oneToManyItem, 2), entityName = _h[0], foreignKey = _h[1];
-                if (foreignKeySet.hasOwnProperty(entityName)) {
-                    foreignKeySet[entityName].push(foreignKey);
-                }
-                else {
-                    foreignKeySet[entityName] = [foreignKey];
-                }
+        for (const oneToManyItem of oneToManySet) {
+            const [entityName, foreignKey] = oneToManyItem;
+            if (foreignKeySet.hasOwnProperty(entityName)) {
+                foreignKeySet[entityName].push(foreignKey);
             }
-        }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
-        finally {
-            try {
-                if (oneToManySet_4_1 && !oneToManySet_4_1.done && (_b = oneToManySet_4.return)) _b.call(oneToManySet_4);
+            else {
+                foreignKeySet[entityName] = [foreignKey];
             }
-            finally { if (e_9) throw e_9.error; }
         }
-        var otmAttrs_1 = [];
-        var _loop_8 = function (entityName) {
-            var entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
+        const otmAttrs = [];
+        for (const entityName in foreignKeySet) {
+            const entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
             if (foreignKeySet[entityName].length > 1) {
-                foreignKeySet[entityName].forEach(function (foreignKey) {
-                    var head = "".concat(entityNameLc, "s$").concat(foreignKey);
-                    otmAttrs_1.push(factory.createTemplateLiteralType(factory.createTemplateHead("".concat(head, "$"), "".concat(head, "$")), [
+                foreignKeySet[entityName].forEach((foreignKey) => {
+                    const head = `${entityNameLc}s$${foreignKey}`;
+                    otmAttrs.push(factory.createTemplateLiteralType(factory.createTemplateHead(`${head}$`, `${head}$`), [
                         factory.createTemplateLiteralTypeSpan(factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword), factory.createTemplateMiddle(".", ".")),
                         factory.createTemplateLiteralTypeSpan(factory.createTypeReferenceNode(entityName === entity
                             ? factory.createIdentifier("NativeAttr")
@@ -1918,40 +1772,37 @@ function constructFullAttrs(statements, entity) {
                 });
             }
             else {
-                otmAttrs_1.push(factory.createTemplateLiteralType(factory.createTemplateHead("".concat(entityNameLc, "s$"), "".concat(entityNameLc, "s$")), [
+                otmAttrs.push(factory.createTemplateLiteralType(factory.createTemplateHead(`${entityNameLc}s$`, `${entityNameLc}s$`), [
                     factory.createTemplateLiteralTypeSpan(factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword), factory.createTemplateMiddle(".", ".")),
                     factory.createTemplateLiteralTypeSpan(factory.createTypeReferenceNode(entityName === entity
                         ? factory.createIdentifier("NativeAttr")
                         : factory.createQualifiedName(factory.createIdentifier(entityName), factory.createIdentifier("NativeAttr")), undefined), factory.createTemplateTail("", ""))
                 ]));
             }
-        };
-        for (var entityName in foreignKeySet) {
-            _loop_8(entityName);
         }
-        statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("FullAttr"), undefined, factory.createUnionTypeNode(tslib_1.__spreadArray([
-            factory.createTypeReferenceNode(factory.createIdentifier("NativeAttr"), undefined)
-        ], tslib_1.__read(otmAttrs_1), false))));
+        statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("FullAttr"), undefined, factory.createUnionTypeNode([
+            factory.createTypeReferenceNode(factory.createIdentifier("NativeAttr"), undefined),
+            ...otmAttrs
+        ])));
     }
     else {
-        statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("FullAttr"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("NativeAttr"), undefined)));
+        statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("FullAttr"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("NativeAttr"), undefined)));
     }
 }
 function constructOperations(statements, entity) {
-    var e_10, _a, e_11, _b, e_12, _c, e_13, _d, e_14, _e, e_15, _f, e_16, _g, e_17, _h, e_18, _j;
     // Selection
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("SelectOperation"), [
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("SelectOperation"), [
         factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("P"), factory.createTypeReferenceNode(factory.createIdentifier("Object"), undefined), factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined))
     ], factory.createTypeReferenceNode(factory.createIdentifier("OakSelection"), [
         factory.createLiteralTypeNode(factory.createStringLiteral("select")),
         factory.createTypeReferenceNode(factory.createIdentifier("P"), undefined),
         factory.createTypeReferenceNode(factory.createIdentifier("Filter"), undefined),
         factory.createTypeReferenceNode(factory.createIdentifier("Sorter"), undefined)
-    ])), factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Selection"), [
+    ])), factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Selection"), [
         factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("P"), factory.createTypeReferenceNode(factory.createIdentifier("Object"), undefined), factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined))
     ], factory.createTypeReferenceNode(factory.createIdentifier("SelectOperation"), [
         factory.createTypeReferenceNode(factory.createIdentifier("P"), undefined)
-    ])), factory.createTypeAliasDeclaration(undefined, [factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Aggregation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("DeduceAggregation"), [
+    ])), factory.createTypeAliasDeclaration([factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Aggregation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("DeduceAggregation"), [
         factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined),
         factory.createTypeReferenceNode(factory.createIdentifier("Filter"), undefined),
         factory.createTypeReferenceNode(factory.createIdentifier("Sorter"), undefined)
@@ -1984,58 +1835,38 @@ function constructOperations(statements, entity) {
              )
          )
      ); */
-    var _k = ManyToOne, _l = entity, manyToOneSet = _k[_l];
-    var _m = OneToMany, _o = entity, oneToManySet = _m[_o];
-    var foreignKeySet = {};
+    const { [entity]: manyToOneSet } = ManyToOne;
+    const { [entity]: oneToManySet } = OneToMany;
+    const foreignKeySet = {};
     if (oneToManySet) {
-        try {
-            for (var oneToManySet_5 = tslib_1.__values(oneToManySet), oneToManySet_5_1 = oneToManySet_5.next(); !oneToManySet_5_1.done; oneToManySet_5_1 = oneToManySet_5.next()) {
-                var oneToManyItem = oneToManySet_5_1.value;
-                var _p = tslib_1.__read(oneToManyItem, 2), entityName = _p[0], foreignKey = _p[1];
-                if (foreignKeySet.hasOwnProperty(entityName)) {
-                    foreignKeySet[entityName].push(foreignKey);
-                }
-                else {
-                    foreignKeySet[entityName] = [foreignKey];
-                }
+        for (const oneToManyItem of oneToManySet) {
+            const [entityName, foreignKey] = oneToManyItem;
+            if (foreignKeySet.hasOwnProperty(entityName)) {
+                foreignKeySet[entityName].push(foreignKey);
             }
-        }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
-        finally {
-            try {
-                if (oneToManySet_5_1 && !oneToManySet_5_1.done && (_a = oneToManySet_5.return)) _a.call(oneToManySet_5);
+            else {
+                foreignKeySet[entityName] = [foreignKey];
             }
-            finally { if (e_10) throw e_10.error; }
         }
     }
     // CreateOperationData
-    var foreignKeyAttr = [];
+    let foreignKeyAttr = [];
     if (ReversePointerEntities[entity]) {
         foreignKeyAttr.push('entity', 'entityId');
     }
     if (manyToOneSet) {
-        try {
-            for (var manyToOneSet_2 = tslib_1.__values(manyToOneSet), manyToOneSet_2_1 = manyToOneSet_2.next(); !manyToOneSet_2_1.done; manyToOneSet_2_1 = manyToOneSet_2.next()) {
-                var one = manyToOneSet_2_1.value;
-                if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[1])) {
-                    foreignKeyAttr.push("".concat(one[1], "Id"));
-                }
-            }
-        }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
-        finally {
-            try {
-                if (manyToOneSet_2_1 && !manyToOneSet_2_1.done && (_b = manyToOneSet_2.return)) _b.call(manyToOneSet_2);
+        for (const one of manyToOneSet) {
+            if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[1])) {
+                foreignKeyAttr.push(`${one[1]}Id`);
             }
-            finally { if (e_11) throw e_11.error; }
         }
     }
-    var adNodes = [
+    let adNodes = [
         factory.createTypeReferenceNode(factory.createIdentifier("FormCreateData"), [
             foreignKeyAttr.length > 0
                 ? factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
                     factory.createTypeReferenceNode(factory.createIdentifier("OpSchema"), undefined),
-                    factory.createUnionTypeNode((0, lodash_1.uniq)(foreignKeyAttr).map(function (ele) { return factory.createLiteralTypeNode(factory.createStringLiteral(ele)); }))
+                    factory.createUnionTypeNode((0, lodash_1.uniq)(foreignKeyAttr).map(ele => factory.createLiteralTypeNode(factory.createStringLiteral(ele))))
                 ])
                 : factory.createTypeReferenceNode(factory.createIdentifier("OpSchema"), undefined)
         ])
@@ -2047,133 +1878,112 @@ function constructOperations(statements, entity) {
          * 如果关联对象是update，则关联对象的filter由对象决定其主键
          * 见cascadeStore
          */
-        var upsertOneNodes = [];
-        try {
-            for (var manyToOneSet_3 = tslib_1.__values(manyToOneSet), manyToOneSet_3_1 = manyToOneSet_3.next(); !manyToOneSet_3_1.done; manyToOneSet_3_1 = manyToOneSet_3.next()) {
-                var one = manyToOneSet_3_1.value;
-                if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[0])) {
-                    var oneEntity = one[0];
-                    var cascadeCreateNode = factory.createTypeLiteralNode([
-                        factory.createPropertySignature(undefined, factory.createIdentifier("".concat(one[1], "Id")), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
-                        factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), one[2] ? factory.createToken(ts.SyntaxKind.QuestionToken) : undefined, factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'CreateSingleOperation')))
-                    ]);
-                    var cascadeUpdateNode = factory.createTypeLiteralNode([
-                        factory.createPropertySignature(undefined, factory.createIdentifier("".concat(one[1], "Id")), undefined, factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one[1]))])),
-                        factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'UpdateOperation')))
-                    ]);
-                    var noCascadeNode = factory.createTypeLiteralNode([
-                        factory.createPropertySignature(undefined, factory.createIdentifier("".concat(one[1], "Id")), one[2] ? factory.createToken(ts.SyntaxKind.QuestionToken) : undefined, factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one[1]))]))
-                    ]);
-                    if (Schema[oneEntity].static) {
-                        upsertOneNodes.push(noCascadeNode);
-                    }
-                    else {
-                        switch (Schema[oneEntity].actionType) {
-                            case 'crud':
-                            case 'excludeRemove': {
-                                upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, cascadeUpdateNode, noCascadeNode]));
-                                break;
-                            }
-                            case 'excludeUpdate':
-                            case 'appendOnly': {
-                                upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, noCascadeNode]));
-                                break;
-                            }
-                            case 'readOnly': {
-                                upsertOneNodes.push(noCascadeNode);
-                                break;
-                            }
-                            default: {
-                                (0, assert_1.default)(false);
-                            }
+        const upsertOneNodes = [];
+        for (const one of manyToOneSet) {
+            if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[0])) {
+                const oneEntity = one[0];
+                const cascadeCreateNode = factory.createTypeLiteralNode([
+                    factory.createPropertySignature(undefined, factory.createIdentifier(`${one[1]}Id`), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
+                    factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), one[2] ? factory.createToken(ts.SyntaxKind.QuestionToken) : undefined, factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'CreateSingleOperation')))
+                ]);
+                const cascadeUpdateNode = factory.createTypeLiteralNode([
+                    factory.createPropertySignature(undefined, factory.createIdentifier(`${one[1]}Id`), undefined, factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one[1]))])),
+                    factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'UpdateOperation')))
+                ]);
+                const noCascadeNode = factory.createTypeLiteralNode([
+                    factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
+                    factory.createPropertySignature(undefined, factory.createIdentifier(`${one[1]}Id`), one[2] ? factory.createToken(ts.SyntaxKind.QuestionToken) : undefined, factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one[1]))]))
+                ]);
+                if (Schema[oneEntity].static) {
+                    upsertOneNodes.push(noCascadeNode);
+                }
+                else {
+                    switch (Schema[oneEntity].actionType) {
+                        case 'crud':
+                        case 'excludeRemove': {
+                            upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, cascadeUpdateNode, noCascadeNode]));
+                            break;
+                        }
+                        case 'excludeUpdate':
+                        case 'appendOnly': {
+                            upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, noCascadeNode]));
+                            break;
+                        }
+                        case 'readOnly': {
+                            upsertOneNodes.push(noCascadeNode);
+                            break;
+                        }
+                        default: {
+                            (0, assert_1.default)(false);
                         }
                     }
                 }
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
-        finally {
-            try {
-                if (manyToOneSet_3_1 && !manyToOneSet_3_1.done && (_c = manyToOneSet_3.return)) _c.call(manyToOneSet_3);
-            }
-            finally { if (e_12) throw e_12.error; }
-        }
         if (upsertOneNodes.length > 0) {
             adNodes.push(factory.createIntersectionTypeNode(upsertOneNodes));
         }
     }
-    var reverseOneNodes = [];
+    const reverseOneNodes = [];
     if (ReversePointerEntities[entity]) {
         if (ReversePointerRelations[entity]) {
-            var schemaAttrs = Schema[entity].schemaAttrs;
-            var entityQuestionToken = schemaAttrs.find(function (ele) {
-                var name = ele.name;
+            const { schemaAttrs } = Schema[entity];
+            const { questionToken: entityQuestionToken } = schemaAttrs.find(ele => {
+                const { name } = ele;
                 return name.text === 'entity';
-            }).questionToken;
-            var entityIdQuestionToken = schemaAttrs.find(function (ele) {
-                var name = ele.name;
+            });
+            const { questionToken: entityIdQuestionToken } = schemaAttrs.find(ele => {
+                const { name } = ele;
                 return name.text === 'entityId';
-            }).questionToken;
-            try {
-                for (var _q = tslib_1.__values(ReversePointerRelations[entity]), _r = _q.next(); !_r.done; _r = _q.next()) {
-                    var one = _r.value;
-                    var cascadeCreateNode = factory.createTypeLiteralNode([
-                        factory.createPropertySignature(undefined, factory.createIdentifier('entity'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
-                        factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
-                        factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), undefined, // 反向指针好像不能为空，以后或许会有特例  by Xc
-                        factory.createTypeReferenceNode(createForeignRef(entity, one, 'CreateSingleOperation')))
-                    ]);
-                    var cascadeUpdateNode = factory.createTypeLiteralNode([
-                        factory.createPropertySignature(undefined, factory.createIdentifier('entity'), undefined, // 反向指针好像不能为空，以后或许会有特例  by Xc
-                        factory.createLiteralTypeNode(factory.createStringLiteral("".concat((0, string_1.firstLetterLowerCase)(one))))),
-                        factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), undefined, // 反向指针好像不能为空，以后或许会有特例  by Xc
-                        factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one))])),
-                        factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), undefined, factory.createTypeReferenceNode(createForeignRef(entity, one, 'UpdateOperation')))
-                    ]);
-                    var noCascadeNode = factory.createTypeLiteralNode([
-                        factory.createPropertySignature(undefined, factory.createIdentifier('entity'), entityQuestionToken, factory.createLiteralTypeNode(factory.createStringLiteral("".concat((0, string_1.firstLetterLowerCase)(one))))),
-                        factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), entityIdQuestionToken, factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one))]))
-                    ]);
-                    if (Schema[one].static) {
-                        reverseOneNodes.push(noCascadeNode);
-                    }
-                    else {
-                        switch (Schema[one].actionType) {
-                            case 'crud':
-                            case 'excludeRemove': {
-                                reverseOneNodes.push(cascadeCreateNode, cascadeUpdateNode, noCascadeNode);
-                                break;
-                            }
-                            case 'appendOnly':
-                            case 'excludeUpdate': {
-                                reverseOneNodes.push(cascadeCreateNode, noCascadeNode);
-                                break;
-                            }
-                            case 'readOnly': {
-                                reverseOneNodes.push(noCascadeNode);
-                                break;
-                            }
-                            default: {
-                                (0, assert_1.default)(false);
-                            }
+            });
+            for (const one of ReversePointerRelations[entity]) {
+                const cascadeCreateNode = factory.createTypeLiteralNode([
+                    factory.createPropertySignature(undefined, factory.createIdentifier('entity'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
+                    factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
+                    factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), entityQuestionToken || entityIdQuestionToken, factory.createTypeReferenceNode(createForeignRef(entity, one, 'CreateSingleOperation')))
+                ]);
+                const cascadeUpdateNode = factory.createTypeLiteralNode([
+                    factory.createPropertySignature(undefined, factory.createIdentifier('entity'), entityQuestionToken, factory.createLiteralTypeNode(factory.createStringLiteral(`${(0, string_1.firstLetterLowerCase)(one)}`))),
+                    factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), entityIdQuestionToken, factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one))])),
+                    factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one, 'UpdateOperation')))
+                ]);
+                const noCascadeNode = factory.createTypeLiteralNode([
+                    factory.createPropertySignature(undefined, factory.createIdentifier('entity'), entityQuestionToken, factory.createLiteralTypeNode(factory.createStringLiteral(`${(0, string_1.firstLetterLowerCase)(one)}`))),
+                    factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), entityIdQuestionToken, factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one))])),
+                    factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword))
+                ]);
+                if (Schema[one].static) {
+                    reverseOneNodes.push(noCascadeNode);
+                }
+                else {
+                    switch (Schema[one].actionType) {
+                        case 'crud':
+                        case 'excludeRemove': {
+                            reverseOneNodes.push(cascadeCreateNode, cascadeUpdateNode, noCascadeNode);
+                            break;
+                        }
+                        case 'appendOnly':
+                        case 'excludeUpdate': {
+                            reverseOneNodes.push(cascadeCreateNode, noCascadeNode);
+                            break;
+                        }
+                        case 'readOnly': {
+                            reverseOneNodes.push(noCascadeNode);
+                            break;
+                        }
+                        default: {
+                            (0, assert_1.default)(false);
                         }
                     }
                 }
             }
-            catch (e_13_1) { e_13 = { error: e_13_1 }; }
-            finally {
-                try {
-                    if (_r && !_r.done && (_d = _q.return)) _d.call(_q);
-                }
-                finally { if (e_13) throw e_13.error; }
-            }
         }
         if (process.env.COMPLING_AS_LIB) {
             // 如果是base，要包容更多可能的反指
             reverseOneNodes.push(factory.createTypeLiteralNode([
                 factory.createPropertySignature(undefined, factory.createIdentifier('entity'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)),
                 factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)),
-                factory.createIndexSignature(undefined, undefined, [factory.createParameterDeclaration(undefined, undefined, undefined, factory.createIdentifier("K"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword))
+                factory.createIndexSignature(undefined, [factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier("K"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword))
             ]));
         }
         if (reverseOneNodes.length > 0) {
@@ -2181,31 +1991,31 @@ function constructOperations(statements, entity) {
         }
     }
     // 一对多
-    var propertySignatures = [];
+    const propertySignatures = [];
     if (oneToManySet) {
-        var _loop_9 = function (entityName) {
-            var entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
-            foreignKeySet[entityName].forEach(function (foreignKey) {
-                var identifier = "".concat(entityNameLc, "$").concat(foreignKey);
-                var otmCreateOperationDataNode = factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
+        for (const entityName in foreignKeySet) {
+            const entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
+            foreignKeySet[entityName].forEach((foreignKey) => {
+                const identifier = `${entityNameLc}$${foreignKey}`;
+                const otmCreateOperationDataNode = factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
                     factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'CreateOperationData'), undefined),
                     factory.createUnionTypeNode(foreignKey === 'entity' ? [
                         factory.createLiteralTypeNode(factory.createStringLiteral("entity")),
                         factory.createLiteralTypeNode(factory.createStringLiteral("entityId"))
                     ] : [
                         factory.createLiteralTypeNode(factory.createStringLiteral(foreignKey)),
-                        factory.createLiteralTypeNode(factory.createStringLiteral("".concat(foreignKey, "Id")))
+                        factory.createLiteralTypeNode(factory.createStringLiteral(`${foreignKey}Id`))
                     ])
                 ]);
-                var otmCreateSingleOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
+                const otmCreateSingleOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
                     factory.createLiteralTypeNode(factory.createStringLiteral("create")),
                     otmCreateOperationDataNode
                 ]);
-                var otmCreateMultipleOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
+                const otmCreateMultipleOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
                     factory.createLiteralTypeNode(factory.createStringLiteral("create")),
                     factory.createArrayTypeNode(otmCreateOperationDataNode)
                 ]);
-                var otmUpdateOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
+                const otmUpdateOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
                     factory.createIndexedAccessTypeNode(factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'UpdateOperation'), undefined), factory.createLiteralTypeNode(factory.createStringLiteral("action"))),
                     factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
                         factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'UpdateOperationData'), undefined),
@@ -2214,7 +2024,7 @@ function constructOperations(statements, entity) {
                             factory.createLiteralTypeNode(factory.createStringLiteral("entityId"))
                         ] : [
                             factory.createLiteralTypeNode(factory.createStringLiteral(foreignKey)),
-                            factory.createLiteralTypeNode(factory.createStringLiteral("".concat(foreignKey, "Id")))
+                            factory.createLiteralTypeNode(factory.createStringLiteral(`${foreignKey}Id`))
                         ])
                     ]),
                     factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
@@ -2224,7 +2034,7 @@ function constructOperations(statements, entity) {
                             factory.createLiteralTypeNode(factory.createStringLiteral("entityId"))
                         ] : [
                             factory.createLiteralTypeNode(factory.createStringLiteral(foreignKey)),
-                            factory.createLiteralTypeNode(factory.createStringLiteral("".concat(foreignKey, "Id")))
+                            factory.createLiteralTypeNode(factory.createStringLiteral(`${foreignKey}Id`))
                         ])
                     ])
                 ]);
@@ -2258,23 +2068,20 @@ function constructOperations(statements, entity) {
                     }
                 }
             });
-        };
-        for (var entityName in foreignKeySet) {
-            _loop_9(entityName);
         }
     }
     if (propertySignatures.length > 0) {
         adNodes.push(factory.createTypeLiteralNode(propertySignatures));
     }
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("CreateOperationData"), undefined, factory.createIntersectionTypeNode(adNodes)));
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("CreateOperationData"), undefined, factory.createIntersectionTypeNode(adNodes)));
     // CreateOperation
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("CreateSingleOperation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("CreateSingleOperation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
         factory.createLiteralTypeNode(factory.createStringLiteral("create")),
         factory.createTypeReferenceNode(factory.createIdentifier("CreateOperationData"))
-    ])), factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("CreateMultipleOperation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
+    ])), factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("CreateMultipleOperation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
         factory.createLiteralTypeNode(factory.createStringLiteral("create")),
         factory.createTypeReferenceNode(factory.createIdentifier("Array"), [factory.createTypeReferenceNode(factory.createIdentifier("CreateOperationData"))])
-    ])), factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("CreateOperation"), undefined, factory.createUnionTypeNode([
+    ])), factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("CreateOperation"), undefined, factory.createUnionTypeNode([
         factory.createTypeReferenceNode(factory.createIdentifier("CreateSingleOperation")),
         factory.createTypeReferenceNode(factory.createIdentifier("CreateMultipleOperation"))
     ])));
@@ -2284,27 +2091,17 @@ function constructOperations(statements, entity) {
         foreignKeyAttr.push('entity', 'entityId');
     }
     if (manyToOneSet) {
-        try {
-            for (var manyToOneSet_4 = tslib_1.__values(manyToOneSet), manyToOneSet_4_1 = manyToOneSet_4.next(); !manyToOneSet_4_1.done; manyToOneSet_4_1 = manyToOneSet_4.next()) {
-                var one = manyToOneSet_4_1.value;
-                if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[1])) {
-                    foreignKeyAttr.push("".concat(one[1], "Id"));
-                }
+        for (const one of manyToOneSet) {
+            if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[1])) {
+                foreignKeyAttr.push(`${one[1]}Id`);
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
-        finally {
-            try {
-                if (manyToOneSet_4_1 && !manyToOneSet_4_1.done && (_e = manyToOneSet_4.return)) _e.call(manyToOneSet_4);
-            }
-            finally { if (e_14) throw e_14.error; }
-        }
     }
     adNodes = [
         factory.createTypeReferenceNode(factory.createIdentifier("FormUpdateData"), [
             foreignKeyAttr.length > 0 ? factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
                 factory.createTypeReferenceNode(factory.createIdentifier("OpSchema"), undefined),
-                factory.createUnionTypeNode((0, lodash_1.uniq)(foreignKeyAttr).map(function (ele) { return factory.createLiteralTypeNode(factory.createStringLiteral(ele)); }))
+                factory.createUnionTypeNode((0, lodash_1.uniq)(foreignKeyAttr).map(ele => factory.createLiteralTypeNode(factory.createStringLiteral(ele))))
             ]) : factory.createTypeReferenceNode(factory.createIdentifier("OpSchema"), undefined)
         ])
     ];
@@ -2315,170 +2112,156 @@ function constructOperations(statements, entity) {
          * 如果关联对象是update或者remove，则关联对象的filter由对象(的原行！注意这里的外键是不能变的!)决定其主键
          * 见cascadeStore
          */
-        var upsertOneNodes = [];
-        try {
-            for (var manyToOneSet_5 = tslib_1.__values(manyToOneSet), manyToOneSet_5_1 = manyToOneSet_5.next(); !manyToOneSet_5_1.done; manyToOneSet_5_1 = manyToOneSet_5.next()) {
-                var one = manyToOneSet_5_1.value;
-                if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[0])) {
-                    var cascadeCreateNode = factory.createTypeLiteralNode([
-                        factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), undefined, factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'CreateSingleOperation'))),
-                        factory.createPropertySignature(undefined, factory.createIdentifier("".concat(one[1], "Id")), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
-                    ]);
-                    var cascadeUpdateNode = factory.createTypeLiteralNode([
-                        factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), undefined, factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'UpdateOperation'))),
-                        factory.createPropertySignature(undefined, factory.createIdentifier("".concat(one[1], "Id")), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
-                    ]);
-                    var cascadeRemoveNode = factory.createTypeLiteralNode([
-                        factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), undefined, factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'RemoveOperation'))),
-                        factory.createPropertySignature(undefined, factory.createIdentifier("".concat(one[1], "Id")), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
-                    ]);
-                    var noCascadeNode = factory.createTypeLiteralNode([
-                        factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
-                        factory.createPropertySignature(undefined, factory.createIdentifier("".concat(one[1], "Id")), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode([
-                            factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one[1]))]),
-                            factory.createLiteralTypeNode(factory.createNull())
-                        ])),
-                    ]);
-                    if (Schema[one[0]].static) {
-                        upsertOneNodes.push(noCascadeNode);
-                    }
-                    else {
-                        switch (Schema[one[0]].actionType) {
-                            case 'crud': {
-                                upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, cascadeUpdateNode, cascadeRemoveNode, noCascadeNode]));
-                                break;
-                            }
-                            case 'excludeUpdate': {
-                                upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, cascadeRemoveNode, noCascadeNode]));
-                                break;
-                            }
-                            case 'appendOnly': {
-                                upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, noCascadeNode]));
-                                break;
-                            }
-                            case 'readOnly': {
-                                upsertOneNodes.push(noCascadeNode);
-                                break;
-                            }
-                            case 'excludeRemove': {
-                                upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, cascadeUpdateNode, noCascadeNode]));
-                                break;
-                            }
-                            default: {
-                                (0, assert_1.default)(false);
-                            }
+        const upsertOneNodes = [];
+        for (const one of manyToOneSet) {
+            if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[0])) {
+                const cascadeCreateNode = factory.createTypeLiteralNode([
+                    factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'CreateSingleOperation'))),
+                    factory.createPropertySignature(undefined, factory.createIdentifier(`${one[1]}Id`), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
+                ]);
+                const cascadeUpdateNode = factory.createTypeLiteralNode([
+                    factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'UpdateOperation'))),
+                    factory.createPropertySignature(undefined, factory.createIdentifier(`${one[1]}Id`), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
+                ]);
+                const cascadeRemoveNode = factory.createTypeLiteralNode([
+                    factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'RemoveOperation'))),
+                    factory.createPropertySignature(undefined, factory.createIdentifier(`${one[1]}Id`), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
+                ]);
+                const noCascadeNode = factory.createTypeLiteralNode([
+                    factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
+                    factory.createPropertySignature(undefined, factory.createIdentifier(`${one[1]}Id`), factory.createToken(ts.SyntaxKind.QuestionToken), one[2] ? factory.createUnionTypeNode([
+                        factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one[1]))]),
+                        factory.createLiteralTypeNode(factory.createNull())
+                    ]) : factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one[1]))])),
+                ]);
+                if (Schema[one[0]].static) {
+                    upsertOneNodes.push(noCascadeNode);
+                }
+                else {
+                    switch (Schema[one[0]].actionType) {
+                        case 'crud': {
+                            upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, cascadeUpdateNode, cascadeRemoveNode, noCascadeNode]));
+                            break;
+                        }
+                        case 'excludeUpdate': {
+                            upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, cascadeRemoveNode, noCascadeNode]));
+                            break;
+                        }
+                        case 'appendOnly': {
+                            upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, noCascadeNode]));
+                            break;
+                        }
+                        case 'readOnly': {
+                            upsertOneNodes.push(noCascadeNode);
+                            break;
+                        }
+                        case 'excludeRemove': {
+                            upsertOneNodes.push(factory.createUnionTypeNode([cascadeCreateNode, cascadeUpdateNode, noCascadeNode]));
+                            break;
+                        }
+                        default: {
+                            (0, assert_1.default)(false);
                         }
                     }
                 }
             }
         }
-        catch (e_15_1) { e_15 = { error: e_15_1 }; }
-        finally {
-            try {
-                if (manyToOneSet_5_1 && !manyToOneSet_5_1.done && (_f = manyToOneSet_5.return)) _f.call(manyToOneSet_5);
-            }
-            finally { if (e_15) throw e_15.error; }
-        }
         if (upsertOneNodes.length > 0) {
             adNodes.push(factory.createIntersectionTypeNode(upsertOneNodes));
         }
-        var reverseOneNodes_1 = [];
+        const reverseOneNodes = [];
         if (ReversePointerRelations[entity]) {
-            var refEntityLitrals = [];
-            try {
-                for (var _s = tslib_1.__values(ReversePointerRelations[entity]), _t = _s.next(); !_t.done; _t = _s.next()) {
-                    var one = _t.value;
-                    refEntityLitrals.push(factory.createLiteralTypeNode(factory.createStringLiteral("".concat((0, string_1.firstLetterLowerCase)(one)))));
-                    var actionNodes = [];
-                    if (!Schema[one].static) {
-                        switch (Schema[one].actionType) {
-                            case 'crud': {
-                                actionNodes.push(factory.createTypeReferenceNode(createForeignRef(entity, one, 'CreateSingleOperation')), factory.createTypeReferenceNode(createForeignRef(entity, one, 'UpdateOperation')), factory.createTypeReferenceNode(createForeignRef(entity, one, 'RemoveOperation')));
-                                break;
-                            }
-                            case 'excludeUpdate': {
-                                actionNodes.push(factory.createTypeReferenceNode(createForeignRef(entity, one, 'CreateSingleOperation')), factory.createTypeReferenceNode(createForeignRef(entity, one, 'RemoveOperation')));
-                                break;
-                            }
-                            case 'excludeRemove': {
-                                actionNodes.push(factory.createTypeReferenceNode(createForeignRef(entity, one, 'CreateSingleOperation')), factory.createTypeReferenceNode(createForeignRef(entity, one, 'UpdateOperation')));
-                                break;
-                            }
-                            case 'appendOnly': {
-                                actionNodes.push(factory.createTypeReferenceNode(createForeignRef(entity, one, 'CreateSingleOperation')));
-                                break;
-                            }
-                            case 'readOnly': {
-                                break;
-                            }
-                            default: {
-                                (0, assert_1.default)(false);
-                            }
+            const refEntityLitrals = [];
+            for (const one of ReversePointerRelations[entity]) {
+                refEntityLitrals.push(factory.createLiteralTypeNode(factory.createStringLiteral(`${(0, string_1.firstLetterLowerCase)(one)}`)));
+                const actionNodes = [];
+                if (!Schema[one].static) {
+                    switch (Schema[one].actionType) {
+                        case 'crud': {
+                            actionNodes.push(factory.createTypeReferenceNode(createForeignRef(entity, one, 'CreateSingleOperation')), factory.createTypeReferenceNode(createForeignRef(entity, one, 'UpdateOperation')), factory.createTypeReferenceNode(createForeignRef(entity, one, 'RemoveOperation')));
+                            break;
+                        }
+                        case 'excludeUpdate': {
+                            actionNodes.push(factory.createTypeReferenceNode(createForeignRef(entity, one, 'CreateSingleOperation')), factory.createTypeReferenceNode(createForeignRef(entity, one, 'RemoveOperation')));
+                            break;
+                        }
+                        case 'excludeRemove': {
+                            actionNodes.push(factory.createTypeReferenceNode(createForeignRef(entity, one, 'CreateSingleOperation')), factory.createTypeReferenceNode(createForeignRef(entity, one, 'UpdateOperation')));
+                            break;
+                        }
+                        case 'appendOnly': {
+                            actionNodes.push(factory.createTypeReferenceNode(createForeignRef(entity, one, 'CreateSingleOperation')));
+                            break;
+                        }
+                        case 'readOnly': {
+                            break;
+                        }
+                        default: {
+                            (0, assert_1.default)(false);
                         }
-                    }
-                    if (actionNodes.length > 0) {
-                        reverseOneNodes_1.push(factory.createTypeLiteralNode([
-                            factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode(actionNodes)),
-                            factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
-                            factory.createPropertySignature(undefined, factory.createIdentifier('entity'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword))
-                        ]));
                     }
                 }
-            }
-            catch (e_16_1) { e_16 = { error: e_16_1 }; }
-            finally {
-                try {
-                    if (_t && !_t.done && (_g = _s.return)) _g.call(_s);
+                if (actionNodes.length > 0) {
+                    reverseOneNodes.push(factory.createTypeLiteralNode([
+                        factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode(actionNodes)),
+                        factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword)),
+                        factory.createPropertySignature(undefined, factory.createIdentifier('entity'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword))
+                    ]));
                 }
-                finally { if (e_16) throw e_16.error; }
-            }
-            if (process.env.COMPLING_AS_LIB) {
-                // 如果是base，要包容更多可能的反指
-                refEntityLitrals.push(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
             }
-            reverseOneNodes_1.push(factory.createTypeLiteralNode([
-                factory.createPropertySignature(undefined, factory.createIdentifier('entity'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode([
-                    factory.createUnionTypeNode(refEntityLitrals),
+            const { schemaAttrs } = Schema[entity];
+            const { questionToken: entityQuestionToken } = schemaAttrs.find(ele => {
+                const { name } = ele;
+                return name.text === 'entity';
+            });
+            const { questionToken: entityIdQuestionToken } = schemaAttrs.find(ele => {
+                const { name } = ele;
+                return name.text === 'entityId';
+            });
+            reverseOneNodes.push(factory.createTypeLiteralNode([
+                factory.createPropertySignature(undefined, factory.createIdentifier('entity'), factory.createToken(ts.SyntaxKind.QuestionToken), !entityQuestionToken ? factory.createUnionTypeNode([
+                    // 如果是作为lib，要包容更多可能的反指
+                    factory.createUnionTypeNode(process.env.COMPLING_AS_LIB ? refEntityLitrals.concat(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)) : refEntityLitrals),
                     factory.createLiteralTypeNode(factory.createNull())
-                ])),
-                factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode([
-                    factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createUnionTypeNode(ReversePointerRelations[entity].map(function (ele) { return factory.createLiteralTypeNode(factory.createStringLiteral(ele)); }))]),
+                ]) : factory.createUnionTypeNode(process.env.COMPLING_AS_LIB ? refEntityLitrals.concat(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)) : refEntityLitrals)),
+                factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), factory.createToken(ts.SyntaxKind.QuestionToken), !entityIdQuestionToken ? factory.createUnionTypeNode([
+                    factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createUnionTypeNode(ReversePointerRelations[entity].map(ele => factory.createLiteralTypeNode(factory.createStringLiteral(ele))))]),
                     factory.createLiteralTypeNode(factory.createNull())
-                ]))
-            ]));
+                ]) : factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createUnionTypeNode(ReversePointerRelations[entity].map(ele => factory.createLiteralTypeNode(factory.createStringLiteral(ele))))]))
+            ].concat(ReversePointerRelations[entity].map((one) => factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.NeverKeyword))))));
         }
-        if (reverseOneNodes_1.length > 0) {
-            adNodes.push(factory.createUnionTypeNode(reverseOneNodes_1));
+        if (reverseOneNodes.length > 0) {
+            adNodes.push(factory.createUnionTypeNode(reverseOneNodes));
         }
     }
-    var propertySignatures2 = [];
+    const propertySignatures2 = [];
     if (process.env.COMPLING_AS_LIB) {
-        propertySignatures2.push(factory.createIndexSignature(undefined, undefined, [factory.createParameterDeclaration(undefined, undefined, undefined, factory.createIdentifier("k"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)));
+        propertySignatures2.push(factory.createIndexSignature(undefined, [factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier("k"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)));
     }
     if (oneToManySet) {
-        var _loop_10 = function (entityName) {
-            var entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
-            foreignKeySet[entityName].forEach(function (foreignKey) {
-                var identifier = "".concat(entityNameLc, "$").concat(foreignKey);
-                var otmCreateOperationDataNode = factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
+        for (const entityName in foreignKeySet) {
+            const entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
+            foreignKeySet[entityName].forEach((foreignKey) => {
+                const identifier = `${entityNameLc}$${foreignKey}`;
+                const otmCreateOperationDataNode = factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
                     factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'CreateOperationData'), undefined),
                     factory.createUnionTypeNode(foreignKey === 'entity' ? [
                         factory.createLiteralTypeNode(factory.createStringLiteral("entity")),
                         factory.createLiteralTypeNode(factory.createStringLiteral("entityId"))
                     ] : [
                         factory.createLiteralTypeNode(factory.createStringLiteral(foreignKey)),
-                        factory.createLiteralTypeNode(factory.createStringLiteral("".concat(foreignKey, "Id")))
+                        factory.createLiteralTypeNode(factory.createStringLiteral(`${foreignKey}Id`))
                     ])
                 ]);
-                var otmCreateSingleOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
+                const otmCreateSingleOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
                     factory.createLiteralTypeNode(factory.createStringLiteral("create")),
                     otmCreateOperationDataNode
                 ]);
-                var otmCreateMultipleOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
+                const otmCreateMultipleOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
                     factory.createLiteralTypeNode(factory.createStringLiteral("create")),
                     factory.createArrayTypeNode(otmCreateOperationDataNode)
                 ]);
-                var otmUpdateOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
+                const otmUpdateOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
                     factory.createIndexedAccessTypeNode(factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'UpdateOperation'), undefined), factory.createLiteralTypeNode(factory.createStringLiteral("action"))),
                     factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
                         factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'UpdateOperationData'), undefined),
@@ -2487,7 +2270,7 @@ function constructOperations(statements, entity) {
                             factory.createLiteralTypeNode(factory.createStringLiteral("entityId"))
                         ] : [
                             factory.createLiteralTypeNode(factory.createStringLiteral(foreignKey)),
-                            factory.createLiteralTypeNode(factory.createStringLiteral("".concat(foreignKey, "Id")))
+                            factory.createLiteralTypeNode(factory.createStringLiteral(`${foreignKey}Id`))
                         ])
                     ]),
                     factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
@@ -2497,11 +2280,11 @@ function constructOperations(statements, entity) {
                             factory.createLiteralTypeNode(factory.createStringLiteral("entityId"))
                         ] : [
                             factory.createLiteralTypeNode(factory.createStringLiteral(foreignKey)),
-                            factory.createLiteralTypeNode(factory.createStringLiteral("".concat(foreignKey, "Id")))
+                            factory.createLiteralTypeNode(factory.createStringLiteral(`${foreignKey}Id`))
                         ])
                     ])
                 ]);
-                var otmRemoveOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
+                const otmRemoveOperationNode = factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
                     factory.createIndexedAccessTypeNode(factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'RemoveOperation'), undefined), factory.createLiteralTypeNode(factory.createStringLiteral("action"))),
                     factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
                         factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'RemoveOperationData'), undefined),
@@ -2510,7 +2293,7 @@ function constructOperations(statements, entity) {
                             factory.createLiteralTypeNode(factory.createStringLiteral("entityId"))
                         ] : [
                             factory.createLiteralTypeNode(factory.createStringLiteral(foreignKey)),
-                            factory.createLiteralTypeNode(factory.createStringLiteral("".concat(foreignKey, "Id")))
+                            factory.createLiteralTypeNode(factory.createStringLiteral(`${foreignKey}Id`))
                         ])
                     ]),
                     factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
@@ -2520,7 +2303,7 @@ function constructOperations(statements, entity) {
                             factory.createLiteralTypeNode(factory.createStringLiteral("entityId"))
                         ] : [
                             factory.createLiteralTypeNode(factory.createStringLiteral(foreignKey)),
-                            factory.createLiteralTypeNode(factory.createStringLiteral("".concat(foreignKey, "Id")))
+                            factory.createLiteralTypeNode(factory.createStringLiteral(`${foreignKey}Id`))
                         ])
                     ])
                 ]);
@@ -2579,17 +2362,14 @@ function constructOperations(statements, entity) {
                     }
                 }
             });
-        };
-        for (var entityName in foreignKeySet) {
-            _loop_10(entityName);
         }
     }
     if (propertySignatures2.length > 0) {
         adNodes.push(factory.createTypeLiteralNode(propertySignatures2));
     }
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("UpdateOperationData"), undefined, factory.createIntersectionTypeNode(adNodes)));
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("UpdateOperationData"), undefined, factory.createIntersectionTypeNode(adNodes)));
     // UpdateOperation
-    var actionTypeNodes = [factory.createLiteralTypeNode(factory.createStringLiteral("update"))];
+    const actionTypeNodes = [factory.createLiteralTypeNode(factory.createStringLiteral("update"))];
     if (ActionAsts[entity]) {
         actionTypeNodes.push(factory.createTypeReferenceNode('ParticularAction'));
     }
@@ -2599,7 +2379,7 @@ function constructOperations(statements, entity) {
     if (process.env.COMPLING_AS_LIB) {
         actionTypeNodes.push(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
     }
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("UpdateOperation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("UpdateOperation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
         factory.createUnionTypeNode(actionTypeNodes),
         factory.createTypeReferenceNode(factory.createIdentifier("UpdateOperationData")),
         factory.createTypeReferenceNode(factory.createIdentifier("Filter"), undefined),
@@ -2615,118 +2395,98 @@ function constructOperations(statements, entity) {
          * 如果关联对象动作是update或者remove，则关联对象的filter由对象(的原行！注意这里的外键是不能变的!)决定其主键
          * 见cascadeStore
          */
-        var upsertOneNodes = [];
-        try {
-            for (var manyToOneSet_6 = tslib_1.__values(manyToOneSet), manyToOneSet_6_1 = manyToOneSet_6.next(); !manyToOneSet_6_1.done; manyToOneSet_6_1 = manyToOneSet_6.next()) {
-                var one = manyToOneSet_6_1.value;
-                if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[0])) {
-                    if (!Schema[one[0]].static) {
-                        switch (Schema[one[0]].actionType) {
-                            case 'crud': {
-                                upsertOneNodes.push(factory.createUnionTypeNode([
-                                    factory.createTypeLiteralNode([
-                                        factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode([
-                                            factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'UpdateOperation')),
-                                            factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'RemoveOperation'))
-                                        ]))
-                                    ])
-                                ]));
-                                break;
-                            }
-                            case 'excludeUpdate': {
-                                upsertOneNodes.push(factory.createUnionTypeNode([
-                                    factory.createTypeLiteralNode([
-                                        factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'RemoveOperation')))
-                                    ])
-                                ]));
-                                break;
-                            }
-                            case 'excludeRemove': {
-                                upsertOneNodes.push(factory.createUnionTypeNode([
-                                    factory.createTypeLiteralNode([
-                                        factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'UpdateOperation')))
-                                    ])
-                                ]));
-                                break;
-                            }
-                            case 'appendOnly':
-                            case 'readOnly': {
-                                break;
-                            }
-                            default: {
-                                (0, assert_1.default)(false);
-                            }
+        const upsertOneNodes = [];
+        for (const one of manyToOneSet) {
+            if (!ReversePointerRelations[entity] || !ReversePointerRelations[entity].includes(one[0])) {
+                if (!Schema[one[0]].static) {
+                    switch (Schema[one[0]].actionType) {
+                        case 'crud': {
+                            upsertOneNodes.push(factory.createUnionTypeNode([
+                                factory.createTypeLiteralNode([
+                                    factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode([
+                                        factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'UpdateOperation')),
+                                        factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'RemoveOperation'))
+                                    ]))
+                                ])
+                            ]));
+                            break;
+                        }
+                        case 'excludeUpdate': {
+                            upsertOneNodes.push(factory.createUnionTypeNode([
+                                factory.createTypeLiteralNode([
+                                    factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'RemoveOperation')))
+                                ])
+                            ]));
+                            break;
+                        }
+                        case 'excludeRemove': {
+                            upsertOneNodes.push(factory.createUnionTypeNode([
+                                factory.createTypeLiteralNode([
+                                    factory.createPropertySignature(undefined, factory.createIdentifier(one[1]), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one[0], 'UpdateOperation')))
+                                ])
+                            ]));
+                            break;
+                        }
+                        case 'appendOnly':
+                        case 'readOnly': {
+                            break;
+                        }
+                        default: {
+                            (0, assert_1.default)(false);
                         }
                     }
                 }
             }
         }
-        catch (e_17_1) { e_17 = { error: e_17_1 }; }
-        finally {
-            try {
-                if (manyToOneSet_6_1 && !manyToOneSet_6_1.done && (_h = manyToOneSet_6.return)) _h.call(manyToOneSet_6);
-            }
-            finally { if (e_17) throw e_17.error; }
-        }
-        var reverseOneNodes_2 = [];
+        const reverseOneNodes = [];
         if (ReversePointerRelations[entity]) {
-            var refEntityLitrals = [];
-            try {
-                for (var _u = tslib_1.__values(ReversePointerRelations[entity]), _v = _u.next(); !_v.done; _v = _u.next()) {
-                    var one = _v.value;
-                    refEntityLitrals.push(factory.createLiteralTypeNode(factory.createStringLiteral("".concat((0, string_1.firstLetterLowerCase)(one)))));
-                    if (!Schema[one].static) {
-                        switch (Schema[one].actionType) {
-                            case 'crud': {
-                                reverseOneNodes_2.push(factory.createTypeLiteralNode([
-                                    factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode([
-                                        factory.createTypeReferenceNode(createForeignRef(entity, one, 'UpdateOperation')),
-                                        factory.createTypeReferenceNode(createForeignRef(entity, one, 'RemoveOperation'))
-                                    ]))
-                                ]));
-                                break;
-                            }
-                            case 'excludeUpdate': {
-                                reverseOneNodes_2.push(factory.createTypeLiteralNode([
-                                    factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one, 'RemoveOperation')))
-                                ]));
-                                break;
-                            }
-                            case 'excludeRemove': {
-                                reverseOneNodes_2.push(factory.createTypeLiteralNode([
-                                    factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one, 'UpdateOperation')))
-                                ]));
-                                break;
-                            }
-                            case 'appendOnly':
-                            case 'readOnly': {
-                                break;
-                            }
-                            default: {
-                                (0, assert_1.default)(false);
-                            }
+            const refEntityLitrals = [];
+            for (const one of ReversePointerRelations[entity]) {
+                refEntityLitrals.push(factory.createLiteralTypeNode(factory.createStringLiteral(`${(0, string_1.firstLetterLowerCase)(one)}`)));
+                if (!Schema[one].static) {
+                    switch (Schema[one].actionType) {
+                        case 'crud': {
+                            reverseOneNodes.push(factory.createTypeLiteralNode([
+                                factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode([
+                                    factory.createTypeReferenceNode(createForeignRef(entity, one, 'UpdateOperation')),
+                                    factory.createTypeReferenceNode(createForeignRef(entity, one, 'RemoveOperation'))
+                                ]))
+                            ]));
+                            break;
+                        }
+                        case 'excludeUpdate': {
+                            reverseOneNodes.push(factory.createTypeLiteralNode([
+                                factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one, 'RemoveOperation')))
+                            ]));
+                            break;
+                        }
+                        case 'excludeRemove': {
+                            reverseOneNodes.push(factory.createTypeLiteralNode([
+                                factory.createPropertySignature(undefined, factory.createIdentifier((0, string_1.firstLetterLowerCase)(one)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(createForeignRef(entity, one, 'UpdateOperation')))
+                            ]));
+                            break;
+                        }
+                        case 'appendOnly':
+                        case 'readOnly': {
+                            break;
+                        }
+                        default: {
+                            (0, assert_1.default)(false);
                         }
                     }
                 }
             }
-            catch (e_18_1) { e_18 = { error: e_18_1 }; }
-            finally {
-                try {
-                    if (_v && !_v.done && (_j = _u.return)) _j.call(_u);
-                }
-                finally { if (e_18) throw e_18.error; }
-            }
             if (process.env.COMPLING_AS_LIB) {
-                reverseOneNodes_2.push(factory.createTypeLiteralNode([
-                    factory.createIndexSignature(undefined, undefined, [factory.createParameterDeclaration(undefined, undefined, undefined, factory.createIdentifier("k"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword))
+                reverseOneNodes.push(factory.createTypeLiteralNode([
+                    factory.createIndexSignature(undefined, [factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier("k"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword))
                 ]));
             }
         }
         if (upsertOneNodes.length > 0) {
             adNodes.push(factory.createIntersectionTypeNode(upsertOneNodes));
         }
-        if (reverseOneNodes_2.length > 0) {
-            adNodes.push(factory.createUnionTypeNode(reverseOneNodes_2));
+        if (reverseOneNodes.length > 0) {
+            adNodes.push(factory.createUnionTypeNode(reverseOneNodes));
         }
     }
     /**
@@ -2799,33 +2559,33 @@ function constructOperations(statements, entity) {
             )
         );
     } */
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("RemoveOperationData"), undefined, factory.createIntersectionTypeNode(adNodes)));
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("RemoveOperationData"), undefined, factory.createIntersectionTypeNode(adNodes)));
     // RemoveOperation
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("RemoveOperation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("RemoveOperation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
         factory.createLiteralTypeNode(factory.createStringLiteral("remove")),
         factory.createTypeReferenceNode(factory.createIdentifier("RemoveOperationData"), undefined),
         factory.createTypeReferenceNode(factory.createIdentifier("Filter"), undefined),
         factory.createTypeReferenceNode(factory.createIdentifier("Sorter"), undefined)
     ])));
-    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Operation"), undefined, factory.createUnionTypeNode([
+    statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Operation"), undefined, factory.createUnionTypeNode([
         factory.createTypeReferenceNode(factory.createIdentifier("CreateOperation"), undefined),
         factory.createTypeReferenceNode(factory.createIdentifier("UpdateOperation"), undefined),
         factory.createTypeReferenceNode(factory.createIdentifier("RemoveOperation"), undefined)
     ])));
 }
-var initialStatements = function () { return [
+const initialStatements = () => [
     // import { String, Text, Int, SpecificKey } from 'oak-domain/types/DataType';
-    factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
+    factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('PrimaryKey')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('ForeignKey')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('JsonProjection'))
-    ])), factory.createStringLiteral("".concat((0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(), "DataType"))),
+    ])), factory.createStringLiteral(`${(0, env_1.TYPE_PATH_IN_OAK_DOMAIN)()}DataType`)),
     /* import {
         Q_DateValue, Q_LogicKey, Q_NumberValue, FnCallKey, FnCallValue,
         Q_StringValue, Q_FullTextKey, Q_FullTextValue, FnCallValueAs,
         Q_BooleanValue,
     } from 'oak-domain/types/Demand'; */
-    factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
+    factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('Q_DateValue')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('Q_BooleanValue')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('Q_NumberValue')),
@@ -2838,11 +2598,11 @@ var initialStatements = function () { return [
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('ExpressionKey')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('JsonFilter')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('SubQueryPredicateMetadata')),
-    ])), factory.createStringLiteral("".concat((0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(), "Demand"))),
-    factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
+    ])), factory.createStringLiteral(`${(0, env_1.TYPE_PATH_IN_OAK_DOMAIN)()}Demand`)),
+    factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("OneOf")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("ValueOf"))
-    ])), factory.createStringLiteral("".concat((0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(), "Polyfill"))),
+    ])), factory.createStringLiteral(`${(0, env_1.TYPE_PATH_IN_OAK_DOMAIN)()}Polyfill`)),
     // import * as SubQuery from '../_SubQuery';
     /* factory.createImportDeclaration(
         undefined,
@@ -2855,7 +2615,7 @@ var initialStatements = function () { return [
         factory.createStringLiteral("../_SubQuery")
     ), */
     // import { Filter as OakFilter } from 'oak-domain/src/types/Entity';
-    factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
+    factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("FormCreateData")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("FormUpdateData")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("DeduceAggregation")),
@@ -2863,83 +2623,77 @@ var initialStatements = function () { return [
         factory.createImportSpecifier(false, factory.createIdentifier("Selection"), factory.createIdentifier("OakSelection")),
         factory.createImportSpecifier(false, factory.createIdentifier("MakeAction"), factory.createIdentifier("OakMakeAction")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("AggregationResult")),
-    ])), factory.createStringLiteral("".concat((0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(), "Entity")), undefined)
-]; };
+    ])), factory.createStringLiteral(`${(0, env_1.TYPE_PATH_IN_OAK_DOMAIN)()}Entity`), undefined)
+];
 function outputSubQuery(outputDir, printer) {
-    var statements = [];
+    const statements = [];
     if (process.env.COMPLING_AS_LIB) {
     }
-    for (var entity in Schema) {
+    for (const entity in Schema) {
         // import * as User from '../User/Schema';
-        statements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamespaceImport(factory.createIdentifier(entity))), factory.createStringLiteral("./".concat(entity, "/Schema"))));
+        statements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamespaceImport(factory.createIdentifier(entity))), factory.createStringLiteral(`./${entity}/Schema`)));
     }
-    var entities = (0, lodash_1.keys)(Schema);
-    var _loop_11 = function (one) {
-        var identifier = "".concat(one, "IdSubQuery");
-        var fromEntites = OneToMany[one] ? (0, lodash_1.uniq)(OneToMany[one]
+    const entities = (0, lodash_1.keys)(Schema);
+    // 每个有manyToOne的Entity都会输出${One}IdSubQuery
+    for (const one in Schema) {
+        const identifier = `${one}IdSubQuery`;
+        const fromEntites = OneToMany[one] ? (0, lodash_1.uniq)(OneToMany[one]
             /* .filter(
                 ([e, f]) => f !== 'entity'
-            ) */ .map(function (_a) {
-            var _b = tslib_1.__read(_a, 1), e = _b[0];
-            return e;
-        })) : [];
+            ) */ .map(([e]) => e)) : [];
         fromEntites.push(one);
-        var inUnionTypeNode = fromEntites.map(function (ele) { return factory.createIntersectionTypeNode([
+        const inUnionTypeNode = fromEntites.map(ele => factory.createIntersectionTypeNode([
             factory.createTypeReferenceNode(factory.createQualifiedName(factory.createIdentifier(ele), factory.createIdentifier(identifier)), undefined),
             factory.createTypeLiteralNode([factory.createPropertySignature(undefined, factory.createIdentifier("entity"), undefined, factory.createLiteralTypeNode(factory.createStringLiteral((0, string_1.firstLetterLowerCase)(ele))))])
-        ]); });
+        ]));
         if (process.env.COMPLING_AS_LIB) {
             // 如果是建立 base，这里要加上额外可能的对象信息
             inUnionTypeNode.push(factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword));
         }
-        statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier(identifier), undefined, factory.createMappedTypeNode(undefined, factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("K"), factory.createUnionTypeNode([
+        statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier(identifier), undefined, factory.createMappedTypeNode(undefined, factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("K"), factory.createUnionTypeNode([
             factory.createLiteralTypeNode(factory.createStringLiteral("$in")),
             factory.createLiteralTypeNode(factory.createStringLiteral("$nin"))
         ]), undefined), undefined, factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode(inUnionTypeNode), undefined)));
-    };
-    // 每个有manyToOne的Entity都会输出${One}IdSubQuery
-    for (var one in Schema) {
-        _loop_11(one);
     }
-    var resultFile = ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS);
-    var result = printer.printNode(ts.EmitHint.Unspecified, factory.createSourceFile(statements, factory.createToken(ts.SyntaxKind.EndOfFileToken), ts.NodeFlags.None), resultFile);
-    var fileName = path_1.default.join(outputDir, '_SubQuery.ts');
+    const resultFile = ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS);
+    const result = printer.printNode(ts.EmitHint.Unspecified, factory.createSourceFile(statements, factory.createToken(ts.SyntaxKind.EndOfFileToken), ts.NodeFlags.None), resultFile);
+    const fileName = path_1.default.join(outputDir, '_SubQuery.ts');
     (0, fs_1.writeFileSync)(fileName, result, { flag: 'w' });
 }
 function outputEntityDict(outputDir, printer) {
-    var statements = [];
-    var propertySignatures = [];
-    for (var entity in Schema) {
+    const statements = [];
+    const propertySignatures = [];
+    for (const entity in Schema) {
         // import * as User from '../User/Schema';
-        statements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("EntityDef"), factory.createIdentifier(entity))])), factory.createStringLiteral("./".concat(entity, "/Schema"))));
-        var entityLc = (0, string_1.firstLetterLowerCase)(entity);
+        statements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("EntityDef"), factory.createIdentifier(entity))])), factory.createStringLiteral(`./${entity}/Schema`)));
+        const entityLc = (0, string_1.firstLetterLowerCase)(entity);
         propertySignatures.push(factory.createPropertySignature(undefined, factory.createIdentifier(entityLc), undefined, factory.createTypeReferenceNode(entity)));
     }
     if ( /* process.env.COMPLING_AS_LIB */false) {
-        statements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityDef"))])), factory.createStringLiteral("../types/Entity"), undefined), factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("EntityDict"), undefined, factory.createIntersectionTypeNode([
+        statements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityDef"))])), factory.createStringLiteral("../types/Entity"), undefined), factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("EntityDict"), undefined, factory.createIntersectionTypeNode([
             factory.createTypeLiteralNode(propertySignatures),
             factory.createTypeLiteralNode([
-                factory.createIndexSignature(undefined, undefined, [factory.createParameterDeclaration(undefined, undefined, undefined, factory.createIdentifier("E"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createTypeReferenceNode(factory.createIdentifier("EntityDef"), undefined))
+                factory.createIndexSignature(undefined, [factory.createParameterDeclaration(undefined, undefined, factory.createIdentifier("E"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), undefined)], factory.createTypeReferenceNode(factory.createIdentifier("EntityDef"), undefined))
             ])
         ])));
     }
     else {
-        statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("EntityDict"), undefined, factory.createTypeLiteralNode(propertySignatures)));
+        statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("EntityDict"), undefined, factory.createTypeLiteralNode(propertySignatures)));
     }
-    var resultFile = ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS);
-    var result = printer.printNode(ts.EmitHint.Unspecified, factory.createSourceFile(statements, factory.createToken(ts.SyntaxKind.EndOfFileToken), ts.NodeFlags.None), resultFile);
-    var fileName = path_1.default.join(outputDir, 'EntityDict.ts');
+    const resultFile = ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS);
+    const result = printer.printNode(ts.EmitHint.Unspecified, factory.createSourceFile(statements, factory.createToken(ts.SyntaxKind.EndOfFileToken), ts.NodeFlags.None), resultFile);
+    const fileName = path_1.default.join(outputDir, 'EntityDict.ts');
     (0, fs_1.writeFileSync)(fileName, result, { flag: 'w' });
 }
 function outputSchema(outputDir, printer) {
-    for (var entity in Schema) {
-        var statements = initialStatements();
+    for (const entity in Schema) {
+        const statements = initialStatements();
         if (ActionAsts[entity]) {
-            var _a = ActionAsts[entity], importedFrom = _a.importedFrom, actionDefNames = _a.actionDefNames;
-            var localActions = ['Action', 'ParticularAction'];
-            for (var a in importedFrom) {
+            const { importedFrom, actionDefNames } = ActionAsts[entity];
+            const localActions = ['Action', 'ParticularAction'];
+            for (const a in importedFrom) {
                 (0, assert_1.default)(a.endsWith('Action'));
-                var s = a.slice(0, a.length - 6).concat('State');
+                const s = a.slice(0, a.length - 6).concat('State');
                 if (importedFrom[a] === 'local' && actionDefNames.includes((0, string_1.firstLetterLowerCase)(a.slice(0, a.length - 6)))) {
                     localActions.push(s);
                 }
@@ -2969,12 +2723,12 @@ function outputSchema(outputDir, printer) {
                     // );
                 }
             }
-            statements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports(localActions.map(function (ele) { return factory.createImportSpecifier(false, undefined, factory.createIdentifier(ele)); }))), factory.createStringLiteral('./Action'), undefined), factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
+            statements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports(localActions.map(ele => factory.createImportSpecifier(false, undefined, factory.createIdentifier(ele))))), factory.createStringLiteral('./Action'), undefined), factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
                 factory.createImportSpecifier(false, undefined, factory.createIdentifier("RelationAction")),
             ])), factory.createStringLiteral((0, env_1.ACTION_CONSTANT_IN_OAK_DOMAIN)()), undefined));
         }
         else {
-            statements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
+            statements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
                 factory.createImportSpecifier(false, undefined, factory.createIdentifier("GenericAction")),
                 factory.createImportSpecifier(false, undefined, factory.createIdentifier("AppendOnlyAction")),
                 factory.createImportSpecifier(false, undefined, factory.createIdentifier("ReadOnlyAction")),
@@ -2983,9 +2737,9 @@ function outputSchema(outputDir, printer) {
                 factory.createImportSpecifier(false, undefined, factory.createIdentifier("RelationAction")),
             ])), factory.createStringLiteral((0, env_1.ACTION_CONSTANT_IN_OAK_DOMAIN)()), undefined));
         }
-        var additionalImports = Schema[entity].additionalImports;
-        if ((additionalImports === null || additionalImports === void 0 ? void 0 : additionalImports.length) > 0) {
-            statements.push.apply(statements, tslib_1.__spreadArray([], tslib_1.__read(additionalImports), false));
+        const { additionalImports } = Schema[entity];
+        if (additionalImports?.length > 0) {
+            statements.push(...additionalImports);
         }
         // Relation定义加入
         /* if (typeof Schema[entity].hasRelationDef === 'object' && ts.isTypeAliasDeclaration(Schema[entity].hasRelationDef as ts.Node)) {
@@ -3009,7 +2763,7 @@ function outputSchema(outputDir, printer) {
         constructQuery(statements, entity);
         // 现在FullAttrs和NativeAttrs似乎没什么用，还会引起递归
         // constructFullAttrs(statements, entity);
-        var makeActionArguments = [];
+        const makeActionArguments = [];
         if (ActionAsts[entity]) {
             makeActionArguments.push(factory.createTypeReferenceNode('Action'));
         }
@@ -3019,8 +2773,8 @@ function outputSchema(outputDir, printer) {
         if (Schema[entity].hasRelationDef || entity === 'User') {
             makeActionArguments.push(factory.createTypeReferenceNode('RelationAction'));
         }
-        var actionTypeNode = factory.createTypeReferenceNode(factory.createIdentifier('OakMakeAction'), makeActionArguments.length === 1 ? makeActionArguments : [factory.createUnionTypeNode(makeActionArguments)]);
-        var EntityDefAttrs = [
+        const actionTypeNode = factory.createTypeReferenceNode(factory.createIdentifier('OakMakeAction'), makeActionArguments.length === 1 ? makeActionArguments : [factory.createUnionTypeNode(makeActionArguments)]);
+        const EntityDefAttrs = [
             factory.createPropertySignature(undefined, factory.createIdentifier("Schema"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Schema"), undefined)),
             factory.createPropertySignature(undefined, factory.createIdentifier("OpSchema"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("OpSchema"), undefined)),
             factory.createPropertySignature(undefined, factory.createIdentifier("Action"), undefined, process.env.COMPLING_AS_LIB ?
@@ -3053,19 +2807,19 @@ function outputSchema(outputDir, printer) {
                 )
             );
         } */
-        statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("EntityDef"), undefined, factory.createTypeLiteralNode(EntityDefAttrs)));
-        var result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements), Schema[entity].sourceFile);
-        var fileName = path_1.default.join(outputDir, entity, 'Schema.ts');
+        statements.push(factory.createTypeAliasDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("EntityDef"), undefined, factory.createTypeLiteralNode(EntityDefAttrs)));
+        const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements), Schema[entity].sourceFile);
+        const fileName = path_1.default.join(outputDir, entity, 'Schema.ts');
         (0, fs_1.writeFileSync)(fileName, result, { flag: 'w' });
     }
 }
 function outputAction(outputDir, printer) {
-    var actionDictStatements = [];
-    var propertyAssignments = [];
-    for (var entity in ActionAsts) {
-        var _a = ActionAsts[entity], sourceFile = _a.sourceFile, statements = _a.statements, importedFrom = _a.importedFrom, actionDefNames = _a.actionDefNames;
-        var importStatements = [];
-        for (var k in importedFrom) {
+    const actionDictStatements = [];
+    const propertyAssignments = [];
+    for (const entity in ActionAsts) {
+        const { sourceFile, statements, importedFrom, actionDefNames } = ActionAsts[entity];
+        const importStatements = [];
+        for (const k in importedFrom) {
             (0, assert_1.default)(k.endsWith('Action'));
             if (importedFrom[k] !== 'local') {
                 importStatements.push(importedFrom[k]);
@@ -3075,7 +2829,7 @@ function outputAction(outputDir, printer) {
         if (actionDiff.length > 0) {
             throw new Error(`action not conform to actionDef: ${actionDiff.join(',')}, entity: ${entity}`);
         } */
-        statements.push(factory.createVariableStatement([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("ActionDefDict"), undefined, undefined, factory.createObjectLiteralExpression(actionDefNames.map(function (ele) { return factory.createPropertyAssignment(factory.createIdentifier("".concat(ele, "State")), factory.createIdentifier("".concat((0, string_1.firstLetterUpperCase)(ele), "ActionDef"))); }), true))], ts.NodeFlags.Const)));
+        statements.push(factory.createVariableStatement([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("ActionDefDict"), undefined, undefined, factory.createObjectLiteralExpression(actionDefNames.map(ele => factory.createPropertyAssignment(factory.createIdentifier(`${ele}State`), factory.createIdentifier(`${(0, string_1.firstLetterUpperCase)(ele)}ActionDef`))), true))], ts.NodeFlags.Const)));
         /*  const result = printer.printNode(
              ts.EmitHint.Unspecified,
              factory.createSourceFile(statements,
@@ -3084,33 +2838,33 @@ function outputAction(outputDir, printer) {
              sourceFile
          ); */
         // 这里如果用printNode，stringLiteral的输出始终有个bug不知道如何处理
-        var result_1 = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(importStatements.concat(statements)), sourceFile);
-        var filename = path_1.default.join(outputDir, entity, 'Action.ts');
-        (0, fs_1.writeFileSync)(filename, result_1, { flag: 'w' });
-        actionDictStatements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("ActionDefDict"), factory.createIdentifier(entity))])), factory.createStringLiteral("./".concat(entity, "/Action"))));
+        const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(importStatements.concat(statements)), sourceFile);
+        const filename = path_1.default.join(outputDir, entity, 'Action.ts');
+        (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
+        actionDictStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("ActionDefDict"), factory.createIdentifier(entity))])), factory.createStringLiteral(`./${entity}/Action`)));
         propertyAssignments.push(factory.createPropertyAssignment(factory.createIdentifier((0, string_1.firstLetterLowerCase)(entity)), factory.createIdentifier(entity)));
     }
     actionDictStatements.push(factory.createVariableStatement([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("ActionDefDict"), undefined, undefined, factory.createObjectLiteralExpression(propertyAssignments, true))], ts.NodeFlags.Const)));
-    var resultFile = ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS);
-    var result = printer.printNode(ts.EmitHint.Unspecified, factory.createSourceFile(actionDictStatements, factory.createToken(ts.SyntaxKind.EndOfFileToken), ts.NodeFlags.None), resultFile);
-    var fileName = path_1.default.join(outputDir, 'ActionDefDict.ts');
+    const resultFile = ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS);
+    const result = printer.printNode(ts.EmitHint.Unspecified, factory.createSourceFile(actionDictStatements, factory.createToken(ts.SyntaxKind.EndOfFileToken), ts.NodeFlags.None), resultFile);
+    const fileName = path_1.default.join(outputDir, 'ActionDefDict.ts');
     (0, fs_1.writeFileSync)(fileName, result, { flag: 'w' });
 }
 function constructAttributes(entity) {
-    var _a = Schema[entity], schemaAttrs = _a.schemaAttrs, enumAttributes = _a.enumAttributes;
-    var _b = ManyToOne, _c = entity, manyToOneSet = _b[_c];
-    var result = [];
-    schemaAttrs.forEach(function (attr) {
-        var attrAssignments = [];
-        var name = attr.name, type = attr.type, allowNull = attr.questionToken;
+    const { schemaAttrs, enumAttributes } = Schema[entity];
+    const { [entity]: manyToOneSet } = ManyToOne;
+    const result = [];
+    schemaAttrs.forEach((attr) => {
+        const attrAssignments = [];
+        const { name, type, questionToken: allowNull } = attr;
         if (!allowNull) {
             attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("notNull"), factory.createTrue()));
         }
-        var name2 = name;
+        let name2 = name;
         if (ts.isTypeReferenceNode(type)) {
-            var typeName = type.typeName, typeArguments = type.typeArguments;
+            const { typeName, typeArguments } = type;
             if (ts.isIdentifier(typeName)) {
-                var text = typeName.text;
+                const { text } = typeName;
                 switch (text) {
                     case 'String': {
                         attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("varchar")), factory.createPropertyAssignment(factory.createIdentifier("params"), factory.createObjectLiteralExpression([
@@ -3118,10 +2872,10 @@ function constructAttributes(entity) {
                         ], true)));
                         // 如果是entity，在这里处理一下ref
                         if (ts.isIdentifier(name) && name.text === 'entity') {
-                            var mtoRelations = ReversePointerRelations[entity];
+                            const mtoRelations = ReversePointerRelations[entity];
                             if (mtoRelations) {
-                                var mtoEntities = mtoRelations.map(function (ele) { return (0, string_1.firstLetterLowerCase)(ele); });
-                                attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("ref"), factory.createArrayLiteralExpression(mtoEntities.map(function (ele) { return factory.createStringLiteral(ele); }), false)));
+                                const mtoEntities = mtoRelations.map(ele => (0, string_1.firstLetterLowerCase)(ele));
+                                attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("ref"), factory.createArrayLiteralExpression(mtoEntities.map(ele => factory.createStringLiteral(ele)), false)));
                             }
                         }
                         break;
@@ -3144,7 +2898,7 @@ function constructAttributes(entity) {
                     case 'Float':
                     case 'Decimal': {
                         if (['Double', 'Float'].includes(text)) {
-                            console.warn("".concat(entity, "\u5BF9\u8C61\u4E2D\u8FD8\u6709").concat(text, "\u7C7B\u578B\u5B9A\u4E49\uFF0C\u73B0\u5728\u7EDF\u4E00\u7528Decimal\u8FDB\u884C\u5B58\u50A8"));
+                            console.warn(`${entity}对象中还有${text}类型定义，现在统一用Decimal进行存储`);
                         }
                         attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("decimal")), factory.createPropertyAssignment(factory.createIdentifier("params"), factory.createObjectLiteralExpression([
                             factory.createPropertyAssignment(factory.createIdentifier("precision"), factory.createNumericLiteral(typeArguments[0].literal.text)),
@@ -3176,19 +2930,16 @@ function constructAttributes(entity) {
                         break;
                     }
                     default: {
-                        var text2_6 = text === 'Schema' ? entity : text;
-                        var manyToOneItem = manyToOneSet && manyToOneSet.find(function (_a) {
-                            var _b = tslib_1.__read(_a, 2), refEntity = _b[0], attrName = _b[1];
-                            return refEntity === text2_6 && attrName === attrName;
-                        });
+                        const text2 = text === 'Schema' ? entity : text;
+                        const manyToOneItem = manyToOneSet && manyToOneSet.find(([refEntity, attrName]) => refEntity === text2 && attrName === attrName);
                         if (manyToOneItem) {
                             // 外键
-                            name2 = factory.createIdentifier("".concat(name.text, "Id"));
-                            attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("ref")), factory.createPropertyAssignment(factory.createIdentifier("ref"), factory.createStringLiteral((0, string_1.firstLetterLowerCase)(text2_6))));
+                            name2 = factory.createIdentifier(`${name.text}Id`);
+                            attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("ref")), factory.createPropertyAssignment(factory.createIdentifier("ref"), factory.createStringLiteral((0, string_1.firstLetterLowerCase)(text2))));
                         }
                         else {
                             if (enumAttributes && enumAttributes[name.text]) {
-                                attrAssignments.push(factory.createPropertyAssignment('type', factory.createStringLiteral("enum")), factory.createPropertyAssignment('enumeration', factory.createArrayLiteralExpression(enumAttributes[name.text].map(function (ele) { return factory.createStringLiteral(ele); }))));
+                                attrAssignments.push(factory.createPropertyAssignment('type', factory.createStringLiteral("enum")), factory.createPropertyAssignment('enumeration', factory.createArrayLiteralExpression(enumAttributes[name.text].map(ele => factory.createStringLiteral(ele)))));
                             }
                             else {
                                 // todo 引用的非string定义，目前没有处理int类型的引用，等遇到了再处理
@@ -3207,7 +2958,7 @@ function constructAttributes(entity) {
                 if (ts.isLiteralTypeNode(type.types[0])) {
                     if (ts.isStringLiteral(type.types[0].literal)) {
                         (0, assert_1.default)(enumAttributes && enumAttributes[name.text]);
-                        attrAssignments.push(factory.createPropertyAssignment('type', factory.createStringLiteral("enum")), factory.createPropertyAssignment('enumeration', factory.createArrayLiteralExpression(enumAttributes[name.text].map(function (ele) { return factory.createStringLiteral(ele); }))));
+                        attrAssignments.push(factory.createPropertyAssignment('type', factory.createStringLiteral("enum")), factory.createPropertyAssignment('enumeration', factory.createArrayLiteralExpression(enumAttributes[name.text].map(ele => factory.createStringLiteral(ele)))));
                     }
                     else {
                         (0, assert_1.default)(ts.isNumericLiteral(type.types[0].literal));
@@ -3245,20 +2996,20 @@ function constructAttributes(entity) {
     return result;
 }
 function outputLocale(outputDir, printer) {
-    var locales = {};
-    var entities = [];
-    var _loop_12 = function (entity) {
-        var _a = Schema[entity], locale = _a.locale, sourceFile = _a.sourceFile;
+    const locales = {};
+    const entities = [];
+    for (const entity in Schema) {
+        const { locale, sourceFile } = Schema[entity];
         if (locale) {
-            var properties = locale.properties;
-            properties.forEach(function (ele) {
+            const { properties } = locale;
+            properties.forEach((ele) => {
                 (0, assert_1.default)(ts.isPropertyAssignment(ele) && (ts.isIdentifier(ele.name) || ts.isStringLiteral(ele.name)) && ts.isObjectLiteralExpression(ele.initializer));
-                var lng = ele.name.text;
-                var result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray([
+                const lng = ele.name.text;
+                const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray([
                     factory.createReturnStatement(ele.initializer)
                 ]), sourceFile);
-                var data = Function(result)();
-                var filename = path_1.default.join(outputDir, entity, 'locales', "".concat(lng, ".json"));
+                const data = Function(result)();
+                const filename = path_1.default.join(outputDir, entity, 'locales', `${lng}.json`);
                 (0, fs_1.writeFileSync)(filename, JSON.stringify(data), { flag: 'w' });
                 if (locales[lng]) {
                     locales[lng].push(entity);
@@ -3269,14 +3020,11 @@ function outputLocale(outputDir, printer) {
             });
             entities.push(entity);
         }
-    };
-    for (var entity in Schema) {
-        _loop_12(entity);
     }
-    for (var lng in locales) {
+    for (const lng in locales) {
         if (locales[lng].length < entities.length) {
-            var lack = (0, lodash_1.difference)(entities, locales[lng]);
-            throw new Error("".concat(lng, "\u8BED\u8A00\u5B9A\u4E49\u4E2D\u7F3A\u5C11\u4E86\u5BF9\u8C61").concat(lack.join(','), "\u7684\u5B9A\u4E49\uFF0C\u8BF7\u68C0\u67E5\u76F8\u5E94\u7684\u5B9A\u4E49\u6587\u4EF6"));
+            const lack = (0, lodash_1.difference)(entities, locales[lng]);
+            throw new Error(`${lng}语言定义中缺少了对象${lack.join(',')}的定义，请检查相应的定义文件`);
         }
         /* const statements: ts.Statement[] = locales[lng].map(
             (entity) => factory.createImportDeclaration(
@@ -3318,15 +3066,15 @@ function outputLocale(outputDir, printer) {
     }
 }
 function outputStorage(outputDir, printer) {
-    var importStatements = [
-        factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("StorageSchema"))])), factory.createStringLiteral("".concat((0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(1), "Storage")), undefined),
-        factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityDict"))])), factory.createStringLiteral("./EntityDict"), undefined)
+    const importStatements = [
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("StorageSchema"))])), factory.createStringLiteral(`${(0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(1)}Storage`), undefined),
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityDict"))])), factory.createStringLiteral("./EntityDict"), undefined)
     ];
-    var entityAssignments = [];
-    for (var entity in Schema) {
-        var indexExpressions = [];
-        var _a = Schema[entity], sourceFile = _a.sourceFile, inModi = _a.inModi, indexes = _a.indexes, toModi = _a.toModi, actionType = _a.actionType, _static = _a.static, hasRelationDef = _a.hasRelationDef;
-        var fromSchemaSpecifiers = [
+    const entityAssignments = [];
+    for (const entity in Schema) {
+        const indexExpressions = [];
+        const { sourceFile, inModi, indexes, toModi, actionType, static: _static, hasRelationDef } = Schema[entity];
+        const fromSchemaSpecifiers = [
             factory.createImportSpecifier(false, undefined, factory.createIdentifier("OpSchema"))
         ];
         /* if (relationHierarchy || reverseCascadeRelationHierarchy) {
@@ -3338,11 +3086,11 @@ function outputStorage(outputDir, printer) {
                 )
             );
         } */
-        var statements = [
-            factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("StorageDesc"))])), factory.createStringLiteral("".concat((0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(), "Storage")), undefined),
-            factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports(fromSchemaSpecifiers)), factory.createStringLiteral("./Schema"), undefined)
+        const statements = [
+            factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("StorageDesc"))])), factory.createStringLiteral(`${(0, env_1.TYPE_PATH_IN_OAK_DOMAIN)()}Storage`), undefined),
+            factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports(fromSchemaSpecifiers)), factory.createStringLiteral("./Schema"), undefined)
         ];
-        var needImportActions = [];
+        const needImportActions = [];
         switch (actionType) {
             case 'readOnly': {
                 needImportActions.push(factory.createImportSpecifier(false, factory.createIdentifier("readOnlyActions"), factory.createIdentifier("actions")));
@@ -3358,7 +3106,7 @@ function outputStorage(outputDir, printer) {
             }
             default: {
                 if (ActionAsts[entity]) {
-                    statements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("actions"))])), factory.createStringLiteral("./Action"), undefined));
+                    statements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("actions"))])), factory.createStringLiteral("./Action"), undefined));
                 }
                 else {
                     needImportActions.push(factory.createImportSpecifier(false, factory.createIdentifier("genericActions"), factory.createIdentifier("actions")));
@@ -3369,13 +3117,13 @@ function outputStorage(outputDir, printer) {
             needImportActions.push(factory.createImportSpecifier(false, undefined, factory.createIdentifier("relationActions")));
         }
         if (needImportActions.length > 0) {
-            statements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports(needImportActions)), factory.createStringLiteral((0, env_1.ACTION_CONSTANT_IN_OAK_DOMAIN)()), undefined));
+            statements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports(needImportActions)), factory.createStringLiteral((0, env_1.ACTION_CONSTANT_IN_OAK_DOMAIN)()), undefined));
         }
-        var propertyAssignments = [];
-        var attributes = constructAttributes(entity);
+        const propertyAssignments = [];
+        const attributes = constructAttributes(entity);
         propertyAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("attributes"), factory.createObjectLiteralExpression(attributes, true)));
         if (indexes) {
-            indexExpressions.push.apply(indexExpressions, tslib_1.__spreadArray([], tslib_1.__read(indexes.elements), false));
+            indexExpressions.push(...indexes.elements);
         }
         if (toModi) {
             propertyAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("toModi"), factory.createTrue()));
@@ -3408,14 +3156,14 @@ function outputStorage(outputDir, printer) {
             );
         } */
         if (hasRelationDef) {
-            var type = hasRelationDef.type;
+            const { type } = hasRelationDef;
             if (ts.isUnionTypeNode(type)) {
-                var types = type.types;
-                var relationTexts = types.map(function (ele) {
+                const { types } = type;
+                const relationTexts = types.map(ele => {
                     (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal));
                     return ele.literal.text;
                 });
-                propertyAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("relation"), factory.createArrayLiteralExpression(relationTexts.map(function (ele) { return factory.createStringLiteral(ele); }))));
+                propertyAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("relation"), factory.createArrayLiteralExpression(relationTexts.map(ele => factory.createStringLiteral(ele)))));
             }
             else {
                 (0, assert_1.default)(ts.isLiteralTypeNode(type));
@@ -3425,124 +3173,130 @@ function outputStorage(outputDir, printer) {
                 ])));
             }
         }
-        var sdTypeArguments = [
+        const sdTypeArguments = [
             factory.createTypeReferenceNode(factory.createIdentifier("OpSchema"), undefined)
         ];
         statements.push(factory.createVariableStatement([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("desc"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("StorageDesc"), sdTypeArguments), factory.createObjectLiteralExpression(propertyAssignments, true))], ts.NodeFlags.Const)));
-        var result_2 = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements), sourceFile);
-        var filename_1 = path_1.default.join(outputDir, entity, 'Storage.ts');
-        (0, fs_1.writeFileSync)(filename_1, result_2, { flag: 'w' });
-        importStatements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
-            factory.createImportSpecifier(false, factory.createIdentifier("desc"), factory.createIdentifier("".concat((0, string_1.firstLetterLowerCase)(entity), "Desc")))
-        ])), factory.createStringLiteral("./".concat(entity, "/Storage")), undefined));
-        entityAssignments.push(factory.createPropertyAssignment((0, string_1.firstLetterLowerCase)(entity), factory.createIdentifier("".concat((0, string_1.firstLetterLowerCase)(entity), "Desc"))));
+        const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(statements), sourceFile);
+        const filename = path_1.default.join(outputDir, entity, 'Storage.ts');
+        (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
+        importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
+            factory.createImportSpecifier(false, factory.createIdentifier("desc"), factory.createIdentifier(`${(0, string_1.firstLetterLowerCase)(entity)}Desc`))
+        ])), factory.createStringLiteral(`./${entity}/Storage`), undefined));
+        entityAssignments.push(factory.createPropertyAssignment((0, string_1.firstLetterLowerCase)(entity), factory.createIdentifier(`${(0, string_1.firstLetterLowerCase)(entity)}Desc`)));
     }
     importStatements.push(factory.createVariableStatement([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("storageSchema"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("StorageSchema"), [
             factory.createTypeReferenceNode('EntityDict')
         ]), factory.createObjectLiteralExpression(entityAssignments, true))], ts.NodeFlags.Const)));
-    var result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(importStatements), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS));
-    var filename = path_1.default.join(outputDir, 'Storage.ts');
+    const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(importStatements), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS));
+    const filename = path_1.default.join(outputDir, 'Storage.ts');
     (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
 }
 function resetOutputDir(outputDir) {
     (0, fs_extra_1.emptydirSync)(outputDir);
-    for (var moduleName in Schema) {
+    for (const moduleName in Schema) {
         (0, fs_1.mkdirSync)(path_1.default.join(outputDir, moduleName));
         (0, fs_1.mkdirSync)(path_1.default.join(outputDir, moduleName, 'locales'));
     }
     (0, fs_1.mkdirSync)(path_1.default.join(outputDir, '_locales'));
 }
 function addReverseRelationship() {
-    var e_19, _a;
-    for (var reverseEntity in ReversePointerRelations) {
+    for (const reverseEntity in ReversePointerRelations) {
         if (!ReversePointerEntities.hasOwnProperty(reverseEntity)) {
-            throw new Error("\u300C".concat(reverseEntity, "\u300D\u88AB\u5F15\u7528\u4E3A\u4E00\u4E2A\u53CD\u6307\u5BF9\u8C61\uFF0C\u4F46\u5176\u5B9A\u4E49\u4E2D\u7684entity\u548CentityId\u4E0D\u7B26\u5408\u8981\u6C42"));
+            throw new Error(`「${reverseEntity}」被引用为一个反指对象，但其定义中的entity和entityId不符合要求`);
         }
-        try {
-            for (var _b = (e_19 = void 0, tslib_1.__values(ReversePointerRelations[reverseEntity])), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var one = _c.value;
-                addRelationship(reverseEntity, one, 'entity', false);
-            }
-        }
-        catch (e_19_1) { e_19 = { error: e_19_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_19) throw e_19.error; }
+        for (const one of ReversePointerRelations[reverseEntity]) {
+            addRelationship(reverseEntity, one, 'entity', false);
         }
     }
 }
 function outputIndexTs(outputDir) {
-    var indexTs = "export * from './EntityDict';\n    export * from './Storage';\n    export * from './ActionDefDict';\n    export * from './Relation';\n    ";
-    var filename = path_1.default.join(outputDir, 'index.ts');
+    const indexTs = `export * from './EntityDict';
+    export * from './Storage';
+    export * from './ActionDefDict';
+    export * from './Relation';
+    `;
+    const filename = path_1.default.join(outputDir, 'index.ts');
     (0, fs_1.writeFileSync)(filename, indexTs, { flag: 'w' });
 }
 function outputPackageJson(outputDir) {
-    var pj = {
+    const pj = {
         "name": process.env.COMPLING_AS_LIB ? "general-app-domain" : "oak-app-domain",
         "main": "index.ts"
     };
-    var filename = path_1.default.join(outputDir, 'package.json');
+    const filename = path_1.default.join(outputDir, 'package.json');
     (0, fs_1.writeFileSync)(filename, JSON.stringify(pj), { flag: 'w' });
 }
 /**
  * （从toModi的对象开始）分析可能被modi指向的对象
  */
 function analyzeInModi() {
-    var getRelateEntities = function (entity) {
-        var result = [];
+    const getRelateEntities = (entity) => {
+        let result = [];
         if (ManyToOne[entity]) {
             // 用反指指针指向的对象可以忽略，因为前端不可能设计出这样的更新页面
-            result = ManyToOne[entity].filter(function (ele) { return ele[1] !== 'entity'; }).map(function (ele) { return ele[0]; });
+            result = ManyToOne[entity].filter(ele => ele[1] !== 'entity').map(ele => ele[0]);
         }
         if (OneToMany[entity]) {
-            result.push.apply(result, tslib_1.__spreadArray([], tslib_1.__read(OneToMany[entity].map(function (ele) { return ele[0]; })), false));
+            result.push(...OneToMany[entity].map(ele => ele[0]));
         }
         return (0, lodash_1.uniq)(result);
     };
-    var setInModi = function (entity) {
+    const setInModi = (entity) => {
         if (['Modi', 'ModiEntity', 'Oper', 'OperEntity', 'User'].includes(entity)) {
             return;
         }
-        var schema = Schema[entity];
+        const schema = Schema[entity];
         if (schema.toModi || schema.inModi || schema.actionType === 'readOnly' || schema.static) {
             return;
         }
         schema.inModi = true;
-        var related = getRelateEntities(entity);
-        related.forEach(function (ele) { return setInModi(ele); });
+        const related = getRelateEntities(entity);
+        related.forEach(ele => setInModi(ele));
     };
-    for (var entity in Schema) {
+    for (const entity in Schema) {
         if (Schema[entity].toModi) {
-            var related = getRelateEntities(entity);
-            related.forEach(function (ele) { return setInModi(ele); });
+            const related = getRelateEntities(entity);
+            related.forEach(ele => setInModi(ele));
         }
     }
 }
-var IGNORED_FOREIGN_KEY_MAP = {};
-var IGNORED_RELATION_PATH_MAP = {};
-var DEDUCED_RELATION_MAP = {};
-var SELECT_FREE_ENTITIES = [];
-var CREATE_FREE_ENTITIES = [];
-var UPDATE_FREE_ENTITIES = [];
-var FIXED_DESTINATION_PATH_MAP = {};
-var FIXED_FOR_ALL_DESTINATION_PATH_ENTITIES = [];
+/**
+ * 此部分功能不再使用
+ * @param map
+ */
+let IGNORED_FOREIGN_KEY_MAP = {};
+let IGNORED_RELATION_PATH_MAP = {};
+let DEDUCED_RELATION_MAP = {};
+let SELECT_FREE_ENTITIES = [];
+let CREATE_FREE_ENTITIES = [];
+let UPDATE_FREE_ENTITIES = [];
+let FIXED_DESTINATION_PATH_MAP = {};
+let FIXED_FOR_ALL_DESTINATION_PATH_ENTITIES = [];
+/**
+ * 此函数不再使用
+ * @param map
+ */
 function registerIgnoredForeignKeyMap(map) {
     IGNORED_FOREIGN_KEY_MAP = map;
 }
 exports.registerIgnoredForeignKeyMap = registerIgnoredForeignKeyMap;
-function registerFreeEntities(selectFreeEntities, createFreeEntities, updateFreeEntities) {
-    if (selectFreeEntities === void 0) { selectFreeEntities = []; }
-    if (createFreeEntities === void 0) { createFreeEntities = []; }
-    if (updateFreeEntities === void 0) { updateFreeEntities = []; }
+/**
+ * 此函数不再使用
+ * @param map
+ */
+function registerFreeEntities(selectFreeEntities = [], createFreeEntities = [], updateFreeEntities = []) {
     SELECT_FREE_ENTITIES = selectFreeEntities;
     CREATE_FREE_ENTITIES = createFreeEntities;
     UPDATE_FREE_ENTITIES = updateFreeEntities;
 }
 exports.registerFreeEntities = registerFreeEntities;
+/**
+ * 此函数不再使用
+ * @param map
+ */
 function registerIgnoredRelationPathMap(map) {
-    for (var k in map) {
+    for (const k in map) {
         IGNORED_RELATION_PATH_MAP[(0, string_1.firstLetterUpperCase)(k)] = map[k];
     }
 }
@@ -3552,13 +3306,12 @@ exports.registerIgnoredRelationPathMap = registerIgnoredRelationPathMap;
  * @param map
  */
 function registerFixedDestinationPathMap(map) {
-    var _a;
-    for (var k in map) {
+    for (const k in map) {
         if (k === '.') {
-            FIXED_FOR_ALL_DESTINATION_PATH_ENTITIES.push.apply(FIXED_FOR_ALL_DESTINATION_PATH_ENTITIES, tslib_1.__spreadArray([], tslib_1.__read(map[k]), false));
+            FIXED_FOR_ALL_DESTINATION_PATH_ENTITIES.push(...map[k]);
         }
         else if (FIXED_DESTINATION_PATH_MAP[k]) {
-            (_a = FIXED_DESTINATION_PATH_MAP[k]).push.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(map[k]), false));
+            FIXED_DESTINATION_PATH_MAP[k].push(...map[k]);
         }
         else {
             FIXED_DESTINATION_PATH_MAP[k] = map[k];
@@ -3566,37 +3319,38 @@ function registerFixedDestinationPathMap(map) {
     }
 }
 exports.registerFixedDestinationPathMap = registerFixedDestinationPathMap;
+/**
+ * 此函数不再使用
+ * @param map
+ */
 function registerDeducedRelationMap(map) {
-    var _loop_13 = function (k) {
-        var entity = (0, string_1.firstLetterUpperCase)(k);
-        (0, assert_1.default)(Schema.hasOwnProperty(entity), "config/relation.ts\u4E2D\u914D\u7F6E\u7684DeducedRelationMap\u5305\u542B\u4E0D\u5408\u6CD5\u7684\u5BF9\u8C61\u540D\u79F0\u300C".concat(k, "\u300D"));
+    for (const k in map) {
+        const entity = (0, string_1.firstLetterUpperCase)(k);
+        (0, assert_1.default)(Schema.hasOwnProperty(entity), `config/relation.ts中配置的DeducedRelationMap包含不合法的对象名称「${k}」`);
         // 定义的deduce的属性一定是多对一的外键，此时ReversePointerEntities还未处理
         if (ReversePointerEntities[entity] && map[k] === 'entity') {
         }
         else {
-            var mto = ManyToOne[entity].find(function (ele) { return ele[1] === map[k]; });
-            (0, assert_1.default)(mto, "config/relation.ts\u4E2D\u914D\u7F6E\u7684DeducedRelationMap\u6240\u5B9A\u4E49\u7684\u300C".concat(k, "\u300D\u7684deduce\u5C5E\u6027\u300C").concat(map[k], "\u300D\u4E0D\u662F\u4E00\u4E2A\u6709\u6548\u7684\u5916\u952E\u6307\u9488"));
+            const mto = ManyToOne[entity].find(ele => ele[1] === map[k]);
+            (0, assert_1.default)(mto, `config/relation.ts中配置的DeducedRelationMap所定义的「${k}」的deduce属性「${map[k]}」不是一个有效的外键指针`);
         }
         DEDUCED_RELATION_MAP[entity] = map[k];
-    };
-    for (var k in map) {
-        _loop_13(k);
     }
 }
 exports.registerDeducedRelationMap = registerDeducedRelationMap;
 /**
  * 输出所有和User相关的对象的后继
+ * 此函数不再使用
  */
 function outputRelation(outputDir, printer) {
-    var ExcludedEntities = ['Oper', 'User', 'OperEntity', 'Modi', 'ModiEntity', 'UserRelation', 'Relation', 'RelationAuth', 'ActionAuth'];
-    var actionPath = [];
-    var relationPath = [];
-    var outputRecursively = function (root, entity, path, paths, isRelation) {
-        var _a;
+    const ExcludedEntities = ['Oper', 'User', 'OperEntity', 'Modi', 'ModiEntity', 'UserRelation', 'Relation', 'RelationAuth', 'ActionAuth'];
+    const actionPath = [];
+    const relationPath = [];
+    const outputRecursively = (root, entity, path, paths, isRelation) => {
         if (ExcludedEntities.includes(entity)) {
             return;
         }
-        if ((_a = IGNORED_RELATION_PATH_MAP[entity]) === null || _a === void 0 ? void 0 : _a.find(function (ele) { return path.includes(ele); })) {
+        if (IGNORED_RELATION_PATH_MAP[entity]?.find((ele) => path.includes(ele))) {
             return;
         }
         if (paths.length > 12) {
@@ -3607,12 +3361,10 @@ function outputRelation(outputDir, printer) {
             // assert(!DEDUCED_RELATION_MAP[entity], `${entity}对象定义了deducedRelationMap，但它有relation`);
             relationPath.push([(0, string_1.firstLetterLowerCase)(entity), path, root, isRelation]);
         }
-        var _b = OneToMany, _c = entity, parent = _b[_c];
+        const { [entity]: parent } = OneToMany;
         if (parent) {
-            parent.forEach(function (_a) {
-                var _b;
-                var _c = tslib_1.__read(_a, 2), child = _c[0], foreignKey = _c[1];
-                var child2 = (0, string_1.firstLetterLowerCase)(child);
+            parent.forEach(([child, foreignKey]) => {
+                const child2 = (0, string_1.firstLetterLowerCase)(child);
                 if (child === entity) {
                     // 如果有层级关系对象，最多找3层。同时这里只找本身存在relation关系的对象，因为如果对象上没有relation，则其上的公共路径应当可以维护住层级关系
                     // 例如在jichuang项目中，house上没有relation，通过其park外键所维护的路径不需要遍历其父亲。而parkCluster因为有relation，所以必须构造以之为根的所有的可能路径
@@ -3620,7 +3372,7 @@ function outputRelation(outputDir, printer) {
                     if (!Schema[entity].hasRelationDef) {
                         return;
                     }
-                    if (paths.find(function (ele) { return ele !== child2; }) || paths.length > 2) {
+                    if (paths.find(ele => ele !== child2) || paths.length > 2) {
                         return;
                     }
                 }
@@ -3628,7 +3380,7 @@ function outputRelation(outputDir, printer) {
                     // 除了层级之外的递归直接忽略
                     return;
                 }
-                if ((_b = IGNORED_FOREIGN_KEY_MAP[child2]) === null || _b === void 0 ? void 0 : _b.includes(foreignKey)) {
+                if (IGNORED_FOREIGN_KEY_MAP[child2]?.includes(foreignKey)) {
                     // 忽略的路径放弃
                     return;
                 }
@@ -3636,28 +3388,26 @@ function outputRelation(outputDir, printer) {
                     // 如果子对象本身由父对象推定，也放弃
                     return;
                 }
-                var fk = foreignKey === 'entity' ? (0, string_1.firstLetterLowerCase)(entity) : foreignKey;
-                var path2 = path ? "".concat(fk, ".").concat(path) : fk;
+                const fk = foreignKey === 'entity' ? (0, string_1.firstLetterLowerCase)(entity) : foreignKey;
+                const path2 = path ? `${fk}.${path}` : fk;
                 outputRecursively(root, child, path2, paths.concat([(0, string_1.firstLetterLowerCase)(entity)]), isRelation);
             });
         }
     };
     // 所有属性中有指向user的对象
-    var User = OneToMany.User;
-    User.forEach(function (_a) {
-        var _b;
-        var _c = tslib_1.__read(_a, 2), entity3 = _c[0], foreignKey = _c[1];
-        var fk = foreignKey === 'entity' ? 'user' : foreignKey;
-        if (!((_b = IGNORED_FOREIGN_KEY_MAP[(0, string_1.firstLetterLowerCase)(entity3)]) === null || _b === void 0 ? void 0 : _b.includes(foreignKey))) {
+    const { User } = OneToMany;
+    User.forEach(([entity3, foreignKey]) => {
+        const fk = foreignKey === 'entity' ? 'user' : foreignKey;
+        if (!IGNORED_FOREIGN_KEY_MAP[(0, string_1.firstLetterLowerCase)(entity3)]?.includes(foreignKey)) {
             outputRecursively((0, string_1.firstLetterLowerCase)(entity3), entity3, fk, [fk], false);
         }
     });
     // 所有带relation的对象
-    var hasRelationEntities = Object.keys(Schema).filter(function (entity) { return Schema[entity].hasRelationDef; });
-    hasRelationEntities.forEach(function (entity3) {
+    const hasRelationEntities = Object.keys(Schema).filter((entity) => Schema[entity].hasRelationDef);
+    hasRelationEntities.forEach((entity3) => {
         outputRecursively((0, string_1.firstLetterLowerCase)(entity3), entity3, '', [], true);
     });
-    actionPath.sort(function (ele1, ele2) {
+    actionPath.sort((ele1, ele2) => {
         // 先按sourceEntity来排序
         if (ele1[0] > ele2[0]) {
             return 1;
@@ -3679,14 +3429,14 @@ function outputRelation(outputDir, printer) {
             }
         }
     });
-    var entityRelations = [];
-    for (var entity in Schema) {
-        var hasRelationDef = Schema[entity].hasRelationDef;
+    const entityRelations = [];
+    for (const entity in Schema) {
+        const { hasRelationDef } = Schema[entity];
         if (hasRelationDef) {
-            var type = hasRelationDef.type;
+            const { type } = hasRelationDef;
             if (ts.isUnionTypeNode(type)) {
-                var types = type.types;
-                var relations = types.map(function (ele) {
+                const { types } = type;
+                const relations = types.map(ele => {
                     (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal));
                     return ele.literal.text;
                 });
@@ -3695,72 +3445,104 @@ function outputRelation(outputDir, printer) {
             else {
                 (0, assert_1.default)(ts.isLiteralTypeNode(type));
                 (0, assert_1.default)(ts.isStringLiteral(type.literal));
-                var relations = [type.literal.text];
+                const relations = [type.literal.text];
                 entityRelations.push([(0, string_1.firstLetterLowerCase)(entity), relations]);
             }
         }
     }
-    var stmts = [
-        factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
+    const stmts = [
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
             factory.createImportSpecifier(false, undefined, factory.createIdentifier("AuthCascadePath")),
             factory.createImportSpecifier(false, undefined, factory.createIdentifier("AuthDeduceRelationMap"))
-        ])), factory.createStringLiteral("".concat((0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(1), "Entity")), undefined),
-        factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityDict"))])), factory.createStringLiteral("./EntityDict"), undefined),
-        factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("CreateOperationData"), factory.createIdentifier("Relation"))])), factory.createStringLiteral("./Relation/Schema"), undefined),
-        factory.createVariableStatement([factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("ActionCascadePathGraph"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("AuthCascadePath"), [factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)])), factory.createArrayLiteralExpression(actionPath.map(function (_a) {
-                var _b = tslib_1.__read(_a, 4), entity = _b[0], path = _b[1], root = _b[2], isRelation = _b[3];
-                return factory.createArrayLiteralExpression([
-                    factory.createStringLiteral(entity),
-                    factory.createStringLiteral(path),
-                    factory.createStringLiteral(root),
-                    isRelation ? factory.createTrue() : factory.createFalse()
-                ], false);
-            }), true))], ts.NodeFlags.Const)),
-        factory.createVariableStatement([factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("RelationCascadePathGraph"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("AuthCascadePath"), [factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)])), factory.createArrayLiteralExpression(relationPath.map(function (_a) {
-                var _b = tslib_1.__read(_a, 4), entity = _b[0], path = _b[1], root = _b[2], isRelation = _b[3];
-                return factory.createArrayLiteralExpression([
-                    factory.createStringLiteral(entity),
-                    factory.createStringLiteral(path),
-                    factory.createStringLiteral(root),
-                    isRelation ? factory.createTrue() : factory.createFalse()
-                ], false);
-            }), true))], ts.NodeFlags.Const)),
-        factory.createVariableStatement([factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("relations"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("Relation"), undefined)), factory.createArrayLiteralExpression((0, lodash_1.flatten)(entityRelations.map(function (_a) {
-                var _b = tslib_1.__read(_a, 2), entity = _b[0], relations = _b[1];
-                return relations.map(function (relation) { return factory.createObjectLiteralExpression([
-                    factory.createPropertyAssignment(factory.createIdentifier("id"), factory.createStringLiteral((0, uuid_1.formUuid)(entity, relation))),
-                    factory.createPropertyAssignment(factory.createIdentifier("entity"), factory.createStringLiteral(entity)),
-                    factory.createPropertyAssignment(factory.createIdentifier("name"), factory.createStringLiteral(relation))
-                ], true); });
-            })), true))], ts.NodeFlags.Const))
+        ])), factory.createStringLiteral(`${(0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(1)}Entity`), undefined),
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityDict"))])), factory.createStringLiteral("./EntityDict"), undefined),
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("CreateOperationData"), factory.createIdentifier("Relation"))])), factory.createStringLiteral("./Relation/Schema"), undefined),
+        factory.createVariableStatement([factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("ActionCascadePathGraph"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("AuthCascadePath"), [factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)])), factory.createArrayLiteralExpression(actionPath.map(([entity, path, root, isRelation]) => factory.createArrayLiteralExpression([
+                factory.createStringLiteral(entity),
+                factory.createStringLiteral(path),
+                factory.createStringLiteral(root),
+                isRelation ? factory.createTrue() : factory.createFalse()
+            ], false)), true))], ts.NodeFlags.Const)),
+        factory.createVariableStatement([factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("RelationCascadePathGraph"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("AuthCascadePath"), [factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)])), factory.createArrayLiteralExpression(relationPath.map(([entity, path, root, isRelation]) => factory.createArrayLiteralExpression([
+                factory.createStringLiteral(entity),
+                factory.createStringLiteral(path),
+                factory.createStringLiteral(root),
+                isRelation ? factory.createTrue() : factory.createFalse()
+            ], false)), true))], ts.NodeFlags.Const)),
+        factory.createVariableStatement([factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("relations"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("Relation"), undefined)), factory.createArrayLiteralExpression((0, lodash_1.flatten)(entityRelations.map(([entity, relations]) => relations.map((relation) => factory.createObjectLiteralExpression([
+                factory.createPropertyAssignment(factory.createIdentifier("id"), factory.createStringLiteral((0, uuid_1.formUuid)(entity, relation))),
+                factory.createPropertyAssignment(factory.createIdentifier("entity"), factory.createStringLiteral(entity)),
+                factory.createPropertyAssignment(factory.createIdentifier("name"), factory.createStringLiteral(relation))
+            ], true)))), true))], ts.NodeFlags.Const))
     ];
     stmts.push(factory.createVariableStatement([
         factory.createToken(ts.SyntaxKind.ExportKeyword)
     ], factory.createVariableDeclarationList([
-        factory.createVariableDeclaration(factory.createIdentifier("deducedRelationMap"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("AuthDeduceRelationMap"), [factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)]), factory.createObjectLiteralExpression(Object.keys(DEDUCED_RELATION_MAP).map(function (ele) { return factory.createPropertyAssignment(factory.createIdentifier((0, string_1.firstLetterLowerCase)(ele)), factory.createStringLiteral(DEDUCED_RELATION_MAP[ele])); }), true))
+        factory.createVariableDeclaration(factory.createIdentifier("deducedRelationMap"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("AuthDeduceRelationMap"), [factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)]), factory.createObjectLiteralExpression(Object.keys(DEDUCED_RELATION_MAP).map(ele => factory.createPropertyAssignment(factory.createIdentifier((0, string_1.firstLetterLowerCase)(ele)), factory.createStringLiteral(DEDUCED_RELATION_MAP[ele]))), true))
     ], ts.NodeFlags.Const)));
     stmts.push(factory.createVariableStatement([
         factory.createToken(ts.SyntaxKind.ExportKeyword)
-    ], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("selectFreeEntities"), undefined, factory.createArrayTypeNode(factory.createParenthesizedType(factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)))), factory.createArrayLiteralExpression(SELECT_FREE_ENTITIES.map(function (ele) { return factory.createStringLiteral(ele); }), false))], ts.NodeFlags.Const)), factory.createVariableStatement([
+    ], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("selectFreeEntities"), undefined, factory.createArrayTypeNode(factory.createParenthesizedType(factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)))), factory.createArrayLiteralExpression(SELECT_FREE_ENTITIES.map(ele => factory.createStringLiteral(ele)), false))], ts.NodeFlags.Const)), factory.createVariableStatement([
         factory.createToken(ts.SyntaxKind.ExportKeyword)
-    ], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("updateFreeEntities"), undefined, factory.createArrayTypeNode(factory.createParenthesizedType(factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)))), factory.createArrayLiteralExpression(UPDATE_FREE_ENTITIES.map(function (ele) { return factory.createStringLiteral(ele); }), false))], ts.NodeFlags.Const)), factory.createVariableStatement([
+    ], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("updateFreeEntities"), undefined, factory.createArrayTypeNode(factory.createParenthesizedType(factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)))), factory.createArrayLiteralExpression(UPDATE_FREE_ENTITIES.map(ele => factory.createStringLiteral(ele)), false))], ts.NodeFlags.Const)), factory.createVariableStatement([
         factory.createToken(ts.SyntaxKind.ExportKeyword)
-    ], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("createFreeEntities"), undefined, factory.createArrayTypeNode(factory.createParenthesizedType(factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)))), factory.createArrayLiteralExpression(CREATE_FREE_ENTITIES.map(function (ele) { return factory.createStringLiteral(ele); }), false))], ts.NodeFlags.Const)));
-    var result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(stmts), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS));
-    var filename = path_1.default.join(outputDir, 'Relation.ts');
+    ], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("createFreeEntities"), undefined, factory.createArrayTypeNode(factory.createParenthesizedType(factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)))), factory.createArrayLiteralExpression(CREATE_FREE_ENTITIES.map(ele => factory.createStringLiteral(ele)), false))], ts.NodeFlags.Const)));
+    const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(stmts), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS));
+    const filename = path_1.default.join(outputDir, 'Relation.ts');
+    (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
+}
+/**
+ * 输出oak-app-domain中的Relation.ts文件
+ * 不再输出actionAuthGraph和relationAuthGraph两个复杂的对象
+ * @param outputDir
+ * @param printer
+ */
+function outputRelation2(outputDir, printer) {
+    const entityRelations = [];
+    for (const entity in Schema) {
+        const { hasRelationDef } = Schema[entity];
+        if (hasRelationDef) {
+            const { type } = hasRelationDef;
+            if (ts.isUnionTypeNode(type)) {
+                const { types } = type;
+                const relations = types.map(ele => {
+                    (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal));
+                    return ele.literal.text;
+                });
+                entityRelations.push([(0, string_1.firstLetterLowerCase)(entity), relations]);
+            }
+            else {
+                (0, assert_1.default)(ts.isLiteralTypeNode(type));
+                (0, assert_1.default)(ts.isStringLiteral(type.literal));
+                const relations = [type.literal.text];
+                entityRelations.push([(0, string_1.firstLetterLowerCase)(entity), relations]);
+            }
+        }
+    }
+    const stmts = [
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityDict"))])), factory.createStringLiteral("./EntityDict"), undefined),
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("CreateOperationData"), factory.createIdentifier("Relation"))])), factory.createStringLiteral("./Relation/Schema"), undefined),
+        factory.createVariableStatement([factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("relations"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("Relation"), undefined)), factory.createArrayLiteralExpression((0, lodash_1.flatten)(entityRelations.map(([entity, relations]) => relations.map((relation) => factory.createObjectLiteralExpression([
+                factory.createPropertyAssignment(factory.createIdentifier("id"), factory.createStringLiteral((0, uuid_1.formUuid)(entity, relation))),
+                factory.createPropertyAssignment(factory.createIdentifier("entity"), factory.createStringLiteral(entity)),
+                factory.createPropertyAssignment(factory.createIdentifier("name"), factory.createStringLiteral(relation))
+            ], true)))), true))], ts.NodeFlags.Const))
+    ];
+    const result = printer.printList(ts.ListFormat.SourceFileStatements, factory.createNodeArray(stmts), ts.createSourceFile("someFileName.ts", "", ts.ScriptTarget.Latest, /*setParentNodes*/ false, ts.ScriptKind.TS));
+    const filename = path_1.default.join(outputDir, 'Relation.ts');
     (0, fs_1.writeFileSync)(filename, result, { flag: 'w' });
 }
 function analyzeEntities(inputDir, relativePath) {
-    var files = (0, fs_1.readdirSync)(inputDir);
-    var fullFilenames = files.map(function (ele) {
-        var entity = ele.slice(0, ele.indexOf('.'));
-        if (env_1.RESERVED_ENTITY_NAMES.includes(entity) || env_1.RESERVED_ENTITY_NAMES.find(function (ele2) { return entity.startsWith(ele2); })) {
-            throw new Error("".concat(ele, "\u662F\u7CFB\u7EDF\u4FDD\u7559\u5B57\uFF0C\u8BF7\u52FF\u4F7F\u7528\u5176\u5F53\u5BF9\u8C61\u540D\u6216\u5BF9\u8C61\u540D\u524D\u7F00"));
+    const files = (0, fs_1.readdirSync)(inputDir);
+    const fullFilenames = files.map(ele => {
+        const entity = ele.slice(0, ele.indexOf('.'));
+        if (env_1.RESERVED_ENTITY_NAMES.includes(entity) || env_1.RESERVED_ENTITY_NAMES.find(ele2 => entity.startsWith(ele2))) {
+            throw new Error(`${ele}是系统保留字，请勿使用其当对象名或对象名前缀`);
         }
-        return "".concat(inputDir, "/").concat(ele);
+        return `${inputDir}/${ele}`;
     });
-    var program = ts.createProgram(fullFilenames, { allowJs: true });
-    files.forEach(function (filename) {
+    const program = ts.createProgram(fullFilenames, { allowJs: true });
+    files.forEach((filename) => {
         analyzeEntity(filename, inputDir, program, relativePath);
     });
     analyzeInModi();
@@ -3770,7 +3552,7 @@ exports.analyzeEntities = analyzeEntities;
 function buildSchema(outputDir) {
     addReverseRelationship();
     // setRelationEntities();
-    var printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
+    const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
     resetOutputDir(outputDir);
     outputSchema(outputDir, printer);
     outputLocale(outputDir, printer);
@@ -3778,7 +3560,7 @@ function buildSchema(outputDir) {
     outputAction(outputDir, printer);
     outputEntityDict(outputDir, printer);
     outputStorage(outputDir, printer);
-    outputRelation(outputDir, printer);
+    outputRelation2(outputDir, printer);
     outputIndexTs(outputDir);
     if (!process.env.COMPLING_AS_LIB) {
         outputPackageJson(outputDir);