@lcap/nasl-language-server-core 4.5.0-beta.6 → 4.5.0-beta.7

package/out/checker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../src/checker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAC4C,QAAQ,EAC5B,IAAI,EAQ+E,GAAG,EAMxH,QAAQ,EAGT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACgE,cAAc,EAGpF,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAK5C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAapE,oBAAY,QAAQ;IAClB,IAAI,YAAY;IAChB,KAAK,UAAU;CAChB;AAED,MAAM,MAAM,UAAU,GAAG,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAEnE,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAOF,MAAM,MAAM,kBAAkB,GAAG,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;AAEpE,MAAM,MAAM,kBAAkB,GAAG,GAAG,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAMrE,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqBF,KAAK,eAAe,GAAG;IACrB,GAAG,EAAE,GAAG,CAAC;IACT,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,yBAAyB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAmPF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAsqKpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAyBb,UAAU;;iDAtvFY,GAAG,KAAG,IAAI;;iBAiwFjD,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBAjrKF,UAAU,WAAW,MAAM,YAAY,YAAY;sCAs5D/B,IAAI,GAAG,QAAQ;2CA8zGxC,UAAU,gBACV,CAAC,YAAY,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,gBAC/C,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,qBACvB,MAAM,EAAE,oBACT,CAAC,YAAY,EAAE,UAAU,KAAK,UAAU,EAAE,KAC3D,kBAAkB,GAAG,IAAI;EAwF7B;AAqED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACrC,mBAAmB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACvC,qBAAqB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;CAC1C;AAMD,eAAO,MAAM,6BAA6B,aAC9B,UAAU,+DAGnB,MAAM,gBAAgB,CAyCxB,CAAC;AAMF,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../src/checker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAC4C,QAAQ,EAC5B,IAAI,EAQ+E,GAAG,EAMxH,QAAQ,EAGT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACgE,cAAc,EAGpF,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAK5C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAcpE,oBAAY,QAAQ;IAClB,IAAI,YAAY;IAChB,KAAK,UAAU;CAChB;AAED,MAAM,MAAM,UAAU,GAAG,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAEnE,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAOF,MAAM,MAAM,kBAAkB,GAAG,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;AAEpE,MAAM,MAAM,kBAAkB,GAAG,GAAG,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAMrE,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqBF,KAAK,eAAe,GAAG;IACrB,GAAG,EAAE,GAAG,CAAC;IACT,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,yBAAyB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAmPF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAmxKpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAyBb,UAAU;;iDAxzFY,GAAG,KAAG,IAAI;;iBAm0FjD,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBA9xKF,UAAU,WAAW,MAAM,YAAY,YAAY;sCAq6D/B,IAAI,GAAG,QAAQ;2CA45GxC,UAAU,gBACV,CAAC,YAAY,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,gBAC/C,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,qBACvB,MAAM,EAAE,oBACT,CAAC,YAAY,EAAE,UAAU,KAAK,UAAU,EAAE,KAC3D,kBAAkB,GAAG,IAAI;EAwF7B;AAqED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACrC,mBAAmB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACvC,qBAAqB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;CAC1C;AAMD,eAAO,MAAM,6BAA6B,aAC9B,UAAU,+DAGnB,MAAM,gBAAgB,CAyCxB,CAAC;AAMF,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/out/checker.js

@@ -16,6 +16,7 @@ const helper_1 = require("./typer/helper");
 const semantic_rules_1 = require("./semantic-rules");
 const view_element_field_attrs_1 = require("@lcap/nasl-concepts/view-element-field-attrs");
 const reference_manager_1 = require("./reference-manager/reference-manager");
+const scope_boundary_1 = require("./utils/scope-boundary");
 const regeExp = new nasl_utils_1.ExpressionLexer();
 regeExp.profile = nasl_utils_1.profiles.js;
 var Severity;
@@ -649,6 +650,16 @@ function createErrorDiagnoser(context) {
             memberExpression = currentNode;
             currentNode = currentNode.parentNode;
         }
+        // 检查变量是否因作用域边界隔离而不可见（而非真正未定义）
+        if (env.isBlockedByScopeBoundary(name)) {
+            const bindAttr = node.getAncestor('BindAttribute');
+            const viewElement = node.getAncestor('ViewElement');
+            const compTitle = (viewElement && (0, scope_boundary_1.getCompTitle)(viewElement.tag)) ?? '当前组件';
+            const attrName = bindAttr?.name ?? '';
+            const attrHint = attrName ? `的"${attrName}"属性` : '';
+            error(memberExpression ?? node, `"${name}" 在此处不可用：${compTitle}${attrHint}不允许访问父级作用域中的变量`);
+            return;
+        }
         let message = `所选择的内容 ${name} 未定义`;
         const scope = memberExpression?.constructor?.nodeTitle;
         if (scope) {
@@ -2405,16 +2416,43 @@ function createErrorDiagnoser(context) {
         // HACK u-table-view-expander 的BindAttribute节点存在脏的item，因此降级
         const isTempWarningMode = node.parentNode?.concept === 'ViewElement' &&
             node.parentNode?.tag === 'u-table-view-expander';
-        if (isTempWarningMode) {
-            inPlayground++;
-            yield* checkNode(node.expression);
-            inPlayground--;
+        // 判断当前属性是否为作用域边界属性（需要隔离父级 View 变量）
+        const parentTag = node.parentNode?.tag;
+        const isAttrScopeBoundary = !!(parentTag && (0, scope_boundary_1.isScopeBoundaryAttr)(parentTag, node.name));
+        // 判断当前属性是否要求表达式必须为服务端 CallLogic
+        const backendLogicInfo = parentTag ? (0, scope_boundary_1.getBackendLogicAttrInfo)(parentTag, node.name) : undefined;
+        // 表达式是否不符合"必须为 CallLogic"的约束（仅在有该约束时才为 true）
+        const isNotCallLogicViolation = !!(backendLogicInfo && !(0, asserts_1.isCallLogic)(node.expression));
+        if (isNotCallLogicViolation) {
+            error(node, `${backendLogicInfo.compTitle}的${backendLogicInfo.attrTitle}必须是调用逻辑`);
+        }
+        if (isAttrScopeBoundary) {
+            env.pushScopeBoundary();
         }
-        else {
-            yield* checkNode(node.expression);
+        try {
+            if (isTempWarningMode || isNotCallLogicViolation) {
+                // isTempWarningMode：已知节点存在脏数据，降级为警告
+                // isNotCallLogicViolation：表达式类型不符合约束，深度检查意义不大，
+                //   降级为警告以避免产生无关噪音诊断
+                inPlayground++;
+                try {
+                    yield* checkNode(node.expression);
+                }
+                finally {
+                    inPlayground--;
+                }
+            }
+            else {
+                yield* checkNode(node.expression);
+            }
+            yield* checkPlayground(node.playground);
+            yield* checkBindExpressions(node);
+        }
+        finally {
+            if (isAttrScopeBoundary) {
+                env.popScopeBoundary();
+            }
         }
-        yield* checkPlayground(node.playground);
-        yield* checkBindExpressions(node);
         // 检查数据源上的字段属性是否在类型上存在
         // 判断条件：
         // 1. 属性的 setter 是 PropertySelectSetter（从组件定义的 ViewComponentDeclaration 中获取）
@@ -3521,19 +3559,79 @@ function createErrorDiagnoser(context) {
             const authLogic = node.getAncestor('AuthLogic');
             error(authLogic, `鉴权逻辑 ${authLogic.name} 不允许调用 服务端逻辑`);
         }
-        const viewElement = node.getAncestor('ViewElement');
-        if (viewElement && viewElement.tag === 'u-download' && node.parentNode.name === 'dataSource') {
-            const args = ['page', 'size'];
-            const values = [];
-            node.arguments && node.arguments.forEach((arg) => {
-                const expression = arg.expression;
-                if (expression && expression.concept === 'Identifier' && expression.namespace === 'backend') {
-                    values.push(expression.name);
+        // 检查处于 requireBackendLogic 配置属性内的 CallLogic：
+        // 1. 必须调用服务端逻辑
+        // 2. 必须为 page 和 size 指定服务端入参，且不能重复
+        const callLogicViewElement = node.getAncestor('ViewElement');
+        const callLogicBindAttrName = node.parentNode?.name;
+        const callLogicAttrInfo = (callLogicViewElement && callLogicBindAttrName)
+            ? (0, scope_boundary_1.getBackendLogicAttrInfo)(callLogicViewElement.tag, callLogicBindAttrName)
+            : undefined;
+        if (callLogicAttrInfo) {
+            if (!node.calleeNamespace?.startsWith('app.logics')) {
+                error(node, `${callLogicAttrInfo.compTitle}的${callLogicAttrInfo.attrTitle}作用域下必须调用服务端逻辑`);
+                // 已报错，跳过后续 page/size 参数检查，但仍走正常返回路径
+                return env.getType(node);
+            }
+            const ref = env.resolveRef(node);
+            const REQUIRED_PARAMS = ['page', 'size'];
+            const definedParams = ref?.params ?? [];
+            let hasError = false;
+            // ── 校验 1：逻辑定义本身必须声明 page / size 参数，且类型必须为 Long ─
+            const definedParamNames = definedParams.map(p => p?.name);
+            const missingDefParams = REQUIRED_PARAMS.filter(p => !definedParamNames.includes(p));
+            if (missingDefParams.length > 0) {
+                error(node, `${callLogicAttrInfo.compTitle}的${callLogicAttrInfo.attrTitle}调用的逻辑必须声明 ${missingDefParams.map(p => `"${p}"`).join(' 和 ')} 参数`);
+                hasError = true;
+            }
+            // 类型检查：已声明的 page/size 参数类型必须是 Long
+            for (const paramName of REQUIRED_PARAMS) {
+                const param = definedParams.find(p => p?.name === paramName);
+                if (!param)
+                    continue; // 缺失已由上方报错
+                if (param.typeAnnotation?.typeName !== 'Long') {
+                    error(node, `${callLogicAttrInfo.compTitle}的${callLogicAttrInfo.attrTitle}调用的逻辑中 "${paramName}" 参数类型必须是 整数，当前类型为 "${param.typeAnnotation?.typeName ?? '未知'}"`);
+                    hasError = true;
                 }
-            });
-            if (args.length !== values.length || new Set(values).size !== values.length) {
-                error(node, '下载组件必须为page和size指定入参,且不能重复');
             }
+            // 校验 1 有错则定义层本身不符合要求，无需继续检查调用侧
+            if (hasError)
+                return env.getType(node);
+            // ── 校验 2：调用侧必须在对应位置通过服务端入参传入 page / size ──────
+            // 按定义位置逐一检查：arg[i].expression 必须是 namespace=backend、name=paramName 的 Identifier
+            for (const paramName of REQUIRED_PARAMS) {
+                const paramIdx = definedParamNames.indexOf(paramName);
+                if (paramIdx === -1)
+                    continue; // 定义层已报错，跳过
+                const arg = node.arguments?.[paramIdx];
+                const expression = arg?.expression;
+                const isValid = expression?.concept === 'Identifier'
+                    && expression.namespace === 'backend'
+                    && expression.name === paramName;
+                if (isValid)
+                    continue;
+                if (!arg || !expression) {
+                    error(node, `${callLogicAttrInfo.compTitle}的${callLogicAttrInfo.attrTitle}缺少 "${paramName}" 参数的传入`);
+                    hasError = true;
+                }
+                else if (expression.namespace !== 'backend' || expression.concept !== 'Identifier') {
+                    if (isAIStrictMode) {
+                        error(node, `${callLogicAttrInfo.compTitle}的${callLogicAttrInfo.attrTitle}的 "${paramName}" 参数必须传入服务端入参（如 $self.currentPage / $self.pageSize），不允许使用数字字面量或其他变量`);
+                    }
+                    else {
+                        error(node, `${callLogicAttrInfo.compTitle}的${callLogicAttrInfo.attrTitle}的 "${paramName}" 参数必须通过"指定分页参数"设置，不允许使用数字字面量（如 0、1000）或其他变量`);
+                    }
+                    hasError = true;
+                }
+                else {
+                    // namespace=backend 但 name 对不上
+                    error(node, `${callLogicAttrInfo.compTitle}的${callLogicAttrInfo.attrTitle}的 "${paramName}" 参数传入了错误的服务端入参 "${expression.name}"，期望传入 "${paramName}"`);
+                    hasError = true;
+                }
+            }
+            // 校验 2 有错则调用侧不符合要求，无需继续后续作用域校验
+            if (hasError)
+                return env.getType(node);
         }
         const map = {
             frontend: {
@@ -4289,6 +4387,13 @@ function createErrorDiagnoser(context) {
         }
         return type;
     }
+    function* checkNewStructure(node) {
+        if (node.properties?.length) {
+            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.properties, function* (property, index) {
+                yield* checkNode(property);
+            });
+        }
+    }
     /**
      * 获取正则表达式错误的中文消息
      */
@@ -5183,6 +5288,8 @@ function createErrorDiagnoser(context) {
                     return yield* checkNewMap(node);
                 case 'NewComposite':
                     return yield* checkNewComposite(node);
+                case 'NewStructure':
+                    return yield* checkNewStructure(node);
                 case 'NewRegex':
                     return checkNewRegex(node);
                 case 'Assignment':