@lcap/nasl-language-server-core 4.4.1-rc.1 → 4.5.0-beta.1

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;AAYpE,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;oCAowKpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAyBb,UAAU;;iDAl2FY,GAAG,KAAG,IAAI;;iBA62FjD,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBAjxKF,UAAU,WAAW,MAAM,YAAY,YAAY;sCA04D/B,IAAI,GAAG,QAAQ;2CA06GxC,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;AAYpE,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;oCAgoKpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAyBb,UAAU;;iDAztFY,GAAG,KAAG,IAAI;;iBAouFjD,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBA7oKF,UAAU,WAAW,MAAM,YAAY,YAAY;sCA+4D/B,IAAI,GAAG,QAAQ;2CAiyGxC,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

@@ -257,7 +257,7 @@ function createErrorDiagnoser(context) {
     let env = context.env;
     let isDebug = context.debug;
     // 严格模式
-    let isStrictMode = context.isStrictMode;
+    let isAIStrictMode = context.isAIStrictMode;
     // 引用管理器
     let referenceManager = env.refMgr;
     // 检查共享数据是否有更新
@@ -792,24 +792,27 @@ function createErrorDiagnoser(context) {
         return false;
     }
     /**
-     * 获取 ViewElement 的数据源类型（T 或 T1）
-     * 参考 util.js 中的 getDataTypeOfViewElement 实现
+     * 获取 ViewElement 的数据源类型
+     * 基于 __ViewElementTV 中存储的 role === 'dataItem' 查找，优先返回有自有数据源的 dataItem。
      */
     function getDataSourceTypeAnnotation(viewElement) {
-        // 向上查找定义了数据源类型的祖先组件
         let currentNode = viewElement;
         let depth = 0;
         const maxSearchDepth = 5;
         while (currentNode?.concept === 'ViewElement' && depth <= maxSearchDepth) {
-            // 使用 __ViewElementTV 获取类型，与 IDE 前端 getDataTypeOfViewElement 保持一致
-            if (currentNode.__TypeAnnotation && currentNode.__ViewElementTV?.length) {
-                // 先查找 T1（动态列），若无再查找 T（普通数据源组件）
-                const t1 = currentNode.__ViewElementTV.find((x) => x.rawName === 'T1');
-                if (t1?.renamed)
-                    return t1.renamed;
-                const t = currentNode.__ViewElementTV.find((x) => x.rawName === 'T');
-                if (t?.renamed)
-                    return t.renamed;
+            if (currentNode.__ViewElementTV?.length) {
+                // 优先查找有自有数据源的 dataItem（如动态列的 T1）
+                for (const tv of currentNode.__ViewElementTV) {
+                    if (tv.role === 'dataItem' && tv.hasOwnDataSource && tv.renamed) {
+                        return tv.renamed;
+                    }
+                }
+                // 兜底查找无自有数据源的 dataItem（如子组件继承的 T）
+                for (const tv of currentNode.__ViewElementTV) {
+                    if (tv.role === 'dataItem' && tv.renamed) {
+                        return tv.renamed;
+                    }
+                }
             }
             currentNode = currentNode.parentNode;
             depth++;
@@ -899,7 +902,7 @@ function createErrorDiagnoser(context) {
                 continue;
             }
             // 严格模式非必填也需要有Argument占位
-            if (isStrictMode || !isNonRequiredParam(param)) {
+            if (isAIStrictMode || !isNonRequiredParam(param)) {
                 minArgsCount++; // 如果参数有默认值，则跳过
             }
         }
@@ -1018,7 +1021,7 @@ function createErrorDiagnoser(context) {
         }
         else if (argsLen < minArgsCount) {
             let msg = `传入参数的个数 ${argsLen} 与 ${getExpressionNodeName(node.concept)} 定义的参数个数 ${paramsLen} 不符。`;
-            if (isStrictMode) {
+            if (isAIStrictMode) {
                 msg += `可选参数和默认值参数必须用 undefined 占位`;
             }
             error(node, msg);
@@ -1777,7 +1780,7 @@ function createErrorDiagnoser(context) {
                                 const decimalPlaces = value?.split('.')[1]?.length || 0;
                                 if (decimalPlaces > +scale) {
                                     error(node, `实体字段${node.name}默认值的小数位数不能大于设置的小数位数${scale}，否则将会按照小数位数自动截断`, {
-                                        severity: isStrictMode ? Severity.ERROR : Severity.WARN,
+                                        severity: isAIStrictMode ? Severity.ERROR : Severity.WARN,
                                     });
                                 }
                             }
@@ -4313,97 +4316,6 @@ function createErrorDiagnoser(context) {
         }
         return env.getType(node);
     }
-    /**
-     * 递归检查赋值类型不兼容问题
-     * 检查左侧类型(Decimal/Long)是否与右侧联合类型(Union<Decimal, Long>)不兼容
-     * @param leftType 左侧类型
-     * @param rightType 右侧类型
-     * @param context 上下文信息，用于生成错误消息
-     * @param allowImplicitConversion 是否允许隐式类型转换（仅对直接的基础类型赋值允许，复杂类型内部不允许）
-     * @returns 所有类型不兼容的错误信息数组
-     */
-    function checkAssignmentTypeIncompatibility(leftType, rightType, context = {}, allowImplicitConversion = true) {
-        if (!leftType || !rightType)
-            return [];
-        const errors = [];
-        // 先检查 Decimal/Long vs Union<Decimal, Long> 的情况（需要先于其他检查）
-        // 这种情况应该报错，即使允许隐式转换
-        if (allowImplicitConversion) {
-            const isLeftPrimitive = leftType.typeKind === 'primitive';
-            const isLeftDecimalOrLong = isLeftPrimitive && (leftType.typeName === 'Decimal' || leftType.typeName === 'Long');
-            if (isLeftDecimalOrLong && (0, type_predicate_1.isDecimalUnionLongTy)(rightType)) {
-                const prefix = context.prefix || '赋值';
-                const fieldInfo = context.fieldName ? `字段 ${context.fieldName} ` : '';
-                errors.push(`${prefix}：${fieldInfo}类型不匹配，不能将 ${(0, type_manager_1.showUserLevelType)(rightType)} 赋值给 ${(0, type_manager_1.showUserLevelType)(leftType)} 类型。`);
-                return errors; // 找到基本类型错误后直接返回，不再检查嵌套
-            }
-        }
-        // 检查基础类型是否严格相等（不允许隐式转换）
-        const isLeftPrimitive = leftType.typeKind === 'primitive';
-        const isRightPrimitive = rightType.typeKind === 'primitive';
-        if (isLeftPrimitive && isRightPrimitive) {
-            // 如果不允许隐式转换，则要求类型完全相等
-            if (!allowImplicitConversion) {
-                if (leftType.typeName !== rightType.typeName || leftType.typeNamespace !== rightType.typeNamespace) {
-                    const prefix = context.prefix || '赋值';
-                    const fieldInfo = context.fieldName ? `字段 ${context.fieldName} ` : '';
-                    errors.push(`${prefix}：${fieldInfo}类型不匹配，不能将 ${(0, type_manager_1.showUserLevelType)(rightType)} 赋值给 ${(0, type_manager_1.showUserLevelType)(leftType)} 类型。`);
-                    return errors;
-                }
-                // 类型完全相等，没有错误，继续检查其他情况
-            }
-            else {
-                // 允许隐式转换的情况下，检查是否通过 isSubTy 检查（允许隐式转换）
-                if ((0, type_predicate_1.isSubTy)(env, rightType, leftType)) {
-                    // 类型兼容（允许隐式转换），没有错误，继续检查其他情况
-                }
-                // 如果 isSubTy 返回 false，继续检查其他不兼容的情况
-            }
-        }
-        // 2. 检查 List 类型（包括嵌套）：List<T> vs List<Union<...>>
-        if (leftType.typeKind === 'generic' &&
-            leftType.typeName === 'List' &&
-            rightType.typeKind === 'generic' &&
-            rightType.typeName === 'List' &&
-            leftType.typeArguments?.[0] &&
-            rightType.typeArguments?.[0]) {
-            // 递归检查 List 的元素类型，嵌套类型内部不允许隐式转换
-            return checkAssignmentTypeIncompatibility(leftType.typeArguments[0], rightType.typeArguments[0], { ...context, prefix: context.prefix || '赋值' }, false // 嵌套类型内部不允许隐式转换
-            );
-        }
-        // 3. 检查 Map 类型（包括嵌套）：Map<K, V> vs Map<K, Union<...>>
-        if (leftType.typeKind === 'generic' &&
-            leftType.typeName === 'Map' &&
-            rightType.typeKind === 'generic' &&
-            rightType.typeName === 'Map' &&
-            leftType.typeArguments?.length === 2 &&
-            rightType.typeArguments?.length === 2) {
-            // 递归检查 Map 的值类型（第二个类型参数），嵌套类型内部不允许隐式转换
-            const valueTypeErrors = checkAssignmentTypeIncompatibility(leftType.typeArguments[1], rightType.typeArguments[1], { ...context, prefix: context.prefix || '赋值' }, false // 嵌套类型内部不允许隐式转换
-            );
-            errors.push(...valueTypeErrors);
-            // 也检查键类型（第一个类型参数），嵌套类型内部不允许隐式转换
-            const keyTypeErrors = checkAssignmentTypeIncompatibility(leftType.typeArguments[0], rightType.typeArguments[0], { ...context, prefix: context.prefix || '赋值' }, false // 嵌套类型内部不允许隐式转换
-            );
-            errors.push(...keyTypeErrors);
-            return errors;
-        }
-        // 4. 检查匿名结构体：递归检查每个字段，收集所有字段的错误
-        if ((0, type_predicate_1.isAnonymousTy)(leftType) && (0, type_predicate_1.isAnonymousTy)(rightType)) {
-            const leftProps = leftType.properties ?? [];
-            const rightProps = rightType.properties ?? [];
-            for (const leftProp of leftProps) {
-                const rightProp = rightProps.find(p => p.name === leftProp.name);
-                if (rightProp && leftProp.typeAnnotation && rightProp.typeAnnotation) {
-                    // 匿名结构体的字段类型检查不允许隐式转换
-                    const fieldErrors = checkAssignmentTypeIncompatibility(leftProp.typeAnnotation, rightProp.typeAnnotation, { prefix: context.prefix || '赋值', fieldName: leftProp.name }, false // 复杂类型内部不允许隐式转换
-                    );
-                    errors.push(...fieldErrors); // 收集所有字段的错误，不提前返回
-                }
-            }
-        }
-        return errors;
-    }
     /**
      * 检查 赋值语句
      * @param node
@@ -4415,14 +4327,6 @@ function createErrorDiagnoser(context) {
         if (ensureNodeKeyExists(node, 'right')) {
             yield* checkNode(node.right);
         }
-        // 使用统一的类型兼容性检查
-        const leftType = env.getType(node.left);
-        const rightType = env.getType(node.right);
-        const errorMessages = checkAssignmentTypeIncompatibility(leftType, rightType);
-        // 报告所有错误
-        errorMessages.forEach(errorMessage => {
-            error(node, errorMessage);
-        });
         if (nasl_concepts_1.asserts.isMemberExpression(node.left)) {
             reportCurrentItemModification(node.left, node);
         }
@@ -4488,7 +4392,7 @@ function createErrorDiagnoser(context) {
                         error(args[i], '当前参数无效，不可用。');
                     }
                 }
-                if (isStrictMode) {
+                if (isAIStrictMode) {
                     yield* checkCallExpressionParameters(node, ref);
                 }
             }