@lcap/nasl-language-server-core 4.1.0-beta.14 → 4.1.0-beta.16

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;AAS7B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAK5C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAMpE,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;AAkQF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAuoIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAuBb,UAAU;;kBA3oInB,UAAU,WAAW,MAAM,YAAY,YAAY;EA6pIzE;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,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAK5C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAMpE,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;AAkQF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAomIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAuBb,UAAU;;kBAxmInB,UAAU,WAAW,MAAM,YAAY,YAAY;EA0nIzE;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

@@ -10,7 +10,6 @@ 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 get_q_name_1 = require("./reference-manager/get-q-name");
 const helper_1 = require("./typer/helper");
 var Severity;
 (function (Severity) {
@@ -1128,6 +1127,7 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkConnector(node) {
+        env.enterScope(node);
         yield* checkModule(node);
         if (node.triggerLaunchers?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.triggerLaunchers, function* (node) {
@@ -1154,6 +1154,7 @@ function createErrorDiagnoser(context) {
                 yield* checkNode(node);
             });
         }
+        env.exitScope();
     }
     /**
      * 检查 连接器触发器
@@ -1268,11 +1269,14 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkStructure(node) {
+        const pConn = node.getAncestor('Connector');
+        pConn && env.enterScope(pConn);
         if (node.properties?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.properties, function* (node) {
                 yield* checkNode(node);
             });
         }
+        pConn && env.exitScope();
     }
     /**
      * 检查 数据结构属性
@@ -1747,11 +1751,9 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkInterface(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            ...(node.params || []),
-            ...(node.returns || []),
-            ...(node.protocolParams || [])
-        ]);
+        const pConn = node.getAncestor('Connector');
+        pConn && env.enterScope(pConn);
+        env.enterScope(node);
         if (node.params?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.params, function* (node) {
                 yield* checkNode(node);
@@ -1769,18 +1771,17 @@ function createErrorDiagnoser(context) {
         }
         yield* checkNode(node.validation);
         yield* checkTimeout(node);
-        unbindVariables();
+        env.exitScope();
+        pConn && env.exitScope();
     }
     /**
      * 检查 鉴权接口
      * @param node
      */
     function* checkAuthInterface(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            ...(node.params || []),
-            ...(node.returns || []),
-            ...(node.protocolParams || [])
-        ]);
+        const pConn = node.getAncestor('Connector');
+        pConn && env.enterScope(pConn);
+        env.enterScope(node);
         if (node.params?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.params, function* (node) {
                 yield* checkNode(node);
@@ -1798,7 +1799,8 @@ function createErrorDiagnoser(context) {
         }
         yield* checkNode(node.validation);
         yield* checkTimeout(node);
-        unbindVariables();
+        env.exitScope();
+        pConn && env.exitScope();
     }
     /**
      * 检查 接口参数
@@ -1859,7 +1861,7 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkFrontend(node) {
-        const unbindVariables = env.temporarilyBindVariables(node.variables);
+        env.enterScope(node);
         if (node.variables?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.variables, function* (node) {
                 yield* checkNode(node);
@@ -1875,18 +1877,14 @@ function createErrorDiagnoser(context) {
                 yield* checkNode(node);
             });
         }
-        unbindVariables();
+        env.exitScope();
     }
     /**
      * 检查 页面
      * @param node
      */
     function* checkView(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            ...(node.params || []),
-            ...(node.variables || []),
-            ...(node.logics || []),
-        ]);
+        env.enterScope(node);
         checkVariableAndReturnTypeAnnotations(node.variables, [], false);
         const module = node.getAncestor('Module');
         if (!(module?.parentKey === 'dependencies')) {
@@ -1929,18 +1927,14 @@ function createErrorDiagnoser(context) {
                 yield* checkNode(node);
             });
         }
-        unbindVariables();
+        env.exitScope();
     }
     /**
      * 检查 业务组件
      * @param node
      */
     function* checkBusinessComponent(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            ...(node.params || []),
-            ...(node.variables || []),
-            ...(node.logics || []),
-        ]);
+        env.enterScope(node);
         // 组件元素
         if (node.elements?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.elements, function* (node) {
@@ -1965,7 +1959,7 @@ function createErrorDiagnoser(context) {
                 yield* checkNode(node);
             });
         }
-        unbindVariables();
+        env.exitScope();
     }
     /**
      * 检查 页面元素
@@ -1977,18 +1971,14 @@ function createErrorDiagnoser(context) {
             return;
         }
         const shouldProvideCurrentCtx = !!(node.slotScope);
-        let unbindVariables;
+        let scopeEntered = false;
         if (shouldProvideCurrentCtx) {
             const name = curVarCounter > 0 ? node.slotScope + curVarCounter : node.slotScope;
-            const variable = new nasl_concepts_1.Variable({
-                name,
-            });
+            const variable = new nasl_concepts_1.Variable({ name });
             curVarCounter++;
-            unbindVariables = env.temporarilyBindVariables([
-                variable,
-            ], () => {
-                curVarCounter--;
-            });
+            // @ts-expect-error ViewElement 引入的 current 目前没有加入 refMgr，VE 也没当做 ScopeNode
+            env.enterScope(node, [variable]);
+            scopeEntered = true;
         }
         if (node.bindAttrs?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.bindAttrs, function* (node) {
@@ -2033,7 +2023,10 @@ function createErrorDiagnoser(context) {
         if (!dsFilled && !hasSubComponents) {
             error(errNode, '数据源不能为空');
         }
-        unbindVariables?.();
+        if (scopeEntered) {
+            env.exitScope();
+            curVarCounter--;
+        }
     }
     /**
      * 检查 元素绑定属性
@@ -2191,10 +2184,7 @@ function createErrorDiagnoser(context) {
         if (node.includeTypeArgs) {
             error(node, '流程暂不支持泛型参数');
         }
-        const unbindVariables = env.temporarilyBindVariables([
-            ...(node?.params || []),
-            ...(node?.returns || []),
-        ]);
+        // env.enterScope(node); 尚不支持流程 1.0
         if (node.params?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.params, function* (node) {
                 yield* checkNode(node);
@@ -2220,17 +2210,14 @@ function createErrorDiagnoser(context) {
                 yield* checkNode(node);
             });
         }
-        unbindVariables();
+        // env.exitScope();
     }
     /**
      * 检查 流程元素
      * @param node
      */
     function* checkProcessElement(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            ...(node?.variables || []),
-            ...(node?.returns || []),
-        ]);
+        // env.enterScope(node); 尚不支持流程1.0
         if (node.returns?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.returns, function* (node) {
                 yield* checkNode(node);
@@ -2275,7 +2262,7 @@ function createErrorDiagnoser(context) {
                 yield* checkNode(node);
             });
         }
-        unbindVariables();
+        // env.exitScope();
     }
     /**
      * 检查 常量
@@ -2290,6 +2277,7 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkProcessV2(node) {
+        env.enterScope(node);
         yield* checkNode(node.bind);
         if (node.processDefinitions?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.processDefinitions, function* (node) {
@@ -2306,6 +2294,7 @@ function createErrorDiagnoser(context) {
         if (node.includeTypeArgs) {
             error(node, '流程暂不支持泛型参数');
         }
+        env.exitScope();
     }
     /**
      * 检查 绑定实体或数据结构
@@ -2319,14 +2308,7 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkProcessDefinitionV2(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            ...(node.variables || []),
-            ...['custom', 'processSystem'].map((name) => {
-                return new nasl_concepts_1.Variable({
-                    name,
-                });
-            }),
-        ]);
+        env.enterScope(node);
         if (node.variables?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.variables, function* (node) {
                 yield* checkNode(node);
@@ -2342,20 +2324,14 @@ function createErrorDiagnoser(context) {
                 yield* checkNode(node);
             });
         }
-        unbindVariables();
+        env.exitScope();
     }
     /**
      * 检查 流程元素
      * @param node
      */
     function* checkProcessElementV2(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            ...['custom', 'processSystem'].map((name) => {
-                return new nasl_concepts_1.Variable({
-                    name,
-                });
-            }),
-        ]);
+        env.enterScope(node);
         yield* checkNode(node.logic);
         yield* checkNode(node.flowCondition);
         if (node.bindEvents?.length) {
@@ -2410,7 +2386,7 @@ function createErrorDiagnoser(context) {
         else if (!service_1.ProcessesV2.isFromStartNode(node)) {
             error(node, '节点未关联到流程图');
         }
-        unbindVariables();
+        env.exitScope();
     }
     /**
      * 检查 无人时，自动转派审批策略
@@ -2492,16 +2468,8 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkLogic(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            ...(node.params || []),
-            ...(node.returns || []),
-            ...(node.variables || []),
-            ...(node.virtualParams || [])
-        ]);
-        // 仅检查用户写的逻辑
-        // if (node.nodePath?.startsWith('app.logics')) {
+        env.enterScope(node);
         checkVariableAndReturnTypeAnnotations(node.variables ?? [], node.returns ?? []);
-        // }
         const module = node.getAncestor('Module');
         if (!(module?.parentKey === 'dependencies')) {
             if (node.params?.length) {
@@ -2592,34 +2560,38 @@ function createErrorDiagnoser(context) {
         if (!likeComponent) {
             yield* checkTrigger(node);
         }
-        unbindVariables();
+        env.exitScope();
     }
     /**
      * 检查 鉴权逻辑
      * @param node
      */
     function* checkAuthLogic(node) {
+        const pConn = node.getAncestor('Connector');
+        pConn && env.enterScope(pConn);
         inAuthLogic = true;
+        // checkLogic 会 enter scope
         yield* checkLogic(node);
         inAuthLogic = false;
+        pConn && env.exitScope();
     }
     /**
      * 检查 调用接口的鉴权逻辑
      * @param node
      */
     function* checkAuthLogicForCallInterface(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            ...(node.authParams || []),
-        ]);
+        // authLogic 会打开 Connector 的局部-全局变量
         yield* checkAuthLogic(node);
-        unbindVariables();
     }
     /**
      * 检查 调用接口的鉴权逻辑
      * @param node
      */
     function* checkConnectorLogic(node) {
+        const pConn = node.getAncestor('Connector');
+        pConn && env.enterScope(pConn);
         yield* checkLogic(node);
+        pConn && env.exitScope();
     }
     /**
      * 检查 业务组件逻辑
@@ -2633,12 +2605,7 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkOverriddenLogic(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            ...(node.params || []),
-            ...(node.returns || []),
-            ...(node.variables || []),
-            ...(node.virtualParams || [])
-        ]);
+        env.enterScope(node);
         const module = node.getAncestor('Module');
         if (!(module?.parentKey === 'dependencies')) {
             if (node.params?.length) {
@@ -2664,7 +2631,7 @@ function createErrorDiagnoser(context) {
             });
         }
         yield* checkPlayground(node.playground);
-        unbindVariables();
+        env.exitScope();
         yield* checkTrigger(node);
     }
     /**
@@ -2677,14 +2644,8 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkSubLogic(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            ...(node.params || []),
-            ...(node.returns || []),
-            ...(node.variables || []),
-        ]);
-        // if (nd.nodePath?.startsWith('app.logics')) {
+        env.enterScope(node);
         checkVariableAndReturnTypeAnnotations(node.variables, node.returns);
-        // }
         const module = node.getAncestor('Module');
         if (!(module?.parentKey === 'dependencies')) {
             if (node.params?.length) {
@@ -2710,7 +2671,7 @@ function createErrorDiagnoser(context) {
             });
         }
         yield* checkPlayground(node.playground);
-        unbindVariables();
+        env.exitScope();
         return env.getType(node);
     }
     /**
@@ -2777,7 +2738,7 @@ function createErrorDiagnoser(context) {
         yield* checkVoidCallUsedAsStatement(node);
         const ref = env.resolveRef(node); // 前端
         // TODO: sql 函数的 namespace 带有数据库名 nasl.sqlFunction.mysql nasl.sqlFunction.oracle ...
-        // 暂时不在 qNameDefs 里，用 isBuiltInCall 简单判断了
+        // 暂时不在 gQNameDefs 里，用 isBuiltInCall 简单判断了
         if (!ref && !isBuiltInCall(node)) {
             const depLibName = getExtensionLibName(node);
             if (depLibName) {
@@ -3245,10 +3206,7 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkForEachStatement(node) {
-        const unbindVariables = env.temporarilyBindVariables([
-            node.item,
-            node.index,
-        ]);
+        env.enterScope(node);
         if (ensureNodeKeyExists(node, 'each')) {
             yield* checkNode(node.each);
         }
@@ -3270,7 +3228,7 @@ function createErrorDiagnoser(context) {
                 error(node, `ForEach：循环列表：参数类型不匹配！结束值自动推导失败。`);
             }
         }
-        unbindVariables();
+        env.exitScope();
     }
     /**
      * 检查 循环分支
@@ -3904,14 +3862,14 @@ function createErrorDiagnoser(context) {
      */
     function* checkFunction(node) {
         if (ensureNodeKeyExists(node, 'returnExpression')) {
-            const unbindVariables = env.temporarilyBindVariables(node.params);
+            env.enterScope(node);
             if (node.params?.length) {
                 yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.params, function* (node) {
                     yield* checkNode(node);
                 });
             }
             yield* checkNode(node.returnExpression);
-            unbindVariables();
+            env.exitScope();
         }
     }
     /**
@@ -3919,7 +3877,7 @@ function createErrorDiagnoser(context) {
      * @param node
      */
     function* checkAnonymousFunction(node) {
-        const unbindVariables = env.temporarilyBindVariables(node.params);
+        env.enterScope(node);
         if (node.params?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.params, function* (node) {
                 yield* checkNode(node);
@@ -3928,7 +3886,7 @@ function createErrorDiagnoser(context) {
         if (ensureNodeKeyExists(node, 'body')) {
             yield* checkNode(node.body);
         }
-        unbindVariables();
+        env.exitScope();
     }
     /**
      * 检查 验证规则
@@ -3964,8 +3922,7 @@ function createErrorDiagnoser(context) {
         ensureNodeKeyExists(node, 'typeKind');
         if (['primitive', 'reference', 'generic'].includes(node.typeKind)) {
             if (ensureNodeKeyExists(node, 'typeName') && node.typeKind === 'reference') {
-                const qName = (0, get_q_name_1.getTokenQualifiedName)(node);
-                const ref = env.refMgr.gQNameDefs.get(qName);
+                const ref = env.resolveRef(node);
                 if (!ref) {
                     error(node, `找不到类型 ${node.typeName}`);
                 }