oak-domain 2.6.10 → 3.0.0

package/lib/compiler/schemalBuilder.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSchema = exports.analyzeEntities = void 0;
+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"));
@@ -220,6 +220,7 @@ var RESERVED_ACTION_NAMES = ['GenericAction', 'ParticularAction', 'ExcludeRemove
 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 = {
     'crud': 'GenericAction',
     'excludeUpdate': 'ExcludeUpdateAction',
@@ -227,9 +228,9 @@ var OriginActionDict = {
     'appendOnly': 'AppendOnlyAction',
     'readOnly': 'ReadOnlyAction',
 };
-function dealWithActions(moduleName, filename, node, program, sourceFile, hasRelationDef) {
+function dealWithActions(moduleName, filename, node, program, sourceFile) {
     var actionTexts = action_1.genericActions.map(function (ele) { return ele; });
-    if (hasRelationDef) {
+    if (moduleName === 'User') {
         actionTexts.push.apply(actionTexts, tslib_1.__spreadArray([], tslib_1.__read(action_1.relationActions), false));
     }
     if (ts.isUnionTypeNode(node)) {
@@ -238,7 +239,7 @@ function dealWithActions(moduleName, filename, node, program, sourceFile, hasRel
                 return ele.typeName.text;
             }
         }).filter(function (ele) { return !!ele; });
-        (0, assert_1.default)((0, lodash_1.intersection)(actionNames, env_1.RESERVED_ENTITIES).length === 0, "".concat(filename, "\u4E2D\u7684Action\u547D\u540D\u4E0D\u80FD\u662F\u300C").concat(RESERVED_ACTION_NAMES.join(','), "\u300D\u4E4B\u4E00"));
+        (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) {
             if (ts.isTypeReferenceNode(ele)) {
                 actionTexts.push.apply(actionTexts, tslib_1.__spreadArray([], tslib_1.__read(getStringTextFromUnionStringLiterals(moduleName, filename, ele, program)), false));
@@ -385,26 +386,26 @@ function analyzeEntity(filename, path, program, relativePath) {
     // let relationHierarchy: ts.ObjectLiteralExpression | undefined = undefined;
     // let reverseCascadeRelationHierarchy: ts.ObjectLiteralExpression | undefined = undefined;
     ts.forEachChild(sourceFile, function (node) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         if (ts.isImportDeclaration(node)) {
             var entityImported = getEntityImported(node);
             if (entityImported) {
                 referencedSchemas.push(entityImported);
             }
-            else if (!process.env.COMPLING_IN_DOMAIN && !(relativePath === null || relativePath === void 0 ? void 0 : relativePath.startsWith(env_1.LIB_OAK_DOMAIN))) {
-                /**import了domain以外的其它定义类型，需要被复制到生成的Schema文件中
-                 * 这里必须注意，1、假设了domain当中定义的几个entity不会引用其它文件上的定义（除了type里的那些通用类型，默认都会被输出到文件中）
-                 * 2、假设了其它项目文件不会引用domain当中除了type通用类型之外的其它内容，否则不会被输出到文件中
-                 * 这里主要是对import的处理比较粗略，日后有需要的时候再精修
-                */
+            else {
                 var moduleSpecifier = node.moduleSpecifier, importClause = node.importClause;
-                if (ts.isStringLiteral(moduleSpecifier) && !moduleSpecifier.text.startsWith(env_1.LIB_OAK_DOMAIN)) {
-                    // 编译后的路径默认要深一层
-                    var moduleSpecifier2Text = relativePath
-                        ? path_1.default.join(relativePath, moduleSpecifier.text).replace(/\\/g, '/')
-                        : path_1.default.join('..', moduleSpecifier.text).replace(/\\/g, '/');
+                if (ts.isStringLiteral(moduleSpecifier)) {
+                    var text = moduleSpecifier.text;
+                    // 和数据类型相关的会自动引入，这里忽略（见initialStatements）
+                    // 如果是相对路径，编译后的路径默认要深一层
+                    var 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));
                 }
+                else {
+                    (0, assert_1.default)(false, '未处理的import方式');
+                }
             }
         }
         if (ts.isInterfaceDeclaration(node)) {
@@ -566,23 +567,10 @@ function analyzeEntity(filename, path, program, relativePath) {
                 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);
-                var actionDefNodes = [
-                    factory.createTypeReferenceNode(OriginActionDict[actionType], undefined),
-                    factory.createTypeReferenceNode('ParticularAction', undefined)
-                ];
-                if (hasRelationDef || moduleName === 'User') {
-                    actionDefNodes.push(factory.createTypeReferenceNode('RelationAction', undefined));
-                }
-                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);
-                dealWithActions(moduleName, filename, node.type, program, sourceFile, !!hasRelationDef || moduleName === 'User');
+                dealWithActions(moduleName, filename, node.type, program, sourceFile);
             }
             else if (node.name.text === 'Relation') {
-                (0, assert_1.default)(!hasActionDef, "\u3010".concat(filename, "\u3011action\u5B9A\u4E49\u987B\u5728Relation\u4E4B\u540E"));
                 (0, assert_1.default)(!localeDef, "\u3010".concat(filename, "\u3011locale\u5B9A\u4E49\u987B\u5728Relation\u4E4B\u540E"));
-                // 增加userXXX对象的描述
                 var relationValues = [];
                 if (ts.isLiteralTypeNode(node.type)) {
                     (0, assert_1.default)(ts.isStringLiteral(node.type.literal));
@@ -597,39 +585,39 @@ function analyzeEntity(filename, path, program, relativePath) {
                         return ele.literal.text;
                     })), false));
                 }
-                var entityLc = (0, string_1.firstLetterLowerCase)(moduleName);
-                var relationEntityName = "User".concat(moduleName);
-                var relationSchemaAttrs = [
-                    factory.createPropertySignature(undefined, factory.createIdentifier("user"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("User"), undefined)),
-                    factory.createPropertySignature(undefined, factory.createIdentifier(entityLc), undefined, factory.createTypeReferenceNode(factory.createIdentifier(moduleName), undefined)),
-                    factory.createPropertySignature(undefined, factory.createIdentifier('relation'), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Relation"), undefined)),
-                ];
-                (0, lodash_1.assign)(Schema, (_d = {},
-                    _d[relationEntityName] = {
-                        schemaAttrs: relationSchemaAttrs,
-                        sourceFile: sourceFile,
-                        enumAttributes: {
-                            relation: relationValues,
-                        },
-                        actionType: 'excludeUpdate',
-                        additionalImports: [
-                            factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("Relation"))])), factory.createStringLiteral("../".concat(moduleName, "/Schema")), undefined)
-                        ],
-                    },
-                    _d));
-                addRelationship(relationEntityName, 'User', 'user', true);
-                addRelationship(relationEntityName, moduleName, entityLc, true);
                 // 对UserEntityGrant对象，建立相应的反指关系
                 if (ReversePointerRelations['UserEntityGrant']) {
                     if (!ReversePointerRelations['UserEntityGrant'].includes(moduleName)) {
                         ReversePointerRelations['UserEntityGrant'].push(moduleName);
                     }
                 }
+                else {
+                    (0, lodash_1.assign)(ReversePointerRelations, (_d = {},
+                        _d['UserEntityGrant'] = [moduleName],
+                        _d));
+                }
+                // 对Relation对象建立相应的反指关系
+                if (ReversePointerRelations['Relation']) {
+                    if (!ReversePointerRelations['Relation'].includes(moduleName)) {
+                        ReversePointerRelations['Relation'].push(moduleName);
+                    }
+                }
                 else {
                     (0, lodash_1.assign)(ReversePointerRelations, (_e = {},
-                        _e['UserEntityGrant'] = [moduleName],
+                        _e['Relation'] = [moduleName],
                         _e));
                 }
+                // 对UserRelation对象建立相应的反指关系
+                if (ReversePointerRelations['UserRelation']) {
+                    if (!ReversePointerRelations['UserRelation'].includes(moduleName)) {
+                        ReversePointerRelations['UserRelation'].push(moduleName);
+                    }
+                }
+                else {
+                    (0, lodash_1.assign)(ReversePointerRelations, (_f = {},
+                        _f['UserRelation'] = [moduleName],
+                        _f));
+                }
                 hasRelationDef = node;
             }
             else if (node.name.text.endsWith('Action') || node.name.text.endsWith('State')) {
@@ -656,145 +644,190 @@ function analyzeEntity(filename, path, program, relativePath) {
         }
         if (ts.isVariableStatement(node)) {
             var declarations = node.declarationList.declarations;
-            declarations.forEach(function (declaration) {
-                if (declaration.type && ts.isTypeReferenceNode(declaration.type) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'ActionDef') {
-                    checkActionDefNameConsistent(filename, declaration);
-                    var typeArguments = declaration.type.typeArguments;
-                    (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.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"));
-                    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');
-                    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;
-                }
-                else if (declaration.type && (ts.isArrayTypeNode(declaration.type)
-                    && ts.isTypeReferenceNode(declaration.type.elementType)
-                    && ts.isIdentifier(declaration.type.elementType.typeName)
-                    && declaration.type.elementType.typeName.text === 'Index'
-                    || ts.isTypeReferenceNode(declaration.type)
-                        && ts.isIdentifier(declaration.type.typeName)
-                        && declaration.type.typeName.text === 'Array'
-                        && ts.isTypeReferenceNode(declaration.type.typeArguments[0])
-                        && ts.isIdentifier(declaration.type.typeArguments[0].typeName)
-                        && declaration.type.typeArguments[0].typeName.text === 'Index')) {
-                    // 对索引Index的定义
-                    var indexNameDict_1 = {};
-                    (0, assert_1.default)(ts.isArrayLiteralExpression(declaration.initializer), "\u300C".concat(filename, "\u300DIndex\u300C").concat(declaration.name.getText(), "\u300D\u7684\u5B9A\u4E49\u5FC5\u987B\u7B26\u5408\u89C4\u8303"));
-                    // todo 这里应该先做一个类型检查的，但不知道怎么写  by Xc
-                    // 检查索引的属性是否合法
-                    var elements = declaration.initializer.elements;
-                    elements.forEach(function (ele) {
-                        var _a;
-                        var isFulltextIndex = false;
-                        (0, assert_1.default)(ts.isObjectLiteralExpression(ele));
-                        var properties = ele.properties;
-                        var attrProperty = properties.find(function (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) {
+            var dealWithActionDef_1 = function (declaration) {
+                checkActionDefNameConsistent(filename, declaration);
+                var typeArguments = declaration.type.typeArguments;
+                (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.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"));
+                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');
+                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 = {};
+                // 检查索引的属性是否合法
+                var elements = declaration.elements;
+                elements.forEach(function (ele) {
+                    var _a;
+                    var isFulltextIndex = false;
+                    (0, assert_1.default)(ts.isObjectLiteralExpression(ele));
+                    var properties = ele.properties;
+                    var attrProperty = properties.find(function (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) {
+                        (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;
+                    if (indexNameDict[nameText]) {
+                        throw new Error("\u300C".concat(filename, "\u300D\u7D22\u5F15\u5B9A\u4E49\u91CD\u540D\u300C").concat(nameText, "\u300D"));
+                    }
+                    (0, lodash_1.assign)(indexNameDict, (_a = {},
+                        _a[nameText] = true,
+                        _a));
+                    var configProperty = properties.find(function (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) {
                             (0, assert_1.default)(ts.isPropertyAssignment(ele2));
-                            return ele2.name.getText() === 'name';
+                            return ele2.name.getText() === 'type';
                         });
-                        (0, assert_1.default)(ts.isStringLiteral(nameProperty.initializer));
-                        var nameText = nameProperty.initializer.text;
-                        if (indexNameDict_1[nameText]) {
-                            throw new Error("\u300C".concat(filename, "\u300D\u7D22\u5F15\u5B9A\u4E49\u91CD\u540D\u300C").concat(nameText, "\u300D"));
+                        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"));
+                            }
+                            hasFulltextIndex = true;
+                            isFulltextIndex = true;
                         }
-                        (0, lodash_1.assign)(indexNameDict_1, (_a = {},
-                            _a[nameText] = true,
-                            _a));
-                        var configProperty = properties.find(function (ele2) {
-                            (0, assert_1.default)(ts.isPropertyAssignment(ele2));
-                            return ele2.name.getText() === 'config';
+                    }
+                    var elements = attrProperty.initializer.elements;
+                    // 每个属性都应该在schema中有值，且对象类型是可索引值
+                    elements.forEach(function (ele2) {
+                        (0, assert_1.default)(ts.isObjectLiteralExpression(ele2));
+                        var properties2 = ele2.properties;
+                        var nameProperty = properties2.find(function (ele3) {
+                            (0, assert_1.default)(ts.isPropertyAssignment(ele3));
+                            return ele3.name.getText() === 'name';
                         });
-                        if (configProperty) {
-                            (0, assert_1.default)(ts.isObjectLiteralExpression(configProperty.initializer));
-                            var properties2 = configProperty.initializer.properties;
-                            var typeProperty = properties2.find(function (ele2) {
-                                (0, assert_1.default)(ts.isPropertyAssignment(ele2));
-                                return ele2.name.getText() === 'type';
+                        var indexAttrName = nameProperty.initializer.text;
+                        if (!Entity_1.initinctiveAttributes.includes(indexAttrName)) {
+                            var schemaNode = schemaAttrs.find(function (ele3) {
+                                (0, assert_1.default)(ts.isPropertySignature(ele3));
+                                return ele3.name.text === indexAttrName;
                             });
-                            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"));
-                                }
-                                hasFulltextIndex = true;
-                                isFulltextIndex = true;
+                            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"));
                             }
-                        }
-                        var elements = attrProperty.initializer.elements;
-                        // 每个属性都应该在schema中有值，且对象类型是可索引值
-                        elements.forEach(function (ele2) {
-                            (0, assert_1.default)(ts.isObjectLiteralExpression(ele2));
-                            var properties2 = ele2.properties;
-                            var nameProperty = properties2.find(function (ele3) {
-                                (0, assert_1.default)(ts.isPropertyAssignment(ele3));
-                                return ele3.name.getText() === 'name';
-                            });
-                            var indexAttrName = nameProperty.initializer.text;
-                            if (!Entity_1.initinctiveAttributes.includes(indexAttrName)) {
-                                var schemaNode = schemaAttrs.find(function (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"));
-                                }
-                                var type = schemaNode.type, name_1 = schemaNode.name;
-                                var entity = moduleName;
-                                var _a = ManyToOne, _b = entity, manyToOneSet = _a[_b];
-                                if (ts.isTypeReferenceNode(type)) {
-                                    var typeName = type.typeName;
-                                    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;
-                                        });
-                                        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"));
-                                            }
-                                            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"));
-                                            }
+                            var type = schemaNode.type, name_1 = schemaNode.name;
+                            var entity = moduleName;
+                            var _a = ManyToOne, _b = entity, manyToOneSet = _a[_b];
+                            if (ts.isTypeReferenceNode(type)) {
+                                var typeName = type.typeName;
+                                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;
+                                    });
+                                    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"));
                                         }
                                         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"));
-                                            // 在这里把外键加上Id，这样storageSchema才能正常通过
-                                            // 这里的写法不太好，未来TS版本高了可能会有问题。by Xc 20230131
-                                            Object.assign(nameProperty, {
-                                                initializer: factory.createStringLiteral("".concat(indexAttrName, "Id")),
-                                            });
+                                            (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"));
                                         }
                                     }
                                     else {
-                                        (0, assert_1.default)(false); // 这是什么case，不确定
+                                        (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"));
+                                        // 在这里把外键加上Id，这样storageSchema才能正常通过
+                                        // 这里的写法不太好，未来TS版本高了可能会有问题。by Xc 20230131
+                                        Object.assign(nameProperty, {
+                                            initializer: factory.createStringLiteral("".concat(indexAttrName, "Id")),
+                                        });
                                     }
                                 }
                                 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)(false); // 这是什么case，不确定
                                 }
                             }
-                        });
+                            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"));
+                            }
+                        }
                     });
-                    indexes = declaration.initializer;
+                });
+                indexes = declaration;
+            };
+            var dealWithLocales_1 = function (declaration) {
+                if (hasActionDef) {
+                    // 检查每种locale定义中都应该有'action'域
+                    checkLocaleExpressionPropertyExists(declaration, 'action', true, filename);
+                }
+                else {
+                    checkLocaleExpressionPropertyExists(declaration, 'action', false, filename);
+                }
+                if (hasRelationDef) {
+                    // 检查每种locale定义中都应该有'r'域
+                    checkLocaleExpressionPropertyExists(declaration, 'r', true, filename);
+                }
+                else {
+                    checkLocaleExpressionPropertyExists(declaration, 'r', false, filename);
+                }
+                var allEnumStringAttrs = Object.keys(enumAttributes);
+                if (allEnumStringAttrs.length > 0) {
+                    // 检查每种locale定义中都应该有'v'域
+                    checkLocaleExpressionPropertyExists(declaration, 'v', true, filename);
+                }
+                else {
+                    // 检查每种locale定义中都应该有'v'域
+                    checkLocaleExpressionPropertyExists(declaration, 'v', false, filename);
+                }
+                localeDef = declaration;
+            };
+            var dealWithConfiguration_1 = function (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'; });
+                if (atProperty) {
+                    actionType = atProperty.initializer.text;
+                }
+                if (staticProperty) {
+                    _static = true; // static如果有值只能为true
+                }
+            };
+            declarations.forEach(function (declaration) {
+                if (declaration.type && ts.isTypeReferenceNode(declaration.type) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'ActionDef') {
+                    dealWithActionDef_1(declaration);
+                }
+                else if (declaration.type && (ts.isArrayTypeNode(declaration.type)
+                    && ts.isTypeReferenceNode(declaration.type.elementType)
+                    && ts.isIdentifier(declaration.type.elementType.typeName)
+                    && declaration.type.elementType.typeName.text === 'Index'
+                    || ts.isTypeReferenceNode(declaration.type)
+                        && ts.isIdentifier(declaration.type.typeName)
+                        && declaration.type.typeName.text === 'Array'
+                        && ts.isTypeReferenceNode(declaration.type.typeArguments[0])
+                        && 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"));
+                    (0, assert_1.default)(ts.isArrayLiteralExpression(declaration.initializer));
+                    dealWithIndexes_1(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;
                     (0, assert_1.default)(ts.isObjectLiteralExpression(initializer));
                     var properties = initializer.properties;
@@ -807,73 +840,72 @@ function analyzeEntity(filename, path, program, relativePath) {
                     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"));
-                        // 检查每种locale定义中都应该有'action'域
-                        checkLocaleExpressionPropertyExists(initializer, 'action', true, filename);
                     }
                     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"));
-                        checkLocaleExpressionPropertyExists(initializer, 'action', false, filename);
                     }
                     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"));
-                        // 检查每种locale定义中都应该有'r'域
-                        checkLocaleExpressionPropertyExists(initializer, 'r', true, filename);
                     }
                     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"));
-                        checkLocaleExpressionPropertyExists(initializer, 'r', false, filename);
                     }
                     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{}"));
                         checkLocaleEnumAttrs(typeArguments[3], allEnumStringAttrs, filename);
-                        // 检查每种locale定义中都应该有'v'域
-                        checkLocaleExpressionPropertyExists(initializer, 'v', true, 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"));
-                        // 检查每种locale定义中都应该有'v'域
-                        checkLocaleExpressionPropertyExists(initializer, 'v', false, filename);
                     }
-                    localeDef = initializer;
+                    dealWithLocales_1(initializer);
                 }
                 else if (declaration.type && ts.isTypeReferenceNode(declaration.type) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'Configuration') {
-                    (0, assert_1.default)(!hasActionDef, "".concat(moduleName, "\u4E2D\u7684Configuration\u5B9A\u4E49\u5728Action\u4E4B\u540E"));
+                    console.log("\u300C".concat(filename, "\u300D\u76F4\u63A5\u5B9A\u4E49configuration\u7684\u5199\u6CD5\u5DF2\u7ECF\u8FC7\u65F6\uFF0C\u8BF7\u5B9A\u4E49\u5728entityDesc\u4E2D"));
+                    (0, assert_1.default)(ts.isObjectLiteralExpression(declaration.initializer));
+                    dealWithConfiguration_1(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 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'; });
-                    if (atProperty) {
-                        actionType = atProperty.initializer.text;
-                    }
-                    if (staticProperty) {
-                        _static = true; // static如果有值只能为true
-                    }
-                }
-                /* else if (ts.isTypeReferenceNode(declaration.type!) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'RelationHierarchy') {
-                    // RelationHierary
-                    assert(hasRelationDef, `${moduleName}中的Relation定义在RelationHierarchy之后`);
-                    const { initializer } = declaration;
-                    assert(ts.isObjectLiteralExpression(initializer!), `${moduleName}中的RelationHierarchy的定义必须是初始化为ObjectLiteralExpress`);
-                    relationHierarchy = initializer;
-                }
-                else if (ts.isTypeReferenceNode(declaration.type!) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'ReverseCascadeRelationHierarchy') {
-                    // ReverseCascadeRelationHierarchy
-                    assert(hasRelationDef, `${moduleName}中的Relation定义在ReverseCascadeRelationHierarchy之后`);
-                    const { initializer } = declaration;
-                    assert(ts.isObjectLiteralExpression(initializer!), `${moduleName}中的RelationHierarchy的定义必须是初始化为ObjectLiteralExpress`);
-                    reverseCascadeRelationHierarchy = initializer;
-                } */
+                    var localesProperty = properties.find(function (ele) { return 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'; });
+                    if (indexesProperty) {
+                        (0, assert_1.default)(ts.isPropertyAssignment(indexesProperty));
+                        dealWithIndexes_1(indexesProperty.initializer);
+                    }
+                    var configurationProperty = properties.find(function (ele) { return ts.isPropertyAssignment(ele) && ts.isIdentifier(ele.name) && ele.name.text === 'configuration'; });
+                    if (configurationProperty) {
+                        (0, assert_1.default)(ts.isPropertyAssignment(configurationProperty));
+                        dealWithConfiguration_1(configurationProperty.initializer);
+                    }
+                }
                 else {
                     throw new Error("".concat(moduleName, "\uFF1A\u4E0D\u80FD\u7406\u89E3\u7684\u5B9A\u4E49\u5185\u5BB9").concat(declaration.name.text));
                 }
             });
         }
     });
+    // 要等configuration确定了actionType后再处理
+    if (hasActionDef) {
+        var actionDefNodes = [
+            factory.createTypeReferenceNode(OriginActionDict[actionType], undefined),
+            factory.createTypeReferenceNode('ParticularAction', undefined)
+        ];
+        if (moduleName === 'User') {
+            actionDefNodes.push(factory.createTypeReferenceNode('RelationAction', undefined));
+        }
+        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);
+    }
     if (!hasActionDef && hasActionOrStateDef) {
         throw new Error("".concat(filename, "\u4E2D\u6709Action\u6216State\u5B9A\u4E49\uFF0C\u4F46\u6CA1\u6709\u5B9A\u4E49\u5B8C\u6574\u7684Action\u7C7B\u578B"));
     }
@@ -1097,13 +1129,18 @@ function constructSchema(statements, entity) {
  * @param entity
  */
 function constructFilter(statements, entity) {
-    var e_3, _a;
-    var _b = Schema[entity], schemaAttrs = _b.schemaAttrs, fulltextIndex = _b.fulltextIndex;
+    var e_3, _a, e_4, _b;
+    var _c = Schema[entity], schemaAttrs = _c.schemaAttrs, fulltextIndex = _c.fulltextIndex, enumAttributes = _c.enumAttributes;
     var members = [
         // id: Q_StringValue
         factory.createPropertySignature(undefined, factory.createIdentifier('id'), undefined, factory.createUnionTypeNode([
             factory.createTypeReferenceNode(factory.createIdentifier('Q_StringValue')),
-            factory.createTypeReferenceNode(factory.createQualifiedName(factory.createIdentifier("SubQuery"), factory.createIdentifier("".concat(entity, "IdSubQuery"))))
+            /* factory.createTypeReferenceNode(
+                factory.createQualifiedName(
+                    factory.createIdentifier("SubQuery"),
+                    factory.createIdentifier(`${entity}IdSubQuery`)
+                )
+            ) */
         ])),
         // $$createAt$$: Q_DateValue
         factory.createPropertySignature(undefined, factory.createIdentifier('$$createAt$$'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('Q_DateValue'))),
@@ -1112,9 +1149,13 @@ function constructFilter(statements, entity) {
         // $$updateAt$$: Q_DateValue
         factory.createPropertySignature(undefined, factory.createIdentifier('$$updateAt$$'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('Q_DateValue')))
     ];
-    var _c = ManyToOne, _d = entity, manyToOneSet = _c[_d];
+    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))); });
+    if (process.env.COMPLING_AS_LIB) {
+        entityUnionTypeNodes && entityUnionTypeNodes.push(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
+    }
     var _loop_3 = function (attr) {
-        var _e = attr, type = _e.type, name_3 = _e.name;
+        var _j = attr, type = _j.type, name_3 = _j.name;
         var attrName = name_3.text;
         if (ts.isTypeReferenceNode(type)) {
             var typeName = type.typeName;
@@ -1127,7 +1168,9 @@ function constructFilter(statements, entity) {
                     case 'Image':
                     case 'File': {
                         if (ReversePointerRelations[entity] && attrName === 'entity') {
-                            type2 = factory.createTypeReferenceNode('E');
+                            type2 = factory.createTypeReferenceNode(factory.createIdentifier('Q_EnumValue'), [
+                                factory.createUnionTypeNode(entityUnionTypeNodes)
+                            ]);
                         }
                         else {
                             type2 = factory.createTypeReferenceNode(factory.createIdentifier('Q_StringValue'));
@@ -1167,19 +1210,22 @@ function constructFilter(statements, entity) {
                         });
                         if (manyToOneItem) {
                             // 外键可能落到相应的子查询中
-                            members.push(factory.createPropertySignature(undefined, "".concat(name_3.text, "Id"), undefined, factory.createUnionTypeNode([
-                                factory.createTypeReferenceNode(factory.createIdentifier('Q_StringValue')),
-                                factory.createTypeReferenceNode(factory.createQualifiedName(factory.createIdentifier("SubQuery"), factory.createIdentifier("".concat(text2_3, "IdSubQuery"))), undefined)
-                            ])));
+                            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'));
                         }
-                        else {
+                        else if (enumAttributes && enumAttributes[attrName] || ts.isUnionTypeNode(type)) {
                             // 这里应该都是引用某个UnionType类型的定义了，如何判断？
                             // const words = getStringTextFromUnionStringLiterals();
                             type2 = factory.createTypeReferenceNode(factory.createIdentifier('Q_EnumValue'), [
                                 factory.createTypeReferenceNode(factory.createIdentifier(text), undefined)
                             ]);
                         }
+                        else {
+                            // 非枚举类型的非结构化属性，用JSONFilter来形式化
+                            type2 = factory.createTypeReferenceNode(factory.createIdentifier('JsonFilter'), [
+                                factory.createTypeReferenceNode(factory.createIdentifier(text), undefined)
+                            ]);
+                        }
                     }
                 }
                 if (type2) {
@@ -1194,6 +1240,10 @@ function constructFilter(statements, entity) {
         }
         else {
             // 此时应当是引用本地定义的shape
+            (0, assert_1.default)(type);
+            members.push(factory.createPropertySignature(undefined, name_3, undefined, factory.createTypeReferenceNode(factory.createIdentifier('JsonFilter'), [
+                type
+            ])));
         }
     };
     try {
@@ -1216,13 +1266,44 @@ function constructFilter(statements, entity) {
             return members.push(factory.createPropertySignature(undefined, (0, string_1.firstLetterLowerCase)(ele), undefined, factory.createTypeReferenceNode(createForeignRef(entity, ele, 'Filter'))));
         });
     }
-    var eumUnionTypeNode = ReversePointerRelations[entity] && ReversePointerRelations[entity].map(function (ele) { return factory.createLiteralTypeNode(factory.createStringLiteral((0, string_1.firstLetterLowerCase)(ele))); });
-    if (process.env.COMPLING_AS_LIB) {
-        eumUnionTypeNode && eumUnionTypeNode.push(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
+    // 一对多的生成子查询
+    var _f = OneToMany, _g = entity, oneToManySet = _f[_g];
+    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];
+                }
+            }
+        }
+        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);
+            }
+            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);
+                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'), ReversePointerRelations[entity] ? [
-        factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("E"), undefined)
-    ] : undefined, factory.createTypeLiteralNode(members)));
+    statements.push(factory.createTypeAliasDeclaration(undefined, undefined, factory.createIdentifier('AttrFilter'), undefined, factory.createTypeLiteralNode(members)));
     /**
      *
     export type Filter = AttrFilter | Partial<ExprOp<OpSchema> | {
@@ -1233,7 +1314,7 @@ function constructFilter(statements, entity) {
 
      */
     var types = [
-        factory.createTypeReferenceNode(factory.createIdentifier("AttrFilter"), ReversePointerRelations[entity] ? [factory.createTypeReferenceNode('E')] : undefined),
+        factory.createTypeReferenceNode(factory.createIdentifier("AttrFilter")),
         factory.createTypeReferenceNode(factory.createIdentifier("ExprOp"), [
             process.env.COMPLING_AS_LIB ?
                 factory.createUnionTypeNode([
@@ -1247,11 +1328,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"), ReversePointerRelations[entity] ? [
-        factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("E"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Q_EnumValue"), [
-            factory.createUnionTypeNode(eumUnionTypeNode)
-        ]))
-    ] : undefined, factory.createTypeReferenceNode(factory.createIdentifier("MakeFilter"), [factory.createIntersectionTypeNode(types)])));
+    statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Filter"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("MakeFilter"), [factory.createIntersectionTypeNode(types)])));
 }
 /**
  * 构造Projection和OneAttrProjection
@@ -1259,8 +1336,8 @@ function constructFilter(statements, entity) {
  * @param entity
  */
 function constructProjection(statements, entity) {
-    var _a, e_4, _b, e_5, _c;
-    var schemaAttrs = Schema[entity].schemaAttrs;
+    var _a, e_5, _b, e_6, _c;
+    var _d = Schema[entity], schemaAttrs = _d.schemaAttrs, enumAttributes = _d.enumAttributes;
     var properties = [
         ['id', false],
         ['$$createAt$$', false],
@@ -1270,10 +1347,10 @@ function constructProjection(statements, entity) {
     var foreignKeyProperties = (_a = {},
         _a[entity] = [''],
         _a);
-    var _d = ManyToOne, _e = entity, manyToOneSet = _d[_e];
-    var _loop_4 = function (attr) {
-        var _j;
-        var _k = attr, type = _k.type, name_4 = _k.name;
+    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;
         if (ts.isTypeReferenceNode(type)) {
             var typeName = type.typeName;
@@ -1283,6 +1360,7 @@ function constructProjection(statements, entity) {
                     case 'String':
                     case 'Text':
                     case 'Int':
+                    case 'Uint':
                     case 'Float':
                     case 'Double':
                     case 'Boolean':
@@ -1291,11 +1369,17 @@ function constructProjection(statements, entity) {
                     case 'File':
                     case 'SingleGeo':
                     case 'Geo':
-                    case 'Object':
                     case 'Price': {
                         properties.push([name_4, false]);
                         break;
                     }
+                    case 'Object': {
+                        properties.push([name_4, 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) {
@@ -1312,18 +1396,21 @@ function constructProjection(statements, entity) {
                                 foreignKeyProperties[text2_4].push(attrName);
                             }
                             else {
-                                (0, lodash_1.assign)(foreignKeyProperties, (_j = {},
-                                    _j[text2_4] = [attrName],
-                                    _j));
+                                (0, lodash_1.assign)(foreignKeyProperties, (_k = {},
+                                    _k[text2_4] = [attrName],
+                                    _k));
                             }
                         }
                         else {
-                            // todo 此处是对State的专门处理
-                            if (text.endsWith('State')) {
-                                properties.push([name_4, false, undefined]);
+                            if (!enumAttributes || !enumAttributes[attrName]) {
+                                // 引用的非enum类型shape
+                                properties.push([name_4, false, factory.createUnionTypeNode([
+                                        factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword),
+                                        factory.createTypeReferenceNode(factory.createIdentifier("JsonProjection"), [type])
+                                    ])]);
                             }
                             else {
-                                // 引用的shape
+                                // 引用的enum类型shape
                                 properties.push([name_4, false, undefined]);
                             }
                         }
@@ -1337,21 +1424,30 @@ function constructProjection(statements, entity) {
         else {
             // 增加了本身object的shape定义
             // assert(ts.isUnionTypeNode(type!) && ts.isLiteralTypeNode(type.types[0]) || ts.isLiteralTypeNode(type!));
-            properties.push([name_4, false, undefined]);
+            if (enumAttributes && enumAttributes[attrName] || ts.isUnionTypeNode(type) && ts.isLiteralTypeNode(type.types[0])) {
+                properties.push([name_4, false, undefined]);
+            }
+            else {
+                // 如果是非枚举类型的其它对象的union定义，加上JsonProjection
+                properties.push([name_4, 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_4(attr);
+            _loop_5(attr);
         }
     }
-    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+    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_4) throw e_4.error; }
+        finally { if (e_5) throw e_5.error; }
     }
     if (ReversePointerRelations[entity]) {
         ReversePointerRelations[entity].forEach(function (one) {
@@ -1372,13 +1468,13 @@ function constructProjection(statements, entity) {
         });
     }
     // 一对多的projection
-    var _f = OneToMany, _g = entity, oneToManySet = _f[_g];
+    var _g = OneToMany, _h = entity, oneToManySet = _g[_h];
     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];
+            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);
                 }
@@ -1387,14 +1483,14 @@ function constructProjection(statements, entity) {
                 }
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
-                if (oneToManySet_2_1 && !oneToManySet_2_1.done && (_c = oneToManySet_2.return)) _c.call(oneToManySet_2);
+                if (oneToManySet_3_1 && !oneToManySet_3_1.done && (_c = oneToManySet_3.return)) _c.call(oneToManySet_3);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_6) throw e_6.error; }
         }
-        var _loop_5 = function (entityName) {
+        var _loop_6 = function (entityName) {
             var entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
             foreignKeySet[entityName].forEach(function (foreignKey) {
                 var identifier = "".concat(entityNameLc, "$").concat(foreignKey);
@@ -1431,7 +1527,7 @@ function constructProjection(statements, entity) {
             });
         };
         for (var entityName in foreignKeySet) {
-            _loop_5(entityName);
+            _loop_6(entityName);
         }
     }
     var exprNode = factory.createTypeReferenceNode(factory.createIdentifier("Partial"), [
@@ -1626,7 +1722,7 @@ function constructQuery(statements, entity) {
  * @param entity
  */
 function constructSorter(statements, entity) {
-    var e_6, _a;
+    var e_7, _a;
     var schemaAttrs = Schema[entity].schemaAttrs;
     var members = [
         // id: 1
@@ -1639,7 +1735,7 @@ function constructSorter(statements, entity) {
         factory.createTypeLiteralNode([factory.createPropertySignature(undefined, factory.createIdentifier("$$updateAt$$"), undefined, factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword))]),
     ];
     var _b = ManyToOne, _c = entity, manyToOneSet = _b[_c];
-    var _loop_6 = function (attr) {
+    var _loop_7 = function (attr) {
         var _d = attr, type = _d.type, name_5 = _d.name, questionToken = _d.questionToken;
         if (ts.isTypeReferenceNode(type)) {
             var typeName = type.typeName;
@@ -1691,15 +1787,15 @@ function constructSorter(statements, entity) {
     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_6(attr);
+            _loop_7(attr);
         }
     }
-    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    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_6) throw e_6.error; }
+        finally { if (e_7) throw e_7.error; }
     }
     if (ReversePointerRelations[entity]) {
         ReversePointerRelations[entity].forEach(function (one) {
@@ -1753,7 +1849,7 @@ function constructSorter(statements, entity) {
     statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Sorter"), undefined, factory.createArrayTypeNode(factory.createTypeReferenceNode(factory.createIdentifier("SortNode"), undefined))));
 }
 function constructFullAttrs(statements, entity) {
-    var e_7, _a, e_8, _b;
+    var e_8, _a, e_9, _b;
     var _c = ManyToOne, _d = entity, manyToOneSet = _c[_d];
     var _e = OneToMany, _f = entity, oneToManySet = _e[_f];
     if (manyToOneSet && manyToOneSet.length) {
@@ -1772,12 +1868,12 @@ function constructFullAttrs(statements, entity) {
                 }
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        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);
             }
-            finally { if (e_7) throw e_7.error; }
+            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)
@@ -1789,8 +1885,8 @@ function constructFullAttrs(statements, entity) {
     var foreignKeySet = {};
     if (oneToManySet && oneToManySet.length > 0) {
         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;
+            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);
@@ -1800,15 +1896,15 @@ function constructFullAttrs(statements, entity) {
                 }
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
-                if (oneToManySet_3_1 && !oneToManySet_3_1.done && (_b = oneToManySet_3.return)) _b.call(oneToManySet_3);
+                if (oneToManySet_4_1 && !oneToManySet_4_1.done && (_b = oneToManySet_4.return)) _b.call(oneToManySet_4);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_9) throw e_9.error; }
         }
         var otmAttrs_1 = [];
-        var _loop_7 = function (entityName) {
+        var _loop_8 = function (entityName) {
             var entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
             if (foreignKeySet[entityName].length > 1) {
                 foreignKeySet[entityName].forEach(function (foreignKey) {
@@ -1831,7 +1927,7 @@ function constructFullAttrs(statements, entity) {
             }
         };
         for (var entityName in foreignKeySet) {
-            _loop_7(entityName);
+            _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)
@@ -1841,8 +1937,8 @@ function constructFullAttrs(statements, entity) {
         statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("FullAttr"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("NativeAttr"), undefined)));
     }
 }
-function constructActions(statements, entity) {
-    var e_9, _a, e_10, _b, e_11, _c, e_12, _d, e_13, _e, e_14, _f, e_15, _g, e_16, _h, e_17, _j;
+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"), [
         factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("P"), factory.createTypeReferenceNode(factory.createIdentifier("Object"), undefined), factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined))
@@ -1853,11 +1949,8 @@ function constructActions(statements, entity) {
         factory.createTypeReferenceNode(factory.createIdentifier("Sorter"), undefined)
     ])), factory.createTypeAliasDeclaration(undefined, [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("Omit"), [
-        factory.createTypeReferenceNode(factory.createIdentifier("SelectOperation"), [
-            factory.createTypeReferenceNode(factory.createIdentifier("P"), undefined)
-        ]),
-        factory.createLiteralTypeNode(factory.createStringLiteral("action"))
+    ], 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.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined),
         factory.createTypeReferenceNode(factory.createIdentifier("Filter"), undefined),
@@ -1896,8 +1989,8 @@ function constructActions(statements, entity) {
     var foreignKeySet = {};
     if (oneToManySet) {
         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;
+            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);
@@ -1907,12 +2000,12 @@ function constructActions(statements, entity) {
                 }
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
-                if (oneToManySet_4_1 && !oneToManySet_4_1.done && (_a = oneToManySet_4.return)) _a.call(oneToManySet_4);
+                if (oneToManySet_5_1 && !oneToManySet_5_1.done && (_a = oneToManySet_5.return)) _a.call(oneToManySet_5);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_10) throw e_10.error; }
         }
     }
     // CreateOperationData
@@ -1929,12 +2022,12 @@ function constructActions(statements, entity) {
                 }
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        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);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
     }
     var adNodes = [
@@ -1965,11 +2058,11 @@ function constructActions(statements, entity) {
                         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("String"), [factory.createLiteralTypeNode(factory.createNumericLiteral("64"))])),
+                        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("String"), [factory.createLiteralTypeNode(factory.createNumericLiteral("64"))]))
+                        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);
@@ -1998,12 +2091,12 @@ function constructActions(statements, entity) {
                 }
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        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_11) throw e_11.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         if (upsertOneNodes.length > 0) {
             adNodes.push(factory.createIntersectionTypeNode(upsertOneNodes));
@@ -2013,10 +2106,14 @@ function constructActions(statements, entity) {
     if (ReversePointerEntities[entity]) {
         if (ReversePointerRelations[entity]) {
             var schemaAttrs = Schema[entity].schemaAttrs;
-            var questionToken = schemaAttrs.find(function (ele) {
+            var entityQuestionToken = schemaAttrs.find(function (ele) {
                 var name = ele.name;
                 return name.text === 'entity';
             }).questionToken;
+            var entityIdQuestionToken = schemaAttrs.find(function (ele) {
+                var name = ele.name;
+                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;
@@ -2030,12 +2127,12 @@ function constructActions(statements, entity) {
                         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("String"), [factory.createLiteralTypeNode(factory.createNumericLiteral("64"))])),
+                        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'), questionToken, factory.createLiteralTypeNode(factory.createStringLiteral("".concat((0, string_1.firstLetterLowerCase)(one))))),
-                        factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), questionToken, factory.createTypeReferenceNode(factory.createIdentifier("String"), [factory.createLiteralTypeNode(factory.createNumericLiteral("64"))]))
+                        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);
@@ -2063,12 +2160,12 @@ function constructActions(statements, entity) {
                     }
                 }
             }
-            catch (e_12_1) { e_12 = { error: e_12_1 }; }
+            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_12) throw e_12.error; }
+                finally { if (e_13) throw e_13.error; }
             }
         }
         if (process.env.COMPLING_AS_LIB) {
@@ -2086,7 +2183,7 @@ function constructActions(statements, entity) {
     // 一对多
     var propertySignatures = [];
     if (oneToManySet) {
-        var _loop_8 = function (entityName) {
+        var _loop_9 = function (entityName) {
             var entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
             foreignKeySet[entityName].forEach(function (foreignKey) {
                 var identifier = "".concat(entityNameLc, "$").concat(foreignKey);
@@ -2120,7 +2217,16 @@ function constructActions(statements, entity) {
                             factory.createLiteralTypeNode(factory.createStringLiteral("".concat(foreignKey, "Id")))
                         ])
                     ]),
-                    factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'Filter'), undefined)
+                    factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
+                        factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'Filter'), 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")))
+                        ])
+                    ])
                 ]);
                 if (!Schema[entityName].static) {
                     switch (Schema[entityName].actionType) {
@@ -2154,7 +2260,7 @@ function constructActions(statements, entity) {
             });
         };
         for (var entityName in foreignKeySet) {
-            _loop_8(entityName);
+            _loop_9(entityName);
         }
     }
     if (propertySignatures.length > 0) {
@@ -2186,12 +2292,12 @@ function constructActions(statements, entity) {
                 }
             }
         }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        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_13) throw e_13.error; }
+            finally { if (e_14) throw e_14.error; }
         }
     }
     adNodes = [
@@ -2229,7 +2335,7 @@ function constructActions(statements, entity) {
                     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("String"), [factory.createLiteralTypeNode(factory.createNumericLiteral("64"))]),
+                            factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createLiteralTypeNode(factory.createStringLiteral(one[1]))]),
                             factory.createLiteralTypeNode(factory.createNull())
                         ])),
                     ]);
@@ -2266,12 +2372,12 @@ function constructActions(statements, entity) {
                 }
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        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_14) throw e_14.error; }
+            finally { if (e_15) throw e_15.error; }
         }
         if (upsertOneNodes.length > 0) {
             adNodes.push(factory.createIntersectionTypeNode(upsertOneNodes));
@@ -2319,12 +2425,12 @@ function constructActions(statements, entity) {
                     }
                 }
             }
-            catch (e_15_1) { e_15 = { error: e_15_1 }; }
+            catch (e_16_1) { e_16 = { error: e_16_1 }; }
             finally {
                 try {
                     if (_t && !_t.done && (_g = _s.return)) _g.call(_s);
                 }
-                finally { if (e_15) throw e_15.error; }
+                finally { if (e_16) throw e_16.error; }
             }
             if (process.env.COMPLING_AS_LIB) {
                 // 如果是base，要包容更多可能的反指
@@ -2336,7 +2442,7 @@ function constructActions(statements, entity) {
                     factory.createLiteralTypeNode(factory.createNull())
                 ])),
                 factory.createPropertySignature(undefined, factory.createIdentifier('entityId'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode([
-                    factory.createTypeReferenceNode(factory.createIdentifier("String"), [factory.createLiteralTypeNode(factory.createNumericLiteral("64"))]),
+                    factory.createTypeReferenceNode(factory.createIdentifier("ForeignKey"), [factory.createUnionTypeNode(ReversePointerRelations[entity].map(function (ele) { return factory.createLiteralTypeNode(factory.createStringLiteral(ele)); }))]),
                     factory.createLiteralTypeNode(factory.createNull())
                 ]))
             ]));
@@ -2350,7 +2456,7 @@ function constructActions(statements, entity) {
         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)));
     }
     if (oneToManySet) {
-        var _loop_9 = function (entityName) {
+        var _loop_10 = function (entityName) {
             var entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
             foreignKeySet[entityName].forEach(function (foreignKey) {
                 var identifier = "".concat(entityNameLc, "$").concat(foreignKey);
@@ -2372,8 +2478,52 @@ function constructActions(statements, entity) {
                     factory.createLiteralTypeNode(factory.createStringLiteral("create")),
                     factory.createArrayTypeNode(otmCreateOperationDataNode)
                 ]);
-                var otmUpdateOperationNode = factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'UpdateOperation'), undefined);
-                var otmRemoveOperationNode = factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'RemoveOperation'), undefined);
+                var 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),
+                        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.createTypeReferenceNode(factory.createIdentifier("Omit"), [
+                        factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'Filter'), 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")))
+                        ])
+                    ])
+                ]);
+                var 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),
+                        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.createTypeReferenceNode(factory.createIdentifier("Omit"), [
+                        factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'Filter'), 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")))
+                        ])
+                    ])
+                ]);
                 if (!Schema[entityName].static) {
                     switch (Schema[entityName].actionType) {
                         case 'crud': {
@@ -2431,7 +2581,7 @@ function constructActions(statements, entity) {
             });
         };
         for (var entityName in foreignKeySet) {
-            _loop_9(entityName);
+            _loop_10(entityName);
         }
     }
     if (propertySignatures2.length > 0) {
@@ -2511,12 +2661,12 @@ function constructActions(statements, entity) {
                 }
             }
         }
-        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+        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_16) throw e_16.error; }
+            finally { if (e_17) throw e_17.error; }
         }
         var reverseOneNodes_2 = [];
         if (ReversePointerRelations[entity]) {
@@ -2559,12 +2709,12 @@ function constructActions(statements, entity) {
                     }
                 }
             }
-            catch (e_17_1) { e_17 = { error: e_17_1 }; }
+            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_17) throw e_17.error; }
+                finally { if (e_18) throw e_18.error; }
             }
             if (process.env.COMPLING_AS_LIB) {
                 reverseOneNodes_2.push(factory.createTypeLiteralNode([
@@ -2666,21 +2816,9 @@ function constructActions(statements, entity) {
 var initialStatements = function () { return [
     // import { String, Text, Int, SpecificKey } from 'oak-domain/types/DataType';
     factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('String')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('Int')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('Uint')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('Float')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('Double')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('Boolean')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('Text')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('Datetime')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('File')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('Price')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('Image')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('PrimaryKey')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('ForeignKey')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('Geo')),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier('SingleGeo'))
+        factory.createImportSpecifier(false, undefined, factory.createIdentifier('JsonProjection'))
     ])), factory.createStringLiteral("".concat((0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(), "DataType"))),
     /* import {
         Q_DateValue, Q_LogicKey, Q_NumberValue, FnCallKey, FnCallValue,
@@ -2698,13 +2836,24 @@ var initialStatements = function () { return [
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('FulltextFilter')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('ExprOp')),
         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.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"))),
     // import * as SubQuery from '../_SubQuery';
-    factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamespaceImport(factory.createIdentifier("SubQuery"))), factory.createStringLiteral("../_SubQuery")),
+    /* factory.createImportDeclaration(
+        undefined,
+        undefined,
+        factory.createImportClause(
+            false,
+            undefined,
+            factory.createNamespaceImport(factory.createIdentifier("SubQuery"))
+        ),
+        factory.createStringLiteral("../_SubQuery")
+    ), */
     // import { Filter as OakFilter } from 'oak-domain/src/types/Entity';
     factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("FormCreateData")),
@@ -2713,7 +2862,6 @@ var initialStatements = function () { return [
         factory.createImportSpecifier(false, factory.createIdentifier("Operation"), factory.createIdentifier("OakOperation")),
         factory.createImportSpecifier(false, factory.createIdentifier("Selection"), factory.createIdentifier("OakSelection")),
         factory.createImportSpecifier(false, factory.createIdentifier("MakeAction"), factory.createIdentifier("OakMakeAction")),
-        factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityShape")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("AggregationResult")),
     ])), factory.createStringLiteral("".concat((0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(), "Entity")), undefined)
 ]; };
@@ -2726,13 +2874,12 @@ function outputSubQuery(outputDir, printer) {
         statements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamespaceImport(factory.createIdentifier(entity))), factory.createStringLiteral("./".concat(entity, "/Schema"))));
     }
     var entities = (0, lodash_1.keys)(Schema);
-    var _loop_10 = function (one) {
+    var _loop_11 = function (one) {
         var identifier = "".concat(one, "IdSubQuery");
         var fromEntites = OneToMany[one] ? (0, lodash_1.uniq)(OneToMany[one]
-            .filter(function (_a) {
-            var _b = tslib_1.__read(_a, 2), e = _b[0], f = _b[1];
-            return f !== 'entity';
-        }).map(function (_a) {
+            /* .filter(
+                ([e, f]) => f !== 'entity'
+            ) */ .map(function (_a) {
             var _b = tslib_1.__read(_a, 1), e = _b[0];
             return e;
         })) : [];
@@ -2752,7 +2899,7 @@ function outputSubQuery(outputDir, printer) {
     };
     // 每个有manyToOne的Entity都会输出${One}IdSubQuery
     for (var one in Schema) {
-        _loop_10(one);
+        _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);
@@ -2797,10 +2944,29 @@ function outputSchema(outputDir, printer) {
                     localActions.push(s);
                 }
                 else if (actionDefNames.includes((0, string_1.firstLetterLowerCase)(a.slice(0, a.length - 6)))) {
-                    var moduleSpecifier = importedFrom[a].moduleSpecifier;
-                    statements.push(factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
-                        factory.createImportSpecifier(false, undefined, factory.createIdentifier(s))
-                    ])), moduleSpecifier, undefined));
+                    // 现在源文件中的import语句保留下来了
+                    // const { moduleSpecifier } = importedFrom[a] as ts.ImportDeclaration;
+                    // statements.push(
+                    //     factory.createImportDeclaration(
+                    //         undefined,
+                    //         undefined,
+                    //         factory.createImportClause(
+                    //             false,
+                    //             undefined,
+                    //             factory.createNamedImports(
+                    //                 [
+                    //                     factory.createImportSpecifier(
+                    //                         false,
+                    //                         undefined,
+                    //                         factory.createIdentifier(s)
+                    //                     )
+                    //                 ]
+                    //             )
+                    //         ),
+                    //         moduleSpecifier,
+                    //         undefined
+                    //     )
+                    // );
                 }
             }
             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([
@@ -2822,15 +2988,24 @@ function outputSchema(outputDir, printer) {
             statements.push.apply(statements, tslib_1.__spreadArray([], tslib_1.__read(additionalImports), false));
         }
         // Relation定义加入
-        if (typeof Schema[entity].hasRelationDef === 'object' && ts.isTypeAliasDeclaration(Schema[entity].hasRelationDef)) {
-            var node = Schema[entity].hasRelationDef;
-            statements.push(factory.updateTypeAliasDeclaration(node, undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], node.name, node.typeParameters, node.type));
-        }
+        /* if (typeof Schema[entity].hasRelationDef === 'object' && ts.isTypeAliasDeclaration(Schema[entity].hasRelationDef as ts.Node)) {
+            const node = Schema[entity].hasRelationDef as ts.TypeAliasDeclaration;
+            statements.push(
+                factory.updateTypeAliasDeclaration(
+                    node,
+                    undefined,
+                    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+                    node.name,
+                    node.typeParameters,
+                    node.type
+                )
+            );
+        } */
         constructSchema(statements, entity);
         constructFilter(statements, entity);
         constructProjection(statements, entity);
         constructSorter(statements, entity);
-        constructActions(statements, entity);
+        constructOperations(statements, entity);
         constructQuery(statements, entity);
         // 现在FullAttrs和NativeAttrs似乎没什么用，还会引起递归
         // constructFullAttrs(statements, entity);
@@ -2865,9 +3040,19 @@ function outputSchema(outputDir, printer) {
         if (ActionAsts[entity]) {
             EntityDefAttrs.push(factory.createPropertySignature(undefined, factory.createIdentifier("ParticularAction"), undefined, factory.createTypeReferenceNode(factory.createIdentifier('ParticularAction'), undefined)));
         }
-        if (typeof Schema[entity].hasRelationDef === 'object' && ts.isTypeAliasDeclaration(Schema[entity].hasRelationDef)) {
-            EntityDefAttrs.push(factory.createPropertySignature(undefined, factory.createIdentifier("Relation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier('Relation'), undefined)));
-        }
+        /* if (typeof Schema[entity].hasRelationDef === 'object' && ts.isTypeAliasDeclaration(Schema[entity].hasRelationDef as ts.Node)) {
+            EntityDefAttrs.push(
+                factory.createPropertySignature(
+                    undefined,
+                    factory.createIdentifier("Relation"),
+                    undefined,
+                    factory.createTypeReferenceNode(
+                        factory.createIdentifier('Relation'),
+                        undefined
+                    )
+                )
+            );
+        } */
         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');
@@ -3062,7 +3247,7 @@ function constructAttributes(entity) {
 function outputLocale(outputDir, printer) {
     var locales = {};
     var entities = [];
-    var _loop_11 = function (entity) {
+    var _loop_12 = function (entity) {
         var _a = Schema[entity], locale = _a.locale, sourceFile = _a.sourceFile;
         if (locale) {
             var properties = locale.properties;
@@ -3086,7 +3271,7 @@ function outputLocale(outputDir, printer) {
         }
     };
     for (var entity in Schema) {
-        _loop_11(entity);
+        _loop_12(entity);
     }
     for (var lng in locales) {
         if (locales[lng].length < entities.length) {
@@ -3202,12 +3387,7 @@ function outputStorage(outputDir, printer) {
             propertyAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("static"), factory.createTrue()));
         }
         propertyAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("actionType"), factory.createStringLiteral(actionType)));
-        if (Schema[entity].hasRelationDef || entity === 'User') {
-            propertyAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("actions"), factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("actions"), factory.createIdentifier("concat")), undefined, [factory.createIdentifier("relationActions")])));
-        }
-        else {
-            propertyAssignments.push(factory.createShorthandPropertyAssignment(factory.createIdentifier("actions"), undefined));
-        }
+        propertyAssignments.push(factory.createShorthandPropertyAssignment(factory.createIdentifier("actions"), undefined));
         if (indexExpressions.length > 0) {
             propertyAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("indexes"), factory.createArrayLiteralExpression(indexExpressions, true)));
         }
@@ -3273,28 +3453,28 @@ function resetOutputDir(outputDir) {
     (0, fs_1.mkdirSync)(path_1.default.join(outputDir, '_locales'));
 }
 function addReverseRelationship() {
-    var e_18, _a;
+    var e_19, _a;
     for (var 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"));
         }
         try {
-            for (var _b = (e_18 = void 0, tslib_1.__values(ReversePointerRelations[reverseEntity])), _c = _b.next(); !_c.done; _c = _b.next()) {
+            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_18_1) { e_18 = { error: e_18_1 }; }
+        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_18) throw e_18.error; }
+            finally { if (e_19) throw e_19.error; }
         }
     }
 }
 function outputIndexTs(outputDir) {
-    var indexTs = "export * from './EntityDict';\n    export * from './Storage';\n    export * from './ActionDefDict';\n    ";
+    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');
     (0, fs_1.writeFileSync)(filename, indexTs, { flag: 'w' });
 }
@@ -3340,11 +3520,241 @@ function analyzeInModi() {
         }
     }
 }
+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 = [];
+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 = []; }
+    SELECT_FREE_ENTITIES = selectFreeEntities;
+    CREATE_FREE_ENTITIES = createFreeEntities;
+    UPDATE_FREE_ENTITIES = updateFreeEntities;
+}
+exports.registerFreeEntities = registerFreeEntities;
+function registerIgnoredRelationPathMap(map) {
+    for (var k in map) {
+        IGNORED_RELATION_PATH_MAP[(0, string_1.firstLetterUpperCase)(k)] = map[k];
+    }
+}
+exports.registerIgnoredRelationPathMap = registerIgnoredRelationPathMap;
+/**
+ * 很多路径虽然最后指向同一对象，但不能封掉，封了会导致查询的时候找不到对应的路径path
+ * @param map
+ */
+function registerFixedDestinationPathMap(map) {
+    var _a;
+    for (var 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));
+        }
+        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));
+        }
+        else {
+            FIXED_DESTINATION_PATH_MAP[k] = map[k];
+        }
+    }
+}
+exports.registerFixedDestinationPathMap = registerFixedDestinationPathMap;
+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"));
+        // 定义的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"));
+        }
+        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;
+        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); })) {
+            return;
+        }
+        if (paths.length > 12) {
+            throw new Error('对象之间的关系深度过长，请优化设计加以避免');
+        }
+        actionPath.push([(0, string_1.firstLetterLowerCase)(entity), path, root, isRelation, paths]);
+        if (Schema[entity].hasRelationDef) {
+            // 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];
+        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);
+                if (child === entity) {
+                    // 如果有层级关系对象，最多找3层。同时这里只找本身存在relation关系的对象，因为如果对象上没有relation，则其上的公共路径应当可以维护住层级关系
+                    // 例如在jichuang项目中，house上没有relation，通过其park外键所维护的路径不需要遍历其父亲。而parkCluster因为有relation，所以必须构造以之为根的所有的可能路径
+                    // 如果不是以之为根的，同样可以根据其上的公共路径去查找，parkCluster.system和parkCluster.parent.system必然是一样的
+                    if (!Schema[entity].hasRelationDef) {
+                        return;
+                    }
+                    if (paths.find(function (ele) { return ele !== child2; }) || paths.length > 2) {
+                        return;
+                    }
+                }
+                else if (paths.indexOf(child2) >= 0) {
+                    // 除了层级之外的递归直接忽略
+                    return;
+                }
+                if ((_b = IGNORED_FOREIGN_KEY_MAP[child2]) === null || _b === void 0 ? void 0 : _b.includes(foreignKey)) {
+                    // 忽略的路径放弃
+                    return;
+                }
+                if (DEDUCED_RELATION_MAP[child] === foreignKey) {
+                    // 如果子对象本身由父对象推定，也放弃
+                    return;
+                }
+                var fk = foreignKey === 'entity' ? (0, string_1.firstLetterLowerCase)(entity) : foreignKey;
+                var path2 = path ? "".concat(fk, ".").concat(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))) {
+            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) {
+        outputRecursively((0, string_1.firstLetterLowerCase)(entity3), entity3, '', [], true);
+    });
+    actionPath.sort(function (ele1, ele2) {
+        // 先按sourceEntity来排序
+        if (ele1[0] > ele2[0]) {
+            return 1;
+        }
+        else if (ele1[0] < ele2[0]) {
+            return -1;
+        }
+        else {
+            // 再按destEntity
+            if (ele1[2] > ele2[2]) {
+                return 1;
+            }
+            else if (ele1[2] < ele2[2]) {
+                return -1;
+            }
+            else {
+                // 最后按paths的长度倒排
+                return ele1[4].length - ele2[4].length;
+            }
+        }
+    });
+    var entityRelations = [];
+    for (var entity in Schema) {
+        var hasRelationDef = Schema[entity].hasRelationDef;
+        if (hasRelationDef) {
+            var type = hasRelationDef.type;
+            if (ts.isUnionTypeNode(type)) {
+                var types = type.types;
+                var relations = types.map(function (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));
+                var relations = [type.literal.text];
+                entityRelations.push([(0, string_1.firstLetterLowerCase)(entity), relations]);
+            }
+        }
+    }
+    var stmts = [
+        factory.createImportDeclaration(undefined, 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))
+    ];
+    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))
+    ], 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.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.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');
+    (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_ENTITIES.includes(entity) || env_1.RESERVED_ENTITIES.find(function (ele2) { return entity.startsWith(ele2); })) {
+        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"));
         }
         return "".concat(inputDir, "/").concat(ele);
@@ -3359,6 +3769,7 @@ function analyzeEntities(inputDir, relativePath) {
 exports.analyzeEntities = analyzeEntities;
 function buildSchema(outputDir) {
     addReverseRelationship();
+    // setRelationEntities();
     var printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
     resetOutputDir(outputDir);
     outputSchema(outputDir, printer);
@@ -3367,6 +3778,7 @@ function buildSchema(outputDir) {
     outputAction(outputDir, printer);
     outputEntityDict(outputDir, printer);
     outputStorage(outputDir, printer);
+    outputRelation(outputDir, printer);
     outputIndexTs(outputDir);
     if (!process.env.COMPLING_AS_LIB) {
         outputPackageJson(outputDir);