@lcap/nasl 4.4.0-rc.2 → 4.4.1-rc.2

package/out/natural/parser/parseNaturalTS.js

@@ -35,6 +35,7 @@ const transform2Variable_1 = require("../transforms/transform2Variable");
 const parseNaturalTSXView_1 = require("./parseNaturalTSXView");
 const transform2MetadataType_1 = require("../transforms/transform2MetadataType");
 const transformThemeAndStyle_1 = require("../transforms/transformThemeAndStyle");
+const transform2Directory_1 = require("../transforms/utils/transform2Directory");
 /**
  * 铺平命名空间
  * 会将连续嵌套的命令空间铺平
@@ -271,7 +272,9 @@ function parseNaturalTS(tsCode, { parsingId, strictForTraining, source = 'creato
                 app.dataSources.push(dataSource);
             }
             if (statement.type === 'ClassDeclaration') {
-                dataSource.entities.push((0, transform2Entity_1.transform2Entity)(statement, { ...parseState }));
+                const entity = (0, transform2Entity_1.transform2Entity)(statement, { ...parseState });
+                dataSource.entities.push(entity);
+                (0, transform2Directory_1.handleDirectory)(app, entity, 'Entity');
             }
             else if (statement.type === 'VariableDeclaration') { }
             else if (statement.type === 'ExpressionStatement' && statement.expression.type === 'CallExpression' && statement.expression.callee.type === 'MemberExpression' && statement.expression.callee.property.type === 'Identifier' && statement.expression.callee.property.name === '$mockData') {
@@ -291,14 +294,18 @@ function parseNaturalTS(tsCode, { parsingId, strictForTraining, source = 'creato
         }
         else if (typeInNamespace === 'structures') {
             if (statement.type === 'ClassDeclaration') {
-                addType2Namespace(app, (0, transform2Structure_1.transform2Structure)(statement, { ...parseState }), headNamespace, typeInNamespace, { ...parseState });
+                const structure = (0, transform2Structure_1.transform2Structure)(statement, { ...parseState });
+                addType2Namespace(app, structure, headNamespace, typeInNamespace, { ...parseState });
+                (0, transform2Directory_1.handleDirectory)(app, structure, 'Structure');
             }
             else
                 return (0, utils_1.throwError)(parseState, '数据结构命名空间中不支持的节点类型', statement.type, statement);
         }
         else if (typeInNamespace === 'enums') {
             if (statement.type === 'ClassDeclaration') {
-                addType2Namespace(app, (0, transform2Enum_1.transform2Enum)(statement, statement.leadingComments, { ...parseState }), headNamespace, typeInNamespace, { ...parseState });
+                const enumeration = (0, transform2Enum_1.transform2Enum)(statement, statement.leadingComments, { ...parseState });
+                addType2Namespace(app, enumeration, headNamespace, typeInNamespace, { ...parseState });
+                (0, transform2Directory_1.handleDirectory)(app, enumeration, 'Enum');
             }
             else
                 return (0, utils_1.throwError)(parseState, '枚举命名空间中不支持的节点类型', statement.type, statement);
@@ -311,35 +318,46 @@ function parseNaturalTS(tsCode, { parsingId, strictForTraining, source = 'creato
                 return (0, utils_1.throwError)(parseState, '元数据类型命名空间中不支持的节点类型', statement.type, statement);
         }
         else if (typeInNamespace === 'logics') {
-            const logicParseState = { ...parseState, logicKind: statement.type === 'TSDeclareFunction' ? 'declare' : 'export' };
-            if (statement.type === 'TSDeclareFunction') {
-                addType2Namespace(app, (0, transform2GlobalLogicDeclaration_1.transform2GlobalLogicDeclaration)(statement, { ...parseState }), headNamespace, typeInNamespace, logicParseState);
-            }
-            else if (statement.type === 'FunctionDeclaration') {
-                addType2Namespace(app, (0, transform2Logic_1.transform2Logic)(statement, undefined, { ...parseState }), headNamespace, typeInNamespace, logicParseState);
+            // 只处理函数声明，忽略其他类型（如装饰器调用 $Logic({...})）
+            if (statement.type === 'TSDeclareFunction' || statement.type === 'FunctionDeclaration') {
+                const logicParseState = { ...parseState, logicKind: statement.type === 'TSDeclareFunction' ? 'declare' : 'export' };
+                // 检查前一个语句是否是 $Logic 调用表达式
+                const decorator = (0, utils_1.getDecoratorCall)(namespaceStatements[index - 1]?.statement, 'Logic');
+                let logic;
+                if (statement.type === 'TSDeclareFunction') {
+                    logic = (0, transform2GlobalLogicDeclaration_1.transform2GlobalLogicDeclaration)(statement, decorator, { ...parseState });
+                }
+                else {
+                    logic = (0, transform2Logic_1.transform2Logic)(statement, undefined, decorator, { ...parseState, logicType: 'global_logic' });
+                }
+                addType2Namespace(app, logic, headNamespace, typeInNamespace, logicParseState);
+                (0, transform2Directory_1.handleDirectory)(app, logic, 'Logic');
             }
-            else
-                return (0, utils_1.throwError)(parseState, '逻辑命名空间中不支持的节点类型', statement.type, statement);
         }
         else if (['apis', 'extensions', 'connectors'].includes(headNamespace)) {
             // logics / interfaces
             if (tailNamespace === 'logics' || tailNamespace === 'interfaces') {
                 const logicParseState = { ...parseState, logicKind: statement.type === 'TSDeclareFunction' ? 'declare' : 'export' };
-                const logic = (0, transform2Logic_1.transform2Logic)(statement, undefined, logicParseState);
+                const logic = (0, transform2Logic_1.transform2Logic)(statement, undefined, undefined, logicParseState);
                 if (logicParseState.logicKind === 'declare') {
                     logic.body = [];
                 }
                 addType2Namespace(app, logic, headNamespace, tailNamespace, logicParseState);
+                // 注意：扩展、API、连接器的逻辑不需要处理 directory，因为它们属于依赖模块
             }
             else if (tailNamespace === 'enums' && statement.type === 'ClassDeclaration') {
-                addType2Namespace(app, (0, transform2Enum_1.transform2Enum)(statement, statement.leadingComments, { ...parseState }), headNamespace, tailNamespace, parseState);
+                const enumeration = (0, transform2Enum_1.transform2Enum)(statement, statement.leadingComments, { ...parseState });
+                addType2Namespace(app, enumeration, headNamespace, tailNamespace, parseState);
+                // 扩展、API、连接器的枚举不需要处理 directory
             }
             else if (tailNamespace === 'structures' && statement.type === 'ClassDeclaration') {
-                addType2Namespace(app, (0, transform2Structure_1.transform2Structure)(statement, { ...parseState }), headNamespace, tailNamespace, parseState);
+                const structure = (0, transform2Structure_1.transform2Structure)(statement, { ...parseState });
+                addType2Namespace(app, structure, headNamespace, tailNamespace, parseState);
+                // 扩展、API、连接器的结构不需要处理 directory
             }
             else if (headNamespace === 'connectors') {
                 const logicParseState = { ...parseState, logicKind: statement.type === 'TSDeclareFunction' ? 'declare' : 'export' };
-                const logic = (0, transform2Logic_1.transform2Logic)(statement, undefined, logicParseState);
+                const logic = (0, transform2Logic_1.transform2Logic)(statement, undefined, undefined, logicParseState);
                 if (logicParseState.logicKind === 'declare') {
                     logic.body = [];
                 }
@@ -350,15 +368,27 @@ function parseNaturalTS(tsCode, { parsingId, strictForTraining, source = 'creato
             }
         }
         else if (idNamesStr === 'app.backend.variables') {
+            // 只处理变量声明，忽略其他类型（如装饰器调用 $BackendVariable({...})）
             if (statement.type === 'VariableDeclaration') {
                 if (!app.backend) {
                     app.backend = new utils_1.naslTypes.Backend();
                 }
-                const variable = (0, transform2Variable_1.transform2BackendVariable)(statement, { ...parseState });
+                // 检查前一个语句是否是 $BackendVariable 装饰器
+                const decorator = (0, utils_1.getDecoratorCall)(namespaceStatements[index - 1]?.statement, 'BackendVariable');
+                const variable = (0, transform2Variable_1.transform2BackendVariable)(statement, decorator, { ...parseState });
                 variable && app.backend.variables.push(variable);
             }
-            else
+            else if (statement.type === 'ExpressionStatement') {
+                // 检查是否是 $BackendVariable 装饰器，如果不是则报错
+                const isDecorator = (0, utils_1.getDecoratorCall)(statement, 'BackendVariable');
+                if (!isDecorator) {
+                    return (0, utils_1.throwError)(parseState, '变量命名空间中不支持的表达式', statement.type, statement);
+                }
+                // 是装饰器则跳过，等待下一个变量声明处理
+            }
+            else {
                 return (0, utils_1.throwError)(parseState, '变量命名空间中不支持的节点类型', statement.type, statement);
+            }
         }
         else if (idNames[1] === 'frontendTypes' && idNames[3] === 'frontends') {
             let frontendType = app.frontendTypes.find((item) => item.name === idNames[2]);
@@ -386,20 +416,48 @@ function parseNaturalTS(tsCode, { parsingId, strictForTraining, source = 'creato
                 frontendType.frontends.push(frontend);
             }
             if (idNames[5] === 'variables') {
+                // 只处理变量声明，忽略其他类型（如装饰器调用 $FrontendVariable({...})）
                 if (statement.type === 'VariableDeclaration') {
-                    const variable = (0, transform2Variable_1.transform2FrontendVariable)(statement, { ...parseState });
+                    // 检查前一个语句是否是 $FrontendVariable 装饰器
+                    const decorator = (0, utils_1.getDecoratorCall)(namespaceStatements[index - 1]?.statement, 'FrontendVariable');
+                    const variable = (0, transform2Variable_1.transform2FrontendVariable)(statement, decorator, { ...parseState });
                     variable && frontend.variables.push(variable);
                 }
-                else
+                else if (statement.type === 'ExpressionStatement') {
+                    // 检查是否是 $FrontendVariable 装饰器，如果不是则报错
+                    const isDecorator = (0, utils_1.getDecoratorCall)(statement, 'FrontendVariable');
+                    if (!isDecorator) {
+                        return (0, utils_1.throwError)(parseState, '前端变量命名空间中不支持的表达式', statement.type, statement);
+                    }
+                    // 是装饰器则跳过，等待下一个变量声明处理
+                }
+                else {
                     return (0, utils_1.throwError)(parseState, '前端变量命名空间中不支持的节点类型', statement.type, statement);
+                }
+            }
+            else if (idNames[5] === 'theme') {
+                if (statement.type === 'ExpressionStatement' && statement.expression.type === 'TaggedTemplateExpression') {
+                    const expression = statement.expression;
+                    if (expression.tag.type === 'Identifier' && expression.tag.name === '$theme') {
+                        if (expression.quasi.expressions.length > 0) {
+                            return (0, utils_1.throwError)(parseState, '不支持在 $theme 中使用动态表达式');
+                        }
+                        const css = expression.quasi.quasis[0].value.raw;
+                        const { scopeVariableMap, cssRules } = (0, transformThemeAndStyle_1.transformTheme)(css, { ...parseState });
+                        frontend.theme.scopeVariableMap = scopeVariableMap;
+                        frontend.theme.cssRules = cssRules;
+                    }
+                    else {
+                        return (0, utils_1.throwError)(parseState, 'theme.css 必须使用 $theme 标签模板字符串', statement.type, statement);
+                    }
+                }
+                else {
+                    return (0, utils_1.throwError)(parseState, 'theme.css 必须使用 $theme 标签模板字符串', statement.type, statement);
+                }
             }
             else if (idNames[5] === 'views') {
                 if (statement.type === 'FunctionDeclaration' || statement.type === 'TSDeclareFunction') {
-                    let decorator;
-                    let prevStatement = namespaceStatements[index - 1]?.statement;
-                    if (prevStatement?.type === 'ExpressionStatement' && prevStatement.expression.type === 'CallExpression' && prevStatement.expression.callee.type === 'Identifier' && prevStatement.expression.callee.name === '$View') {
-                        decorator = prevStatement.expression;
-                    }
+                    const decorator = (0, utils_1.getDecoratorCall)(namespaceStatements[index - 1]?.statement, 'View');
                     const newOptions = { ...parseState, isInFrontend: true };
                     const view = statement.type === 'FunctionDeclaration' ? (0, parseNaturalTSXView_1.transform2View)(statement, decorator, newOptions) : (0, parseNaturalTSXView_1.transformTSDeclareFunction2View)(statement, decorator, newOptions);
                     newOptions.nodeName = view.name;
@@ -443,6 +501,18 @@ function parseNaturalTS(tsCode, { parsingId, strictForTraining, source = 'creato
                         }
                         parentViewList = parentView.children;
                     }
+                    // 子页面未开启权限时，向上找最近一个 auth=true 的祖先页面，继承其 auth 和 bindRoles
+                    if (!view.auth && parentPathSegments.length > 0) {
+                        for (let i = parentPathSegments.length; i >= 1; i--) {
+                            const ancestorPath = parentPathSegments.slice(0, i).join('/');
+                            const ancestorView = viewCacheMap[ancestorPath] ?? findViewByPath(frontend.views, parentPathSegments.slice(0, i));
+                            if (ancestorView?.auth) {
+                                view.auth = ancestorView.auth;
+                                view.bindRoles = ancestorView.bindRoles;
+                                break;
+                            }
+                        }
+                    }
                     if (view) {
                         const existingView = parentViewList.find((item) => item.name === view.name);
                         if (existingView) {
@@ -468,8 +538,9 @@ function parseNaturalTS(tsCode, { parsingId, strictForTraining, source = 'creato
                         return (0, utils_1.throwError)(parseState, '不支持在 $theme 中使用动态表达式');
                     }
                     const css = expression.quasi.quasis[0].value.raw;
-                    const variableMap = (0, transformThemeAndStyle_1.transformTheme)(css, { ...parseState });
-                    frontend.theme.scopeVariableMap = variableMap;
+                    const { scopeVariableMap, cssRules } = (0, transformThemeAndStyle_1.transformTheme)(css, { ...parseState });
+                    frontend.theme.scopeVariableMap = scopeVariableMap;
+                    frontend.theme.cssRules = cssRules;
                 }
                 else if (expression.tag.type === 'Identifier' && expression.tag.name === '$extraStyle') {
                     if (expression.quasi.expressions.length > 0) {

package/out/natural/parser/parseNaturalTS.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseNaturalTS.js","sourceRoot":"","sources":["../../../src/natural/parser/parseNaturalTS.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parseNaturalTS.js","sourceRoot":"","sources":["../../../src/natural/parser/parseNaturalTS.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAqC;AACrC,oCAAgJ;AAChJ,qEAAkE;AAClE,2EAAwE;AACxE,qGAAkG;AAClG,iEAA8D;AAC9D,mEAAgE;AAChE,yEAAyG;AACzG,+DAAwF;AACxF,iFAA8E;AAC9E,iFAAsF;AACtF,iFAA0E;AAQ1E;;;GAGG;AACH,SAAS,aAAa,CAAC,IAAoC;IACzD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;IACtB,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;QACvC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QAC1C,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAA2B,EAAE,GAAG,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;IACpE,CAAC;;QACC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAA2B,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;AACnE,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,0BAA0B,CAAC,KAA6B,EAAE,OAAO,GAAG,KAAK,EAAE,UAA+B;IACjH,MAAM,MAAM,GAAkF,EAAE,CAAC;IACjG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,IAAI,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;YAC3C,2FAA2F;YAC3F,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC;YAC7B,SAAS,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,IAAI,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,qBAAqB,IAAI,CAAC,gBAAgB,EAAE,0BAA0B,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,iGAAiG;gBACvO,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAC7C,MAAM,IAAI,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;YACtC,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9D,8EAA8E;YAC9E,MAAM,SAAS,GAAG,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;YACtG,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACzB,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACtC,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,gBAAgB,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAO;IAC/E,IAAI,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,EAAE,UAAU,CAAC,CAAC;IAC5E,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;YAC/B,UAAU,GAAG,IAAI,iBAAS,CAAC,SAAS,CAAC;gBACnC,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,IAAI,CAAC,UAAU;aACtB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,IAAI,iBAAS,CAAC,MAAM,CAAC;gBAChC,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,IAAI,CAAC,UAAU;aACtB,CAAC,CAAC;QACL,CAAC;QACD,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,QAAQ,KAAK,YAAY,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACtD,UAAU;QACV,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,IAAI,SAAS,GAAG,UAAU,KAAK,WAAW,IAAI,UAAU,KAAK,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;QAErH,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;YAC/B,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC3C,IAAI,EAAE,GAAI,UAAkC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;gBAC7F,IAAI,CAAC,EAAE,EAAE,CAAC;oBACR,EAAE,GAAG,IAAI,iBAAS,CAAC,SAAS,CAAC;wBAC3B,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,QAAQ;qBAChB,CAAC,CAAC;oBACF,UAAkC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC1D,CAAC;gBACD,SAAS,GAAG,EAAE,CAAC,MAAM,CAAC;YACxB,CAAC;QACH,CAAC;QAED,MAAM,aAAa,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QAClF,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACjC,WAAW;YACX,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE,CAAC;gBACzB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;YACvC,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE,CAAC;gBACzB,KAAK;gBACL,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACN,KAAK;gBACL,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAID,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;AACpE,MAAM,kBAAkB,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;AAE5F;;GAEG;AACH,SAAgB,iBAAiB,CAAC,GAAkB,EAAE,IAAS,EAAE,eAA8B,EAAE,IAAqB,EAAE,IAAU;IAChI,IAAI,eAAe,KAAK,KAAK,EAAE,CAAC;QAC9B,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IACD,IAAI,eAAe,KAAK,YAAY,EAAE,CAAC;QACrC,gBAAgB,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5G,CAAC;SAAM,IAAI,eAAe,KAAK,YAAY,EAAE,CAAC;QAC5C,gBAAgB,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,qBAAqB,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACrH,CAAC;SAAM,IAAI,eAAe,KAAK,MAAM,EAAE,CAAC;QACtC,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;YAC1B,mBAAmB;YACnB,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;gBACpD,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBAC5C,OAAO,IAAI,iBAAS,CAAC,cAAc,CAAC;oBAClC,GAAG,IAAI,CAAC,MAAM,EAAE;oBAChB,IAAI;oBACJ,EAAE,EAAE,MAAM;oBACV,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ;iBAC3B,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,IAAI,GAAG,IAAI,iBAAS,CAAC,SAAS,CAAC;gBAC7B,GAAG,IAAI,CAAC,MAAM,EAAE;gBAChB,KAAK,EAAE,IAAI,CAAC,IAAI;gBAChB,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,MAAM;gBACd,QAAQ,EAAE,OAAO;gBACjB,MAAM,EAAE,eAAe;aACxB,CAAC,CAAA;QACJ,CAAC;QACD,gBAAgB,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,qBAAqB,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACrH,CAAC;AACH,CAAC;AA/BD,8CA+BC;AAED,SAAS,mBAAmB,CAAC,GAAkB,EAAE,cAAsB,EAAE,aAAqB;IAC5F,GAAG,CAAC,aAAa,CAAC,IAAI,iBAAS,CAAC,UAAU,CAAC;QACzC,IAAI,EAAE,cAAc;QACpB,SAAS,EAAE,aAAa,aAAa,EAAE;KACxC,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAgB,cAAc,CAC5B,MAAc,EACd,EACE,SAAS,EACT,iBAAiB,EACjB,MAAM,GAAG,SAAS,EAClB,aAAa,KAcX,EAAE;IAEN,MAAM,OAAO,GAAG;QACd,CAAC,OAAO,CAAC,mCAAmC,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAChE,OAAO,CAAC,yCAAyC,CAAC;KACnD,CAAC;IACF,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE;QACnC,QAAQ,EAAE,YAAY;QACtB,OAAO,EAAE,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC9C,OAAO;KACR,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,iBAAS,CAAC,GAAG,EAAE,CAAC;IAEhC,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IAChH,IAAI,YAAY,GAAmC,EAAE,CAAC;IACtD,mBAAmB,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,EAAE;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,oEAAoE;QACpE,MAAM,UAAU,GAAwB;YACtC,QAAQ,EAAE,IAAI;YACd,SAAS;YACT,aAAa,EAAE,UAAU;YACzB,QAAQ,EAAE,EAAE;YACZ,aAAa,EAAE,IAAI;YACnB,MAAM;YACN,aAAa;YACb,iBAAiB;SAClB,CAAA;QAED,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAAE,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,WAAW,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACpG,IAAI,aAAa,GAAG,OAAO,CAAC,CAAC,CAAkB,CAAC;QAEhD,IAAI,eAAgC,CAAC;QACrC,IAAI,aAAa,KAAK,KAAK,EAAE,CAAC;YAC5B,eAAe,GAAG,OAAO,CAAC,CAAC,CAAoB,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBACf,IAAI,SAAS,CAAC,IAAI,KAAK,mBAAmB,IAAI,SAAS,CAAC,EAAE,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;oBAC9E,MAAM,SAAS,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,cAA8C,CAAA,CAAC,cAAc,CAAC;oBACtG,IAAI,SAAS,CAAC,IAAI,KAAK,eAAe,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;wBACrF,MAAM,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC;wBAC/C,mBAAmB,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;wBACpD,OAAO;oBACT,CAAC;yBAAM,IAAI,SAAS,CAAC,IAAI,KAAK,aAAa;wBAAE,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,eAAe,CAAC,CAAC;yBACvF,CAAC;wBACJ,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;4BACnD,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gCAC3E,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;4BAC5B,CAAC;iCAAM,CAAC;gCACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;4BAChD,CAAC;wBACH,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAa,CAAC;wBAC/B,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;4BACzC,mBAAmB,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;wBACvD,CAAC,CAAC,CAAC;wBACH,OAAO;oBACT,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,YAAY,UAAU,EAAE,CAAC,CAAC;gBAC1D,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,eAAe,GAAG,OAAO,CAAC,CAAC,CAAoB,CAAC;YAClD,CAAC;QACH,CAAC;QAED,IAAI,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAoB,CAAC;QACnE,UAAU,CAAC,UAAU,GAAG,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAClE,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,aAAa,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,CAAC;YAC9D,IAAI,UAAU,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACpC,IAAI,UAAU,EAAE,CAAC;gBACf,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC;oBAAE,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,YAAY,UAAU,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACjH,CAAC;iBAAM,CAAC;gBACN,UAAU,GAAG,IAAI,iBAAS,CAAC,UAAU,CAAC;oBACpC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;iBACjB,CAAC,CAAC;gBACH,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACnC,CAAC;YAED,IAAI,SAAS,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gBAC1C,MAAM,MAAM,GAAG,IAAA,mCAAgB,EAAC,SAAS,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;gBAC9D,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACjC,IAAA,qCAAe,EAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACzC,CAAC;iBAAM,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC,CAAC,CAAC;iBACnD,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAqB,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,KAAK,gBAAgB,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,kBAAkB,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC1R,IAAI,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9C,MAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBACnD,IAAI,CAAC;wBACH,MAAM,OAAO,GAAG,IAAA,gBAAQ,EAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;wBACxC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACtB,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,OAAO,IAAA,kBAAU,EACf,EAAE,GAAG,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EACtF,yBAAyB,EACzB,QAAQ,CAAC,IAAI,EACb,SAAS,CACV,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;;gBACI,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,iBAAiB,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACnF,CAAC;aAAM,IAAI,eAAe,KAAK,YAAY,EAAE,CAAC;YAC5C,IAAI,SAAS,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gBAC1C,MAAM,SAAS,GAAG,IAAA,yCAAmB,EAAC,SAAS,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;gBACpE,iBAAiB,CAAC,GAAG,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;gBACrF,IAAA,qCAAe,EAAC,GAAG,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;YAC/C,CAAC;;gBAAM,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,mBAAmB,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACvF,CAAC;aAAM,IAAI,eAAe,KAAK,OAAO,EAAE,CAAC;YACvC,IAAI,SAAS,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gBAC1C,MAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,SAAS,EAAE,SAAS,CAAC,eAAe,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;gBAC5F,iBAAiB,CAAC,GAAG,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;gBACvF,IAAA,qCAAe,EAAC,GAAG,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;YAC5C,CAAC;;gBAAM,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,iBAAiB,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACrF,CAAC;aAAM,IAAI,eAAe,KAAK,eAAe,EAAE,CAAC;YAC/C,IAAI,SAAS,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;gBAChD,iBAAiB,CAAC,GAAG,EAAE,IAAA,+CAAsB,EAAC,SAAS,EAAE,SAAS,CAAC,eAAe,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;YAC7J,CAAC;;gBAAM,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,oBAAoB,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACxF,CAAC;aAAM,IAAI,eAAe,KAAK,QAAQ,EAAE,CAAC;YACxC,uCAAuC;YACvC,IAAI,SAAS,CAAC,IAAI,KAAK,mBAAmB,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBACvF,MAAM,eAAe,GAAoB,EAAE,GAAG,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAErI,0BAA0B;gBAC1B,MAAM,SAAS,GAAG,IAAA,wBAAgB,EAAC,mBAAmB,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;gBAEvF,IAAI,KAAsB,CAAC;gBAC3B,IAAI,SAAS,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;oBAC3C,KAAK,GAAG,IAAA,mEAAgC,EAAC,SAAS,EAAE,SAAS,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;gBACpF,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAG,IAAA,iCAAe,EAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,GAAG,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC;gBACzG,CAAC;gBAED,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;gBAC/E,IAAA,qCAAe,EAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YACxE,sBAAsB;YACtB,IAAI,aAAa,KAAK,QAAQ,IAAI,aAAa,KAAK,YAAY,EAAE,CAAC;gBACjE,MAAM,eAAe,GAAoB,EAAE,GAAG,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACrI,MAAM,KAAK,GAAG,IAAA,iCAAe,EAAC,SAA2C,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;gBAClH,IAAI,eAAe,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;oBAC5C,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC;gBAClB,CAAC;gBACD,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;gBAC7E,6CAA6C;YAC/C,CAAC;iBAAM,IAAI,aAAa,KAAK,OAAO,IAAI,SAAS,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gBAC9E,MAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,SAAS,EAAE,SAAS,CAAC,eAAe,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;gBAC5F,iBAAiB,CAAC,GAAG,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;gBAC9E,+BAA+B;YACjC,CAAC;iBAAM,IAAI,aAAa,KAAK,YAAY,IAAI,SAAS,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gBACnF,MAAM,SAAS,GAAG,IAAA,yCAAmB,EAAC,SAAS,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;gBACpE,iBAAiB,CAAC,GAAG,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;gBAC5E,+BAA+B;YACjC,CAAC;iBAAM,IAAI,aAAa,KAAK,YAAY,EAAE,CAAC;gBAC1C,MAAM,eAAe,GAAoB,EAAE,GAAG,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACrI,MAAM,KAAK,GAAG,IAAA,iCAAe,EAAC,SAA2C,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;gBAClH,IAAI,eAAe,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;oBAC5C,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC;gBAClB,CAAC;gBACD,iBAAiB,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;YAC/E,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,WAAW,GAAG,UAAU,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;aAAM,IAAI,UAAU,KAAK,uBAAuB,EAAE,CAAC;YAClD,iDAAiD;YACjD,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBAC7C,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;oBACjB,GAAG,CAAC,OAAO,GAAG,IAAI,iBAAS,CAAC,OAAO,EAAE,CAAC;gBACxC,CAAC;gBACD,kCAAkC;gBAClC,MAAM,SAAS,GAAG,IAAA,wBAAgB,EAAC,mBAAmB,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;gBACjG,MAAM,QAAQ,GAAG,IAAA,8CAAyB,EAAC,SAAS,EAAE,SAAS,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;gBACpF,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnD,CAAC;iBAAM,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBACpD,qCAAqC;gBACrC,MAAM,WAAW,GAAG,IAAA,wBAAgB,EAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;gBACnE,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,gBAAgB,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBAC7E,CAAC;gBACD,sBAAsB;YACxB,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,iBAAiB,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC9E,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,eAAe,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC;YACxE,IAAI,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9E,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,YAAY,GAAG,IAAI,iBAAS,CAAC,YAAY,CAAC;oBACxC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAgB;oBAC/B,IAAI,EAAE,OAAO,CAAC,CAAC,CAAgB;oBAC/B,aAAa,EAAE,MAAM;oBACrB,WAAW,EAAE,aAAa;iBAC3B,CAAC,CAAC;gBACH,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACvC,CAAC;YAED,IAAI,QAAQ,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/E,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,QAAQ,GAAG,IAAI,iBAAS,CAAC,QAAQ,CAAC;oBAChC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAgB;oBAC/B,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;oBAChB,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG;oBACrC,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,IAAI,iBAAS,CAAC,KAAK,CAAC;wBACzB,IAAI,EAAE,SAAS;wBACf,KAAK,EAAE,QAAQ;qBAChB,CAAC;iBACH,CAAC,CAAC;gBACH,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxC,CAAC;YAED,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC;gBAC/B,kDAAkD;gBAClD,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;oBAC7C,mCAAmC;oBACnC,MAAM,SAAS,GAAG,IAAA,wBAAgB,EAAC,mBAAmB,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,kBAAkB,CAAC,CAAC;oBAClG,MAAM,QAAQ,GAAG,IAAA,+CAA0B,EAAC,SAAS,EAAE,SAAS,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;oBACrF,QAAQ,IAAI,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAChD,CAAC;qBAAM,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;oBACpD,sCAAsC;oBACtC,MAAM,WAAW,GAAG,IAAA,wBAAgB,EAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;oBACpE,IAAI,CAAC,WAAW,EAAE,CAAC;wBACjB,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,kBAAkB,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;oBAC/E,CAAC;oBACD,sBAAsB;gBACxB,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,mBAAmB,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBAChF,CAAC;YACH,CAAC;iBAAM,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;gBAClC,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAqB,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,KAAK,0BAA0B,EAAE,CAAC;oBACzG,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;oBACxC,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBAC7E,IAAI,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAC5C,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;wBACxD,CAAC;wBACD,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;wBACjD,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,GAAG,IAAA,uCAAc,EAAC,GAAG,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;wBAC9E,QAAQ,CAAC,KAAK,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;wBACnD,QAAQ,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBACrC,CAAC;yBAAM,CAAC;wBACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,+BAA+B,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;oBAC5F,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,+BAA+B,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBAC5F,CAAC;YACH,CAAC;iBAAM,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;gBAClC,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAqB,IAAI,SAAS,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;oBACvF,MAAM,SAAS,GAAG,IAAA,wBAAgB,EAAC,mBAAmB,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;oBACtF,MAAM,UAAU,GAAoB,EAAE,GAAG,UAAU,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;oBAC1E,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,KAAK,qBAAqB,CAAC,CAAC,CAAC,IAAA,oCAAc,EAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAA,qDAA+B,EAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;oBAC7K,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;oBAChC,MAAM,kBAAkB,GAAG,EAAE,CAAC,CAAC,uBAAuB;oBACtD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC/C,IAAI,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;4BAC/B,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;wBACtC,CAAC;6BAAM,CAAC;4BACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,6BAA6B,UAAU,EAAE,CAAC,CAAC;wBAC3E,CAAC;oBACH,CAAC;oBAED,2BAA2B;oBAC3B,SAAS,cAAc,CAAC,KAAuB,EAAE,YAAsB;wBACrE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;4BAAE,OAAO,IAAI,CAAC;wBAC3C,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;wBACnC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;wBACzD,IAAI,CAAC,SAAS;4BAAE,OAAO,IAAI,CAAC;wBAC5B,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;4BAAE,OAAO,SAAS,CAAC;wBAChD,OAAO,cAAc,CAAC,SAAS,CAAC,QAAQ,IAAI,EAAE,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBACzE,CAAC;oBAED,IAAI,cAAgC,CAAC;oBACrC,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACpC,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC;oBAClC,CAAC;yBAAM,CAAC;wBACN,IAAI,UAAU,GAAG,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;wBAC5D,IAAI,CAAC,UAAU;4BAAE,UAAU,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;wBACjF,IAAI,CAAC,UAAU;4BAAE,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,WAAW,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBAE5F,iCAAiC;wBACjC,MAAM,aAAa,GAAG,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAY,EAAE,EAAE;4BAChE,OAAO,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;wBACrD,CAAC,CAAC,CAAC;wBAEH,IAAI,CAAC,aAAa,EAAE,CAAC;4BACnB,OAAO,IAAA,kBAAU,EACf,EAAE,GAAG,UAAU,EAAE,aAAa,EAAE,EAAE,EAAE,EACpC,QAAQ,UAAU,CAAC,IAAI,gDAAgD,CACxE,CAAC;wBACJ,CAAC;wBACD,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAC;oBACvC,CAAC;oBAED,yDAAyD;oBACzD,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAChD,KAAK,IAAI,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;4BACpD,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;4BAC9D,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;4BAClH,IAAI,YAAY,EAAE,IAAI,EAAE,CAAC;gCACvB,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;gCAC9B,IAAI,CAAC,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC;gCACxC,MAAM;4BACR,CAAC;wBACH,CAAC;oBACH,CAAC;oBAED,IAAI,IAAI,EAAE,CAAC;wBACT,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC5E,IAAI,YAAY,EAAE,CAAC;4BACjB,IAAI,aAAK,EAAE,CAAC;gCACV,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,GAAG,UAAU,YAAY,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;4BACtE,CAAC;iCAAM,CAAC,CAAC,uBAAuB;gCAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC;gCACrB,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;4BACpC,CAAC;wBACH,CAAC;6BAAM,CAAC;4BACN,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;4BAC1B,YAAY,CAAC,CAAC,GAAG,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;wBACpE,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,IAAI,SAAS,CAAC,IAAI,KAAK,qBAAqB,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,KAAK,0BAA0B,EAAE,CAAC;gBAChH,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;gBACxC,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC7E,IAAI,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC5C,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;oBACxD,CAAC;oBACD,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;oBACjD,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,GAAG,IAAA,uCAAc,EAAC,GAAG,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;oBAC9E,QAAQ,CAAC,KAAK,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;oBACnD,QAAQ,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACrC,CAAC;qBAAM,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;oBACzF,IAAI,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC5C,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;oBACxD,CAAC;oBACD,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;oBACjD,MAAM,QAAQ,GAAG,IAAA,uCAAc,EAAC,GAAG,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;oBACxD,QAAQ,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACrC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,WAAW,GAAG,UAAU,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,IAAA,kBAAU,EAAC,UAAU,EAAE,WAAW,GAAG,UAAU,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC;AA/WD,wCA+WC"}

package/out/natural/parser/parseNaturalTSXView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseNaturalTSXView.d.ts","sourceRoot":"","sources":["../../../src/natural/parser/parseNaturalTSXView.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAgE,KAAK,mBAAmB,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AA8FpL,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,cAAc,GAAG,SAAS,CAAC,WAAW,GAAG,IAAI,CAiYlI;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,mBAAmB,EAAE,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,OAAO,EAAE,mBAAmB,kBAmItI;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAAE,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,OAAO,EAAE,eAAe,kBAkCjJ;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,kBA0B/E"}
+{"version":3,"file":"parseNaturalTSXView.d.ts","sourceRoot":"","sources":["../../../src/natural/parser/parseNaturalTSXView.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAkF,KAAK,mBAAmB,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AA2CtM,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,cAAc,GAAG,SAAS,CAAC,WAAW,GAAG,IAAI,CA6ZlI;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,mBAAmB,EAAE,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,OAAO,EAAE,mBAAmB,kBAwItI;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAAE,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,OAAO,EAAE,eAAe,kBAiEjJ;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,kBAuB/E"}

package/out/natural/parser/parseNaturalTSXView.js

@@ -38,9 +38,11 @@ const transform2Logic_1 = require("../transforms/transform2Logic");
 const transform2ValidationRule_1 = require("../transforms/transform2ValidationRule");
 const transformThemeAndStyle_1 = require("../transforms/transformThemeAndStyle");
 const checkViewElement_2 = require("../transforms/checker/checkViewElement");
+const transform2Directory_1 = require("../transforms/utils/transform2Directory");
+const normalizeNode_1 = require("../transforms/utils/normalizeNode");
 function transform2EventLogics(node, eventName, options) {
     if (node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression') {
-        const logic = (0, transform2Logic_1.transform2Logic)(node, eventName, { ...options, logicType: 'event_logic' });
+        const logic = (0, transform2Logic_1.transform2Logic)((0, normalizeNode_1.normalizeArrowFunctionBody)(node), eventName, undefined, { ...options, logicType: 'event_logic' });
         logic.params = [];
         return [logic];
     }
@@ -49,7 +51,7 @@ function transform2EventLogics(node, eventName, options) {
             const args = node.arguments;
             return args.map((node) => {
                 if (node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression') {
-                    const logic = (0, transform2Logic_1.transform2Logic)(node, eventName, { ...options, logicType: 'event_logic' });
+                    const logic = (0, transform2Logic_1.transform2Logic)((0, normalizeNode_1.normalizeArrowFunctionBody)(node), eventName, undefined, { ...options, logicType: 'event_logic' });
                     logic.params = [];
                     return logic;
                 }
@@ -69,54 +71,22 @@ function transform2EventLogics(node, eventName, options) {
         return (0, utils_1.throwError)(options, '事件逻辑参数不正确', node);
     }
 }
-function handleDirectoryItem(directoryItem, nextStatement, view, options, callerName) {
-    let definitionItem = null;
-    if (nextStatement.type === 'VariableDeclaration') {
-        // 处理变量声明
-        const variables = (0, transform2Variable_1.transform2Variables)(nextStatement, options);
-        definitionItem = variables[0];
-    }
-    else if (nextStatement.type === 'FunctionDeclaration') {
-        // 处理函数/逻辑声明
-        definitionItem = (0, transform2Logic_1.transform2Logic)(nextStatement, undefined, { ...options, logicType: 'view_logic' });
-    }
-    else {
-        const functionName = callerName || '$Variable';
-        (0, utils_1.throwError)(options, `${functionName} 后面必须跟变量声明或函数声明`, nextStatement);
-    }
-    if (!definitionItem)
-        return null;
-    const referredConcept = definitionItem.concept;
-    const definition = new utils_1.naslTypes.ReferredDefinition({
-        referredConcept,
-        name: definitionItem.name,
-        namespace: '',
-    });
-    // 将定义添加到目录
-    if (!view.directories?.find((dir) => dir.name === directoryItem.name)) {
-        directoryItem.definitions = [definition];
-        view.addDirectory(directoryItem);
-    }
-    else {
-        const existingDirectory = view.directories.find((dir) => dir.name === directoryItem.name);
-        const hasDefinition = existingDirectory?.definitions.find((def) => def.name === definitionItem.name && def.referredConcept === referredConcept);
-        if (!hasDefinition) {
-            existingDirectory?.definitions.push(definition);
-        }
-    }
-    // 将实际的变量或逻辑添加到视图
-    if (referredConcept === 'Variable') {
-        view.addVariable(definitionItem);
-    }
-    else if (referredConcept === 'Logic') {
-        view.addLogic(definitionItem);
-    }
-    return definitionItem;
-}
 function transformJSXElement2ViewElement(node, options) {
     const el = node.openingElement;
-    if (el.name.type === 'JSXIdentifier') {
-        let tag = (0, lodash_1.kebabCase)(el.name.name);
+    const parentNode = node;
+    if (el.name.type === 'JSXIdentifier' || el.name.type === 'JSXMemberExpression') {
+        let name = '';
+        if (el.name.type === 'JSXMemberExpression') {
+            const fullPath = (0, utils_1.generate)(el.name).code;
+            if (!/^uilibs\.[^.]+\.components\.[^.]+$/.test(fullPath)) {
+                return (0, utils_1.throwError)(options, `扩展组件需书写完整命名空间，格式为 uilibs.依赖名.components.组件名（示例：uilibs.cw_chart_js.components.CwChartJs），实际得到：${fullPath}`, node);
+            }
+            name = el.name.property.name;
+        }
+        else {
+            name = el.name.name;
+        }
+        let tag = (0, lodash_1.kebabCase)(name);
         if (['span', 'div'].includes(tag)) {
             return (0, utils_1.throwError)(options, `不支持的JSX子元素 ${tag}, 请使用 ElFlex`, node);
         }
@@ -128,12 +98,15 @@ function transformJSXElement2ViewElement(node, options) {
             tag = 'el-form-input';
         if (tag === 'el-form-item')
             tag = 'el-form-input';
-        const rootOnlyComponents = ['el-dialog', 'el-message-box', 'el-drawer', 'el-message', 'el-notification', 'el-popover'];
+        if (el.name.type === 'JSXIdentifier' && !tag.startsWith('el-')) {
+            return (0, utils_1.throwError)(options, `基础组件无需命名空间，扩展组件需书写完整命名空间（示例：uilibs.cw_chart_js.components.CwChartJs），你可能忘记写扩展组件的命名空间了`, node);
+        }
+        const rootOnlyComponents = ['el-dialog', 'el-message-box', 'el-drawer', 'el-message', 'el-notification'];
         if (rootOnlyComponents.includes(tag) && !options.isRootLevel) {
-            return (0, utils_1.throwError)(options, `${el.name.name} 组件只能出现在 View 的顶层, 例如:
+            return (0, utils_1.throwError)(options, `${name} 组件只能出现在 View 的顶层, 例如:
 return <>
   ...
-  <${el.name.name} .../>
+  <${name} .../>
 </>
 `, node);
         }
@@ -149,6 +122,15 @@ return <>
         function addJSXChild(node, slotTarget = 'default', slotScope = '') {
             // 子元素调用时，统一设置为非根层级
             const childOptions = { ...options, parentTag: tag, isRootLevel: false };
+            // 如果是 default slot，检查父组件是否支持 slotDefault
+            if (slotTarget === 'default' && options.componentsMap) {
+                const componentInfo = options.componentsMap.get(tag);
+                if (componentInfo && !componentInfo.slotsMap.get('slotDefault')) {
+                    const supportedSlots = componentInfo.component?.slotNames;
+                    const slotTip = supportedSlots ? `，当前支持的插槽有：${supportedSlots}` : '';
+                    return (0, utils_1.throwError)(options, `组件 ${name} 不支持子组件（无 slotDefault 插槽）${slotTip}`, parentNode);
+                }
+            }
             if (node.type === 'JSXElement') {
                 if (slotTarget === 'default' && !slotScope) {
                     const child = transformJSXElement2ViewElement(node, childOptions);
@@ -337,9 +319,13 @@ return <>
                     else {
                         return (0, utils_1.throwError)(options, '不支持的指令类型', attr.value.type, attr.value);
                     }
-                    if (directiveName !== 'for') {
+                    const directiveWhitelist = ['if', 'auth'];
+                    if (directiveWhitelist.includes(directiveName)) {
                         viewElement.addBindDirective(directive);
                     }
+                    else {
+                        return (0, utils_1.throwError)(options, '不支持的指令名称', directiveName);
+                    }
                 }
                 else if (attrName.startsWith(eventPrefix)) {
                     const eventName = (0, lodash_1.kebabCase)(attrName.slice(eventPrefix.length));
@@ -414,13 +400,13 @@ return <>
                         bindAttribute.value = attr.value.value;
                     }
                     else if (attr.value.type === 'JSXExpressionContainer') {
-                        if (attr.value.expression.type === 'BooleanLiteral') {
+                        if (attr.value.expression.type === 'BooleanLiteral' || attr.value.expression.type === 'NumericLiteral') {
                             bindAttribute.type = 'static';
                             bindAttribute.value = attr.value.expression.value;
                         }
-                        else if (attr.value.expression.type === 'NumericLiteral' || attr.value.expression.type === 'NullLiteral' || attr.value.expression.type === 'StringLiteral') {
-                            bindAttribute.type = 'static';
-                            bindAttribute.value = (0, utils_1.generate)(attr.value.expression).code;
+                        else if (attr.value.expression.type === 'StringLiteral') {
+                            bindAttribute.type = 'string';
+                            bindAttribute.value = attr.value.expression.value;
                         }
                         else {
                             let expr = attr.value.expression;
@@ -565,6 +551,9 @@ function transform2View(func, decorator, options) {
                 'isIndex',
             ]), {}, options);
             Object.assign(view, viewObj);
+            if (view.auth) {
+                view.bindRoles = ["DEV-AdminRole"];
+            }
             view.crumb = new utils_1.naslTypes.StaticString({
                 value: viewObj.crumb,
             });
@@ -617,18 +606,37 @@ function transform2View(func, decorator, options) {
     for (let index = 0; index < statements.length; index++) {
         const statement = statements[index];
         if (statement.type === 'VariableDeclaration') {
-            const variables = (0, transform2Variable_1.transform2Variables)(statement, { ...options });
-            variables.forEach((variable) => {
-                view.addVariable(variable);
-            });
+            // 检查前一个语句是否是 $Variable 装饰器调用
+            const decorator = (0, utils_1.getDecoratorCall)(statements[index - 1], 'Variable');
+            const variables = (0, transform2Variable_1.transform2Variables)(statement, decorator, { ...options });
+            if (decorator) {
+                // 有装饰器时需要处理 directory
+                variables.forEach((variable) => {
+                    (0, transform2Directory_1.handleDirectory)(view, variable, 'View');
+                    view.addVariable(variable);
+                });
+            }
+            else {
+                // 无装饰器：直接添加
+                variables.forEach((variable) => {
+                    view.addVariable(variable);
+                });
+            }
         }
         else if (statement.type === 'FunctionDeclaration') {
-            const logic = (0, transform2Logic_1.transform2Logic)(statement, undefined, { ...options, logicType: 'view_logic' });
+            // 检查前一个语句是否是 $Logic 装饰器调用
+            const decorator = (0, utils_1.getDecoratorCall)(statements[index - 1], 'Logic');
+            const logic = (0, transform2Logic_1.transform2Logic)(statement, undefined, decorator, { ...options, logicType: 'view_logic' });
+            if (decorator) {
+                // 有装饰器时需要处理 directory
+                (0, transform2Directory_1.handleDirectory)(view, logic, 'View');
+            }
             view.addLogic(logic);
         }
         else if (statement.type === 'ExpressionStatement' && statement.expression.type === 'CallExpression') {
             const expression = statement.expression;
             if (expression.callee.type == 'Identifier' && expression.callee.name.startsWith('on')) {
+                // 处理事件绑定
                 const eventName = (0, lodash_1.kebabCase)(expression.callee.name.slice(2));
                 const logicName = eventName.replace(/-/g, '');
                 const arg = expression.arguments[0];
@@ -639,29 +647,8 @@ function transform2View(func, decorator, options) {
                 view.addBindEvent(bindEvent);
             }
             else if (expression.callee.type == 'Identifier' && expression.callee.name.startsWith('$')) {
-                if (expression?.arguments[0]?.type === 'ObjectExpression') {
-                    const { properties } = expression?.arguments[0];
-                    const directoryNode = properties.find((item) => item.key?.name === 'directory');
-                    if (directoryNode) {
-                        const directoryItem = (0, transform2LogicItem_1.transformNode2Directory)(directoryNode);
-                        if (directoryItem) {
-                            const nextStatement = statements[index + 1];
-                            if (nextStatement) {
-                                const definitionItem = handleDirectoryItem(directoryItem, nextStatement, view, { ...options }, expression.callee.name);
-                                if (definitionItem) {
-                                    // 跳过下一个语句，因为已经处理过了
-                                    index++;
-                                }
-                            }
-                        }
-                        else {
-                            return (0, utils_1.throwError)(options, '不支持的定义类型', directoryNode);
-                        }
-                    }
-                }
-                else {
-                    return (0, utils_1.throwError)(options, '不支持的表达式', statement);
-                }
+                // 装饰器调用语句本身，跳过（会在处理下一个语句时一起处理）
+                continue;
             }
             else {
                 return (0, utils_1.throwError)(options, '不支持的表达式', statement);
@@ -717,6 +704,41 @@ function transformTSDeclareFunction2View(func, decorator, options) {
             const _param = (0, transform2Param_1.transform2Param)(param, { ...options, transformType: 'attr' });
             _param && view.params.push(_param);
         }
+        else if (param.type === 'ObjectPattern') {
+            const propertyMap = {};
+            param.properties.forEach((property) => {
+                if (property.type === 'ObjectProperty') {
+                    if (property.value.type === 'Identifier') {
+                        propertyMap[property.value.name] = {
+                            type: 'AssignmentPattern',
+                            left: property.value,
+                            right: undefined,
+                        };
+                    }
+                    else if (property.value.type === 'AssignmentPattern') {
+                        propertyMap[property.value.left.name] = property.value;
+                    }
+                    else {
+                        return (0, utils_1.throwError)(options, '不支持的参数类型', property.value.type, property.value);
+                    }
+                }
+            });
+            const type = param.typeAnnotation?.typeAnnotation;
+            if (!type)
+                return (0, utils_1.throwError)(options, 'param 没有对应的类型', param);
+            type.members.forEach((member) => {
+                if (member.type === 'TSPropertySignature') {
+                    const name = member.key.name;
+                    if (propertyMap[name]) {
+                        propertyMap[name].left.typeAnnotation = member.typeAnnotation;
+                    }
+                }
+            });
+            Object.values(propertyMap).forEach((property) => {
+                const _param = (0, transform2Param_1.transform2Param)(property, { ...options, transformType: 'attr' });
+                _param && view.params.push(_param);
+            });
+        }
     });
     return view;
 }
@@ -727,16 +749,13 @@ function parseNaturalTSXView(tsCode, options) {
         presets: [require('@babel/preset-typescript')],
     });
     let func;
-    let funcIndex = 0;
     let decorator;
     root.program.body.forEach((statement, index) => {
         if (statement.type === 'ExportNamedDeclaration' && statement.declaration.type === 'FunctionDeclaration') {
             func = statement.declaration;
-            funcIndex = index;
         }
         else if (statement.type === 'FunctionDeclaration') {
             func = statement;
-            funcIndex = index;
         }
         const prevStatement = root.program.body[index - 1];
         if (prevStatement?.type === 'ExpressionStatement' && prevStatement.expression.type === 'CallExpression' && prevStatement.expression.callee.type === 'Identifier' && prevStatement.expression.callee.name === '$View') {