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

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 { SemEnv } from './typer';
+import { type SemEnv } from './typer';
 export declare enum Severity {
     WARN = "warning",
     ERROR = "error"
@@ -37,10 +37,10 @@ export declare function createErrorDiagnoser(context: DiagnoseContext): {
     setLatestVersionsOfSharedApp: (sharedAppVersions: SharedAppVersion[]) => void;
     diagnosticApp: () => Generator<TypeAnnotation | {
         typeKind: string;
-    } | undefined, void, any>;
+    } | undefined, void, unknown>;
     checkNode: (node: SyntaxNode | undefined) => Generator<TypeAnnotation | {
         typeKind: string;
-    } | undefined, any, any>;
+    } | undefined, any, unknown>;
     clearDiagnostics: (node: SyntaxNode) => void;
     getDiagnostics: (node: SyntaxNode) => NodeDiagnosticsMap | FileDiagnosticsMap | undefined;
     error: (node: SyntaxNode, message: string, context?: ErrorContext) => void;

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,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"}
+{"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;oCA8hIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;6BAsChB,UAAU;2BAuBZ,UAAU;kBA5gInB,UAAU,WAAW,MAAM,YAAY,YAAY;EA4hIzE;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"}

package/out/checker.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformDiagnosticsToRecords = exports.Severity = void 0;
-exports.createErrorDiagnoser = createErrorDiagnoser;
+exports.transformDiagnosticsToRecords = exports.createErrorDiagnoser = exports.Severity = void 0;
 const decimal_js_1 = require("decimal.js");
 const nasl_concepts_1 = require("@lcap/nasl-concepts");
 const service_1 = require("@lcap/nasl-concepts/service");
@@ -9,6 +8,7 @@ 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");
+const nasl_predicate_1 = require("./typer/nasl-predicate");
 var Severity;
 (function (Severity) {
     Severity["WARN"] = "warning";
@@ -28,19 +28,19 @@ const processV2TaskTitleMap = {
     SubmitTask: '执行任务',
     CCTask: '抄送任务',
 };
-// fast cheap unsafe checks
-// 不判断空指针让它更快
-const isCallFunction = (node) => node.concept === 'CallFunction';
-const isCallLogic = (node) => node.concept === 'CallLogic' || node.concept === 'CallConnector';
-const isCallInterface = (node) => node.concept === 'CallInterface' || node.concept === 'CallMicroserviceInterface' || node.concept === 'CallAuthInterface';
-const isCallAuthInterface = (node) => node.concept === 'CallAuthInterface';
-const isCallConnector = (node) => node.concept === 'CallConnector';
-const isCallEvent = (node) => node.concept === 'CallEvent';
-// order matters as for speed
+/**
+ * 是否属于 控制流节点
+ * @param node
+ */
+function isControlFlowNode(node) {
+    return nasl_concepts_1.asserts.isStrictEnd(node) || nasl_concepts_1.asserts.isStrictAbort(node) || nasl_concepts_1.asserts.isStrictBreak(node) || nasl_concepts_1.asserts.isStrictContinue(node);
+}
 /**
  * 是否属于 调用表达式
  */
-const fastIsCallExpression = (node) => isCallLogic(node) || isCallFunction(node) || isCallEvent(node) || isCallInterface(node) || isCallAuthInterface(node) || isCallConnector(node);
+function isCallExpression(node) {
+    return nasl_concepts_1.asserts.isCallFunction(node) || nasl_concepts_1.asserts.isCallInterface(node) || nasl_concepts_1.asserts.isCallLogic(node) || nasl_concepts_1.asserts.isCallConnector(node) || nasl_concepts_1.asserts.isCallEvent(node);
+}
 const isEnd = (node) => node.concept === 'End';
 const isAbort = (node) => node.concept === 'Abort';
 const isBreak = (node) => node.concept === 'Break';
@@ -356,7 +356,7 @@ function createErrorDiagnoser(context) {
      */
     function getStatusOfSharedApp(sharedApp) {
         const version = latestVersionsOfSharedApp?.find((item) => item.name === sharedApp.name && item.provider === sharedApp.provider);
-        if (!version) {
+        if (!version || !version.version) {
             return 'delete';
         }
         else if (version.version !== sharedApp.version) {
@@ -561,6 +561,15 @@ 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 = '任务未关联页面';
@@ -570,9 +579,6 @@ function createErrorDiagnoser(context) {
                 message = '';
             }
         }
-        if (message) {
-            error(node, message);
-        }
     }
     /**
      * 创建一个未找到定义的实体的错误信息
@@ -1278,14 +1284,7 @@ function createErrorDiagnoser(context) {
             const property = dataSourceGroup.getProperty(node.name);
             if (property.values?.length) {
                 property.values.forEach((propertyValue) => {
-                    if (!propertyValue.value && node.name !== 'defaultDS') {
-                        // prod 环境数据源未配置数据信息 时，不再给出其他提示
-                        // https://projectmanage.netease-official.lcap.163yun.com/dashboard/FeatureDetail?id=2782461488301056
-                        if (propertyValue.env === 'dev') {
-                            error(node, `数据源配置：数据源${property.name}${propertyValue.envDisplayLabel}未配置数据信息`);
-                        }
-                    }
-                    else if (propertyValue.value) {
+                    if (propertyValue.value) {
                         const dataSource = node;
                         // 数据源有连接错误
                         // 手动插入报错
@@ -1297,6 +1296,11 @@ function createErrorDiagnoser(context) {
                     }
                 });
             }
+            // prod 环境数据源未配置数据信息 时，不再给出其他提示
+            // https://projectmanage.netease-official.lcap.163yun.com/dashboard/FeatureDetail?id=2782461488301056
+            if (!node.devConfigId) {
+                error(node, `数据源配置：数据源${property.name}开发环境未配置数据信息`);
+            }
         }
         dbType = '';
     }
@@ -3872,7 +3876,7 @@ function createErrorDiagnoser(context) {
             if (ensureNodeKeyExists(node, 'typeName') && node.typeKind === 'reference') {
                 const ref = env.resolveRef(node);
                 if (!ref) {
-                    error(node, `找不到类型${node.typeName}`);
+                    error(node, `找不到类型 ${node.typeName}`);
                 }
             }
         }
@@ -3950,7 +3954,7 @@ function createErrorDiagnoser(context) {
     function* dispatchNode(node) {
         try {
             // 调用表达式
-            if (fastIsCallExpression(node)) {
+            if ((0, nasl_predicate_1.isNaslCallExpr)(node)) {
                 return yield* checkCallExpression(node);
             }
             const { concept } = node;
@@ -4289,11 +4293,12 @@ function createErrorDiagnoser(context) {
         error,
     };
 }
+exports.createErrorDiagnoser = createErrorDiagnoser;
 const transformDiagnosticsToRecords = (fileNode, diagnostics) => {
     const records = [];
     let filePath;
     try {
-        filePath = fileNode.getEmbeddedFilePath();
+        filePath = fileNode.concept !== 'App' ? fileNode.getEmbeddedFilePath() : undefined;
     }
     catch (err) {
         console.log(err);