@lcap/nasl-language-server-core 4.0.0-beta.6 → 4.0.0-beta.8

package/out/checker.d.ts

@@ -1,14 +1,12 @@
 import type { SyntaxNode, App, BaseNode } from '@lcap/nasl-concepts';
 import { TypeAnnotation } from '@lcap/nasl-concepts';
 import { type SemEnv } from './typer';
+import { Diagnostic as NaslTypeDiagnostic } from '@lcap/nasl-types';
 export declare enum Severity {
     WARN = "warning",
     ERROR = "error"
 }
-export interface Diagnostic {
-    severity?: Severity;
-    message?: string;
-}
+export type Diagnostic = NaslTypeDiagnostic.Diagnostic<SyntaxNode>;
 type ErrorContext = {
     severity?: Severity;
     [key: string]: any;
@@ -41,8 +39,9 @@ export declare function createErrorDiagnoser(context: DiagnoseContext): {
     checkNode: (node: SyntaxNode | undefined) => Generator<TypeAnnotation | {
         typeKind: string;
     } | undefined, any, unknown>;
-    clearDiagnostics: (node: SyntaxNode) => void;
-    getDiagnostics: (node: SyntaxNode) => NodeDiagnosticsMap | FileDiagnosticsMap | undefined;
+    clearDiagnostics: (node?: SyntaxNode) => void;
+    getDiagnostics: (node: SyntaxNode) => NodeDiagnosticsMap | undefined;
+    getAllDiagnostics: () => FileDiagnosticsMap;
     error: (node: SyntaxNode, message: string, context?: ErrorContext) => void;
 };
 export interface DiagnosticRecord {
@@ -56,5 +55,6 @@ export interface DiagnosticRecord {
     suggestionDiagnostics: Array<Diagnostic>;
 }
 export declare const transformDiagnosticsToRecords: (fileNode: SyntaxNode, diagnostics: NodeDiagnosticsMap) => Array<DiagnosticRecord>;
+export type ErrorDiagnoser = ReturnType<typeof createErrorDiagnoser>;
 export {};
 //# sourceMappingURL=checker.d.ts.map

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;AAQ7B,OAAO,EAA4B,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAKhE,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;AAiQF;;;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,aAAc,UAAU,sCAAoC,MAAM,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;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;AAEpE,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;oCAwiIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BAsCf,UAAU;2BAuBb,UAAU;;kBAthInB,UAAU,WAAW,MAAM,YAAY,YAAY;EAwiIzE;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

@@ -4,6 +4,7 @@ exports.transformDiagnosticsToRecords = exports.createErrorDiagnoser = exports.S
 const decimal_js_1 = require("decimal.js");
 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 type_predicate_1 = require("./typer/type-predicate");
@@ -91,7 +92,7 @@ function getExpressionNodeName(concept) {
 function isDescendant(node, rangeNode) {
     let currentNode = node;
     while (currentNode) {
-        if (currentNode === rangeNode) {
+        if (toRaw(currentNode) === toRaw(rangeNode)) {
             return true;
         }
         currentNode = currentNode.parentNode;
@@ -561,15 +562,6 @@ function createErrorDiagnoser(context) {
             message = 'SQL查询：语句不能为空。';
         }
         else if (nasl_concepts_1.asserts.isDestination(node)) {
-            chkDest(node);
-        }
-        else if (node.concept === 'Argument' && nasl_concepts_1.asserts.isDestination(node.parentNode)) {
-            chkDest(node.parentNode);
-        }
-        if (message) {
-            error(node, message);
-        }
-        function chkDest(node) {
             const processElement = node.getAncestor('ProcessElementV2') ?? node.getAncestor('ProcessElement');
             if (processElement) {
                 message = '任务未关联页面';
@@ -579,6 +571,9 @@ function createErrorDiagnoser(context) {
                 message = '';
             }
         }
+        if (message) {
+            error(node, message);
+        }
     }
     /**
      * 创建一个未找到定义的实体的错误信息
@@ -677,7 +672,7 @@ function createErrorDiagnoser(context) {
                         // 允许在当前业务组件中访问
                         businessComponent,
                     ],
-                    errMsg: `“${node.name}”是私有的，只能在“${businessComponent.name}”中访问。`,
+                    errMsg: `"${node.name}"是私有的，只能在"${businessComponent.name}"中访问。`,
                 } : null;
             case 'ConfigProperty':
                 return node.isPrivate ? {
@@ -1100,8 +1095,8 @@ function createErrorDiagnoser(context) {
             const status = getStatusOfSharedApp(node);
             if (status) {
                 const msgMap = {
-                    update: `共享数据 ${node.name} 已在“${node.provider}应用”中更新，请同步更新`,
-                    delete: `共享数据 ${node.name} 已在“${node.provider}应用”中被删除，请同步删除`,
+                    update: `共享数据 ${node.name} 已在"${node.provider}应用"中更新，请同步更新`,
+                    delete: `共享数据 ${node.name} 已在"${node.provider}应用"中被删除，请同步删除`,
                 };
                 error(node, msgMap[status], {
                     severity: Severity.WARN,
@@ -1273,7 +1268,6 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkDataSource(node) {
-        dbType = node.dataSourceSqlType;
         if (node.entities?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.entities, function* (node) {
                 yield* checkNode(node);
@@ -1297,13 +1291,13 @@ function createErrorDiagnoser(context) {
                 });
             }
         }
-        dbType = '';
     }
     /**
      * 检查 实体
      * @param node
      */
     function* checkEntity(node) {
+        dbType = node.getAncestor('DataSource')?.dataSourceSqlType;
         if (node.properties?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.properties, function* (node) {
                 yield* checkNode(node);
@@ -1321,6 +1315,7 @@ function createErrorDiagnoser(context) {
         if (node.sharedScope?.scope === 'specifiedRange' && !node.sharedScope?.specifiedRange?.length) {
             error(node, '共享范围为指定应用时，必须指定共享应用');
         }
+        dbType = '';
     }
     function getCurrentDataBaseType(node) {
         if (node.databaseTypeAnnotation) {
@@ -1600,6 +1595,7 @@ function createErrorDiagnoser(context) {
                             typeAnnotationErrorDetail.errorPos.min = errorMsg;
                         }
                     }
+                    typeAnnotation.tsErrorDetail = undefined;
                     if (Object.keys(typeAnnotationErrorDetail.errorPos).length) {
                         typeAnnotation.tsErrorDetail = typeAnnotationErrorDetail;
                     }
@@ -2447,7 +2443,7 @@ function createErrorDiagnoser(context) {
         }
     }
     function* checkMsgTriggerLauncher(node) {
-        console.log(node);
+        nasl_utils_1.isDebugMode && console.log(node);
     }
     /**
      * 检查 角色
@@ -2736,19 +2732,27 @@ function createErrorDiagnoser(context) {
         }
         yield* checkVoidCallUsedAsStatement(node);
         const ref = env.resolvedCallInfo.get(node) ?? env.resolveRef(node);
+        const typeUnresolved = ref.ret
+            ? (0, type_manager_1.hasUnresolvedTyInCallInfo)(ref) // 其他
+            : (0, type_predicate_1.isUnResolvedTy)(ref); // 前端页面，TODO： 需要统一处理
         // Handle the new FunctionDefinition structure
-        if (ref?.params && !(0, type_manager_1.hasUnresolvedTyInCallInfo)(ref)) {
+        if (ref?.params && !typeUnresolved) {
             // It's a FunctionDefinition object
             yield* checkScopeOfUse(node, ref);
             yield* checkCallExpressionParameters(node, ref);
         }
-        else if (ref && !(0, type_predicate_1.isUnResolvedTy)(ref)) {
+        else if (ref && !typeUnresolved) {
             // 检查使用范围
             yield* checkScopeOfUse(node, ref);
             yield* checkCallExpressionParameters(node, ref);
         }
         else {
-            error(node, `找不到${getExpressionNodeName(node.concept)} ${node.calleeName}。`);
+            if (ref.depLibName) {
+                error(node, `找不到依赖库 ${ref.depLibName} 上的 ${getExpressionNodeName(node.concept)} ${node.calleeName}。`);
+            }
+            else {
+                error(node, `找不到${getExpressionNodeName(node.concept)} ${node.calleeName}。`);
+            }
             return errorType;
         }
         switch (node.concept) {
@@ -2823,6 +2827,9 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkCallLogic(node) {
+        // HACK 取这个字段会修复 arguments 中 keyword 为空的问题
+        // 参考：流程回退接口报错500 http://projectmanage.netease-official.lcap.163yun.com/dashboard/BugDetail?id=3127862102823424
+        node.completeArguments;
         if (inAuthLogic && node.calleeNamespace?.startsWith?.('app.logics')) {
             const authLogic = node.getAncestor('AuthLogic');
             error(authLogic, `鉴权逻辑 ${authLogic.name} 不允许调用 服务端逻辑`);
@@ -3483,7 +3490,7 @@ function createErrorDiagnoser(context) {
         if (ensureNodeKeyExists(node, 'members')) {
             if (node.members?.length) {
                 yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.members, function* (node) {
-                    yield* checkNode(node);
+                    yield* checkNode(toRaw(node));
                 });
             }
         }
@@ -3497,6 +3504,7 @@ function createErrorDiagnoser(context) {
         if (ensureNodeKeyExists(node, 'viewName')) {
             if (node.arguments?.length) {
                 yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.arguments, function* (node) {
+                    node.paramRequired = false;
                     yield* checkNode(node);
                 });
             }
@@ -3724,23 +3732,23 @@ function createErrorDiagnoser(context) {
     function* checkOqlQueryComponent(node) {
         ensureNodeKeyExists(node, 'code');
         yield* checkSameSource(node);
-        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}。`);
-                    }
+        // 自动推导情况
+        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}。`);
                 }
             }
         }
+        // 尝试加载错误
+        const errs = node.errorsFromTSServer;
+        if (errs) {
+            errs.forEach((e) => {
+                env.addDiagnosticsFor(e.message, node);
+            });
+        }
         return env.getType(node);
     }
     /**
@@ -3844,6 +3852,10 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkValidationRule(node) {
+        /**
+         * HACK: 从 toEmbeddedTS 中提取出补全参数 keyword 的逻辑。ValidationRule 的 Argument 的脏数据需要通过这个方法来修复。
+         */
+        node.fixArgumentsKeyword();
         // const ref: any = env.resolveRef(node);
         if (node.arguments?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.arguments, function* (node) {
@@ -3880,7 +3892,7 @@ function createErrorDiagnoser(context) {
         }
         // 元数据
         if (!metadataTypeEnable && node.typeNamespace?.endsWith('.metadataTypes')) {
-            error(node, '未启用元数据功能，请在“偏好设置”中启用元数据。');
+            error(node, '未启用元数据功能，请在"偏好设置"中启用元数据。');
         }
         if (node.typeArguments?.length) {
             // 有同名的
@@ -3934,6 +3946,8 @@ function createErrorDiagnoser(context) {
     function* checkVoidCallUsedAsStatement(node) {
         const parentNode = node.parentNode;
         const usedAsStatement = parentNode && (nasl_concepts_1.asserts.isLogic(parentNode) ||
+            // temp fix: should have been covered in `isLogic` by defining OverriddenLogic as a subclass of Logic in old ast
+            nasl_concepts_1.asserts.isOverriddenLogic(parentNode) ||
             nasl_concepts_1.asserts.isSubLogic(parentNode) ||
             nasl_concepts_1.asserts.isForEachStatement(parentNode) ||
             nasl_concepts_1.asserts.isWhileStatement(parentNode) ||
@@ -4196,8 +4210,8 @@ function createErrorDiagnoser(context) {
      * @returns 清理函数
      */
     function handleFileNode(node) {
-        // TODO: checkNodeIsFileModuleInIde 也慢，后续可以优化
-        const isFileModule = fileNodes.length ? (0, service_1.checkNodeIsFileModuleInIde)(node) : true;
+        // TODO: checkNodeIsFileModuleInIdeWithCache 也慢，后续可以优化
+        const isFileModule = fileNodes.length ? (0, file_node_cache_1.checkNodeIsFileModuleInIdeWithCache)(node) : true;
         if (isFileModule) {
             fileNodes.push(node);
             let diagnostics = diagnosticMap.get(node);
@@ -4273,9 +4287,9 @@ function createErrorDiagnoser(context) {
      * @returns
      */
     function getDiagnostics(node) {
-        if (node) {
-            return diagnosticMap.get(node);
-        }
+        return diagnosticMap.get(node);
+    }
+    function getAllDiagnostics() {
         return diagnosticMap;
     }
     return {
@@ -4285,6 +4299,7 @@ function createErrorDiagnoser(context) {
         checkNode,
         clearDiagnostics,
         getDiagnostics,
+        getAllDiagnostics,
         error,
     };
 }
@@ -4296,7 +4311,7 @@ const transformDiagnosticsToRecords = (fileNode, diagnostics) => {
         filePath = fileNode.concept !== 'App' ? fileNode.getEmbeddedFilePath() : undefined;
     }
     catch (err) {
-        console.log(err);
+        nasl_utils_1.isDebugMode && console.error(err);
     }
     const semanticDiagnostics = [];
     const suggestionDiagnostics = [];