@lcap/nasl-language-server-core 4.4.0-beta.4 → 4.4.0-beta.5

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;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;oCAy2IpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAyBb,UAAU;;;iBAW3B,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBA53IF,UAAU,WAAW,MAAM,YAAY,YAAY;EA+5IzE;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;oCA47IpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAyBb,UAAU;;;iBAW3B,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBA/8IF,UAAU,WAAW,MAAM,YAAY,YAAY;EAk/IzE;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,8 +10,8 @@ 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 asserts_1 = require("@lcap/nasl-concepts/asserts");
 const helper_1 = require("./typer/helper");
 const semantic_rules_1 = require("./semantic-rules");
 var Severity;
@@ -321,7 +321,30 @@ function createErrorDiagnoser(context) {
             }
             const finalNode = memberExpression ?? node;
             (0, helper_1.createOnPush)(diagnostics, finalNode, diagnostic);
-            finalNode.tsErrorDetail = diagnostic;
+            const aggregationFields = {
+                assignmentLine: 'assignmentLines',
+            };
+            const nodeDiagnostics = diagnostics.get(finalNode);
+            if (nodeDiagnostics && nodeDiagnostics.length > 0) {
+                // 构建最终的 tsErrorDetail，合并所有上下文信息
+                const aggregatedContext = {};
+                // 对每个需要聚合的字段进行收集
+                for (const [singleField, arrayField] of Object.entries(aggregationFields)) {
+                    const values = nodeDiagnostics
+                        .map(d => d[singleField])
+                        .filter((val) => val !== undefined);
+                    if (values.length > 0) {
+                        aggregatedContext[arrayField] = values;
+                    }
+                }
+                finalNode.tsErrorDetail = {
+                    ...diagnostic,
+                    ...aggregatedContext,
+                };
+            }
+            else {
+                finalNode.tsErrorDetail = diagnostic;
+            }
         }
         else { }
     }
@@ -2941,15 +2964,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 的特殊交互导致的问题
@@ -3031,6 +3066,7 @@ function createErrorDiagnoser(context) {
      */
     function* checkIfStatement(node) {
         if (ensureNodeKeyExists(node, 'test')) {
+            yield* rejectNullLiteral(node.test);
             yield* checkNode(node.test);
         }
         // then
@@ -3046,12 +3082,32 @@ function createErrorDiagnoser(context) {
             });
         }
     }
+    /**
+     * 检查 条件表达式
+     * @param node
+     */
+    function* checkIfExpression(node) {
+        if (ensureNodeKeyExists(node, 'condition')) {
+            yield* rejectNullLiteral(node.condition);
+            yield* checkNode(node.condition);
+        }
+        // then
+        if (ensureNodeKeyExists(node, 'consequent')) {
+            yield* checkNode(node.consequent);
+        }
+        // else
+        if (ensureNodeKeyExists(node, 'alternate')) {
+            yield* checkNode(node.alternate);
+        }
+        return env.getType(node);
+    }
     /**
      * 检查 匹配
      * @param node
      */
     function* checkMatch(node) {
         if (ensureNodeKeyExists(node, 'expression')) {
+            yield* rejectNullLiteral(node.expression);
             yield* checkNode(node.expression);
         }
         if (node.cases?.length) {
@@ -3350,6 +3406,7 @@ function createErrorDiagnoser(context) {
      */
     function* checkWhileStatement(node) {
         if (ensureNodeKeyExists(node, 'test')) {
+            yield* rejectNullLiteral(node.test);
             yield* checkNode(node.test);
         }
         if (node.body?.length) {
@@ -3469,6 +3526,11 @@ function createErrorDiagnoser(context) {
         if (typeof node.value !== 'string') {
             error(node, '字符串');
         }
+        const MAX_LENGTH = 2 ** 16;
+        if (node.value.length >= MAX_LENGTH) {
+            // 插值内部的字符串过长时要报错在插值节点上有红框
+            error(node.parentNode?.concept === 'StringInterpolation' ? node.parentNode : node, `存在过长文本，当前长度：${node.value.length}，最大长度：${MAX_LENGTH}。建议使用变量拆分文本后再拼接。`);
+        }
         return env.getType(node);
     }
     /**
@@ -4003,10 +4065,17 @@ function createErrorDiagnoser(context) {
      */
     function* checkBinaryExpression(node) {
         yield* semantic_rules_1.ExtraSemanticRules.rejectFileTypes(node, env, error);
+        const isCandidate = ['+', '-', '*', '/', '%', '>', '<', '>=', '<='].includes(node.operator);
         if (ensureNodeKeyExists(node, 'left')) {
+            if (isCandidate) {
+                yield* rejectNullLiteral(node.left);
+            }
             yield* checkNode(node.left);
         }
         if (ensureNodeKeyExists(node, 'right')) {
+            if (isCandidate) {
+                yield* rejectNullLiteral(node.right);
+            }
             yield* checkNode(node.right);
         }
         return env.getType(node);
@@ -4019,6 +4088,7 @@ function createErrorDiagnoser(context) {
             error(node, '表达式不能为空！');
         }
         yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.expressions, function* (node) {
+            yield* rejectNullLiteral(node);
             yield* checkNode(node);
         });
         return env.getType(node);
@@ -4208,6 +4278,15 @@ function createErrorDiagnoser(context) {
             error(node, `无返回值的${node?.constructor?.nodeTitle}${node.calleeName} 不能在${parentNode?.constructor?.nodeTitle}中作为表达式使用。`);
         }
     }
+    /**
+     * 检查 不允许使用 null 字面量
+     * @param node
+     */
+    function* rejectNullLiteral(node) {
+        if (node.concept === 'NullLiteral') {
+            error(node, `此处不允许使用 null`);
+        }
+    }
     function* dispatchNode(node) {
         try {
             // 调用表达式
@@ -4354,6 +4433,8 @@ function createErrorDiagnoser(context) {
                     return yield* checkBlock(node);
                 case 'IfStatement':
                     return yield* checkIfStatement(node);
+                case 'IfExpression':
+                    return yield* checkIfExpression(node);
                 case 'Match':
                     return yield* checkMatch(node);
                 case 'MatchCase':