@lcap/nasl-language-server-core 4.0.0-beta.1 → 4.0.0-beta.2

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;AAC7B,OAAO,EACgE,cAAc,EAGpF,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAA4C,MAAM,EAAE,MAAM,SAAS,CAAC;AAE3E,oBAAY,QAAQ;IAClB,IAAI,YAAY;IAChB,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,UAAU;IAEzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,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;AA+PF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCA0hIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;6BAsChB,UAAU;2BAuBZ,UAAU;kBAxgInB,UAAU,WAAW,MAAM,YAAY,YAAY;EAwhIzE;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,GAAI,UAAU,UAAU,EAAE,aAAa,kBAAkB,KAAG,KAAK,CAAC,gBAAgB,CAmC3H,CAAA"}
+{"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;AAC7B,OAAO,EACgE,cAAc,EAGpF,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAA4B,MAAM,EAAE,MAAM,SAAS,CAAC;AAI3D,oBAAY,QAAQ;IAClB,IAAI,YAAY;IAChB,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,UAAU;IAEzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,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;AAgQF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAwhIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;6BAsChB,UAAU;2BAuBZ,UAAU;kBAtgInB,UAAU,WAAW,MAAM,YAAY,YAAY;EAshIzE;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,GAAI,UAAU,UAAU,EAAE,aAAa,kBAAkB,KAAG,KAAK,CAAC,gBAAgB,CAmC3H,CAAA"}

package/out/checker.js

@@ -7,6 +7,8 @@ const nasl_concepts_1 = require("@lcap/nasl-concepts");
 const service_1 = require("@lcap/nasl-concepts/service");
 const nasl_utils_1 = require("@lcap/nasl-utils");
 const typer_1 = require("./typer");
+const type_predicate_1 = require("./typer/type-predicate");
+const type_manager_1 = require("./typer/type-manager");
 var Severity;
 (function (Severity) {
     Severity["WARN"] = "warning";
@@ -48,6 +50,7 @@ const isContinue = (node) => node.concept === 'Continue';
  * @param node
  */
 const fastIsControlFlowNode = (node) => isEnd(node) || isAbort(node) || isBreak(node) || isContinue(node);
+const isArgument = (node) => node.concept === 'Argument';
 /**
  * 是端类型下的参数
  * @param node
@@ -315,7 +318,7 @@ function createErrorDiagnoser(context) {
         if (diagnostics) {
             const diagnostic = {
                 message,
-                severity: inPlayground > 0 ? Severity.WARN : severity ?? Severity.ERROR,
+                severity: inPlayground > 0 ? Severity.WARN : (severity ?? Severity.ERROR),
                 ...others,
             };
             if (isDebug) {
@@ -694,14 +697,11 @@ function createErrorDiagnoser(context) {
      */
     function getMinArgsCount(params) {
         const paramLen = params?.length;
-        let minArgsCount = paramLen;
-        for (let i = paramLen - 1; i >= 0; i--) {
+        let minArgsCount = 0;
+        for (let i = 0; i < paramLen; i++) {
             const param = params[i];
-            if (isNonRequiredParam(param)) {
-                minArgsCount--;
-            }
-            else { // 如果参数有默认值，则跳过
-                break;
+            if (!isNonRequiredParam(param)) {
+                minArgsCount++; // 如果参数有默认值，则跳过
             }
         }
         return minArgsCount;
@@ -805,10 +805,12 @@ function createErrorDiagnoser(context) {
      * @param ref
      */
     function* checkCallExpressionParameters(node, ref) {
-        const params = nasl_concepts_1.asserts.isTypeAnnotation(ref) ? ref.typeArguments : ref.params;
+        // Handle both TypeAnnotation and FunctionDefinition formats
+        const params = ref.params ?? ref.typeArguments;
         const { arguments: args } = node;
         const paramsLen = params?.length || 0;
         const argsLen = args?.length || 0;
+        // For FunctionDefinition format, check spread and optional params
         const spreadParamIndex = params?.findIndex((param) => param.spread);
         const hasSpreadParam = spreadParamIndex !== -1;
         const minArgsCount = getMinArgsCount(params);
@@ -820,11 +822,12 @@ function createErrorDiagnoser(context) {
         }
         yield* (0, nasl_utils_1.wrapForEachToGenerator)(args, function* (arg, index) {
             const param = params?.[index];
-            const isParamRequired = !(hasSpreadParam && index > spreadParamIndex) && !isNonRequiredParam(param);
-            arg.paramRequired = isParamRequired;
             if (!param)
                 return;
-            const paramType = (nasl_concepts_1.asserts.isTypeAnnotation(param) ? param : env.getType(param));
+            const isParamRequired = !(hasSpreadParam && index > spreadParamIndex) && !isNonRequiredParam(param);
+            arg.paramRequired = isParamRequired;
+            const paramType = param.typeAnnotation ??
+                (nasl_concepts_1.asserts.isTypeAnnotation(param) ? param : env.getType(param));
             const argType = yield* checkNode(arg);
             if (paramType?.typeKind === 'function' && argType?.typeKind === 'function') {
                 const argTypeArgs = argType?.typeArguments || [];
@@ -2155,7 +2158,7 @@ function createErrorDiagnoser(context) {
             error(node, '流程暂不支持可变参数');
         }
         if (node.includeTypeArgs) {
-            error(node, '流程暂不支持范型参数');
+            error(node, '流程暂不支持泛型参数');
         }
         const unbindVariables = env.temporarilyBindVariables([
             ...(node?.params || []),
@@ -2269,7 +2272,7 @@ function createErrorDiagnoser(context) {
             error(node, '流程暂不支持可变参数');
         }
         if (node.includeTypeArgs) {
-            error(node, '流程暂不支持范型参数');
+            error(node, '流程暂不支持泛型参数');
         }
     }
     /**
@@ -2530,7 +2533,7 @@ function createErrorDiagnoser(context) {
                     if (logicReturns[0].name !== itfReturns[0].name) {
                         isSame = false;
                     }
-                    else if (!(logicReturns[0]?.typeAnnotation ?? env.getType(logicReturns[0]))?.isSame?.(itfReturns[0]?.typeAnnotation)) {
+                    else if (!(0, type_predicate_1.isEqualTy)(env, env.getType(logicReturns[0]), env.getType(itfReturns[0]))) {
                         isSame = false;
                     }
                 }
@@ -2733,8 +2736,14 @@ function createErrorDiagnoser(context) {
             return;
         }
         yield* checkVoidCallUsedAsStatement(node);
-        const ref = env.resolvedCallTypeBindings.get(node) ?? env.resolveRef(node);
-        if (ref && !(0, typer_1.isUnResolvedTy)(ref)) {
+        const ref = env.resolvedCallInfo.get(node) ?? env.resolveRef(node);
+        // Handle the new FunctionDefinition structure
+        if (ref?.params && !(0, type_manager_1.hasUnresolvedTyInCallInfo)(ref)) {
+            // It's a FunctionDefinition object
+            yield* checkScopeOfUse(node, ref);
+            yield* checkCallExpressionParameters(node, ref);
+        }
+        else if (ref && !(0, type_predicate_1.isUnResolvedTy)(ref)) {
             // 检查使用范围
             yield* checkScopeOfUse(node, ref);
             yield* checkCallExpressionParameters(node, ref);
@@ -3777,20 +3786,6 @@ function createErrorDiagnoser(context) {
         if (ensureNodeKeyExists(node, 'argument')) {
             yield* checkNode(node.argument);
         }
-        if (node.operator === 'isNull' && !!node.getAncestor('CallQueryComponent')) {
-            function useVariable(node) {
-                let res = false;
-                node.traverseStrictChildren((child) => {
-                    if (child.concept === 'Identifier' && child.namespace !== 'inner') {
-                        res = true;
-                    }
-                });
-                return res;
-            }
-            if (useVariable(node)) {
-                error(node, '空值匹配组件暂不支持使用变量');
-            }
-        }
         return env.getType(node);
     }
     /**
@@ -3949,7 +3944,7 @@ function createErrorDiagnoser(context) {
             nasl_concepts_1.asserts.isBlock(parentNode));
         const nodeType = env.getType(node);
         if (isUnresolvedType(nodeType) && !usedAsStatement) {
-            error(node, `无返回值的${node?.constructor?.nodeTitle}不能在${parentNode?.constructor?.nodeTitle}中作为表达式使用。`);
+            error(node, `无返回值的${node?.constructor?.nodeTitle}${node.calleeName} 不能在${parentNode?.constructor?.nodeTitle}中作为表达式使用。`);
         }
     }
     function* dispatchNode(node) {