@lcap/nasl-language-server-core 4.0.1-rc.1 → 4.0.1-rc.2

package/out/checker.d.ts

@@ -1,6 +1,6 @@
 import type { SyntaxNode, App, BaseNode } from '@lcap/nasl-concepts';
 import { TypeAnnotation } from '@lcap/nasl-concepts';
-import { type SemEnv } from './typer';
+import { type SemEnv } from './typer/typer';
 import { Diagnostic as NaslTypeDiagnostic } from '@lcap/nasl-types';
 export declare enum Severity {
     WARN = "warning",

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,EAU0F,GAAG,EAMvG,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACgE,cAAc,EAGpF,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAA4B,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAIhE,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAIpE,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;AAiQF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAmmIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAuBb,UAAU;;kBAvmInB,UAAU,WAAW,MAAM,YAAY,YAAY;EAynIzE;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;AAED,eAAO,MAAM,6BAA6B,aAAc,UAAU,sCAAoC,MAAM,gBAAgB,CAmC3H,CAAA;AAMD,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,EAU0F,GAAG,EAMvG,QAAQ,EACT,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;AAiQF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAunIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAuBb,UAAU;;kBA3nInB,UAAU,WAAW,MAAM,YAAY,YAAY;EA6oIzE;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;AAED,eAAO,MAAM,6BAA6B,aAAc,UAAU,sCAAoC,MAAM,gBAAgB,CAmC3H,CAAA;AAMD,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/out/checker.js

@@ -6,10 +6,11 @@ const nasl_concepts_1 = require("@lcap/nasl-concepts");
 const service_1 = require("@lcap/nasl-concepts/service");
 const file_node_cache_1 = require("./utils/file-node-cache");
 const nasl_utils_1 = require("@lcap/nasl-utils");
-const typer_1 = require("./typer");
+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 nasl_predicate_1 = require("./typer/nasl-predicate");
+const helper_1 = require("./typer/helper");
 var Severity;
 (function (Severity) {
     Severity["WARN"] = "warning";
@@ -333,7 +334,7 @@ function createErrorDiagnoser(context) {
                 currentNode = currentNode.parentNode;
             }
             const finalNode = memberExpression ?? node;
-            (0, typer_1.createOnPush)(diagnostics, finalNode, diagnostic);
+            (0, helper_1.createOnPush)(diagnostics, finalNode, diagnostic);
             finalNode.tsErrorDetail = diagnostic;
         }
         else { }
@@ -2816,6 +2817,9 @@ function createErrorDiagnoser(context) {
         if (node.calleeName === 'Clear' && type?.typeKind === 'union') {
             error(node, `传入类型错误，接收类型：非union类型`);
         }
+        if (node.calleeName === 'ListSort' || node.calleeName === 'ListSortAsync') {
+            checkListSort(node);
+        }
         if (node.typeArguments?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.typeArguments, function* (node) {
                 yield* checkNode(node);
@@ -2859,6 +2863,23 @@ function createErrorDiagnoser(context) {
             }
         }
         return type;
+        function checkListSort(nd) {
+            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);
+                }
+                else if (expr?.concept === 'SubLogic') {
+                    resTy = env.getType(expr.returns?.[0]);
+                }
+                const byTy = resTy?.properties?.find((prop) => prop.name === 'by')?.typeAnnotation;
+                if (byTy?.typeKind === 'union') {
+                    // 这里使用 node.arguments[i] 则无红框，猜测是 ListSort 的特殊交互导致的问题
+                    error(node, (0, sem_diag_1.mkIncompatibleTyErr)(env, byTy, '非 union 的基础类型：如字符串、整数、布尔等'));
+                }
+            }
+        }
     }
     /**
      * 检查 调用逻辑
@@ -3277,7 +3298,7 @@ function createErrorDiagnoser(context) {
                     /**
                      * 参考类型检查器的 {@link tpIdentifier}方法
                      */
-                    return typer_1.naslLongTy;
+                    return type_manager_1.naslLongTy;
                 }
                 else if (node.name === 'it') {
                     return env.getType(node);