@lcap/nasl-language-server-core 3.14.0-rc.3 → 3.14.0-rc.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,EAU0F,GAAG,EAMvG,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACgE,cAAc,EAEpF,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;AAuPF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCA+8HpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAfjD,UAAU,GAAG,SAAS;;;8BAqCf,UAAU;2BAsBb,UAAU;;kBAp9HnB,UAAU,WAAW,MAAM,YAAY,YAAY;EAs+HzE;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,EAEpF,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAA4B,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAIhE,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGpE,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;AAuPF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCA0/HpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAfjD,UAAU,GAAG,SAAS;;;8BA2Df,UAAU;2BAsBb,UAAU;;kBArhInB,UAAU,WAAW,MAAM,YAAY,YAAY;EAuiIzE;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

@@ -693,7 +693,7 @@ function createErrorDiagnoser(context) {
     /**
      * 检查 调用表达式的参数
      * @param node
-     * @param ref
+     *( @param r) as anyef
      */
     function* checkCallExpressionParameters(node, ref) {
         // Handle both TypeAnnotation and FunctionDefinition formats
@@ -817,12 +817,11 @@ function createErrorDiagnoser(context) {
         const type = yield* checkNode(node);
         if (isUnresolvedType(type)) {
             const scope = node?.constructor?.nodeTitle;
-            if (node.concept === 'Identifier') {
-                error(node, `${scope}：${node.name} 未定义。`);
-            }
-            else {
-                error(node, `${scope}：所选择的内容未定义。`);
-            }
+            // if (node.concept === 'Identifier') {
+            //   error(node, `${scope}：${node.name} 未定义。`);
+            // } else {
+            error(node, `${scope}：所选择的内容未定义。`);
+            // }
             return errorType;
         }
         return type;
@@ -1148,13 +1147,14 @@ function createErrorDiagnoser(context) {
         }
     }
     /**
-     * 检查 变量
+     * 检查【局部】变量
      * @param node
      */
     function* checkVariable(node) {
         yield* checkNode(node.defaultValue);
         // 前面加了报错，省点时间，报错不用那么精确
         // yield* checkVariableType(node);
+        yield* checkNode(node.typeAnnotation);
     }
     /**
      * 检查 前端全局变量
@@ -1679,6 +1679,7 @@ function createErrorDiagnoser(context) {
         yield* checkNode(node.defaultValue);
         // 前面加了报错，省点时间，报错不用那么精确
         // yield* checkVariableType(node);
+        yield* checkNode(node.typeAnnotation);
     }
     /**
      * 检查 接口
@@ -1825,6 +1826,7 @@ function createErrorDiagnoser(context) {
             ...(node.variables || []),
             ...(node.logics || []),
         ]);
+        checkVariableAndReturnTypeAnnotations(node.variables, [], false);
         const module = node.getAncestor('Module');
         if (!(module?.parentKey === 'dependencies')) {
             if (node.params?.length) {
@@ -1955,6 +1957,21 @@ function createErrorDiagnoser(context) {
         if (node._foldInView) {
             error(node, `组件${node.name}已经极速折叠`);
         }
+        // 已知：选择器会漏报，因为 children 里是两个空 template。暂时先这样吧。
+        let dsFilled = true;
+        let errNode = node;
+        const ds = node.bindAttrs.find(nd => nd.name === 'dataSource');
+        if (ds) {
+            if (ds.type === 'dynamic' && !ds.expression) {
+                dsFilled = false;
+                errNode = ds;
+            }
+        }
+        const hasSubComponents = node.children.filter(c => c.tag !== 'template').length > 0 ||
+            node.children.filter(c => c.tag === 'template').some(cc => cc.children.length > 0);
+        if (!dsFilled && !hasSubComponents) {
+            error(errNode, '数据源不能为空');
+        }
         unbindVariables?.();
     }
     /**
@@ -2215,7 +2232,8 @@ function createErrorDiagnoser(context) {
         yield* checkNode(node.bind);
         if (node.processDefinitions?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.processDefinitions, function* (node) {
-                yield* checkNode(node);
+                // 现有流程版本 [v1, v2]，加个 v3 后，变成了 [proxy(v1), proxy(v2), v3]，无法理解
+                yield* checkNode(toRaw(node));
             });
         }
         if (node?.subLogics?.length) {
@@ -2391,7 +2409,7 @@ function createErrorDiagnoser(context) {
                 const prop = getPropertyOfType(type, propertyName);
                 if (!prop) {
                     const scope = item?.constructor?.nodeTitle;
-                    error(item, `${scope}：找不到 ${type?.typeTitle} 上的 ${propertyName}。`);
+                    error(item, `${scope}：找不到 ${(0, type_manager_1.showUserLevelType)(type)} 上的 ${propertyName}。`);
                 }
                 type = env.getType(prop);
                 if (type?.typeKind === 'generic' && type.typeName === 'List') {
@@ -2419,6 +2437,10 @@ function createErrorDiagnoser(context) {
             ...(node.variables || []),
             ...(node.virtualParams || [])
         ]);
+        // 仅检查用户写的逻辑
+        // if (node.nodePath?.startsWith('app.logics')) {
+        checkVariableAndReturnTypeAnnotations(node.variables ?? [], node.returns ?? []);
+        // }
         const module = node.getAncestor('Module');
         if (!(module?.parentKey === 'dependencies')) {
             if (node.params?.length) {
@@ -2613,6 +2635,9 @@ function createErrorDiagnoser(context) {
             ...(node.returns || []),
             ...(node.variables || []),
         ]);
+        // if (nd.nodePath?.startsWith('app.logics')) {
+        checkVariableAndReturnTypeAnnotations(node.variables, node.returns);
+        // }
         const module = node.getAncestor('Module');
         if (!(module?.parentKey === 'dependencies')) {
             if (node.params?.length) {
@@ -2702,30 +2727,27 @@ function createErrorDiagnoser(context) {
         if (!ensureNodeKeyExists(node, 'calleeName')) {
             return;
         }
-        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 && !typeUnresolved) {
-            // It's a FunctionDefinition object
-            yield* checkScopeOfUse(node, ref);
-            yield* checkCallExpressionParameters(node, ref);
-        }
-        else if (ref && !typeUnresolved) {
-            // 检查使用范围
-            yield* checkScopeOfUse(node, ref);
-            yield* checkCallExpressionParameters(node, ref);
-        }
-        else {
-            if (ref.depLibName) {
-                error(node, `找不到依赖库 ${ref.depLibName} 上的 ${getExpressionNodeName(node.concept)} ${node.calleeName}。`);
+        const ref = env.resolveRef(node); // 前端
+        // TODO: sql 函数的 namespace 带有数据库名 nasl.sqlFunction.mysql nasl.sqlFunction.oracle ...
+        // 暂时不在 qNameDefs 里，用 isBuiltInCall 简单判断了
+        if (!ref && !isBuiltInCall(node)) {
+            const depLibName = getExtensionLibName(node);
+            if (depLibName) {
+                error(node, `找不到依赖库 ${depLibName} 上的 ${getExpressionNodeName(node.concept)} ${node.calleeName}。`);
             }
             else {
                 error(node, `找不到${getExpressionNodeName(node.concept)} ${node.calleeName}。`);
             }
             return errorType;
         }
+        /**
+         * 目前的 callInfo：所有内置函数 + 服务端调用。前端因为有组件库调用，还没统一
+         * 排除未求解出类型变元等引发的报错，这些不应该报 '找不到'
+         */
+        // FIXME: wudengke 帮帮忙，行行好
+        const callInfo = env.resolvedCallInfo.get(node);
+        yield* checkScopeOfUse(node, (callInfo ?? ref));
+        yield* checkCallExpressionParameters(node, (callInfo ?? ref));
         switch (node.concept) {
             case 'CallFunction':
                 return yield* checkCallFunction(node);
@@ -3098,18 +3120,29 @@ function createErrorDiagnoser(context) {
                 }
             });
         }
+        else if (!isOtherCase(node)) {
+            // pattern 为空时，如果不是其他就报错
+            error(node, '匹配分支：匹配模式不能为空', {
+                titleTip: '匹配模式不能为空',
+            });
+        }
         if (node.body?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.body, function* (node) {
                 yield* checkNode(node);
             });
         }
-        if (match?.isExpression && node.body.length === 0) {
-            // 如果不是其他就标红
-            if (node?.getIndexOfParent() !== (match?.cases?.length || 0) - 1) {
-                error(node, '匹配分支：返回内容不能为空', {
-                    titleTip: '返回内容不能为空',
-                });
+        if (match?.isExpression && node.body.length === 0 && !isOtherCase(node)) {
+            // 如果不是其他就报错
+            error(node, '匹配分支：返回内容不能为空', {
+                titleTip: '返回内容不能为空',
+            });
+        }
+        function isOtherCase(node) {
+            const indexInParent = node.getIndexOfParent();
+            if (indexInParent === -1) {
+                return false;
             }
+            return indexInParent === match.cases.length - 1;
         }
     }
     /**
@@ -3256,7 +3289,7 @@ function createErrorDiagnoser(context) {
                 }
                 else {
                     const scope = node?.constructor?.nodeTitle;
-                    error(node, `${scope}：找不到 ${type?.typeTitle} 上的 ${nodeProperty?.name}。`);
+                    error(node, `${scope}：找不到 ${(0, type_manager_1.showUserLevelType)(type)} 上的 ${nodeProperty?.name}。`);
                     return errorType;
                 }
                 return env.getType(node);
@@ -3400,7 +3433,7 @@ function createErrorDiagnoser(context) {
                 }
                 else {
                     const scope = property?.constructor?.nodeTitle;
-                    error(property, `${scope}：找不到 ${type?.typeTitle} 上的 ${propertyName}。`);
+                    error(property, `${scope}：找不到 ${(0, type_manager_1.showUserLevelType)(type)} 上的 ${propertyName}。`);
                 }
             });
         }
@@ -4168,6 +4201,26 @@ function createErrorDiagnoser(context) {
     function setMetadataTypeEnable(enable) {
         metadataTypeEnable = enable;
     }
+    const checkVariableAndReturnTypeAnnotations = (variables, returns, inLogic = true) => {
+        for (const v of variables) {
+            if (v.typeAnnotation)
+                continue;
+            const tyAnn = v.__TypeAnnotation;
+            if (!(0, type_predicate_1.isResolvedUserTy)(tyAnn)) {
+                error(v, `局部变量 ${v.name} 未设置类型，在非草稿区正常使用可自动推断类型`);
+                v.__TypeAnnotation = undefined;
+            }
+        }
+        for (const r of returns) {
+            if (r.typeAnnotation)
+                continue;
+            const tyAnn = r.__TypeAnnotation;
+            if (!(0, type_predicate_1.isResolvedUserTy)(tyAnn)) {
+                error(r, `输出参数 ${r.name} 未设置类型，在非草稿区正常使用可自动推断类型`);
+                r.__TypeAnnotation = undefined;
+            }
+        }
+    };
     /**
      * 诊断App
      * @param app
@@ -4258,4 +4311,8 @@ const transformDiagnosticsToRecords = (fileNode, diagnostics) => {
 exports.transformDiagnosticsToRecords = transformDiagnosticsToRecords;
 // @ts-expect-error
 const toRaw = (nd) => nd.__v_raw ?? nd;
+// 是否来自系统内置
+const isBuiltInCall = (nd) => nd.calleeNamespace.startsWith('nasl.');
+// 是否来自依赖库
+const getExtensionLibName = (nd) => nd.calleeNamespace.startsWith('extensions.') ? nd.calleeNamespace.split('.')[1] : undefined;
 //# sourceMappingURL=checker.js.map