@lcap/nasl 3.13.1-beta.9 → 3.13.1-debug.2

package/out/server/naslServer.js

@@ -57,7 +57,6 @@ const translator_2 = require("./translator");
 const common_1 = require("../common");
 const diagnostic_1 = require("../manager/diagnostic");
 const naslStdlibMap_1 = __importDefault(require("./naslStdlibMap"));
-const vue_1 = require("../utils/vue");
 const utils_2 = require("../utils");
 const decorators_1 = require("../decorators");
 const nasl_concepts_1 = require("@lcap/nasl-concepts");
@@ -129,34 +128,24 @@ function belongVirtualParams(node) {
     return (0, utils_1.findConceptKeyWordIndexFromNodePath)(node?.nodePath, 'virtualParams') !== -1;
 }
 /**
- * 包含特定的关键字
+ * 是端事件下的参数
  * @param node
- * @param keywords
  * @returns
  */
-function containsSpecificKeywords(node, keywords) {
-    return keywords.filter((keyword) => {
-        return (0, utils_1.findConceptKeyWordIndexFromNodePath)(node?.nodePath, keyword) !== -1;
-    })?.length;
-}
-/**
- * 方法下入参'_'
- * @param node
- * @returns
- */
-function isFunctionUnderlineParam(node) {
-    return node?.name === '_' && node?.concept === 'Param' && node?.parentNode?.concept === 'Function';
-}
-/**
- * 是端类型下的参数
- * @param node
- * @returns
- */
-function isFrontendTypeEvent(node) {
+function isFrontendEvent(node) {
+    let flag = false;
     if (node?.name === 'event') {
-        return node.getAncestor('FrontendType');
+        flag = true;
+        let target = node;
+        const conceptList = ['Param', 'Logic', 'BindEvent', 'Frontend'];
+        conceptList.forEach((concept) => {
+            if (target?.concept !== concept) {
+                flag = false;
+            }
+            target = target?.parentNode;
+        });
     }
-    return false;
+    return flag;
 }
 // 联合类型切割取出类型
 function getDisplayString2Type(displayString) {
@@ -1729,19 +1718,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
             errorFRefNames,
         };
     }
-    _getDuplicateNames(node, getItems, getName) {
-        const items = getItems(node);
-        const nameSet = new Set();
-        const res = new Set();
-        for (const item of items) {
-            const name = getName(item);
-            if (!nameSet.has(name))
-                nameSet.add(name);
-            else
-                res.add(name);
-        }
-        return Array.from(res);
-    }
     /**
      * 额外的诊断
      * @param fileNode 文件级别的节点
@@ -2034,21 +2010,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     }
                 }
                 else if (node instanceof concepts_1.Logic) {
-                    const duplicateVariables = self._getDuplicateNames(node, (logic) => [
-                        ...logic.variables,
-                        ...logic.params,
-                        ...logic.returns,
-                        ...likeComponent.variables,
-                        ...likeComponent.params,
-                    ], (item) => item.name);
-                    if (duplicateVariables.length) {
-                        const diagnostic = {
-                            node,
-                            severity: 'error',
-                            message: `逻辑${node.name}存在重名变量：${duplicateVariables.join(', ')}`,
-                        };
-                        diagnostics.push(diagnostic);
-                    }
                 }
                 else {
                     self.checkNodeError(node, diagnostics);
@@ -2122,15 +2083,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     });
                 }
             }
-            // 检查实体重名
-            const duplidateEntities = this._getDuplicateNames(fileNodeRaw, (dataSource) => dataSource.entities, (entity) => entity.name);
-            if (duplidateEntities.length) {
-                diagnostics.push({
-                    node: fileNode,
-                    severity: 'error',
-                    message: `数据源${fileNodeRaw.name}存在重名实体：${duplidateEntities.join(', ')}`,
-                });
-            }
         }
         // 加上对实体属性存储类型的校验规则
         else if (fileNodeRaw instanceof concepts_1.Entity) {
@@ -2473,15 +2425,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 }
             }
             if (fileNodeRaw instanceof concepts_1.Logic && fileNodeRaw.calleewholeKey.startsWith('app.logics')) {
-                const duplicateLogics = this._getDuplicateNames(fileNodeRaw.rootNode, (app) => app.logics, (logic) => logic.name);
-                if (duplicateLogics.includes(fileNodeRaw.name)) {
-                    const diagnostic = {
-                        node: fileNode,
-                        severity: 'error',
-                        message: `存在重名服务端逻辑${fileNodeRaw.name}`,
-                    };
-                    diagnostics.push(diagnostic);
-                }
                 if (fileNodeRaw.sharedScope?.scope === 'specifiedRange' && !fileNodeRaw.sharedScope?.specifiedRange?.length) {
                     const diagnostic = {
                         node: fileNode,
@@ -2911,16 +2854,11 @@ let NaslServer = NaslServer_1 = class NaslServer {
         // 校验节点名
         function* validateNodeName(node) {
             // 排除一些不需要校验的情况
-            if (isFrontendTypeEvent(node) || belongEntityLogic(node) || belongVirtualParams(node)
-                || containsSpecificKeywords(node, ['dependencies', 'interfaceDependencies'])
-                || isFunctionUnderlineParam(node)) {
+            if (isFrontendEvent(node) || belongEntityLogic(node) || belongVirtualParams(node)) {
                 return;
             }
             const { concept } = node || {};
-            let conceptValidator = validator_1.validator[concept];
-            if (concept === 'EnumItem' && node?.parentNode?.valueType?.typeName === 'Long') {
-                conceptValidator = validator_1.validator['EnumItemInteger'];
-            }
+            const conceptValidator = validator_1.validator[concept];
             if (conceptValidator) {
                 try {
                     const vusionValidator = new validator_1.VusionValidator({}, {}, conceptValidator.rules(node), null) || {};
@@ -2945,21 +2883,17 @@ let NaslServer = NaslServer_1 = class NaslServer {
                             message: `【${toBeVerifiedName}】命名非法：${res}`,
                         };
                         diagnostics.push(diagnostic);
+                        console.log(diagnostic);
                     }
                 }
                 catch (err) {
-                    if (utils.isDebugMode) {
-                        self.logger.info(err);
-                    }
+                    // console.log(err);
                 }
             }
         }
-        /**
-         * 问题没有收敛，先注释
-         */
-        // yield* utils.wrapIteratorToGenerator(fileNodeRaw.sourceMap.entries(), function* ([node]: any) {
-        //   yield* validateNodeName(node);
-        // });
+        yield* utils.wrapIteratorToGenerator(fileNodeRaw.sourceMap.entries(), function* ([node]) {
+            yield* validateNodeName(node);
+        });
         return diagnostics;
     }
     timeoutCheck(fileNodeRaw, fileNode, diagnostics) {
@@ -5001,8 +4935,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 // 预留时间做 minor gc，减少峰值内存占用
                 utils.delay(55);
             }
-            const { node: nodeOrigin, filePath, item } = itemDetail;
-            const node = (0, vue_1.toRaw)(nodeOrigin);
+            const { node, filePath, item } = itemDetail;
             // 先按照顺序占位
             types.set(node, null);
             // 获取已知节点类型的类型
@@ -5287,7 +5220,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
         this.logger.time('app to AnnotatedJSON');
         const jsonMap = new Map();
-        const json = (0, vue_1.toRaw)(naslNode)._toJSON((newJson, oldNode) => {
+        const json = naslNode._toJSON((newJson, oldNode) => {
             // 删除多余属性，降低全量数据
             delete newJson._aiUID;
             jsonMap.set(oldNode, newJson);
@@ -5626,74 +5559,70 @@ let NaslServer = NaslServer_1 = class NaslServer {
             // 有值而且没有类型再去设置
             // 但是Identifier 和 MemberExpression 都用标注出来的因为本身是变量，有类型也需要覆盖一下
             if (typ && (node instanceof concepts_1.Argument) && node.getAncestor('Connector')?.concept === 'Connector') {
-                const newJson = jsonMap.get((0, vue_1.toRaw)(node));
+                const newJson = jsonMap.get(node);
                 if (newJson) {
                     newJson.typeAnnotation = typ?.toJSON?.() ?? typ;
                 }
             }
             if (typ && (!node.typeAnnotation || node instanceof concepts_1.Identifier || node instanceof concepts_1.MemberExpression)) {
-                const newJson = jsonMap.get((0, vue_1.toRaw)(node));
+                const newJson = jsonMap.get(node);
                 if (newJson) {
                     newJson.typeAnnotation = typ?.toJSON?.() ?? typ;
                 }
             }
             // 旧版本数据查询需要确认是匿名数据结构的 ListTotal 类型
             if (node instanceof concepts_1.CallQueryComponent && !node.isAutoInfer()) {
-                const jsonNode = jsonMap.get((0, vue_1.toRaw)(node));
-                if (jsonNode) {
-                    jsonNode.typeAnnotation = {
-                        concept: 'TypeAnnotation',
-                        typeKind: 'anonymousStructure',
-                        typeNamespace: null,
-                        typeName: null,
-                        typeArguments: [],
-                        inferred: false,
-                        ruleMap: null,
-                        properties: [
-                            {
-                                concept: 'StructureProperty',
-                                name: 'list',
-                                label: null,
-                                description: null,
-                                typeAnnotation: {
-                                    concept: 'TypeAnnotation',
-                                    typeKind: 'generic',
-                                    typeNamespace: 'nasl.collection',
-                                    typeName: 'List',
-                                    typeArguments: [jsonNode.typeAnnotation],
-                                    inferred: null,
-                                },
-                                required: null,
-                                defaultValue: null,
+                const newJson = jsonMap.get(node);
+                newJson.typeAnnotation = {
+                    concept: 'TypeAnnotation',
+                    typeKind: 'anonymousStructure',
+                    typeNamespace: null,
+                    typeName: null,
+                    typeArguments: [],
+                    inferred: false,
+                    ruleMap: null,
+                    properties: [
+                        {
+                            concept: 'StructureProperty',
+                            name: 'list',
+                            label: null,
+                            description: null,
+                            typeAnnotation: {
+                                concept: 'TypeAnnotation',
+                                typeKind: 'generic',
+                                typeNamespace: 'nasl.collection',
+                                typeName: 'List',
+                                typeArguments: [newJson.typeAnnotation],
+                                inferred: null,
                             },
-                            {
-                                concept: 'StructureProperty',
-                                name: 'total',
-                                label: null,
-                                description: null,
-                                typeAnnotation: {
-                                    concept: 'TypeAnnotation',
-                                    typeKind: 'primitive',
-                                    typeNamespace: 'nasl.core',
-                                    typeName: 'Long',
-                                    typeArguments: null,
-                                    inferred: null,
-                                },
-                                required: null,
-                                defaultValue: null,
+                            required: null,
+                            defaultValue: null,
+                        },
+                        {
+                            concept: 'StructureProperty',
+                            name: 'total',
+                            label: null,
+                            description: null,
+                            typeAnnotation: {
+                                concept: 'TypeAnnotation',
+                                typeKind: 'primitive',
+                                typeNamespace: 'nasl.core',
+                                typeName: 'Long',
+                                typeArguments: null,
+                                inferred: null,
                             },
-                        ],
-                    };
-                }
+                            required: null,
+                            defaultValue: null,
+                        },
+                    ],
+                };
             }
             // 特殊处理param有类型错误的
             if (node instanceof concepts_1.Param) {
                 // index在nasl foreach上有脏数据
                 if (node.parentKey === 'index' && node.parentNode instanceof concepts_1.ForEachStatement) {
-                    const jsonNode = jsonMap.get((0, vue_1.toRaw)(node));
-                    if (jsonNode) {
-                        jsonNode.typeAnnotation = concepts_1.TypeAnnotation.createPrimitive('Long').toJSON();
-                    }
+                    const newJson = jsonMap.get(node);
+                    newJson.typeAnnotation = concepts_1.TypeAnnotation.createPrimitive('Long').toJSON();
                 }
             }
             if (node instanceof concepts_1.Match) {
@@ -5705,10 +5634,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     fileNode.sourceMap.forEach((item, itemNode) => {
                         const itemCode = this.getNodeCode(fileNode, item);
                         if (itemNode.concept === matchExpression.concept && itemCode === currentCode) {
-                            const newJson = jsonMap.get((0, vue_1.toRaw)(itemNode));
-                            if (newJson) {
-                                newJson.typeAnnotation = matchExpression.__TypeAnnotation;
-                            }
+                            const newJson = jsonMap.get(itemNode);
+                            newJson.typeAnnotation = matchExpression.__TypeAnnotation;
                         }
                     });
                 }
@@ -5717,17 +5644,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
             if (typ && (node instanceof concepts_1.Param)) {
                 // index在nasl foreach上有脏数据
                 if (node.parentKey === 'index' && node.parentNode instanceof concepts_1.ForEachStatement) {
-                    const newJson = jsonMap.get((0, vue_1.toRaw)(node));
-                    if (newJson) {
-                        newJson.typeAnnotation = typ?.toJSON?.() ?? typ;
-                    }
+                    const newJson = jsonMap.get(node);
+                    newJson.typeAnnotation = typ?.toJSON?.() ?? typ;
                 }
             }
             if (typ && (node instanceof concepts_1.NewComposite) && (node.typeAnnotation?.typeKind === 'anonymousStructure' || node.typeAnnotation?.typeKind === 'generic')) {
-                const newJson = jsonMap.get((0, vue_1.toRaw)(node));
-                if (newJson) {
-                    newJson.typeAnnotation = typ?.toJSON?.() ?? typ;
-                }
+                const newJson = jsonMap.get(node);
+                newJson.typeAnnotation = typ?.toJSON?.() ?? typ;
             }
             // jsonSerializer 是 CallLogic，其余是 CallFunction
             if (node instanceof concepts_1.CallFunction || node instanceof concepts_1.CallLogic) {
@@ -5743,11 +5666,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 * 特殊处理，不想去查两次类型, 因为是从函数签名上拿类型，所以直接合并在一起，先这样
                 */
                 if (node instanceof concepts_1.CallLogic && node.__TypeArguments?.length) {
-                    const newJson = jsonMap.get((0, vue_1.toRaw)(node));
-                    if (newJson) {
-                        newJson.typeArguments = node.__TypeArguments.map((type) => type?.toJSON?.() ?? type);
-                        newJson.typeAnnotation = node.__TypeAnnotation?.toJSON?.() ?? node.__TypeAnnotation;
-                    }
+                    const newJson = jsonMap.get(node);
+                    newJson.typeArguments = node.__TypeArguments.map((type) => type?.toJSON?.() ?? type);
+                    newJson.typeAnnotation = node.__TypeAnnotation?.toJSON?.() ?? node.__TypeAnnotation;
                 }
                 // 根据 https://projectmanage.netease-official.lcap.163yun.com/dashboard/FeatureDetail?id=2737356895760128&id1=null&iterationId=null&versionid=null&tab=info
                 // 对CallFunction节点，若其callee为部分List/Map内置函数，则修改其argument类型标注以让服务端据此插入显式的类型转换。规则如下：
@@ -5776,10 +5697,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
                             if (itemExpression) {
                                 const listTypeArgument = list.__TypeAnnotation?.typeArguments?.[0]?.toJSON?.() ?? list.__TypeAnnotation?.typeArguments?.[0];
                                 if (listTypeArgument) {
-                                    const newJson = jsonMap.get((0, vue_1.toRaw)(item));
-                                    if (newJson) {
-                                        newJson.typeAnnotation = listTypeArgument;
-                                    }
+                                    const newJson = jsonMap.get(item);
+                                    newJson.typeAnnotation = listTypeArgument;
                                 }
                             }
                         }
@@ -5794,19 +5713,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
                                 if (keyExpression) {
                                     const mapKeyTypeArgument = map.__TypeAnnotation?.typeArguments?.[0]?.toJSON?.() ?? map.__TypeAnnotation?.typeArguments?.[0];
                                     if (mapKeyTypeArgument) {
-                                        const newJson = jsonMap.get((0, vue_1.toRaw)(key));
-                                        if (newJson) {
-                                            newJson.typeAnnotation = mapKeyTypeArgument;
-                                        }
+                                        const newJson = jsonMap.get(key);
+                                        newJson.typeAnnotation = mapKeyTypeArgument;
                                     }
                                 }
                                 if (valueExpression) {
                                     const mapValueTypeArgument = map.__TypeAnnotation?.typeArguments?.[1]?.toJSON?.() ?? map.__TypeAnnotation?.typeArguments?.[1];
                                     if (mapValueTypeArgument) {
-                                        const newJson = jsonMap.get((0, vue_1.toRaw)(value));
-                                        if (newJson) {
-                                            newJson.typeAnnotation = mapValueTypeArgument;
-                                        }
+                                        const newJson = jsonMap.get(value);
+                                        newJson.typeAnnotation = mapValueTypeArgument;
                                     }
                                 }
                             }
@@ -5816,7 +5731,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             // 服务端需要默认值节点有类型来判断父节点是否是日期类型
             if (node instanceof concepts_1.DefaultValue && !typ) {
-                const newJson = jsonMap.get((0, vue_1.toRaw)(node));
+                const newJson = jsonMap.get(node);
                 const parentNodeType = node.parentNode?.typeAnnotation || node.parentNode?.__TypeAnnotation;
                 if (parentNodeType && newJson) {
                     newJson.typeAnnotation = parentNodeType?.toJSON?.() ?? parentNodeType;