oak-domain 2.6.2 → 2.6.4

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

@@ -38,10 +38,8 @@ exports.desc = {
             type: "object"
         },
         iState: {
-            type: "varchar",
-            params: {
-                length: 24
-            }
+            type: "enum",
+            enumeration: ["active", "applied", "abandoned"]
         }
     },
     actionType: "crud",

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

@@ -25,10 +25,8 @@ exports.desc = {
             ref: "user"
         },
         userState: {
-            type: "varchar",
-            params: {
-                length: 24
-            }
+            type: "enum",
+            enumeration: ["normal", "merged"]
         }
     },
     actionType: "crud",

package/lib/compiler/schemalBuilder.js

@@ -160,6 +160,13 @@ function checkActionDefNameConsistent(filename, actionDefNode) {
     var sName = stateNode.typeName.text.slice(0, stateNode.typeName.text.length - 5);
     (0, assert_1.default)(adfName === aName && aName === sName, "\u6587\u4EF6".concat(filename, "\u4E2D\u7684ActionDef").concat(name.text, "\u4E2DActionDef, Action\u548CState\u7684\u547D\u540D\u89C4\u5219\u4E0D\u4E00\u81F4"));
 }
+function checkStringLiteralLegal(filename, obj, text, ele) {
+    (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), "".concat(filename, "\u4E2D\u5F15\u7528\u7684").concat(obj, " ").concat(text, "\u4E2D\u5B58\u5728\u4E0D\u662Fstringliteral\u7684\u7C7B\u578B"));
+    (0, assert_1.default)(!ele.literal.text.includes('$'), "".concat(filename, "\u4E2D\u5F15\u7528\u7684action").concat(text, "\u4E2D\u7684").concat(obj, "\u300C").concat(ele.literal.text, "\u300D\u5305\u542B\u975E\u6CD5\u5B57\u7B26$"));
+    (0, assert_1.default)(ele.literal.text.length > 0, "".concat(filename, "\u4E2D\u5F15\u7528\u7684action").concat(text, "\u4E2D\u7684").concat(obj, "\u300C").concat(ele.literal.text, "\u300D\u957F\u5EA6\u975E\u6CD5"));
+    (0, assert_1.default)(ele.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "".concat(filename, "\u4E2D\u5F15\u7528\u7684").concat(obj, " ").concat(text, "\u4E2D\u7684\u300C").concat(ele.literal.text, "\u300D\u957F\u5EA6\u8FC7\u957F"));
+    return ele.literal.text;
+}
 function addActionSource(moduleName, name, node) {
     var _a;
     var ast = ActionAsts[moduleName];
@@ -199,20 +206,13 @@ function getStringTextFromUnionStringLiterals(moduleName, filename, node, progra
             _a[name.text] = 'local',
             _a));
     }
-    var getStringLiteral = function (ele) {
-        (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), "".concat(filename, "\u4E2D\u5F15\u7528\u7684action").concat(name.text, "\u4E2D\u5B58\u5728\u4E0D\u662Fstringliteral\u7684\u7C7B\u578B"));
-        (0, assert_1.default)(!ele.literal.text.includes('$'), "".concat(filename, "\u4E2D\u5F15\u7528\u7684action").concat(name.text, "\u4E2D\u7684action\u300C").concat(ele.literal.text, "\u300D\u5305\u542B\u975E\u6CD5\u5B57\u7B26$"));
-        (0, assert_1.default)(ele.literal.text.length > 0, "".concat(filename, "\u4E2D\u5F15\u7528\u7684action").concat(name.text, "\u4E2D\u7684action\u300C").concat(ele.literal.text, "\u300D\u957F\u5EA6\u975E\u6CD5"));
-        (0, assert_1.default)(ele.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "".concat(filename, "\u4E2D\u5F15\u7528\u7684action").concat(name.text, "\u4E2D\u7684action\u300C").concat(ele.literal.text, "\u300D\u957F\u5EA6\u8FC7\u957F"));
-        return ele.literal.text;
-    };
     if (ts.isUnionTypeNode(type)) {
-        var actions = type.types.map(function (ele) { return getStringLiteral(ele); });
+        var actions = type.types.map(function (ele) { return checkStringLiteralLegal(filename, 'action', name.text, ele); });
         return actions;
     }
     else {
         (0, assert_1.default)(ts.isLiteralTypeNode(type), "".concat(filename, "\u4E2D\u5F15\u7528\u7684action\u300C").concat(name.text, "\u300D\u7684\u5B9A\u4E49\u4E0D\u662Funion\u548CstringLiteral\u7C7B\u578B"));
-        var action = getStringLiteral(type);
+        var action = checkStringLiteralLegal(filename, 'action', name.text, type);
         return [action];
     }
 }
@@ -325,6 +325,25 @@ function checkLocaleExpressionPropertyExists(root, attr, exists, filename) {
         }
     });
 }
+function getStringEnumValues(filename, program, obj, node) {
+    var _a;
+    var checker = program.getTypeChecker();
+    var symbol = checker.getSymbolAtLocation(node.typeName);
+    var declaration = symbol === null || symbol === void 0 ? void 0 : symbol.getDeclarations()[0];
+    if (ts.isImportSpecifier(declaration)) {
+        var typee = checker.getDeclaredTypeOfSymbol(symbol);
+        declaration = (_a = typee.aliasSymbol) === null || _a === void 0 ? void 0 : _a.getDeclarations()[0];
+    }
+    if (declaration && ts.isTypeAliasDeclaration(declaration)) {
+        if (ts.isUnionTypeNode(declaration.type) && ts.isLiteralTypeNode(declaration.type.types[0])) {
+            return declaration.type.types.map(function (ele) { return checkStringLiteralLegal(filename, obj, declaration.name.text, ele); });
+        }
+        if (ts.isLiteralTypeNode(declaration.type)) {
+            var value = checkStringLiteralLegal(filename, obj, declaration.name.text, declaration.type);
+            return [value];
+        }
+    }
+}
 function analyzeEntity(filename, path, program, relativePath) {
     var _a;
     var fullPath = "".concat(path, "/").concat(filename);
@@ -347,9 +366,7 @@ function analyzeEntity(filename, path, program, relativePath) {
     var toModi = false;
     var actionType = 'crud';
     var _static = false;
-    var enumStringAttrs = [];
-    var states = [];
-    var localEnumStringTypes = [];
+    var enumAttributes = {};
     var additionalImports = [];
     var localeDef = undefined;
     // let relationHierarchy: ts.ObjectLiteralExpression | undefined = undefined;
@@ -419,8 +436,9 @@ function analyzeEntity(filename, path, program, relativePath) {
                         }
                         else {
                             schemaAttrs.push(attrNode);
-                            if (localEnumStringTypes.includes(type.typeName.text)) {
-                                enumStringAttrs.push(name.text);
+                            var enumStringValues = getStringEnumValues(filename, program, '属性', type);
+                            if (enumStringValues) {
+                                enumAttributes[attrName] = enumStringValues;
                             }
                         }
                     }
@@ -447,15 +465,19 @@ function analyzeEntity(filename, path, program, relativePath) {
                     }
                     else {
                         schemaAttrs.push(attrNode);
-                        if (ts.isUnionTypeNode(type)) {
+                        if (ts.isUnionTypeNode(type) && ts.isLiteralTypeNode(type.types[0]) && ts.isStringLiteral(type.types[0].literal)) {
+                            (0, assert_1.default)(ts.isIdentifier(name));
                             var types = type.types;
-                            if (ts.isLiteralTypeNode(types[0]) && ts.isStringLiteral(types[0].literal)) {
-                                enumStringAttrs.push(name.text);
-                                types.forEach(function (ele) {
-                                    (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), "\u300C".concat(filename, "\u300D\u4E0D\u652F\u6301\u6DF7\u5408\u578B\u7684\u679A\u4E3E\u5C5E\u6027\u5B9A\u4E49\u300C").concat(attrName, "\u300D"));
-                                    (0, assert_1.default)(ele.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "\u300C".concat(filename, "\u300D\u4E2D\u5B9A\u4E49\u7684\u5C5E\u6027\u679A\u4E3E\u300C").concat(attrName, "\u300D\u7684\u5B57\u7B26\u4E32\u957F\u5EA6\u5E94\u5C0F\u4E8E").concat(env_1.STRING_LITERAL_MAX_LENGTH));
-                                });
-                            }
+                            var enumValues = types.map(function (ele) { return checkStringLiteralLegal(filename, '属性', name.text, ele); });
+                            enumAttributes[name.text] = enumValues;
+                        }
+                        else if (ts.isLiteralTypeNode(type) && ts.isStringLiteral(type.literal)) {
+                            // 单个字符串的情形，目前应该没有，没测试过，先写着 by Xc 20230221
+                            (0, assert_1.default)(ts.isIdentifier(name));
+                            var enumValues = [
+                                checkStringLiteralLegal(filename, '属性', name.text, type)
+                            ];
+                            enumAttributes[name.text] = enumValues;
                         }
                     }
                     if (attrName === 'entity') {
@@ -547,16 +569,19 @@ function analyzeEntity(filename, path, program, relativePath) {
                 (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));
                     (0, assert_1.default)(node.type.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "Relation\u5B9A\u4E49\u7684\u5B57\u7B26\u4E32\u957F\u5EA6\u4E0D\u957F\u4E8E".concat(env_1.STRING_LITERAL_MAX_LENGTH, "\uFF08").concat(filename, "\uFF0C").concat(node.type.literal.text, "\uFF09"));
+                    relationValues.push(node.type.literal.text);
                 }
                 else {
                     (0, assert_1.default)(ts.isUnionTypeNode(node.type), "Relation\u7684\u5B9A\u4E49\u53EA\u80FD\u662Fstring\u7C7B\u578B\uFF08".concat(filename, "\uFF09"));
-                    node.type.types.forEach(function (ele) {
+                    relationValues.push.apply(relationValues, tslib_1.__spreadArray([], tslib_1.__read(node.type.types.map(function (ele) {
                         (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), "Relation\u7684\u5B9A\u4E49\u53EA\u80FD\u662Fstring\u7C7B\u578B\uFF08".concat(filename, "\uFF09"));
                         (0, assert_1.default)(ele.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "Relation\u5B9A\u4E49\u7684\u5B57\u7B26\u4E32\u957F\u5EA6\u4E0D\u957F\u4E8E".concat(env_1.STRING_LITERAL_MAX_LENGTH, "\uFF08").concat(filename, "\uFF0C").concat(ele.literal.text, "\uFF09"));
-                    });
+                        return ele.literal.text;
+                    })), false));
                 }
                 var entityLc = (0, string_1.firstLetterLowerCase)(moduleName);
                 var relationEntityName = "User".concat(moduleName);
@@ -569,7 +594,9 @@ function analyzeEntity(filename, path, program, relativePath) {
                     _d[relationEntityName] = {
                         schemaAttrs: relationSchemaAttrs,
                         sourceFile: sourceFile,
-                        enumStringAttrs: ['relation'],
+                        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)
@@ -611,58 +638,27 @@ function analyzeEntity(filename, path, program, relativePath) {
             else if (beforeSchema) {
                 // 本地规定的一些形状定义，直接使用
                 pushStatementIntoSchemaAst(moduleName, node, sourceFile);
-                if (ts.isUnionTypeNode(node.type) && ts.isLiteralTypeNode(node.type.types[0]) && ts.isStringLiteral(node.type.types[0].literal)) {
-                    // 本文件内定义的枚举类型
-                    localEnumStringTypes.push(node.name.text);
-                    node.type.types.forEach(function (ele) {
-                        (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), "\u300C".concat(filename, "\u300D\u4E0D\u652F\u6301\u6DF7\u5408\u578B\u7684\u5E38\u91CF\u5B9A\u4E49\u300C").concat(node.name.text, "\u300D"));
-                        (0, assert_1.default)(ele.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "\u300C".concat(filename, "\u300D\u4E2D\u5B9A\u4E49\u7684\u5E38\u91CF\u679A\u4E3E\u300C").concat(node.name.text, "\u300D\u7684\u5B57\u7B26\u4E32\u957F\u5EA6\u5E94\u5C0F\u4E8E").concat(env_1.STRING_LITERAL_MAX_LENGTH));
-                    });
-                }
             }
         }
         if (ts.isVariableStatement(node)) {
             var declarations = node.declarationList.declarations;
             declarations.forEach(function (declaration) {
-                if (ts.isIdentifier(declaration.name) && declaration.name.text.endsWith('ActionDef')) {
-                    if (declaration.type && ts.isTypeReferenceNode(declaration.type) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'ActionDef') {
-                        // 是显示的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];
-                        var checker = program.getTypeChecker();
-                        var symbol = checker.getSymbolAtLocation(actionNode.typeName);
-                        var declaration2_1 = symbol.getDeclarations()[0];
-                        if (declaration2_1.getSourceFile() === sourceFile) {
-                            // pushStatementIntoActionAst(moduleName, <ts.TypeAliasDeclaration>declaration2, sourceFile);
-                        }
-                        symbol = checker.getSymbolAtLocation(stateNode.typeName);
-                        declaration2_1 = symbol.getDeclarations()[0];
-                        if (declaration2_1.getSourceFile() === sourceFile) {
-                            // 检查state的定义合法
-                            (0, assert_1.default)(ts.isTypeAliasDeclaration(declaration2_1) && ts.isUnionTypeNode(declaration2_1.type), "\u300C".concat(filename, "\u300DState\u300C").concat(declaration2_1.name, "\u300D\u7684\u5B9A\u4E49\u53EA\u80FD\u662F\u6216\u7ED3\u70B9"));
-                            declaration2_1.type.types.forEach(function (type) {
-                                (0, assert_1.default)(ts.isLiteralTypeNode(type) && ts.isStringLiteral(type.literal), "\u300C".concat(filename, "\u300DState\u300C").concat(declaration2_1.name, "\u300D\u7684\u5B9A\u4E49\u53EA\u80FD\u662F\u5B57\u7B26\u4E32"));
-                                (0, assert_1.default)(type.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "\u300C".concat(filename, "\u300DState\u300C").concat(type.literal.text, "\u300D\u7684\u957F\u5EA6\u5927\u4E8E\u300C").concat(env_1.STRING_LITERAL_MAX_LENGTH, "\u300D"));
-                            });
-                            /* pushStatementIntoActionAst(moduleName,
-                                factory.updateTypeAliasDeclaration(
-                                    declaration2,
-                                    declaration2.decorators,
-                                    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-                                    declaration2.name,
-                                    declaration2.typeParameters,
-                                    declaration2.type
-                                ),
-                                sourceFile); */
-                        }
-                    }
+                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, factory.createIdentifier((0, string_1.firstLetterLowerCase)(attr)), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createTypeReferenceNode(factory.createIdentifier(attr))));
-                    states.push((0, string_1.firstLetterLowerCase)(attr));
+                    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)
@@ -783,13 +779,13 @@ function analyzeEntity(filename, path, program, relativePath) {
                     });
                     indexes = declaration.initializer;
                 }
-                else if (ts.isTypeReferenceNode(declaration.type) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'LocaleDef') {
+                else if (declaration.type && ts.isTypeReferenceNode(declaration.type) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'LocaleDef') {
                     // locale定义
                     var type = declaration.type, initializer = declaration.initializer;
                     (0, assert_1.default)(ts.isObjectLiteralExpression(initializer));
                     var properties = initializer.properties;
                     (0, assert_1.default)(properties.length > 0, "".concat(filename, "\u81F3\u5C11\u9700\u8981\u6709\u4E00\u79CDlocale\u5B9A\u4E49"));
-                    var allEnumStringAttrs = enumStringAttrs.concat(states);
+                    var allEnumStringAttrs = Object.keys(enumAttributes);
                     var typeArguments = type.typeArguments;
                     (0, assert_1.default)(typeArguments &&
                         ts.isTypeReferenceNode(typeArguments[0])
@@ -831,7 +827,7 @@ function analyzeEntity(filename, path, program, relativePath) {
                     }
                     localeDef = initializer;
                 }
-                else if (ts.isTypeReferenceNode(declaration.type) && ts.isIdentifier(declaration.type.typeName) && declaration.type.typeName.text === 'Configuration') {
+                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"));
                     (0, assert_1.default)(ts.isObjectLiteralExpression(declaration.initializer));
                     var properties = declaration.initializer.properties;
@@ -878,7 +874,7 @@ function analyzeEntity(filename, path, program, relativePath) {
         actionType: actionType,
         static: _static,
         hasRelationDef: hasRelationDef,
-        enumStringAttrs: enumStringAttrs.concat(states),
+        enumAttributes: enumAttributes,
         additionalImports: additionalImports,
     };
     if (hasFulltextIndex) {
@@ -1127,7 +1123,8 @@ function constructFilter(statements, entity) {
                     case 'Int':
                     case 'Uint':
                     case 'Float':
-                    case 'Double': {
+                    case 'Double':
+                    case 'Price': {
                         type2 = factory.createTypeReferenceNode(factory.createIdentifier('Q_NumberValue'));
                         break;
                     }
@@ -1280,7 +1277,8 @@ function constructProjection(statements, entity) {
                     case 'File':
                     case 'SingleGeo':
                     case 'Geo':
-                    case 'Object': {
+                    case 'Object':
+                    case 'Price': {
                         properties.push([name_4, false]);
                         break;
                     }
@@ -1643,7 +1641,8 @@ function constructSorter(statements, entity) {
                     case 'Boolean':
                     case 'Datetime':
                     case 'Image':
-                    case 'File': {
+                    case 'File':
+                    case 'Price': {
                         type2 = factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
                         break;
                     }
@@ -2662,6 +2661,7 @@ var initialStatements = function () { return [
         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')),
@@ -2898,7 +2898,7 @@ function outputAction(outputDir, printer) {
     (0, fs_1.writeFileSync)(fileName, result, { flag: 'w' });
 }
 function constructAttributes(entity) {
-    var _a = Schema[entity], schemaAttrs = _a.schemaAttrs, enumStringAttrs = _a.enumStringAttrs;
+    var _a = Schema[entity], schemaAttrs = _a.schemaAttrs, enumAttributes = _a.enumAttributes;
     var _b = ManyToOne, _c = entity, manyToOneSet = _b[_c];
     var result = [];
     schemaAttrs.forEach(function (attr) {
@@ -2938,15 +2938,13 @@ function constructAttributes(entity) {
                         ], true)));
                         break;
                     }
-                    case 'Float': {
-                        attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("float")), factory.createPropertyAssignment(factory.createIdentifier("params"), factory.createObjectLiteralExpression([
-                            factory.createPropertyAssignment(factory.createIdentifier("precision"), factory.createNumericLiteral(typeArguments[0].literal.text)),
-                            factory.createPropertyAssignment(factory.createIdentifier("scale"), factory.createNumericLiteral(typeArguments[1].literal.text))
-                        ], true)));
-                        break;
-                    }
-                    case 'Double': {
-                        attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("double")), factory.createPropertyAssignment(factory.createIdentifier("params"), factory.createObjectLiteralExpression([
+                    case 'Double':
+                    case 'Float':
+                    case 'Decimal': {
+                        if (['Double', 'Float'].includes(text)) {
+                            console.warn("".concat(entity, "\u5BF9\u8C61\u4E2D\u8FD8\u6709").concat(text, "\u7C7B\u578B\u5B9A\u4E49\uFF0C\u73B0\u5728\u7EDF\u4E00\u7528Decimal\u8FDB\u884C\u5B58\u50A8"));
+                        }
+                        attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("decimal")), factory.createPropertyAssignment(factory.createIdentifier("params"), factory.createObjectLiteralExpression([
                             factory.createPropertyAssignment(factory.createIdentifier("precision"), factory.createNumericLiteral(typeArguments[0].literal.text)),
                             factory.createPropertyAssignment(factory.createIdentifier("scale"), factory.createNumericLiteral(typeArguments[1].literal.text))
                         ], true)));
@@ -2956,6 +2954,10 @@ function constructAttributes(entity) {
                         attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("boolean")));
                         break;
                     }
+                    case 'Price': {
+                        attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("money")));
+                        break;
+                    }
                     case 'Datetime': {
                         attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("datetime")));
                         break;
@@ -2983,8 +2985,8 @@ function constructAttributes(entity) {
                             attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("ref")), factory.createPropertyAssignment(factory.createIdentifier("ref"), factory.createStringLiteral((0, string_1.firstLetterLowerCase)(text2_6))));
                         }
                         else {
-                            if (enumStringAttrs && enumStringAttrs.includes(name.text)) {
-                                attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("varchar")), factory.createPropertyAssignment(factory.createIdentifier("params"), factory.createObjectLiteralExpression([factory.createPropertyAssignment(factory.createIdentifier("length"), factory.createNumericLiteral(env_1.STRING_LITERAL_MAX_LENGTH))], true)));
+                            if (enumAttributes && enumAttributes[name.text]) {
+                                attrAssignments.push(factory.createPropertyAssignment('type', factory.createStringLiteral("enum")), factory.createPropertyAssignment('enumeration', factory.createArrayLiteralExpression(enumAttributes[name.text].map(function (ele) { return factory.createStringLiteral(ele); }))));
                             }
                             else {
                                 // todo 引用的非string定义，目前没有处理int类型的引用，等遇到了再处理
@@ -3002,7 +3004,8 @@ function constructAttributes(entity) {
             if (ts.isUnionTypeNode(type)) {
                 if (ts.isLiteralTypeNode(type.types[0])) {
                     if (ts.isStringLiteral(type.types[0].literal)) {
-                        attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("varchar")), factory.createPropertyAssignment(factory.createIdentifier("params"), factory.createObjectLiteralExpression([factory.createPropertyAssignment(factory.createIdentifier("length"), factory.createNumericLiteral(env_1.STRING_LITERAL_MAX_LENGTH))], true)));
+                        (0, assert_1.default)(enumAttributes && enumAttributes[name.text]);
+                        attrAssignments.push(factory.createPropertyAssignment('type', factory.createStringLiteral("enum")), factory.createPropertyAssignment('enumeration', factory.createArrayLiteralExpression(enumAttributes[name.text].map(function (ele) { return factory.createStringLiteral(ele); }))));
                     }
                     else {
                         (0, assert_1.default)(ts.isNumericLiteral(type.types[0].literal));

package/lib/entities/Modi.js

@@ -21,6 +21,7 @@ var indexes = [
 ];
 var locale = {
     zh_CN: {
+        name: '更新',
         attr: {
             targetEntity: '目标对象',
             entity: '关联对象',

package/lib/entities/ModiEntity.js

@@ -6,6 +6,7 @@ var config = {
 };
 var locale = {
     zh_CN: {
+        name: '更新对象连接',
         attr: {
             modi: '更新',
             entity: '关联对象',

package/lib/entities/Oper.js

@@ -6,6 +6,7 @@ var configuration = {
 };
 var locale = {
     zh_CN: {
+        name: '操作',
         attr: {
             action: '动作',
             data: '数据',

package/lib/entities/OperEntity.js

@@ -6,6 +6,7 @@ var config = {
 };
 var locale = {
     zh_CN: {
+        name: '操作对象连接',
         attr: {
             oper: '操作',
             entity: '关联对象',

package/lib/entities/User.js

@@ -8,6 +8,7 @@ var UserActionDef = {
 };
 var locale = {
     zh_CN: {
+        name: '用户',
         attr: {
             name: '姓名',
             nickname: '昵称',

package/lib/entities/UserEntityGrant.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 ;
 var locale = {
     zh_CN: {
+        name: '用户授权',
         attr: {
             relation: '关系',
             entity: '关联对象',

package/lib/store/AsyncRowStore.js

@@ -64,93 +64,91 @@ var AsyncContext = /** @class */ (function () {
     };
     AsyncContext.prototype.commit = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, e, e_1_1;
-            var e_1, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var commitEvents, commitEvents_1, commitEvents_1_1, e, e_1_1;
+            var e_1, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        if (!this.uuid) return [3 /*break*/, 10];
+                        if (!this.uuid) return [3 /*break*/, 9];
                         return [4 /*yield*/, this.rowStore.commit(this.uuid)];
                     case 1:
-                        _d.sent();
+                        _b.sent();
                         this.uuid = undefined;
-                        _d.label = 2;
+                        commitEvents = this.events.commit;
+                        this.resetEvents();
+                        _b.label = 2;
                     case 2:
-                        _d.trys.push([2, 7, 8, 9]);
-                        _a = tslib_1.__values(this.events.commit), _b = _a.next();
-                        _d.label = 3;
+                        _b.trys.push([2, 7, 8, 9]);
+                        commitEvents_1 = tslib_1.__values(commitEvents), commitEvents_1_1 = commitEvents_1.next();
+                        _b.label = 3;
                     case 3:
-                        if (!!_b.done) return [3 /*break*/, 6];
-                        e = _b.value;
+                        if (!!commitEvents_1_1.done) return [3 /*break*/, 6];
+                        e = commitEvents_1_1.value;
                         return [4 /*yield*/, e()];
                     case 4:
-                        _d.sent();
-                        _d.label = 5;
+                        _b.sent();
+                        _b.label = 5;
                     case 5:
-                        _b = _a.next();
+                        commitEvents_1_1 = commitEvents_1.next();
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_1_1 = _d.sent();
+                        e_1_1 = _b.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 9];
                     case 8:
                         try {
-                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                            if (commitEvents_1_1 && !commitEvents_1_1.done && (_a = commitEvents_1.return)) _a.call(commitEvents_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 9:
-                        this.resetEvents();
-                        _d.label = 10;
-                    case 10: return [2 /*return*/];
+                    case 9: return [2 /*return*/];
                 }
             });
         });
     };
     AsyncContext.prototype.rollback = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, e, e_2_1;
-            var e_2, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var rollbackEvents, rollbackEvents_1, rollbackEvents_1_1, e, e_2_1;
+            var e_2, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        if (!this.uuid) return [3 /*break*/, 10];
+                        if (!this.uuid) return [3 /*break*/, 9];
                         return [4 /*yield*/, this.rowStore.rollback(this.uuid)];
                     case 1:
-                        _d.sent();
+                        _b.sent();
                         // console.log('rollback', this.uuid);
                         this.uuid = undefined;
-                        _d.label = 2;
+                        rollbackEvents = this.events.rollback;
+                        this.resetEvents();
+                        _b.label = 2;
                     case 2:
-                        _d.trys.push([2, 7, 8, 9]);
-                        _a = tslib_1.__values(this.events.rollback), _b = _a.next();
-                        _d.label = 3;
+                        _b.trys.push([2, 7, 8, 9]);
+                        rollbackEvents_1 = tslib_1.__values(rollbackEvents), rollbackEvents_1_1 = rollbackEvents_1.next();
+                        _b.label = 3;
                     case 3:
-                        if (!!_b.done) return [3 /*break*/, 6];
-                        e = _b.value;
+                        if (!!rollbackEvents_1_1.done) return [3 /*break*/, 6];
+                        e = rollbackEvents_1_1.value;
                         return [4 /*yield*/, e()];
                     case 4:
-                        _d.sent();
-                        _d.label = 5;
+                        _b.sent();
+                        _b.label = 5;
                     case 5:
-                        _b = _a.next();
+                        rollbackEvents_1_1 = rollbackEvents_1.next();
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_2_1 = _d.sent();
+                        e_2_1 = _b.sent();
                         e_2 = { error: e_2_1 };
                         return [3 /*break*/, 9];
                     case 8:
                         try {
-                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                            if (rollbackEvents_1_1 && !rollbackEvents_1_1.done && (_a = rollbackEvents_1.return)) _a.call(rollbackEvents_1);
                         }
                         finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
-                    case 9:
-                        this.resetEvents();
-                        _d.label = 10;
-                    case 10: return [2 /*return*/];
+                    case 9: return [2 /*return*/];
                 }
             });
         });