@lcap/nasl 2.12.0-beta → 2.12.0-beta.1

package/src/automate/engine/uniqueName.js

@@ -1,9 +1,12 @@
 import { unique } from '../../utils/string';
-class uniqueName {
+export class uniqueName {
     NamesWeakMap = new Map();
     initAppUniqueNames(app) {
         const NamesWeakMap = this.NamesWeakMap;
-        NamesWeakMap.set('DataSource', new Set(app.getDataSourceExistingNames()));
+        const defaultDS = app.dataSources.find(d => d.name === 'defaultDS');
+        NamesWeakMap.set('defaultDS', new Set(defaultDS.getEntityExistingNames()));
+
+        // NamesWeakMap.set('DataSource', new Set(app.getDataSourceExistingNames()));
         NamesWeakMap.set('Structure', new Set(app.getStructureExistingNames()));
         NamesWeakMap.set('Enum', new Set(app.getEnumExistingNames()));
         NamesWeakMap.set('Logic', new Set(app.getLogicExistingNames()));
@@ -15,22 +18,87 @@ class uniqueName {
     getGenUniqNameFunctionName(item, concept) {
         const p = item.parentNode;
         const NamesWeakMap = this.NamesWeakMap;
-        if(!p) {
+        if (!p) {
+            // 添加至顶层 App 的对象
+            if(concept === 'DataSource') {
+                return item.name;
+            }
+            if(concept === 'Entity') {
+                // Entity 是为了兼容 2.11 及之前的模板
+                concept = 'defaultDS';
+            }
+            const nameSet = NamesWeakMap.get(concept);
+            const n = unique(item.name, nameSet, 1, true);
+            nameSet.add(n);
+            return n;
+        }
+        const f1 = p['get' + concept + 'UniqueName'];
+        const f2 = p['get' + concept + 'ExistingNames'];
+        if (f1 && f2) {
+            const names = f2.call(p);
+            const t = names.filter((n) => n === item.name);
+            if (t.length > 1) {
+                return f1.call(p, item.name);
+            }
+        }
+        return item.name;
+    }
+}
+
+export class componentUniqueName {
+    NamesWeakMap = new Map();
+    view = null;
+    initAppUniqueNames(app, view) {
+        const NamesWeakMap = this.NamesWeakMap;
+        this.view = view;
+        NamesWeakMap.set('DataSource', new Set(app.getDataSourceExistingNames()));
+        NamesWeakMap.set('Structure', new Set(app.getStructureExistingNames()));
+        NamesWeakMap.set('Enum', new Set(app.getEnumExistingNames()));
+        NamesWeakMap.set('Logic', new Set(app.getLogicExistingNames()));
+        NamesWeakMap.set('Interface', new Set(app.getInterfaceExistingNames()));
+        NamesWeakMap.set('View', new Set(app.getViewExistingNames()));
+        NamesWeakMap.set('Process', new Set(app.getProcessExistingNames()));
+        NamesWeakMap.set('Role', new Set(app.getRoleExistingNames()));
+        // .... 这里要补一下 view 下面 variable, logics的名字
+        NamesWeakMap.set('Variable', new Set(view.getVarExistingNames()));
+        NamesWeakMap.set('Logic', new Set(view.getLogicExistingNames()));
+    }
+    getGenUniqNameFunctionName(item, concept) {
+        const p = concept === 'ViewElement' ? this.view : item.parentNode;
+        const NamesWeakMap = this.NamesWeakMap;
+        if (!p) {
             const nameSet = NamesWeakMap.get(concept);
             const n = unique(item.name, nameSet, 1, true);
             nameSet.add(n);
             return n;
         }
-        const f1 = p["get" + concept + "UniqueName"];
-        const f2 = p["get" + concept + "ExistingNames"]
-        if(f1 && f2) {
+        const f1 = p['get' + concept + 'UniqueName'];
+        const f2 = p['get' + concept + 'ExistingNames'];
+        if (f1 && f2) {
             const names = f2.call(p);
-            const t = names.filter(n => n === item.name);
-            if(t.length > 1) {     
+            const t = names.filter((n) => n === item.name);
+            if (t.length > 1) {
+                return f1.call(p, item.name);
+            }
+            if (concept === 'ViewElement' && t.length)
+                return f1.call(p, item.name);
+        }
+        // 逻辑里面的变量也需要再判断
+        if (concept === 'Variable' && f1) {
+            const variables = p.getVarExistingNames();
+            if (Array.isArray(this.view.params)) {
+                variables.push(...this.view.params.map((item) => item.name));
+            }
+            if (Array.isArray(this.view.variables)) {
+                variables.push(...this.view.variables.map((item) => item.name));
+            }
+            const t = variables.filter((n) => n === item.name);
+            if (t.length > 1) {
                 return f1.call(p, item.name);
             }
         }
         return item.name;
     }
 }
-export default uniqueName;
+
+export default uniqueName;

package/src/automate/engine/utils.js

@@ -2,7 +2,7 @@
 //     BaseNode,
 //     Module
 // } from '../../concepts';
-import { BaseNode, uiStructures, collectionStructures, interfaceStructures } from '../../concepts';
+import { BaseNode, uiStructures, collectionStructures, interfaceStructures, processStructures } from '../../concepts';
 import { getConceptMeta } from '../../decorators/index';
 /*
     根据 namespace 字符串来获取 node
@@ -74,6 +74,8 @@ export function getNaslNodeByNodeCallee(namespace, typeName) {
         return collectionStructures.find((item) => item.name === typeName);
     } else if (namespace === 'nasl.interface') {
         return interfaceStructures.find((item) => item.name === typeName);
+    } else if (namespace === 'nasl.process') {
+        return processStructures.find((item) => item.name === typeName);
     }
 }
 export const TRACK_TYPE = {
@@ -287,7 +289,7 @@ export function tracking(node, startNode, callback) {
                                     callback(TRACK_TYPE.CALLEE_TEMPLATE, propertyName, node[propertyName], {
                                         rootNode: datasource,
                                         metaNodes: [datasource, entity],
-                                        nstemplate: `function(meta, meta2){ return "app.dataSources" + meta.name + ".entities." + meta2.name + ".logics"; }`,
+                                        nstemplate: `function(meta, meta2){ return "app.dataSources." + meta.name + ".entities." + meta2.name + ".logics"; }`,
                                         nametemplate: `function(){ return "${calleeN}"; }`,
                                         relatedPropertyName,
                                         AppPropertyName: 'dataSources',