@lcap/nasl-language-server-core 4.3.0-rc.4 → 4.3.0-rc.6

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;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;oCA2zIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAuBb,UAAU;;;iBAW3B,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBA50IF,UAAU,WAAW,MAAM,YAAY,YAAY;EA+2IzE;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

@@ -1970,6 +1970,17 @@ function createErrorDiagnoser(context) {
      */
     function* checkBusinessComponent(node) {
         env.enterScope(node);
+        if (node.params?.length) {
+            yield* checkParams(node.params);
+            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.params, function* (node) {
+                yield* checkNode(node);
+            });
+        }
+        if (node.variables?.length) {
+            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.variables, function* (node) {
+                yield* checkNode(node);
+            });
+        }
         // 组件元素
         if (node.elements?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.elements, function* (node) {
@@ -2929,15 +2940,27 @@ function createErrorDiagnoser(context) {
         }
         return type;
         function checkListSort(nd) {
+            const parTy = env.getType(nd.arguments?.[0]);
+            let paramType = '未知类型';
+            if (parTy?.typeName === 'List') {
+                paramType = (0, type_manager_1.showUserLevelType)(parTy.typeArguments?.[0] || type_manager_1.naslAnyTy);
+            }
+            const expectTy = `{ by: (item: ${paramType}) => 未知类型, asc: 布尔值 }`;
             for (let i = 1; i < nd.arguments.length; i++) {
                 const expr = nd.arguments[i].expression;
                 let resTy;
                 if (expr?.concept === 'AnonymousFunction') {
                     resTy = env.getType(expr.body);
+                    if (!nasl_concepts_1.asserts.isNewComposite(expr.body)) {
+                        error(nd.arguments[i], (0, sem_diag_1.mkIncompatibleTyErr)(env, env.getType(expr) || type_manager_1.naslAnyTy, expectTy));
+                    }
                 }
                 else if (expr?.concept === 'SubLogic') {
                     resTy = env.getType(expr.returns?.[0]);
                 }
+                else {
+                    error(nd.arguments[i], (0, sem_diag_1.mkIncompatibleTyErr)(env, env.getType(expr) || type_manager_1.naslAnyTy, expectTy));
+                }
                 const byTy = resTy?.properties?.find((prop) => prop.name === 'by')?.typeAnnotation;
                 if (byTy?.typeKind === 'union') {
                     // 这里使用 node.arguments[i] 则无红框，猜测是 ListSort 的特殊交互导致的问题
@@ -3851,7 +3874,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 +3905,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}。`);
+                    }
                 }
             }
         }
@@ -4173,6 +4205,8 @@ function createErrorDiagnoser(context) {
                     return yield* checkBackendVariable(node);
                 case 'Param':
                     return yield* checkParam(node);
+                case 'ParamWithGroup':
+                    return yield* checkParam(node);
                 case 'Return':
                     return yield* checkReturn(node);
                 case 'DefaultValue':
@@ -4497,7 +4531,7 @@ function createErrorDiagnoser(context) {
     function getAllDiagnostics() {
         return diagnosticMap;
     }
-    function getDebugDiagnostics() {
+    function getDebugDiagnostics(normalize = false) {
         const diagMap = getAllDiagnostics();
         const flattenedDiags = [];
         diagMap.forEach((item) => {
@@ -4506,11 +4540,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
                         }];
                 });
             })));