@lcap/nasl 4.4.0-beta.4 → 4.4.0-beta.6

package/out/natural/transform2BatchActions.js

@@ -19,11 +19,33 @@
  * - view: 视图组件
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyBatchActions = exports.transform2BatchActions = void 0;
+exports.applyBatchActions = exports.transform2BatchActions = exports.generateRouterContainerTemplate = void 0;
 const uuid_1 = require("uuid");
 const concepts_1 = require("../concepts");
 const index_1 = require("../index");
 const utils_1 = require("../utils");
+/**
+ * 生成空的路由容器模板
+ * 用于为嵌套视图创建父级容器视图
+ * @param params - 包含视图名称、标题和命名空间的参数
+ * @returns 生成的路由容器模板代码
+ */
+const generateRouterContainerTemplate = (params) => {
+    const { viewName, title, namespace } = params;
+    return `
+namespace ${namespace} {
+      $View({
+        title: "${title}",
+        crumb: '',
+        auth: false,
+        isIndex: true,
+    })
+    export function ${viewName}() {
+        return <ElRouterView />
+    }
+}`;
+};
+exports.generateRouterContainerTemplate = generateRouterContainerTemplate;
 /**
  * 根据命名空间获取项目类型
  * @param namespace - 命名空间字符串
@@ -42,6 +64,52 @@ const getItemType = (namespace) => {
         return 'view';
     return 'unknown';
 };
+/**
+ * 解析视图路径，提取视图名称和命名空间
+ * @param path - 视图路径，例如: 'src/app.frontendTypes.pc.frontends.pc.views.aaa.tsx'
+ * @returns 包含视图名称、命名空间和完整路径的对象
+ */
+const parseViewPath = (path) => {
+    // 移除 src/ 前缀和 .tsx 后缀
+    const cleanPath = path.replace(/^src\//, '').replace(/\.tsx$/, '');
+    // 提取最后一个部分作为视图名称
+    const lastDotIndex = cleanPath.lastIndexOf('.');
+    const viewName = lastDotIndex !== -1 ? cleanPath.substring(lastDotIndex + 1) : cleanPath;
+    const namespace = lastDotIndex !== -1 ? cleanPath.substring(0, lastDotIndex) : '';
+    return {
+        viewName,
+        namespace,
+        fullPath: path,
+    };
+};
+/**
+ * 提取嵌套视图路径的所有父级路径信息
+ * @param path - 视图路径，例如: 'src/app.frontendTypes.pc.frontends.pc.views.aaa.views.bbb.views.ccc.tsx'
+ * @returns 父级路径信息数组，例如: [{ viewName: 'aaa', namespace: '...', fullPath: '...' }, ...]
+ */
+const extractParentViewPaths = (path) => {
+    const parentInfos = [];
+    // 检查是否是嵌套视图路径（至少包含两个 .views.）
+    const viewsMatches = path.match(/\.views\./g);
+    if (!viewsMatches || viewsMatches.length < 2) {
+        return parentInfos;
+    }
+    // 提取 views 部分: src/app.frontendTypes.pc.frontends.pc.views.aaa.views.bbb.views.ccc.tsx
+    // -> aaa.views.bbb.views.ccc
+    const regex = /src\/app\.frontendTypes\.pc\.frontends\.pc\.views\.(.*?)\.tsx$/;
+    const match = path.match(regex);
+    if (!match)
+        return parentInfos;
+    const viewPath = match[1]; // 例如: aaa.views.bbb.views.ccc
+    const parts = viewPath.split('.views.'); // ['aaa', 'bbb', 'ccc']
+    // 构建所有父级路径信息（不包括当前路径本身）
+    for (let i = 0; i < parts.length - 1; i++) {
+        const pathParts = parts.slice(0, i + 1);
+        const parentPath = `src/app.frontendTypes.pc.frontends.pc.views.${pathParts.join('.views.')}.tsx`;
+        parentInfos.push(parseViewPath(parentPath));
+    }
+    return parentInfos;
+};
 /**
  * 创建不同类型处理器的工厂函数
  * 为每种类型（entity、structure、enum、logic、view）提供统一的操作接口
@@ -101,6 +169,40 @@ const createTypeHandlers = (appInstance, app) => ({
         addMethod: (json) => app.frontendTypes[0].frontends[0].addView(json),
     },
 });
+/**
+ * 检测并生成缺失的父级视图模板
+ * @param path - 当前项的路径
+ * @param codeArray - 代码数组，用于添加生成的模板代码
+ * @param processedPaths - 已处理的路径集合，用于去重
+ * @param errors - 错误收集数组
+ */
+const processParentViews = (path, codeArray, processedPaths, errors) => {
+    // 获取当前项的所有父级路径信息（按层级从浅到深排序）
+    const parentInfos = extractParentViewPaths(path);
+    // 为缺失的父级视图生成模板并添加到 codeArray
+    for (const { viewName, namespace, fullPath } of parentInfos) {
+        if (!processedPaths.has(fullPath)) {
+            try {
+                const template = (0, exports.generateRouterContainerTemplate)({
+                    viewName,
+                    title: viewName,
+                    namespace,
+                });
+                // 直接将模板代码添加到 codeArray
+                codeArray.push(template);
+                // 标记为已处理
+                processedPaths.add(fullPath);
+            }
+            catch (error) {
+                errors.push({
+                    item: fullPath,
+                    type: 'generateParentView',
+                    error: error,
+                });
+            }
+        }
+    }
+};
 /**
  * 转换单个codeAction
  * 将codeAction 中的路径和内容转换为可解析的格式
@@ -147,6 +249,7 @@ const transformCodeAction = ({ path, content, action, }) => {
  * @param app - NASL 应用实例，用于操作目标应用
  * @param sessionId - 会话 ID，用于生成唯一标识
  * @param type - 操作类型，'normal' 为正常模式，'debug' 为调试模式（会返回更多信息）
+ * @param files - 可选的完整文件列表，包含现有文件和新文件
  * @returns 包含批量操作和可选调试信息的对象
  */
 const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal', }) => {
@@ -158,21 +261,36 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
     const itemTypes = [];
     // 存储处理过程中的错误
     const errors = [];
+    // 记录已处理的路径，避免重复生成父级视图
+    const processedPaths = new Set();
     // 第一阶段：转换所有codeAction
     for (const item of codeActions) {
         try {
+            // 检查文件后缀，目前一期只处理 .ts 和 .tsx 文件
+            if (!item.path.endsWith('.ts') && !item.path.endsWith('.tsx')) {
+                continue;
+            }
+            // 检测并生成缺失的父级视图
+            if (item.path?.includes('app.frontendTypes.pc.frontends.')) {
+                processParentViews(item.path, codeArray, processedPaths, errors);
+            }
+            // 处理当前项
             const { transformedCode, itemType, itemName, action } = transformCodeAction(item);
             // 只有非删除操作才需要累积代码用于解析，因为删除操作不需要解析新的 NASL 对象
             if (action !== 'delete') {
                 codeArray.push(transformedCode);
             }
-            itemTypes.push({ type: itemType, name: itemName, action });
+            if (action !== 'exist') {
+                itemTypes.push({ type: itemType, name: itemName, action });
+            }
+            processedPaths.add(item.path);
         }
         catch (error) {
             errors.push({
                 item: item.path,
                 type: 'transformCodeAction',
                 error: error,
+                level: 0,
             });
         }
     }
@@ -184,9 +302,16 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
     let parseJSON = null;
     if (accumulatedTsCode) {
         // 解析 TypeScript 代码为 NASL 对象
-        parseJSON = (0, index_1.parseNaturalTS)(accumulatedTsCode, {});
-        if (!parseJSON)
+        try {
+            parseJSON = (0, index_1.parseNaturalTS)(accumulatedTsCode, {});
+            if (!parseJSON)
+                return null;
+        }
+        catch (error) {
+            console.error("转换失败:", error);
+            console.error("原始数据:", codeActions);
             return null;
+        }
         // 生成 AI 唯一标识并创建应用实例
         const { node: nodes } = (0, index_1.genAIUID)(parseJSON.toJSON(), sessionId);
         appInstance = new concepts_1.App(nodes);
@@ -199,10 +324,12 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
         sourceType: 'spec_driven',
     };
     // 通知开始收集操作
-    app.emit('collect:start', { actionMsg: '批量操作数据模型和视图' });
+    if (type === 'debug')
+        app.emit('collect:start', { actionMsg: '批量操作数据模型和视图' });
     // 第三阶段：生成批量操作
     // 获取不同类型的处理器
     const typeHandlers = createTypeHandlers(appInstance, app);
+    const itemTypeNames = new Set(itemTypes.map((item) => item.name));
     // 遍历每个项目，生成对应的批量操作
     for (const { type: itemType, name: itemName, action } of itemTypes) {
         // 跳过未知类型或无名称的项目
@@ -234,6 +361,7 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
                         item: itemName,
                         type: itemType,
                         error: new Error(`要删除的对象不存在: ${handler.path} - ${itemName}`),
+                        level: 1,
                     });
                 }
             }
@@ -245,18 +373,27 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
                         item: itemName,
                         type: itemType,
                         error: new Error(`未找到对应的 NASL 对象: ${handler.path} - ${itemName}`),
+                        level: 2,
                     });
                     continue;
                 }
-                // 特殊处理：对于 view 类型，如果父级概念是 View，则跳过处理
-                // 这可能是为了避免嵌套视图的问题
+                let finalAction = 'create';
+                let path = '';
+                // 特殊处理：对于 view 类型，判断父级 view 是否存在于 itemTypes 中
                 if (itemType === 'view' && naslObject.parentNode?.concept === 'View') {
-                    continue;
+                    // 如果父级视图在 itemTypes 中，说明父级中已带有当前视图，那么可跳过
+                    const parentViewName = naslObject.parentNode?.name;
+                    if (parentViewName && itemTypeNames.has(parentViewName)) {
+                        continue;
+                    }
+                    // 如果父级视图已存在于应用中，那么此时需要修改对应的path
+                    const parentNode = handler.findExisting(parentViewName);
+                    if (parentNode) {
+                        path = `${parentNode.nodePath}.children[0]`;
+                    }
                 }
                 // 检查目标应用中是否已存在同名对象
                 const existingNode = handler.findExisting(itemName);
-                let finalAction = 'create';
-                let path = '';
                 if (existingNode) {
                     // 存在同名对象，标记为更新操作
                     finalAction = 'update';
@@ -284,16 +421,18 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
                 item: itemName,
                 type: itemType,
                 error: error,
+                level: 3,
             });
         }
     }
     // 第四阶段：错误处理和结果返回
     // 如果有错误发生，在控制台输出错误信息（但不中断执行）
     if (errors.length > 0) {
-        console.error('批量处理过程中发现错误:', errors.length);
+        console.error('批量处理过程中发现错误:', errors);
     }
     // 通知收集操作结束
-    app.emit('collect:end');
+    if (type === 'debug')
+        app.emit('collect:end');
     // 构建返回结果，基础结果包含批量操作
     let result = {
         batchActions,

package/out/natural/transform2BatchActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform2BatchActions.js","sourceRoot":"","sources":["../../src/natural/transform2BatchActions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transform2BatchActions.js","sourceRoot":"","sources":["../../src/natural/transform2BatchActions.ts"],"names":[],"mappings":"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"}

package/out/natural/transforms/transform2LogicItem.d.ts

@@ -55,7 +55,7 @@ export declare class TransformManager {
     private transformCallExpressions;
     register<B extends babelTypes.Node, N extends naslTypes.LogicItemNode>(type: TransformPair<B, N>[0], transform: TransformPair<B, N>[1]): void;
     registerCallExpression(type: TransformCallExpressionPair[0], transform: TransformCallExpressionPair[1]): void;
-    apply(node: babelTypes.Node, options: TransformOptions): void | naslTypes.SubLogic | naslTypes.AnonymousFunction | naslTypes.Abort | naslTypes.Start | naslTypes.End | naslTypes.IfStatement | naslTypes.SwitchStatement | naslTypes.SwitchCase | naslTypes.ForEachStatement | naslTypes.WhileStatement | naslTypes.Break | naslTypes.Continue | naslTypes.Assignment | naslTypes.BatchAssignment | naslTypes.Comment | naslTypes.CallLogic | naslTypes.CallEvent | naslTypes.CallFunction | naslTypes.CallInterface | naslTypes.Destination | naslTypes.ExternalDestination | naslTypes.ValidationRule | naslTypes.ValidationLogic | naslTypes.Argument | naslTypes.Anchor | naslTypes.JSBlock | naslTypes.JavaLogic | naslTypes.Block | naslTypes.Identifier | naslTypes.NullLiteral | naslTypes.BooleanLiteral | naslTypes.StringLiteral | naslTypes.StringInterpolation | naslTypes.NumericLiteral | naslTypes.BinaryExpression | naslTypes.VariadicExpression | naslTypes.MatchCase | naslTypes.Match | naslTypes.UnaryExpression | naslTypes.MemberExpression | naslTypes.Unparsed | naslTypes.New | naslTypes.NewComposite | naslTypes.NewStructure | naslTypes.NewList | naslTypes.NewMap | naslTypes.NewRegex | naslTypes.Paginate | naslTypes.CallQueryComponent | naslTypes.QuerySelectExpression | naslTypes.QueryFromExpression | naslTypes.QueryJoinExpression | naslTypes.QueryFieldExpression | naslTypes.QueryAggregateExpression | naslTypes.QueryOrderByExpression | naslTypes.QueryGroupByExpression | naslTypes.QueryLimitExpression | naslTypes.SqlQueryComponent | naslTypes.OqlQueryComponent | naslTypes.ProcessOutcome | naslTypes.Assignee | naslTypes.ProcessOutcomes;
+    apply(node: babelTypes.Node, options: TransformOptions): void | naslTypes.SubLogic | naslTypes.AnonymousFunction | naslTypes.Abort | naslTypes.Start | naslTypes.End | naslTypes.IfStatement | naslTypes.IfExpression | naslTypes.SwitchStatement | naslTypes.SwitchCase | naslTypes.ForEachStatement | naslTypes.WhileStatement | naslTypes.Break | naslTypes.Continue | naslTypes.Assignment | naslTypes.BatchAssignment | naslTypes.Comment | naslTypes.CallLogic | naslTypes.CallEvent | naslTypes.CallFunction | naslTypes.CallInterface | naslTypes.Destination | naslTypes.ExternalDestination | naslTypes.ValidationRule | naslTypes.ValidationLogic | naslTypes.Argument | naslTypes.Anchor | naslTypes.JSBlock | naslTypes.JavaLogic | naslTypes.Block | naslTypes.Identifier | naslTypes.NullLiteral | naslTypes.BooleanLiteral | naslTypes.StringLiteral | naslTypes.StringInterpolation | naslTypes.NumericLiteral | naslTypes.BinaryExpression | naslTypes.VariadicExpression | naslTypes.MatchCase | naslTypes.Match | naslTypes.UnaryExpression | naslTypes.MemberExpression | naslTypes.Unparsed | naslTypes.New | naslTypes.NewComposite | naslTypes.NewStructure | naslTypes.NewList | naslTypes.NewMap | naslTypes.NewRegex | naslTypes.Paginate | naslTypes.CallQueryComponent | naslTypes.QuerySelectExpression | naslTypes.QueryFromExpression | naslTypes.QueryJoinExpression | naslTypes.QueryFieldExpression | naslTypes.QueryAggregateExpression | naslTypes.QueryOrderByExpression | naslTypes.QueryGroupByExpression | naslTypes.QueryLimitExpression | naslTypes.SqlQueryComponent | naslTypes.OqlQueryComponent | naslTypes.ProcessOutcome | naslTypes.Assignee | naslTypes.ProcessOutcomes;
 }
 export declare function fixExpression(arg: any, options: TransformOptions, supportSubLogic?: boolean): any;
 /**

package/out/natural/transforms/transform2LogicItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform2LogicItem.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2LogicItem.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transform2LogicItem.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2LogicItem.ts"],"names":[],"mappings":"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"}

package/out/natural/transforms/transform2LogicItem.js

@@ -129,6 +129,15 @@ function assertAssignmentRightIsNotAnonymousFunction(expression, options) {
         return (0, utils_1.throwError)(options, 'Anonymous function is not allowed in assignment');
     return expression;
 }
+/**
+ * 处理赋值表达式右侧的判定逻辑
+ */
+function validateAssignmentRightExpression(right, options, node) {
+    if (right?.concept === 'CallLogic' && right.calleeName === 'delete' && right.calleeNamespace?.includes('app.dataSources')) {
+        return (0, utils_1.throwError)(options, 'delete 函数返回值为空，请移除赋值语句和相关判定操作。可默认 delete 函数执行成功，无需考虑失败情况处理。', node);
+    }
+    return right;
+}
 function fixExpression(arg, options, supportSubLogic = false) {
     let expression;
     if (options.transformType === 'logic' && supportSubLogic &&
@@ -464,36 +473,13 @@ function transformConditionalExpression(node, options) {
         const else_expr = (0, utils_1.generate)(node.alternate)?.code;
         return (0, utils_1.throwError)(options, `数据查询中不支持条件表达式！${(0, utils_1.generate)(node)?.code}, 请使用 SQL函数 IF(${expr} == null, ${then_expr}, ${else_expr})`);
     }
-    const test = transformNodeFunction(node.test, options);
+    const condition = transformNodeFunction(node.test, options);
     const consequent = transformNodeFunction(node.consequent, options);
     const alternate = transformNodeFunction(node.alternate, options);
-    const variables = options.transformType === 'logic' ? [...options?.logic?.variables, ...options?.logic?.returns, ...options?.logic?.params] : [];
-    const testType = variables?.find((item) => item?.name === test?.name)?.typeAnnotation;
-    const expression = testType?.typeName === 'Boolean' || test?.concept === 'BinaryExpression' ? test :
-        new utils_1.naslTypes.CallFunction({
-            calleeNamespace: 'nasl.util',
-            calleeName: 'Convert',
-            arguments: [
-                new utils_1.naslTypes.Argument({
-                    expression: test,
-                }),
-            ],
-            typeArguments: [utils_1.naslTypes.TypeAnnotation.createPrimitive('Boolean')],
-        });
-    return new utils_1.naslTypes.Match({
-        expression,
-        isExpression: true,
-        cases: [
-            new utils_1.naslTypes.MatchCase({
-                patterns: [new utils_1.naslTypes.BooleanLiteral({ value: 'true' })],
-                body: consequent ? [consequent] : [],
-                isMatchedTypeEnumable: true,
-            }),
-            new utils_1.naslTypes.MatchCase({
-                patterns: [],
-                body: alternate ? [alternate] : [],
-            }),
-        ],
+    return new utils_1.naslTypes.IfExpression({
+        condition,
+        consequent,
+        alternate
     });
 }
 function transformArrayExpression(node, options) {
@@ -717,9 +703,11 @@ function transform2VariableAndAddAssignment(node, options) {
                 decl.init.typeAnnotations = varTypeAnnotation;
             }
             options.typeAnnotation = typeAnnotation;
+            const right = assertAssignmentRightIsNotAnonymousFunction(transformNodeFunction(decl.init, { ...options, typeAnnotation }), options) || undefined;
+            validateAssignmentRightExpression(right, options, node);
             newNode = new utils_1.naslTypes.Assignment({
                 left: transformNodeFunction(decl.id, options),
-                right: assertAssignmentRightIsNotAnonymousFunction(transformNodeFunction(decl.init, { ...options, typeAnnotation }), options) || undefined,
+                right
             });
         }
     });
@@ -926,9 +914,11 @@ function transform2Assignment(node, options) {
     if (options.transformType !== 'logic') {
         return transformNodeFunction(node.right, options);
     }
+    const right = assertAssignmentRightIsNotAnonymousFunction(transformNodeFunction(node.right, options), options) || undefined;
+    validateAssignmentRightExpression(right, options, node);
     return new utils_1.naslTypes.Assignment({
         left: transformNodeFunction(node.left, options),
-        right: assertAssignmentRightIsNotAnonymousFunction(transformNodeFunction(node.right, options), options) || undefined,
+        right
     });
 }
 exports.transform2Assignment = transform2Assignment;
@@ -1314,35 +1304,77 @@ function transformCallFunctionExpression2Match(node, calleeName, callee, options
         return (0, utils_1.throwError)(options, 'Match 函数体内必须是一个 if 语句', ifStatement);
     }
     const flatedIfStatements = flatIfStatementForMatch(ifStatement);
+    let isExpression = options.transformType !== 'logic';
     const match = new utils_1.naslTypes.Match({
         expression: transformNodeFunction(arg, options),
-        isExpression: true,
-        cases: flatedIfStatements.map((_case) => {
+        isExpression,
+        cases: flatedIfStatements.map((_case, index) => {
             let argument;
             if (_case.consequent.type === 'BlockStatement') {
                 if (_case.consequent.body.length === 1 && _case.consequent.body[0].type === 'ReturnStatement') {
                     argument = _case.consequent.body[0].argument;
+                    // 有一个 Return, match 就按 expression 处理
+                    isExpression = true;
                 }
                 else {
-                    return (0, utils_1.throwError)(options, 'Match Case 的 if 中只能写一个 return 语句', _case.consequent);
+                    const isLastCase = index === flatedIfStatements.length - 1;
+                    let allowEmptyBody = false;
+                    if (isExpression) {
+                        if (isLastCase) {
+                            // 检查前面所有case的test属性,对布尔或者枚举类型特殊处理
+                            allowEmptyBody = flatedIfStatements
+                                .slice(0, index)
+                                .every((prevCase) => {
+                                if (!prevCase.test || prevCase.test.type !== 'BinaryExpression')
+                                    return false;
+                                const testNode = prevCase.test;
+                                const right = testNode.right;
+                                // 检查right是否为BooleanLiteral
+                                if (right?.type === 'BooleanLiteral')
+                                    return true;
+                                // 检查right是否为MemberExpression且包含app.enums
+                                if (right?.type === 'MemberExpression') {
+                                    const rightCode = (0, utils_1.generate)(right).code;
+                                    return rightCode.includes('app.enums');
+                                }
+                                return false;
+                            });
+                        }
+                        if (!allowEmptyBody) {
+                            return (0, utils_1.throwError)(options, 'Match Case 的 if 中只能写一个 return 语句', _case.consequent);
+                        }
+                    }
+                    else {
+                        allowEmptyBody = true;
+                    }
                 }
             }
             else {
                 if (_case.consequent.type === 'ReturnStatement') {
                     argument = _case.consequent.argument;
+                    isExpression = true;
                 }
                 else {
                     return (0, utils_1.throwError)(options, 'Match Case 的 if 中只能写一个 return 语句', _case.consequent);
                 }
             }
-            const bodyNode = transformNodeFunction(argument, options);
+            let bodyNode = transformNodeFunction(argument, options);
+            let body = [];
+            if (bodyNode) {
+                body = [bodyNode];
+            }
+            if (!isExpression && _case.consequent.type === 'BlockStatement') {
+                body = transformBlockBody(_case.consequent.body.filter((item) => item.type !== 'BreakStatement'), options);
+            }
             return new utils_1.naslTypes.MatchCase({
                 isMatchedTypeEnumable: false,
                 patterns: !_case.test ? [] : flatMatchPatternsExpression(transformNodeFunction(_case.test, options)),
-                body: bodyNode ? [bodyNode] : [],
+                body,
             });
         }).filter(Boolean),
     });
+    // 根据 toNaturalTS，有Return语句的默认为 expression
+    match.isExpression = isExpression;
     if (!match.cases.length || match.cases[match.cases.length - 1].patterns.length) {
         match.cases.push(new utils_1.naslTypes.MatchCase({
             isMatchedTypeEnumable: false,
@@ -1352,7 +1384,7 @@ function transformCallFunctionExpression2Match(node, calleeName, callee, options
     }
     match.cases.forEach((case_) => {
         if (case_.patterns.length) {
-            if (case_.patterns[0].concept === 'BooleanLiteral' || case_.patterns[0].concept === 'StringLiteral') {
+            if (case_.patterns[0].concept === 'BooleanLiteral') {
                 case_.isMatchedTypeEnumable = true;
             }
             if (case_.patterns[0].concept === 'MemberExpression') {
@@ -1360,13 +1392,13 @@ function transformCallFunctionExpression2Match(node, calleeName, callee, options
                 case_.patterns[0] = new utils_1.naslTypes.MemberExpression({
                     object: {
                         concept: 'Identifier',
-                        name: case_.patterns[0].object.property.name,
+                        name: case_.patterns[0].object.name,
                         folded: false,
                         namespace: 'app.enums'
                     },
                     property: {
                         concept: 'Identifier',
-                        name: case_.patterns[0].property.value,
+                        name: case_.patterns[0].property.name,
                         folded: false,
                     },
                 });
@@ -1415,23 +1447,30 @@ exports.transformCall2CallViewElementLogic = transformCall2CallViewElementLogic;
 function transformCall2CallEntityLogic(node, calleeName, callee, options) {
     if (options?.isRestricted)
         return (0, utils_1.throwError)(options, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
-    const entityName = callee[0].name.replace(/Entity$/, '');
-    // console.log('callee', callee);
-    return new utils_1.naslTypes.CallLogic({
-        calleeNamespace: `app.dataSources.defaultDS.entities.${entityName}.logics`,
-        calleeName: callee[1].name,
-        arguments: node?.arguments?.map((arg) => new utils_1.naslTypes.Argument({
-            expression: fixExpression(arg, options),
-        })),
-    });
+    return (0, utils_1.throwError)(options, '调用实体逻辑必须要有完整的命名空间，如：app.dataSources.defaultDS.entities.XxxEntity.{create,update,delete,batchCreate,...}(...)', node);
+    // const entityName = (callee[0] as babelTypes.Identifier).name.replace(/Entity$/, '');
+    // // console.log('callee', callee);
+    // return new naslTypes.CallLogic({
+    //   calleeNamespace: `app.dataSources.defaultDS.entities.${entityName}.logics`,
+    //   calleeName: (callee[1] as babelTypes.Identifier).name,
+    //   arguments: node?.arguments?.map((arg) => new naslTypes.Argument({
+    //     expression: fixExpression(arg, options),
+    //   })) as naslTypes.Argument[],
+    // });
 }
 exports.transformCall2CallEntityLogic = transformCall2CallEntityLogic;
 function transformCall2CallDataSourceLogic(node, calleeName, callee, options) {
     if (options?.isRestricted)
         return (0, utils_1.throwError)(options, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
-    if (calleeName?.includes('.entities.')) {
-        const calleeNamespace = (0, utils_1.generate)(node?.callee?.object?.object)?.code;
-        const entityName = node?.callee?.object?.property?.name?.replace(/Entity$/, '');
+    if (calleeName.includes('.entities.')) {
+        const obj = node.callee.object;
+        if (obj.type !== 'MemberExpression')
+            return (0, utils_1.throwError)(options, '调用实体逻辑的命名空间不正确。正确示例如：app.dataSources.defaultDS.entities.XxxEntity.{create,update,delete,batchCreate,...}(...)', node);
+        const calleeNamespace = (0, utils_1.generate)(obj.object).code;
+        let entityName = obj.property.name;
+        if (!entityName.endsWith('Entity'))
+            return (0, utils_1.throwError)(options, '调用实体逻辑的实体名必须要有 Entity 后缀。正确示例如：app.dataSources.defaultDS.entities.XxxEntity.{create,update,delete,batchCreate,...}(...)', node);
+        entityName = entityName.replace(/Entity$/, '');
         let newArguments = node?.arguments?.map((arg) => new utils_1.naslTypes.Argument({
             expression: fixExpression(arg, options),
         }));
@@ -2223,6 +2262,12 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
     let entity;
     let hasErrorTSScopeColumn = false;
     let useResultItem = false;
+    let simplifyType;
+    if (node.arguments?.[2] &&
+        node.arguments[2]?.type === 'StringLiteral' &&
+        node.arguments[2].value === 'SIMPLIFY') {
+        simplifyType = true;
+    }
     // 这里只是一个示例，具体的逻辑需要根据flatted的内容来构建
     flatted && flatted.forEach((item) => {
         // console.log(item.calleeName)
@@ -2439,6 +2484,7 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
         having: having || null,
         orderBy,
         ideVersion: '2.22',
+        simplifyType
     });
     if (!select) {
         return (0, utils_1.throwError)(options, 'SELECT 不符合规范', node);