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

package/src/concepts/Logic__.ts

@@ -227,7 +227,7 @@ export class Logic extends BaseNode {
         });
     }
 
-        getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
+    getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
         const excludedSet = new Set(excludedList);
         return (this.typeParams || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -368,7 +368,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -506,7 +505,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getReturnUniqueName(name = 'result') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -644,7 +642,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -782,11 +779,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
-
-
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -819,8 +811,6 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -843,8 +833,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -864,8 +852,6 @@ export class Logic extends BaseNode {
         return this._insertItemInBodyAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -889,8 +875,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -923,8 +907,6 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -947,8 +929,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -968,8 +948,6 @@ export class Logic extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -993,9 +971,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除事务
     * @param name 事务名称
@@ -1044,8 +1019,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除类型参数
     * @param name 类型参数名称
@@ -1094,8 +1067,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1144,8 +1115,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -1194,8 +1163,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除局部变量
     * @param name 局部变量名称
@@ -1244,8 +1211,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1253,12 +1218,10 @@ export class Logic extends BaseNode {
     removeItemInBody(logicItem: LogicItem): void;
 
     removeItemInBody(options: LogicItem) {
-        let logicItem: LogicItem = options;
+        const logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
-    
-
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1266,7 +1229,7 @@ export class Logic extends BaseNode {
     removeItemInPlayground(logicItem: LogicItem): void;
 
     removeItemInPlayground(options: LogicItem) {
-        let logicItem: LogicItem = options;
+        const logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
@@ -1452,9 +1415,10 @@ export class Logic extends BaseNode {
                 const lowerChar = char.toLowerCase();
                 return index === 0 ? lowerChar : `-${lowerChar}`;
             });
+            const dataSource = parentNode.getAncestor('DataSource');
             // 默认数据源不动，其他数据源需要拼接数据源信息
-            if (parentNode.parentNode.parentNode.concept === 'DataSource' && parentNode.parentNode.parentNode.name !== 'defaultDS') {
-                entityPath = parentNode.parentNode.parentNode.name + '/' + entityPath;
+            if (dataSource && dataSource.name !== 'defaultDS') {
+                entityPath = dataSource.name + '/' + entityPath;
             }
             path = `/api/${entityPath}`;
             switch (this.name) {
@@ -1619,7 +1583,7 @@ export class Logic extends BaseNode {
                 arr.push(parentName);
             }
             let namespace = arr.join('.');
-            if (!['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration'].includes(namespace) && !namespace.includes('.logics')) {
+            if (!['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.process'].includes(namespace) && !namespace.includes('.logics')) {
                 namespace = `${namespace}.logics`;
             }
             return namespace;
@@ -1636,7 +1600,7 @@ export class Logic extends BaseNode {
                 arr.push(parentName);
             }
             let namespace = arr.join('.');
-            if (!['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration'].includes(namespace) && !namespace.includes('.logics')) {
+            if (!['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.process'].includes(namespace) && !namespace.includes('.logics')) {
                 namespace = `${namespace}.logics`;
             }
             return namespace;

package/src/concepts/MemberExpression__.ts

@@ -279,7 +279,7 @@ export class MemberExpression extends LogicItem {
     //================================================================================
 }
 
-classMap.MemberExpression = MemberExpression;
+classMap['MemberExpression'] = MemberExpression;
 export default MemberExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑