@lcap/nasl 2.18.0-beta.7 → 2.19.0-beta.1

package/out/server/getLogics.js

@@ -251,6 +251,17 @@ async function getLogics(node, needAllLogic = true) {
         }
         return result;
     }
+    else if (node.concept === 'Identifier') {
+        const extensions = app.dependencies.map(getExtensionModules_1.moduleToLogicNamesapce).filter((item) => item.logics && item.logics.length);
+        const tree = new __1.Namespace({
+            name: 'category`',
+            path: `${app.getNamespace()}.logics`,
+            title: '全局逻辑',
+            logics: app.logics,
+            children: [...extensions],
+        });
+        return [tree];
+    }
 }
 exports.getLogics = getLogics;
 function iteratorTree(treeList, filterText = '') {

package/out/server/getLogics.js.map

@@ -1 +1 @@
-{"version":3,"file":"getLogics.js","sourceRoot":"","sources":["../../src/server/getLogics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getLogics.js","sourceRoot":"","sources":["../../src/server/getLogics.ts"],"names":[],"mappings":"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"}

package/out/server/getMemberIdentifier.js

@@ -176,7 +176,7 @@ async function getMemberIdentifier(node) {
         const globalVariable = await getGlobalVariableIdentifier(node);
         // 这个可能需要自己算一下
         const result = [
-            { name: '字面量', children: literals, expanded: true, icon: 'category' },
+            { name: '常量', children: literals, expanded: true, icon: 'category' },
             { name: '枚举', children: newEnums, expanded: false, icon: 'category' },
             { name: '变量', children: completionData, expanded: true, icon: 'category' },
             { name: '公共变量', children: globalVariable, expanded: false, icon: 'category' },

package/out/server/getMemberIdentifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"getMemberIdentifier.js","sourceRoot":"","sources":["../../src/server/getMemberIdentifier.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getMemberIdentifier.js","sourceRoot":"","sources":["../../src/server/getMemberIdentifier.ts"],"names":[],"mappings":"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"}

package/out/server/naslServer.d.ts

@@ -293,7 +293,7 @@ export declare class NaslServer {
             defaultValue: any;
         };
     };
-    getCurrentTypeAnnotation(node: BaseNode): Promise<unknown>;
+    getCurrentTypeAnnotation(node: BaseNode, outTime?: number): Promise<unknown>;
     getBaseNodesTypeMap(nodes: Array<BaseNode>): Promise<Map<BaseNode, TypeAnnotation | {
         typeAnnotation: TypeAnnotation;
         option: any;

package/out/server/naslServer.js

@@ -134,7 +134,35 @@ class NaslServer {
             // 收集到一个行为集合
             const eventValue = $event.value;
             eventValue.forEach(async (item) => {
-                this.changeStackList.push(item.originEvent);
+                /**
+                 * 多个行为进行合并
+                 * 合并规则是
+                 * 1.[a,b,c,c] 在cc的时候，在已有一个c，又来一个c的时候，如果他们不都是file级别的节点
+                 *   就可以前面的内容去掉，只保留最后一个
+                 * 2.[a,b,c,b,c] 在bc已存在，又来了bc 这就都要保留，因为可能顺序有相关性，不能去掉
+                 * 理论上只处理同时几个操作 合并，
+                 * 3.有field的也直接保留
+                 */
+                try {
+                    const changeEvent = item.originEvent;
+                    const changeNode = changeEvent.target;
+                    const { fileNode } = this.getCurrentSource(changeNode);
+                    if (changeNode !== fileNode || !changeEvent.field) {
+                        const findIndex = this.changeStackList.findIndex((changeStackItem) => {
+                            const target = changeStackItem.target;
+                            const { fileNode: targetFileNode } = this.getCurrentSource(target);
+                            return targetFileNode === fileNode;
+                        });
+                        if (findIndex === this.changeStackList.length - 1) {
+                            this.changeStackList.pop();
+                        }
+                    }
+                    this.changeStackList.push(item.originEvent);
+                }
+                catch (err) {
+                    console.log(err);
+                    this.changeStackList.push(item.originEvent);
+                }
             });
             // 如果有长度开始执行状态机
             if (this.changeStackList.length) {
@@ -553,7 +581,7 @@ class NaslServer {
             if (!flag)
                 return;
             const types = /\<([^()]+)\>/g.exec(displayString);
-            let typeStr = types && types[1];
+            const typeStr = types && types[1];
             const app = node.app;
             if (typeStr.includes('__name: "AStructure_')) {
                 const properties = [];
@@ -571,7 +599,7 @@ class NaslServer {
                             typeKind: 'reference',
                             typeName,
                             typeNamespace,
-                        })
+                        }),
                     }));
                     return '';
                 });
@@ -723,7 +751,8 @@ class NaslServer {
             //     record.suggestionDiagnostics = record.suggestionDiagnostics.filter((item) => !item.text.includes(`implicitly has an 'any' type, but a better type may be inferred from usage.`));
             // }
             record.suggestionDiagnostics = record.suggestionDiagnostics
-                .filter((item) => [`'__LogicEmpty' is declared but its value is never read.`, `'__destinationEmpty__' is declared but its value is never read.`].includes(item.text))
+                .filter((item) => [`'__LogicEmpty' is declared but its value is never read.`, `'__destinationEmpty__' is declared but its value is never read.`,
+                `'__UpdateNoProperty__' is declared but its value is never read.`].includes(item.text))
                 .map((diag) => this._resolveDiagnostic(diag, node, record))
                 .filter((diag) => !!diag);
             record.suggestionDiagnostics.push(...this._attachSuggestionDiagnostics(node));
@@ -754,7 +783,7 @@ class NaslServer {
             }
             if (removed)
                 return diagnostics;
-            fileNode?.sourceMap.forEach(async (value, node) => {
+            fileNode?.sourceMap.forEach((value, node) => {
                 if (node instanceof concepts_1.Match) {
                     const { cases, expression } = node || {};
                     const typeAnnotationMap = {};
@@ -764,7 +793,7 @@ class NaslServer {
                         count: 0,
                     };
                     if (Array.isArray(cases)) {
-                        cases.forEach(async (caseItem, index) => {
+                        cases.forEach((caseItem, index) => {
                             let isDisabled = false;
                             // 是最后一项
                             if (index === cases.length - 1) {
@@ -903,7 +932,7 @@ class NaslServer {
             }
             if (removed)
                 return diagnostics;
-            fileNode?.sourceMap.forEach(async (value, node) => {
+            fileNode?.sourceMap.forEach((value, node) => {
                 if (node instanceof concepts_1.ViewElement && node.view === fileNode) {
                     if (node.tag) {
                         node.bindAttrs.forEach((bindAttr) => {
@@ -1021,6 +1050,44 @@ class NaslServer {
                             };
                             diagnostics.push(diagnostic);
                         }
+                        else if (propertyValue.value) {
+                            const dataSource = fileNode;
+                            // 数据源有连接错误
+                            let envText;
+                            if (propertyValue.env === 'dev') {
+                                if (dataSource.__devConnectError) {
+                                    envText = '开发';
+                                }
+                                else if (dataSource.__devConnectError === false) {
+                                    return;
+                                }
+                            }
+                            else if (propertyValue.env === 'online') {
+                                if (dataSource.__onlineConnectError) {
+                                    envText = '生产';
+                                }
+                                else if (dataSource.__onlineConnectError === false) {
+                                    return;
+                                }
+                            }
+                            // 手动插入报错
+                            if (envText) {
+                                const diagnostic = {
+                                    node: fileNode,
+                                    severity: 'error',
+                                    message: `数据源配置：数据源 ${property.name} ${envText}环境数据源连接不通，请先检查${envText}环境数据源配置`,
+                                    // 保留原来的内容方便查询一些问题
+                                    originalDiagnostic: {
+                                        fileName: '',
+                                        start: null,
+                                        end: null,
+                                        category: 'error',
+                                        text: `DataSource connection error`,
+                                    },
+                                };
+                                return diagnostics.push(diagnostic);
+                            }
+                        }
                     });
                 }
             }
@@ -1029,17 +1096,18 @@ class NaslServer {
             // 判断逻辑是否已经删除
             if (fileNode.parentNode instanceof concepts_1.App && !fileNode.parentNode.logics.includes(fileNode))
                 return diagnostics;
-            fileNode?.sourceMap.forEach(async (value, node) => {
+            fileNode?.sourceMap.forEach((value, node) => {
+                //OQL支持返回复合类型数据了
                 // SqlQueryComponent内部返回值类型，如果是嵌套的就需要报错
-                if ((node instanceof concepts_1.OqlQueryComponent || node instanceof concepts_1.SqlQueryComponent) && node.getTypeBanError()) {
-                    const diagnostic = {
-                        node,
-                        severity: 'error',
-                        message: 'SQL查询：返回类型内部,不支持复杂类型。',
-                    };
-                    node.tsErrorDetail = diagnostic;
-                    diagnostics.push(diagnostic);
-                }
+                // if ((node instanceof OqlQueryComponent || node instanceof SqlQueryComponent) && (node as SqlQueryComponent).getTypeBanError()) {
+                //     const diagnostic = {
+                //         node,
+                //         severity: 'error',
+                //         message: 'SQL查询：返回类型内部,不支持复杂类型。',
+                //     };
+                //     node.tsErrorDetail = diagnostic;
+                //     diagnostics.push(diagnostic);
+                // }
                 if (node instanceof concepts_1.Return || node instanceof concepts_1.Variable) {
                     if (!node.typeAnnotation && !node.__TypeAnnotation) {
                         const nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
@@ -1076,6 +1144,11 @@ class NaslServer {
                 this.checkNodeError(node, diagnostics);
             });
         }
+        if (fileNode instanceof concepts_1.Process) {
+            fileNode?.sourceMap.forEach((value, node) => {
+                this.checkNodeError(node, diagnostics);
+            });
+        }
         return diagnostics;
     }
     checkNodeError(node, diagnostics) {
@@ -1138,6 +1211,16 @@ class NaslServer {
                 }
             });
         }
+        if (node instanceof concepts_1.MatchCase && node.getAncestor('Match')?.isExpression && node.body.length === 0 && !node.isDisabled) {
+            const diagnostic = {
+                node,
+                severity: 'error',
+                message: '匹配分支：表达式不能为空',
+                titleTip: '表达式不能为空',
+            };
+            node.tsErrorDetail = diagnostic;
+            diagnostics.push(diagnostic);
+        }
         // 如果节点是match的patterns 里的
         if (node?.parentKey === 'patterns' && node.parentNode instanceof concepts_1.MatchCase) {
             const matchNode = node.getAncestor('Match');
@@ -1156,9 +1239,32 @@ class NaslServer {
                     node.tsErrorDetail = diagnostic;
                     diagnostics.push(diagnostic);
                 }
+                // 如果TypeAnnotation 还存在，但是本身已经不是union类型，就是已经从union换别的类型了就都要报错
+            }
+            else if (node instanceof concepts_1.TypeAnnotation && matchExpressionType?.typeKind !== 'union') {
+                const diagnostic = {
+                    node,
+                    severity: 'error',
+                    message: '匹配：选择类型不存在',
+                    titleTip: '该类型已被删除',
+                };
+                node.tsErrorDetail = diagnostic;
+                diagnostics.push(diagnostic);
+                // 如果可枚举变量的 ，变量 还存在，但是本身已经是union类型，就是已经从别的类型 换了union就都要报错
+            }
+            else if (!(node instanceof concepts_1.TypeAnnotation) && matchExpressionType?.typeKind === 'union') {
+                const diagnostic = {
+                    node,
+                    severity: 'error',
+                    message: '匹配：选择值不存在',
+                    titleTip: '该值无法匹配，请重新选择类型',
+                };
+                node.tsErrorDetail = diagnostic;
+                diagnostics.push(diagnostic);
             }
             if (node.tsErrorDetail) {
-                if (matchExpressionType?.typeNamespace?.includes('enums')) {
+                // 如果父级是枚举，而且子集选的是变量，就提示枚举值已被删除
+                if (matchExpressionType?.typeNamespace?.includes('enums') && (node instanceof concepts_1.MemberExpression)) {
                     node.tsErrorDetail.titleTip = '该枚举值已被删除';
                 }
                 else if (!node.tsErrorDetail.titleTip) {
@@ -1176,6 +1282,25 @@ class NaslServer {
             node.tsErrorDetail = diagnostic;
             diagnostics.push(diagnostic);
         }
+        /**
+         * 如果节点是内置函数
+         * 穷举在线上的情况，不在线上就void报错， calllogic 和 callinterface 因为原来有报错，所以就忽略掉
+         * && 他在父级中，不在body
+         * && 也不再 if的线上
+         * && 也不再 switch的线上consequent
+         * && 也不再草稿区域
+         * && 不在 parentNode.parentNode（只用处理两层的，超过两层上就需要报错，只用直接是参数位第一层的需要） 是 callfunction 和 callInfterfase中，因为这两本身有强制类型，内置函数或者一些带T的声明那种，
+         * && 而且也没有类型，就说明在槽位里，就需要报错
+         */
+        if (node instanceof concepts_1.CallFunction && node.parentKey !== 'body' && node.parentKey !== 'alternate' && node.parentKey !== 'playground' && node.parentKey !== 'consequent' && node.parentNode?.parentNode?.concept !== 'CallLogic' && node.parentNode?.parentNode?.concept !== 'CallInterface' && !node.__TypeAnnotation) {
+            const diagnostic = {
+                node,
+                severity: 'error',
+                message: `类型不匹配，传入类型：void`,
+            };
+            node.tsErrorDetail = diagnostic;
+            diagnostics.push(diagnostic);
+        }
     }
     /* 接口导入查找 */
     existStructureFix(semanticDiagnostics, node, that) {
@@ -2187,7 +2312,7 @@ class NaslServer {
      * @returns 不需要去查就可以返回类型的节点
      */
     getCurrentNodeKnownTypeAnnotation(node) {
-        if (node.concept === 'StringLiteral' || node.concept === 'BooleanLiteral' || node.concept === 'NullLiteral') {
+        if (node.concept === 'StringLiteral' || node.concept === 'StringInterpolation' || node.concept === 'BooleanLiteral' || node.concept === 'NullLiteral') {
             let type = 'String';
             switch (node.concept) {
                 case 'NullLiteral':
@@ -2204,7 +2329,7 @@ class NaslServer {
             return concepts_1.TypeAnnotation.createPrimitive('Boolean');
         }
         // Convert和new都是自身携带类型的，就不进行修改
-        if (node instanceof concepts_1.CallFunction && node.calleeNamespace === 'nasl.util' && (node.calleeName === 'Convert' || node.calleeName === 'New')) {
+        if (node instanceof concepts_1.CallFunction && node.calleeNamespace === 'nasl.util' && (['Convert', 'New', 'FromString'].includes(node.calleeName))) {
             if (node.typeArguments.length) {
                 return node.typeArguments[0];
             }
@@ -2284,6 +2409,9 @@ class NaslServer {
                 'Return',
                 'Variable',
                 'Match',
+                'NewComposite',
+                'NewList',
+                'NewMap',
             ].includes(node.concept))
                 return;
             // 要去ls那边获取的
@@ -2335,6 +2463,13 @@ class NaslServer {
                 newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
                 fileDetail.offset = newCode.length + 'return '.length;
             }
+            else if (['NewComposite', 'NewList', 'NewMap'].includes(node.concept)) {
+                fileDetail.line = item.range.end.line;
+                const indexOf = item.code.indexOf('return __newComposite');
+                let newCode = item.code.substring(0, indexOf);
+                newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
+                fileDetail.offset = newCode.length + 'return '.length;
+            }
             args.push(fileDetail);
         });
         console.time('请求');
@@ -2391,6 +2526,10 @@ class NaslServer {
                         node.__TypeAnnotation = Object.freeze(value.typeAnnotation);
                     }
                 }
+                else {
+                    // 清空原来已经赋值上去的类型，可能原来有现在没有了
+                    node.__TypeAnnotation = null;
+                }
             }
             catch (err) {
                 if (globalThis.window) {
@@ -2651,7 +2790,7 @@ class NaslServer {
             option: { defaultValue: param.defaultValue },
         };
     }
-    async getCurrentTypeAnnotation(node) {
+    async getCurrentTypeAnnotation(node, outTime = 600) {
         if (node.__TypeAnnotation) {
             return node.__TypeAnnotation;
         }
@@ -2666,7 +2805,7 @@ class NaslServer {
                 else {
                     resolve(null);
                 }
-            }, 600);
+            }, outTime);
             const mySetInterval = setInterval(() => {
                 if (node.__isCorrectTypeAnnotation) {
                     resolve(node.__TypeAnnotation);