@lcap/nasl-language-server-core 4.3.0-rc.4 → 4.4.0-beta.1

package/out/checker.d.ts

@@ -42,7 +42,7 @@ export declare function createErrorDiagnoser(context: DiagnoseContext): {
     clearDiagnostics: (node?: SyntaxNode) => void;
     getDiagnostics: (node: SyntaxNode) => NodeDiagnosticsMap | undefined;
     getAllDiagnostics: () => FileDiagnosticsMap;
-    getDebugDiagnostics: () => {
+    getDebugDiagnostics: (normalize?: boolean) => {
         message: string;
         severity: string;
         nodePath: string;

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,EAU2G,GAAG,EAMxH,QAAQ,EAET,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;AAMpE,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;AAMF,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;AA4OF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAyxIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAuBb,UAAU;;;iBAW3B,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBA1yIF,UAAU,WAAW,MAAM,YAAY,YAAY;EA40IzE;AAGD,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,EAU2G,GAAG,EAMxH,QAAQ,EAET,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;AAOpE,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;AAMF,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;AA4OF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCA01IpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAyBb,UAAU;;;iBAW3B,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBA72IF,UAAU,WAAW,MAAM,YAAY,YAAY;EAg5IzE;AAGD,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

@@ -10,6 +10,7 @@ const sem_diag_1 = require("./typer/sem-diag");
 const type_predicate_1 = require("./typer/type-predicate");
 const type_manager_1 = require("./typer/type-manager");
 const service_2 = require("@lcap/nasl-concepts/service");
+const asserts_1 = require("@lcap/nasl-concepts/asserts");
 const lodash_1 = require("lodash");
 const helper_1 = require("./typer/helper");
 const semantic_rules_1 = require("./semantic-rules");
@@ -3518,7 +3519,26 @@ function createErrorDiagnoser(context) {
                 });
             }
         }
-        return env.getType(node);
+        const ty = env.getType(node);
+        function isConcreteTy(ty) {
+            if (ty.typeKind === 'generic') {
+                return !!ty.typeArguments?.every(x => isConcreteTy(x));
+            }
+            else if (ty.typeKind === 'primitive') {
+                return ty !== type_manager_1.naslAnyTy;
+            }
+            return true;
+        }
+        if (!ty || !isConcreteTy(ty)) {
+            const p = node.parentNode;
+            if (p && p.name === 'dataSourceWatch' && (0, asserts_1.isBindAttribute)(p)) {
+                // 🐮
+            }
+            else {
+                error(node, `NewList 无法推导类型，请添加手动类型标注或添加元素`);
+            }
+        }
+        return ty;
     }
     /**
      * 检查 Map 构造器
@@ -3607,6 +3627,37 @@ function createErrorDiagnoser(context) {
         if (ensureNodeKeyExists(node, 'right')) {
             yield* checkNode(node.right);
         }
+        // 检查左侧为 Decimal，右侧为 Union<Decimal, Integer> 的情况
+        const leftType = env.getType(node.left);
+        const rightType = env.getType(node.right);
+        // 检查左右两侧同为匿名结构体时，对每个字段，都增加 Decimal 和 Union<Decimal, Long> 的检查
+        if (leftType && rightType && (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) {
+                    if (leftProp.typeAnnotation && rightProp.typeAnnotation) {
+                        if ((0, type_predicate_1.isDecimalTy)(leftProp.typeAnnotation) && (0, type_predicate_1.isDecimalUnionLongTy)(rightProp.typeAnnotation)) {
+                            error(node, `赋值：字段 ${leftProp.name} 类型不匹配，不能将 ${(0, type_manager_1.showUserLevelType)(rightProp.typeAnnotation)} 赋值给 ${(0, type_manager_1.showUserLevelType)(leftProp.typeAnnotation)} 类型。`);
+                        }
+                    }
+                }
+            }
+        }
+        if (leftType && rightType) {
+            // 检查左侧是否为 Decimal
+            const isLeftDecimal = leftType.typeKind === 'primitive' && leftType.typeName === 'Decimal';
+            // 检查右侧是否为 Union<Decimal, Long> 或 Union<Long, Decimal>
+            if (isLeftDecimal && rightType.typeKind === 'union' && rightType.typeArguments) {
+                const typeArgs = rightType.typeArguments;
+                const hasDecimal = typeArgs.some((arg) => arg.typeKind === 'primitive' && arg.typeName === 'Decimal');
+                const hasLong = typeArgs.some((arg) => arg.typeKind === 'primitive' && arg.typeName === 'Long');
+                if (hasDecimal && hasLong && typeArgs.length === 2) {
+                    error(node, `赋值：类型不匹配，不能将联合类型 ${(0, type_manager_1.showUserLevelType)(rightType)} 赋值给 ${(0, type_manager_1.showUserLevelType)(leftType)} 类型。`);
+                }
+            }
+        }
     }
     /**
      * 检查 批量赋值语句
@@ -3851,7 +3902,9 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkQueryOrderByExpression(node) {
-        yield* checkNode(node.orderElement);
+        if (ensureNodeKeyExists(node, 'orderElement')) {
+            yield* checkNode(node.orderElement);
+        }
         yield* checkPlayground(node.orderElementPlayground);
     }
     /**
@@ -3880,13 +3933,20 @@ function createErrorDiagnoser(context) {
     function* checkOqlQueryComponent(node) {
         ensureNodeKeyExists(node, 'code');
         yield* checkSameSource(node);
-        // 自动推导情况
-        const typeAnnotation = env.getType(node);
-        if (!node.typeAnnotation && typeAnnotation) {
-            if (typeAnnotation.typeName === 'List' && typeAnnotation.typeKind === 'generic') {
-                const { typeArguments = [] } = typeAnnotation;
-                if (typeArguments.length && typeArguments[0].isComplexType()) {
-                    error(node, `SQL查询：返回类型不支持单个复杂类型 ${typeArguments[0].headTitle}。`);
+        if (node.typeAnnotation) { // 手动设置
+            const IMPOSSIBLE_TOPLEVEL_TYPES = ['Map'];
+            if (IMPOSSIBLE_TOPLEVEL_TYPES.includes(node.typeAnnotation.typeName || "")) {
+                error(node, `SQL查询：返回类型不支持设置为 ${node.typeAnnotation.headTitle}。`);
+            }
+        }
+        else { // 自动推导
+            const typeAnnotation = env.getType(node);
+            if (typeAnnotation) {
+                if (typeAnnotation.typeName === 'List' && typeAnnotation.typeKind === 'generic') {
+                    const { typeArguments = [] } = typeAnnotation;
+                    if (typeArguments.length && typeArguments[0].isComplexType()) {
+                        error(node, `SQL查询：返回类型不支持单个复杂类型 ${typeArguments[0].headTitle}。`);
+                    }
                 }
             }
         }
@@ -4482,6 +4542,8 @@ function createErrorDiagnoser(context) {
                 }
             });
             diagnostics?.clear();
+            // 删除 diagnosticMap 中的 key，避免内存泄漏和冗余报错
+            diagnosticMap.delete(node);
         }
         else {
             diagnosticMap.clear();
@@ -4497,7 +4559,7 @@ function createErrorDiagnoser(context) {
     function getAllDiagnostics() {
         return diagnosticMap;
     }
-    function getDebugDiagnostics() {
+    function getDebugDiagnostics(normalize = false) {
         const diagMap = getAllDiagnostics();
         const flattenedDiags = [];
         diagMap.forEach((item) => {
@@ -4506,11 +4568,12 @@ function createErrorDiagnoser(context) {
                     if (!x.message || !x.severity) {
                         return [];
                     }
+                    const msg = normalize ? (0, lodash_1.sortBy)(x.message).join('') : x.message;
                     return [{
-                            message: x.message,
+                            message: msg,
                             severity: x.severity,
                             nodePath: node.nodePath,
-                            nodeConcept: node.concept,
+                            nodeConcept: node.concept
                         }];
                 });
             })));