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

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;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;oCAgiIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BAsCf,UAAU;2BAyBb,UAAU;;kBAhhInB,UAAU,WAAW,MAAM,YAAY,YAAY;EAkiIzE;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,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;
@@ -671,7 +672,7 @@ function createErrorDiagnoser(context) {
                         // 允许在当前业务组件中访问
                         businessComponent,
                     ],
-                    errMsg: `“${node.name}”是私有的，只能在“${businessComponent.name}”中访问。`,
+                    errMsg: `"${node.name}"是私有的，只能在"${businessComponent.name}"中访问。`,
                 } : null;
             case 'ConfigProperty':
                 return node.isPrivate ? {
@@ -1094,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,
@@ -2731,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) {
@@ -3481,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));
                 });
             }
         }
@@ -3883,7 +3892,7 @@ function createErrorDiagnoser(context) {
         }
         // 元数据
         if (!metadataTypeEnable && node.typeNamespace?.endsWith('.metadataTypes')) {
-            error(node, '未启用元数据功能，请在“偏好设置”中启用元数据。');
+            error(node, '未启用元数据功能，请在"偏好设置"中启用元数据。');
         }
         if (node.typeArguments?.length) {
             // 有同名的
@@ -4201,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);
@@ -4258,10 +4267,8 @@ function createErrorDiagnoser(context) {
         nodeNameCache.clear();
         if (node) {
             const diagnostics = diagnosticMap.get(node);
-            console.log(diagnosticMap);
             diagnostics?.forEach((value, node) => {
                 if (node) {
-                    console.log(node);
                     node.tsErrorDetail = null;
                     // 如果logic中有报错就把标识置为true
                     if (node?.logic?.haveError) {