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

package/src/server/dist/naslServer.js

@@ -175,8 +175,38 @@ var NaslServer = /** @class */ (function () {
             // 收集到一个行为集合
             var eventValue = $event.value;
             eventValue.forEach(function (item) { return __awaiter(_this, void 0, void 0, function () {
+                var changeEvent, changeNode, fileNode_1, findIndex;
+                var _this = this;
                 return __generator(this, function (_a) {
-                    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 {
+                        changeEvent = item.originEvent;
+                        changeNode = changeEvent.target;
+                        fileNode_1 = this.getCurrentSource(changeNode).fileNode;
+                        if (changeNode !== fileNode_1 || !changeEvent.field) {
+                            findIndex = this.changeStackList.findIndex(function (changeStackItem) {
+                                var target = changeStackItem.target;
+                                var targetFileNode = _this.getCurrentSource(target).fileNode;
+                                return targetFileNode === fileNode_1;
+                            });
+                            if (findIndex === this.changeStackList.length - 1) {
+                                this.changeStackList.pop();
+                            }
+                        }
+                        this.changeStackList.push(item.originEvent);
+                    }
+                    catch (err) {
+                        console.log(err);
+                        this.changeStackList.push(item.originEvent);
+                    }
                     return [2 /*return*/];
                 });
             }); });
@@ -947,7 +977,8 @@ var NaslServer = /** @class */ (function () {
                             //     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(function (item) { return ["'__LogicEmpty' is declared but its value is never read.", "'__destinationEmpty__' is declared but its value is never read."].includes(item.text); })
+                                .filter(function (item) { return ["'__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(function (diag) { return _this._resolveDiagnostic(diag, node, record); })
                                 .filter(function (diag) { return !!diag; });
                             (_b = record.suggestionDiagnostics).push.apply(_b, _this._attachSuggestionDiagnostics(node));
@@ -963,7 +994,6 @@ var NaslServer = /** @class */ (function () {
      * @returns 诊断结果
      */
     NaslServer.prototype._attachSuggestionDiagnostics = function (fileNode) {
-        var _this = this;
         var diagnostics = [];
         if (fileNode instanceof concepts_1.Logic || fileNode instanceof concepts_1.View) {
             // 判断逻辑是否已经删除
@@ -982,140 +1012,132 @@ var NaslServer = /** @class */ (function () {
             }
             if (removed)
                 return diagnostics;
-            fileNode === null || fileNode === void 0 ? void 0 : fileNode.sourceMap.forEach(function (value, node) { return __awaiter(_this, void 0, void 0, function () {
-                var _a, cases_1, expression_1, typeAnnotationMap_1, maxTypeAnnotationInfo_1, maxTypeAnnotation_1, sortedTypeKey, _b, typeAnnotation, cases_2;
-                var _this = this;
-                return __generator(this, function (_c) {
-                    if (node instanceof concepts_1.Match) {
-                        _a = node || {}, cases_1 = _a.cases, expression_1 = _a.expression;
-                        typeAnnotationMap_1 = {};
-                        maxTypeAnnotationInfo_1 = {
-                            typeAnnotation: null,
-                            count: 0
-                        };
-                        if (Array.isArray(cases_1)) {
-                            cases_1.forEach(function (caseItem, index) { return __awaiter(_this, void 0, void 0, function () {
-                                var isDisabled, enumerableItems, currTypeAnnotation, _a, typeKind, typeNamespace, typeName, typeArguments, nameArr, typeNode, enums, children, map_1, enumerableKeys, typeAnnotation, sortedTypeKey, typeAnnotationInfo, count;
-                                var _b, _c;
-                                return __generator(this, function (_d) {
-                                    isDisabled = false;
-                                    // 是最后一项
-                                    if (index === cases_1.length - 1) {
-                                        enumerableItems = [];
-                                        currTypeAnnotation = expression_1 === null || expression_1 === void 0 ? void 0 : expression_1.__TypeAnnotation;
-                                        _a = currTypeAnnotation || {}, typeKind = _a.typeKind, typeNamespace = _a.typeNamespace, typeName = _a.typeName, typeArguments = _a.typeArguments;
-                                        if (typeKind === 'union' && Array.isArray(typeArguments)) {
-                                            enumerableItems = typeArguments.map(function (typeArg) {
-                                                var typeArgJson = typeArg;
-                                                if (typeArg instanceof concepts_1.TypeAnnotation) {
-                                                    typeArgJson = typeArg.toJSON();
-                                                }
-                                                return new concepts_1.TypeAnnotation(typeArgJson);
-                                            });
-                                        }
-                                        else if (typeKind === 'reference') {
-                                            nameArr = [typeName];
-                                            if (typeNamespace) {
-                                                nameArr.unshift(typeNamespace);
-                                            }
-                                            typeNode = ((_c = (_b = node.app) === null || _b === void 0 ? void 0 : _b.findNodeByCompleteName) === null || _c === void 0 ? void 0 : _c.call(_b, nameArr.join('.'))) || {};
-                                            if (typeNode.concept === 'Enum') {
-                                                enums = getMemberIdentifier_1.formatEnums([typeNode]);
-                                                children = ((enums === null || enums === void 0 ? void 0 : enums[0]) || {}).children;
-                                                if (Array.isArray(children)) {
-                                                    enumerableItems = children.map(function (child) { return child === null || child === void 0 ? void 0 : child.expression; });
-                                                }
-                                            }
+            fileNode === null || fileNode === void 0 ? void 0 : fileNode.sourceMap.forEach(function (value, node) {
+                if (node instanceof concepts_1.Match) {
+                    var _a = node || {}, cases_1 = _a.cases, expression_1 = _a.expression;
+                    var typeAnnotationMap_1 = {};
+                    // 最多数的类型
+                    var maxTypeAnnotationInfo_1 = {
+                        typeAnnotation: null,
+                        count: 0
+                    };
+                    if (Array.isArray(cases_1)) {
+                        cases_1.forEach(function (caseItem, index) {
+                            var _a, _b;
+                            var isDisabled = false;
+                            // 是最后一项
+                            if (index === cases_1.length - 1) {
+                                var enumerableItems = [];
+                                var currTypeAnnotation = expression_1 === null || expression_1 === void 0 ? void 0 : expression_1.__TypeAnnotation;
+                                var _c = currTypeAnnotation || {}, typeKind = _c.typeKind, typeNamespace = _c.typeNamespace, typeName = _c.typeName, typeArguments = _c.typeArguments;
+                                if (typeKind === 'union' && Array.isArray(typeArguments)) {
+                                    enumerableItems = typeArguments.map(function (typeArg) {
+                                        var typeArgJson = typeArg;
+                                        if (typeArg instanceof concepts_1.TypeAnnotation) {
+                                            typeArgJson = typeArg.toJSON();
                                         }
-                                        else if (typeKind === 'primitive' && typeNamespace === 'nasl.core' && typeName === 'Boolean') {
-                                            enumerableItems = [
-                                                new concepts_1.BooleanLiteral({
-                                                    value: 'true'
-                                                }),
-                                                new concepts_1.BooleanLiteral({
-                                                    value: 'false'
-                                                }),
-                                            ];
+                                        return new concepts_1.TypeAnnotation(typeArgJson);
+                                    });
+                                }
+                                else if (typeKind === 'reference') {
+                                    var nameArr = [typeName];
+                                    if (typeNamespace) {
+                                        nameArr.unshift(typeNamespace);
+                                    }
+                                    var typeNode = ((_b = (_a = node.app) === null || _a === void 0 ? void 0 : _a.findNodeByCompleteName) === null || _b === void 0 ? void 0 : _b.call(_a, nameArr.join('.'))) || {};
+                                    if (typeNode.concept === 'Enum') {
+                                        var enums = getMemberIdentifier_1.formatEnums([typeNode]);
+                                        var children = ((enums === null || enums === void 0 ? void 0 : enums[0]) || {}).children;
+                                        if (Array.isArray(children)) {
+                                            enumerableItems = children.map(function (child) { return child === null || child === void 0 ? void 0 : child.expression; });
                                         }
-                                        if (Array.isArray(enumerableItems) && enumerableItems.length) {
-                                            map_1 = {};
-                                            cases_1.forEach(function (caseItem) {
-                                                var patterns = (caseItem || {}).patterns;
-                                                if (Array.isArray(patterns)) {
-                                                    patterns.forEach(function (pattern) {
-                                                        if (pattern instanceof concepts_1.TypeAnnotation) {
-                                                            var patternTypeKey = pattern.typeKey;
-                                                            map_1[patternTypeKey] = true;
-                                                        }
-                                                        else if (pattern instanceof concepts_1.MemberExpression || pattern instanceof concepts_1.BooleanLiteral) {
-                                                            var patternValue = pattern.getValue();
-                                                            map_1[patternValue] = true;
-                                                        }
-                                                    });
+                                    }
+                                }
+                                else if (typeKind === 'primitive' && typeNamespace === 'nasl.core' && typeName === 'Boolean') {
+                                    enumerableItems = [
+                                        new concepts_1.BooleanLiteral({
+                                            value: 'true'
+                                        }),
+                                        new concepts_1.BooleanLiteral({
+                                            value: 'false'
+                                        }),
+                                    ];
+                                }
+                                if (Array.isArray(enumerableItems) && enumerableItems.length) {
+                                    var map_1 = {};
+                                    cases_1.forEach(function (caseItem) {
+                                        var patterns = (caseItem || {}).patterns;
+                                        if (Array.isArray(patterns)) {
+                                            patterns.forEach(function (pattern) {
+                                                if (pattern instanceof concepts_1.TypeAnnotation) {
+                                                    var patternTypeKey = pattern.typeKey;
+                                                    map_1[patternTypeKey] = true;
+                                                }
+                                                else if (pattern instanceof concepts_1.MemberExpression || pattern instanceof concepts_1.BooleanLiteral) {
+                                                    var patternValue = pattern.getValue();
+                                                    map_1[patternValue] = true;
                                                 }
                                             });
-                                            enumerableKeys = Object.keys(map_1);
-                                            if (enumerableKeys.length === enumerableItems.length) {
-                                                isDisabled = true;
-                                            }
                                         }
+                                    });
+                                    var enumerableKeys = Object.keys(map_1);
+                                    if (enumerableKeys.length === enumerableItems.length) {
+                                        isDisabled = true;
                                     }
-                                    if (!isDisabled) {
-                                        typeAnnotation = caseItem.__TypeAnnotation;
-                                        // 仅处理有类型的情况，返回类型为void的情况由其他地方处理成报错
-                                        if (typeAnnotation) {
-                                            sortedTypeKey = typeAnnotation === null || typeAnnotation === void 0 ? void 0 : typeAnnotation.sortedTypeKey;
-                                            if (!typeAnnotationMap_1[sortedTypeKey]) {
-                                                typeAnnotationMap_1[sortedTypeKey] = {
-                                                    typeAnnotation: typeAnnotation,
-                                                    cases: [],
-                                                    count: 0
-                                                };
-                                            }
-                                            typeAnnotationInfo = typeAnnotationMap_1[sortedTypeKey];
-                                            typeAnnotationInfo.cases.push(caseItem);
-                                            typeAnnotationInfo.count++;
-                                            count = typeAnnotationInfo.count;
-                                            if (maxTypeAnnotationInfo_1.count < count) {
-                                                maxTypeAnnotationInfo_1 = {
-                                                    typeAnnotation: typeAnnotation,
-                                                    count: count
-                                                };
-                                            }
-                                            return [2 /*return*/, typeAnnotation];
-                                        }
+                                }
+                            }
+                            if (!isDisabled) {
+                                var typeAnnotation = caseItem.__TypeAnnotation;
+                                // 仅处理有类型的情况，返回类型为void的情况由其他地方处理成报错
+                                if (typeAnnotation) {
+                                    var sortedTypeKey = typeAnnotation === null || typeAnnotation === void 0 ? void 0 : typeAnnotation.sortedTypeKey;
+                                    if (!typeAnnotationMap_1[sortedTypeKey]) {
+                                        typeAnnotationMap_1[sortedTypeKey] = {
+                                            typeAnnotation: typeAnnotation,
+                                            cases: [],
+                                            count: 0
+                                        };
                                     }
-                                    return [2 /*return*/];
-                                });
-                            }); });
-                        }
-                        maxTypeAnnotation_1 = maxTypeAnnotationInfo_1.typeAnnotation;
-                        for (sortedTypeKey in typeAnnotationMap_1) {
-                            _b = typeAnnotationMap_1[sortedTypeKey], typeAnnotation = _b.typeAnnotation, cases_2 = _b.cases;
-                            if ((maxTypeAnnotation_1 === null || maxTypeAnnotation_1 === void 0 ? void 0 : maxTypeAnnotation_1.sortedTypeKey) !== (typeAnnotation === null || typeAnnotation === void 0 ? void 0 : typeAnnotation.sortedTypeKey)) {
-                                if (Array.isArray(cases_2)) {
-                                    cases_2.forEach(function (caseItem) {
-                                        var body = (caseItem || {}).body;
-                                        var diagnostic = {
-                                            node: caseItem,
-                                            severity: 'warning',
-                                            message: '分支类型不一致'
+                                    var typeAnnotationInfo = typeAnnotationMap_1[sortedTypeKey];
+                                    typeAnnotationInfo.cases.push(caseItem);
+                                    typeAnnotationInfo.count++;
+                                    var count = typeAnnotationInfo.count;
+                                    if (maxTypeAnnotationInfo_1.count < count) {
+                                        maxTypeAnnotationInfo_1 = {
+                                            typeAnnotation: typeAnnotation,
+                                            count: count
                                         };
-                                        if (Array.isArray(body) && body.length) {
-                                            var lastExpression = body[body.length - 1];
-                                            diagnostic.node = lastExpression;
-                                            diagnostic.message = (lastExpression === null || lastExpression === void 0 ? void 0 : lastExpression.toUI()) + "\u671F\u671B\u7684\u7C7B\u578B\u662F" + (maxTypeAnnotation_1 === null || maxTypeAnnotation_1 === void 0 ? void 0 : maxTypeAnnotation_1.headTitle);
-                                            lastExpression.tsErrorDetail = diagnostic;
-                                            diagnostics.push(diagnostic);
-                                        }
-                                    });
+                                    }
+                                    return typeAnnotation;
                                 }
                             }
+                        });
+                    }
+                    var maxTypeAnnotation_1 = maxTypeAnnotationInfo_1.typeAnnotation;
+                    for (var sortedTypeKey in typeAnnotationMap_1) {
+                        var _b = typeAnnotationMap_1[sortedTypeKey], typeAnnotation = _b.typeAnnotation, cases_2 = _b.cases;
+                        if ((maxTypeAnnotation_1 === null || maxTypeAnnotation_1 === void 0 ? void 0 : maxTypeAnnotation_1.sortedTypeKey) !== (typeAnnotation === null || typeAnnotation === void 0 ? void 0 : typeAnnotation.sortedTypeKey)) {
+                            if (Array.isArray(cases_2)) {
+                                cases_2.forEach(function (caseItem) {
+                                    var body = (caseItem || {}).body;
+                                    var diagnostic = {
+                                        node: caseItem,
+                                        severity: 'warning',
+                                        message: '分支类型不一致'
+                                    };
+                                    if (Array.isArray(body) && body.length) {
+                                        var lastExpression = body[body.length - 1];
+                                        diagnostic.node = lastExpression;
+                                        diagnostic.message = (lastExpression === null || lastExpression === void 0 ? void 0 : lastExpression.toUI()) + "\u671F\u671B\u7684\u7C7B\u578B\u662F" + (maxTypeAnnotation_1 === null || maxTypeAnnotation_1 === void 0 ? void 0 : maxTypeAnnotation_1.headTitle);
+                                        lastExpression.tsErrorDetail = diagnostic;
+                                        diagnostics.push(diagnostic);
+                                    }
+                                });
+                            }
                         }
                     }
-                    return [2 /*return*/];
-                });
-            }); });
+                }
+            });
         }
         return diagnostics;
     };
@@ -1142,104 +1164,101 @@ var NaslServer = /** @class */ (function () {
             }
             if (removed)
                 return diagnostics;
-            fileNode === null || fileNode === void 0 ? void 0 : fileNode.sourceMap.forEach(function (value, node) { return __awaiter(_this, void 0, void 0, function () {
-                var nodeTypeName_1, msg_1, diagnostic;
-                return __generator(this, function (_a) {
-                    if (node instanceof concepts_1.ViewElement && node.view === fileNode) {
-                        if (node.tag) {
-                            node.bindAttrs.forEach(function (bindAttr) {
-                                if ((bindAttr.model || bindAttr.sync) && bindAttr.expression) {
-                                    var bindExpression = bindAttr.expression;
-                                    var diagnostic = void 0;
-                                    if (bindExpression.concept !== 'Identifier' && bindExpression.concept !== 'MemberExpression') {
+            fileNode === null || fileNode === void 0 ? void 0 : fileNode.sourceMap.forEach(function (value, node) {
+                if (node instanceof concepts_1.ViewElement && node.view === fileNode) {
+                    if (node.tag) {
+                        node.bindAttrs.forEach(function (bindAttr) {
+                            if ((bindAttr.model || bindAttr.sync) && bindAttr.expression) {
+                                var bindExpression = bindAttr.expression;
+                                var diagnostic = void 0;
+                                if (bindExpression.concept !== 'Identifier' && bindExpression.concept !== 'MemberExpression') {
+                                    diagnostic = {
+                                        node: bindAttr,
+                                        severity: 'error',
+                                        message: '页面元素双向绑定：只允许绑定可赋值的变量和属性。'
+                                    };
+                                }
+                                else {
+                                    if (bindExpression.isEnum()) {
                                         diagnostic = {
                                             node: bindAttr,
                                             severity: 'error',
                                             message: '页面元素双向绑定：只允许绑定可赋值的变量和属性。'
                                         };
                                     }
-                                    else {
-                                        if (bindExpression.isEnum()) {
-                                            diagnostic = {
-                                                node: bindAttr,
-                                                severity: 'error',
-                                                message: '页面元素双向绑定：只允许绑定可赋值的变量和属性。'
-                                            };
-                                        }
-                                    }
-                                    if (diagnostic) {
-                                        bindAttr.tsErrorDetail = diagnostic;
-                                        diagnostics.push(diagnostic);
-                                    }
                                 }
-                            });
-                        }
+                                if (diagnostic) {
+                                    bindAttr.tsErrorDetail = diagnostic;
+                                    diagnostics.push(diagnostic);
+                                }
+                            }
+                        });
                     }
-                    else if ((node instanceof concepts_1.Variable || node instanceof concepts_1.Return) && node.view === fileNode) {
-                        if (!node.typeAnnotation && !node.__TypeAnnotation) {
-                            nodeTypeName_1 = node.concept === 'Return' ? '输出参数' : '局部变量';
-                            fileNode.traverseChildren(function (nodeIn) {
-                                var _a, _b, _c, _d;
-                                if (nodeIn && (nodeIn instanceof concepts_1.BatchAssignment || (nodeIn instanceof concepts_1.Assignment && ((_a = nodeIn.left) === null || _a === void 0 ? void 0 : _a.name)))) {
-                                    // 子页面内部逻辑过滤
-                                    if (nodeIn.view !== fileNode)
-                                        return;
-                                    // 当局部变量、输出参数属于页面内逻辑时，需过滤同页面下不同逻辑下的同名变量
-                                    if (node.logic && node.logic !== nodeIn.logic)
-                                        return;
-                                    // 跟变量无关的赋值过滤
-                                    var jsCode_1 = nodeIn.toJS();
-                                    if (!jsCode_1.includes(node.name + " = "))
+                }
+                else if ((node instanceof concepts_1.Variable || node instanceof concepts_1.Return) && node.view === fileNode) {
+                    if (!node.typeAnnotation && !node.__TypeAnnotation) {
+                        var nodeTypeName_1 = node.concept === 'Return' ? '输出参数' : '局部变量';
+                        var msg_1;
+                        fileNode.traverseChildren(function (nodeIn) {
+                            var _a, _b, _c, _d;
+                            if (nodeIn && (nodeIn instanceof concepts_1.BatchAssignment || (nodeIn instanceof concepts_1.Assignment && ((_a = nodeIn.left) === null || _a === void 0 ? void 0 : _a.name)))) {
+                                // 子页面内部逻辑过滤
+                                if (nodeIn.view !== fileNode)
+                                    return;
+                                // 当局部变量、输出参数属于页面内逻辑时，需过滤同页面下不同逻辑下的同名变量
+                                if (node.logic && node.logic !== nodeIn.logic)
+                                    return;
+                                // 跟变量无关的赋值过滤
+                                var jsCode_1 = nodeIn.toJS();
+                                if (!jsCode_1.includes(node.name + " = "))
+                                    return;
+                                // 页面局部变量
+                                if (node instanceof concepts_1.Variable && node.parentNode instanceof concepts_1.View) {
+                                    // 跟页面局部变量无关的赋值过滤
+                                    if (!jsCode_1.includes("this." + node.name + " = "))
                                         return;
-                                    // 页面局部变量
-                                    if (node instanceof concepts_1.Variable && node.parentNode instanceof concepts_1.View) {
-                                        // 跟页面局部变量无关的赋值过滤
-                                        if (!jsCode_1.includes("this." + node.name + " = "))
-                                            return;
-                                        // 直接赋值 logic 内局部变量、输入参数直接提示系统无法推断类型
-                                        if (((_b = nodeIn.logic) === null || _b === void 0 ? void 0 : _b.params.find(function (param) { return jsCode_1.includes(param.name); })) || ((_c = nodeIn.logic) === null || _c === void 0 ? void 0 : _c.virtualParams.find(function (vParam) { return jsCode_1.includes(vParam.name); }))
-                                            || ((_d = nodeIn.logic) === null || _d === void 0 ? void 0 : _d.variables.find(function (variable) { return jsCode_1.includes(variable.name); }))) {
-                                            if (!nodeIn.tsErrorDetail) {
-                                                var diagnostic_2 = {
-                                                    node: nodeIn,
-                                                    severity: 'error',
-                                                    message: "\u9875\u9762" + nodeTypeName_1 + " " + node.name + " \u8D4B\u503C\u9875\u9762\u903B\u8F91\u5185\u5C40\u90E8\u53D8\u91CF\u6216\u8F93\u5165\u53C2\u6570\u65F6\uFF0C\u7CFB\u7EDF\u65E0\u6CD5\u63A8\u5BFC\u7C7B\u578B\u3002"
-                                                };
-                                                nodeIn.tsErrorDetail = diagnostic_2;
-                                                diagnostics.push(diagnostic_2);
-                                            }
-                                            msg_1 = '系统无法推断类型。';
+                                    // 直接赋值 logic 内局部变量、输入参数直接提示系统无法推断类型
+                                    if (((_b = nodeIn.logic) === null || _b === void 0 ? void 0 : _b.params.find(function (param) { return jsCode_1.includes(param.name); })) || ((_c = nodeIn.logic) === null || _c === void 0 ? void 0 : _c.virtualParams.find(function (vParam) { return jsCode_1.includes(vParam.name); }))
+                                        || ((_d = nodeIn.logic) === null || _d === void 0 ? void 0 : _d.variables.find(function (variable) { return jsCode_1.includes(variable.name); }))) {
+                                        if (!nodeIn.tsErrorDetail) {
+                                            var diagnostic_2 = {
+                                                node: nodeIn,
+                                                severity: 'error',
+                                                message: "\u9875\u9762" + nodeTypeName_1 + " " + node.name + " \u8D4B\u503C\u9875\u9762\u903B\u8F91\u5185\u5C40\u90E8\u53D8\u91CF\u6216\u8F93\u5165\u53C2\u6570\u65F6\uFF0C\u7CFB\u7EDF\u65E0\u6CD5\u63A8\u5BFC\u7C7B\u578B\u3002"
+                                            };
+                                            nodeIn.tsErrorDetail = diagnostic_2;
+                                            diagnostics.push(diagnostic_2);
                                         }
+                                        msg_1 = '系统无法推断类型。';
                                     }
-                                    if (!nodeIn.tsErrorDetail) {
-                                        var diagnostic_3 = {
-                                            node: nodeIn,
-                                            severity: 'error',
-                                            message: nodeIn.label + "\u5DE6\u8FB9 " + node.name + " \u672A\u8BBE\u7F6E\u7C7B\u578B\uFF0C\u53F3\u8FB9\u5FC5\u987B\u4E3A\u6709\u8FD4\u56DE\u503C\u7684\u5185\u5BB9\u3002"
-                                        };
-                                        nodeIn.tsErrorDetail = diagnostic_3;
-                                        diagnostics.push(diagnostic_3);
-                                    }
-                                    msg_1 = '必须赋值有返回值的内容。';
                                 }
-                            });
-                            if (!msg_1)
-                                msg_1 = '未设置类型或未赋值，直接赋值系统会自动推断类型。';
-                            diagnostic = {
-                                node: node,
-                                severity: 'error',
-                                message: nodeTypeName_1 + " " + node.name + " " + msg_1
-                            };
-                            node.tsErrorDetail = diagnostic;
-                            diagnostics.push(diagnostic);
-                        }
-                    }
-                    else {
-                        this.checkNodeError(node, diagnostics);
+                                if (!nodeIn.tsErrorDetail) {
+                                    var diagnostic_3 = {
+                                        node: nodeIn,
+                                        severity: 'error',
+                                        message: nodeIn.label + "\u5DE6\u8FB9 " + node.name + " \u672A\u8BBE\u7F6E\u7C7B\u578B\uFF0C\u53F3\u8FB9\u5FC5\u987B\u4E3A\u6709\u8FD4\u56DE\u503C\u7684\u5185\u5BB9\u3002"
+                                    };
+                                    nodeIn.tsErrorDetail = diagnostic_3;
+                                    diagnostics.push(diagnostic_3);
+                                }
+                                msg_1 = '必须赋值有返回值的内容。';
+                            }
+                        });
+                        if (!msg_1)
+                            msg_1 = '未设置类型或未赋值，直接赋值系统会自动推断类型。';
+                        var diagnostic = {
+                            node: node,
+                            severity: 'error',
+                            message: nodeTypeName_1 + " " + node.name + " " + msg_1
+                        };
+                        node.tsErrorDetail = diagnostic;
+                        diagnostics.push(diagnostic);
                     }
-                    return [2 /*return*/];
-                });
-            }); });
+                }
+                else {
+                    _this.checkNodeError(node, diagnostics);
+                }
+            });
         }
         if (fileNode instanceof concepts_1.DataSource) {
             var dataSourceGroup = (_a = fileNode.rootNode.configuration) === null || _a === void 0 ? void 0 : _a.getGroup('dataSource');
@@ -1263,6 +1282,44 @@ var NaslServer = /** @class */ (function () {
                             };
                             diagnostics.push(diagnostic);
                         }
+                        else if (propertyValue.value) {
+                            var dataSource = fileNode;
+                            // 数据源有连接错误
+                            var envText = void 0;
+                            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) {
+                                var diagnostic = {
+                                    node: fileNode,
+                                    severity: 'error',
+                                    message: "\u6570\u636E\u6E90\u914D\u7F6E\uFF1A\u6570\u636E\u6E90 " + property_1.name + " " + envText + "\u73AF\u5883\u6570\u636E\u6E90\u8FDE\u63A5\u4E0D\u901A\uFF0C\u8BF7\u5148\u68C0\u67E5" + envText + "\u73AF\u5883\u6570\u636E\u6E90\u914D\u7F6E",
+                                    // 保留原来的内容方便查询一些问题
+                                    originalDiagnostic: {
+                                        fileName: '',
+                                        start: null,
+                                        end: null,
+                                        category: 'error',
+                                        text: "DataSource connection error"
+                                    }
+                                };
+                                return diagnostics.push(diagnostic);
+                            }
+                        }
                     });
                 }
             }
@@ -1271,69 +1328,71 @@ var NaslServer = /** @class */ (function () {
             // 判断逻辑是否已经删除
             if (fileNode.parentNode instanceof concepts_1.App && !fileNode.parentNode.logics.includes(fileNode))
                 return diagnostics;
-            fileNode === null || fileNode === void 0 ? void 0 : fileNode.sourceMap.forEach(function (value, node) { return __awaiter(_this, void 0, void 0, function () {
-                var diagnostic, nodeTypeName, used_1, msg, diagnostic;
-                return __generator(this, function (_a) {
-                    // SqlQueryComponent内部返回值类型，如果是嵌套的就需要报错
-                    if ((node instanceof concepts_1.OqlQueryComponent || node instanceof concepts_1.SqlQueryComponent) && node.getTypeBanError()) {
-                        diagnostic = {
+            fileNode === null || fileNode === void 0 ? void 0 : fileNode.sourceMap.forEach(function (value, node) {
+                //OQL支持返回复合类型数据了
+                // SqlQueryComponent内部返回值类型，如果是嵌套的就需要报错
+                // 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) {
+                        var nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
+                        var used_1 = false;
+                        fileNode === null || fileNode === void 0 ? void 0 : fileNode.sourceMap.forEach(function (valueIn, nodeIn) {
+                            var _a;
+                            if (!used_1 && nodeIn
+                                && (nodeIn instanceof concepts_1.BatchAssignment || (nodeIn instanceof concepts_1.Assignment && ((_a = nodeIn.left) === null || _a === void 0 ? void 0 : _a.name)))
+                                && nodeIn.toJS().includes(node.name + " = ")) {
+                                used_1 = true;
+                                if (!nodeIn.tsErrorDetail) {
+                                    var diagnostic_4 = {
+                                        node: nodeIn,
+                                        severity: 'error',
+                                        message: nodeIn.label + "\u5DE6\u8FB9 " + node.name + " \u672A\u8BBE\u7F6E\u7C7B\u578B\uFF0C\u53F3\u8FB9\u5FC5\u987B\u4E3A\u6709\u8FD4\u56DE\u503C\u7684\u5185\u5BB9\u3002"
+                                    };
+                                    nodeIn.tsErrorDetail = diagnostic_4;
+                                    diagnostics.push(diagnostic_4);
+                                }
+                            }
+                        });
+                        var msg = used_1 ? '必须赋值有返回值的内容。' : '未设置类型或未赋值。直接赋值系统可以自动推断类型。';
+                        var diagnostic = {
                             node: node,
                             severity: 'error',
-                            message: 'SQL查询：返回类型内部,不支持复杂类型。'
+                            message: nodeTypeName + " " + node.name + " " + msg
                         };
                         node.tsErrorDetail = diagnostic;
                         diagnostics.push(diagnostic);
                     }
-                    if (node instanceof concepts_1.Return || node instanceof concepts_1.Variable) {
-                        if (!node.typeAnnotation && !node.__TypeAnnotation) {
-                            nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
-                            used_1 = false;
-                            fileNode === null || fileNode === void 0 ? void 0 : fileNode.sourceMap.forEach(function (valueIn, nodeIn) {
-                                var _a;
-                                if (!used_1 && nodeIn
-                                    && (nodeIn instanceof concepts_1.BatchAssignment || (nodeIn instanceof concepts_1.Assignment && ((_a = nodeIn.left) === null || _a === void 0 ? void 0 : _a.name)))
-                                    && nodeIn.toJS().includes(node.name + " = ")) {
-                                    used_1 = true;
-                                    if (!nodeIn.tsErrorDetail) {
-                                        var diagnostic_4 = {
-                                            node: nodeIn,
-                                            severity: 'error',
-                                            message: nodeIn.label + "\u5DE6\u8FB9 " + node.name + " \u672A\u8BBE\u7F6E\u7C7B\u578B\uFF0C\u53F3\u8FB9\u5FC5\u987B\u4E3A\u6709\u8FD4\u56DE\u503C\u7684\u5185\u5BB9\u3002"
-                                        };
-                                        nodeIn.tsErrorDetail = diagnostic_4;
-                                        diagnostics.push(diagnostic_4);
-                                    }
-                                }
-                            });
-                            msg = used_1 ? '必须赋值有返回值的内容。' : '未设置类型或未赋值。直接赋值系统可以自动推断类型。';
-                            diagnostic = {
-                                node: node,
-                                severity: 'error',
-                                message: nodeTypeName + " " + node.name + " " + msg
-                            };
-                            node.tsErrorDetail = diagnostic;
-                            diagnostics.push(diagnostic);
-                        }
-                        else {
-                            node.tsErrorDetail = undefined;
-                        }
+                    else {
+                        node.tsErrorDetail = undefined;
                     }
-                    this.checkNodeError(node, diagnostics);
-                    return [2 /*return*/];
-                });
-            }); });
+                }
+                _this.checkNodeError(node, diagnostics);
+            });
+        }
+        if (fileNode instanceof concepts_1.Process) {
+            fileNode === null || fileNode === void 0 ? void 0 : fileNode.sourceMap.forEach(function (value, node) {
+                _this.checkNodeError(node, diagnostics);
+            });
         }
         return diagnostics;
     };
     NaslServer.prototype.checkNodeError = function (node, diagnostics) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         if (!node)
             return;
         // 如果节点是match的看看节点里是不是有重复的
         if (node instanceof concepts_1.Match) {
             var typeMap_1 = {};
             if ((_a = node.expression) === null || _a === void 0 ? void 0 : _a.__TypeAnnotation) {
-                var _f = node.expression.__TypeAnnotation, typeName = _f.typeName, typeNamespace = _f.typeNamespace;
+                var _k = node.expression.__TypeAnnotation, typeName = _k.typeName, typeNamespace = _k.typeNamespace;
                 if (typeName === 'Union' || typeName === 'Boolean' || (typeNamespace === null || typeNamespace === void 0 ? void 0 : typeNamespace.endsWith('enums'))) {
                     node.cases.forEach(function (item) {
                         if (Array.isArray(item.patterns)) {
@@ -1405,9 +1464,32 @@ var NaslServer = /** @class */ (function () {
                     node.tsErrorDetail = diagnostic;
                     diagnostics.push(diagnostic);
                 }
+                // 如果TypeAnnotation 还存在，但是本身已经不是union类型，就是已经从union换别的类型了就都要报错
+            }
+            else if (node instanceof concepts_1.TypeAnnotation && (matchExpressionType === null || matchExpressionType === void 0 ? void 0 : matchExpressionType.typeKind) !== 'union') {
+                var diagnostic = {
+                    node: node,
+                    severity: 'error',
+                    message: '匹配：选择类型不存在',
+                    titleTip: '该类型已被删除'
+                };
+                node.tsErrorDetail = diagnostic;
+                diagnostics.push(diagnostic);
+                // 如果可枚举变量的 ，变量 还存在，但是本身已经是union类型，就是已经从别的类型 换了union就都要报错
+            }
+            else if (!(node instanceof concepts_1.TypeAnnotation) && (matchExpressionType === null || matchExpressionType === void 0 ? void 0 : matchExpressionType.typeKind) === 'union') {
+                var diagnostic = {
+                    node: node,
+                    severity: 'error',
+                    message: '匹配：选择值不存在',
+                    titleTip: '该值无法匹配，请重新选择类型'
+                };
+                node.tsErrorDetail = diagnostic;
+                diagnostics.push(diagnostic);
             }
             if (node.tsErrorDetail) {
-                if ((_d = matchExpressionType === null || matchExpressionType === void 0 ? void 0 : matchExpressionType.typeNamespace) === null || _d === void 0 ? void 0 : _d.includes('enums')) {
+                // 如果父级是枚举，而且子集选的是变量，就提示枚举值已被删除
+                if (((_d = matchExpressionType === null || matchExpressionType === void 0 ? void 0 : matchExpressionType.typeNamespace) === null || _d === void 0 ? void 0 : _d.includes('enums')) && (node instanceof concepts_1.MemberExpression)) {
                     node.tsErrorDetail.titleTip = '该枚举值已被删除';
                 }
                 else if (!node.tsErrorDetail.titleTip) {
@@ -1425,6 +1507,25 @@ var NaslServer = /** @class */ (function () {
             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' && ((_g = (_f = node.parentNode) === null || _f === void 0 ? void 0 : _f.parentNode) === null || _g === void 0 ? void 0 : _g.concept) !== 'CallLogic' && ((_j = (_h = node.parentNode) === null || _h === void 0 ? void 0 : _h.parentNode) === null || _j === void 0 ? void 0 : _j.concept) !== 'CallInterface' && !node.__TypeAnnotation) {
+            var diagnostic = {
+                node: node,
+                severity: 'error',
+                message: "\u7C7B\u578B\u4E0D\u5339\u914D\uFF0C\u4F20\u5165\u7C7B\u578B\uFF1Avoid"
+            };
+            node.tsErrorDetail = diagnostic;
+            diagnostics.push(diagnostic);
+        }
     };
     /* 接口导入查找 */
     NaslServer.prototype.existStructureFix = function (semanticDiagnostics, node, that) {
@@ -1568,7 +1669,7 @@ var NaslServer = /** @class */ (function () {
      */
     NaslServer.prototype._isHaveRef = function (node) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, currentSource, fileNode, refsList, newRefs, lists, moduleName_2, item, fileNode_1, newRefs, logicNode, currentSource_1, parentRefs, viewNode, currentSource_2, code, viewIndex, viewRefs, filterViewRefs, code, prefix, prefixIndex, methodsNameIndex, methods, methodRefs_1;
+            var _a, currentSource, fileNode, refsList, newRefs, lists, moduleName_2, item, fileNode_2, newRefs, logicNode, currentSource_1, parentRefs, viewNode, currentSource_2, code, viewIndex, viewRefs, filterViewRefs, code, prefix, prefixIndex, methodsNameIndex, methods, methodRefs_1;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -1591,10 +1692,10 @@ var NaslServer = /** @class */ (function () {
                         moduleName_2 = fileNode.getEmbeddedFilePath();
                         if (!lists.length) return [3 /*break*/, 4];
                         item = lists[0];
-                        fileNode_1 = this.getCurrentSource(item).fileNode;
-                        if (!fileNode_1) return [3 /*break*/, 4];
+                        fileNode_2 = this.getCurrentSource(item).fileNode;
+                        if (!fileNode_2) return [3 /*break*/, 4];
                         return [4 /*yield*/, this.references({
-                                file: fileNode_1.getEmbeddedFilePath(),
+                                file: fileNode_2.getEmbeddedFilePath(),
                                 line: 1,
                                 offset: 22
                             })];
@@ -2479,7 +2580,7 @@ var NaslServer = /** @class */ (function () {
      */
     NaslServer.prototype.getCurrentNodeKnownTypeAnnotation = function (node) {
         var _a;
-        if (node.concept === 'StringLiteral' || node.concept === 'BooleanLiteral' || node.concept === 'NullLiteral') {
+        if (node.concept === 'StringLiteral' || node.concept === 'StringInterpolation' || node.concept === 'BooleanLiteral' || node.concept === 'NullLiteral') {
             var type = 'String';
             switch (node.concept) {
                 case 'NullLiteral':
@@ -2496,7 +2597,7 @@ var NaslServer = /** @class */ (function () {
             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];
             }
@@ -2578,6 +2679,9 @@ var NaslServer = /** @class */ (function () {
                                 'Return',
                                 'Variable',
                                 'Match',
+                                'NewComposite',
+                                'NewList',
+                                'NewMap',
                             ].includes(node.concept))
                                 return;
                             // 要去ls那边获取的
@@ -2629,6 +2733,13 @@ var NaslServer = /** @class */ (function () {
                                 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;
+                                var indexOf = item.code.indexOf('return __newComposite');
+                                var newCode = item.code.substring(0, indexOf);
+                                newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
+                                fileDetail.offset = newCode.length + 'return '.length;
+                            }
                             args.push(fileDetail);
                         });
                         console.time('请求');
@@ -2689,6 +2800,10 @@ var NaslServer = /** @class */ (function () {
                                         node.__TypeAnnotation = Object.freeze(value.typeAnnotation);
                                     }
                                 }
+                                else {
+                                    // 清空原来已经赋值上去的类型，可能原来有现在没有了
+                                    node.__TypeAnnotation = null;
+                                }
                             }
                             catch (err) {
                                 if (globalThis.window) {
@@ -2985,7 +3100,8 @@ var NaslServer = /** @class */ (function () {
             option: { defaultValue: param.defaultValue }
         };
     };
-    NaslServer.prototype.getCurrentTypeAnnotation = function (node) {
+    NaslServer.prototype.getCurrentTypeAnnotation = function (node, outTime) {
+        if (outTime === void 0) { outTime = 600; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 if (node.__TypeAnnotation) {
@@ -3002,7 +3118,7 @@ var NaslServer = /** @class */ (function () {
                             else {
                                 resolve(null);
                             }
-                        }, 600);
+                        }, outTime);
                         var mySetInterval = setInterval(function () {
                             if (node.__isCorrectTypeAnnotation) {
                                 resolve(node.__TypeAnnotation);
@@ -3153,7 +3269,7 @@ var NaslServer = /** @class */ (function () {
     NaslServer.prototype.handleRename = function (fileNode, targetNode, result, oldFilePath) {
         var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function () {
-            var outputFiles, oldRefs, newRefs, newRefFileList_1, newRefs2, _g, currentSource, fileNode_2, oldRefs, newRefs2;
+            var outputFiles, oldRefs, newRefs, newRefFileList_1, newRefs2, _g, currentSource, fileNode_3, oldRefs, newRefs2;
             return __generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
@@ -3215,10 +3331,10 @@ var NaslServer = /** @class */ (function () {
                         newRefs2.refs.forEach(function (ref) { return filesToCheck.add(ref.file); });
                         return [3 /*break*/, 11];
                     case 7:
-                        _g = this.getCurrentSource(targetNode), currentSource = _g.currentSource, fileNode_2 = _g.fileNode;
+                        _g = this.getCurrentSource(targetNode), currentSource = _g.currentSource, fileNode_3 = _g.fileNode;
                         if (!currentSource) return [3 /*break*/, 11];
                         return [4 /*yield*/, this.references({
-                                file: fileNode_2.getEmbeddedFilePath(),
+                                file: fileNode_3.getEmbeddedFilePath(),
                                 line: translator_1.lsp2tspNumber(currentSource.range.start.line),
                                 offset: translator_1.lsp2tspNumber(currentSource.range.start.character)
                             })];
@@ -3231,7 +3347,7 @@ var NaslServer = /** @class */ (function () {
                         // 更新文件之后
                         _h.sent();
                         return [4 /*yield*/, this.references({
-                                file: fileNode_2.getEmbeddedFilePath(),
+                                file: fileNode_3.getEmbeddedFilePath(),
                                 line: translator_1.lsp2tspNumber(currentSource.range.start.line),
                                 offset: translator_1.lsp2tspNumber(currentSource.range.start.character)
                             })];