@lcap/nasl 1.0.0-alpha.13 → 1.0.0-alpha.14

package/src/concepts/ForEachStatement__.ts

@@ -177,7 +177,7 @@ export class ForEachStatement extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'body' };
         let logicItem: LogicItem;
         if (options instanceof LogicItem) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
         } else {
@@ -509,18 +509,13 @@ export class ForEachStatement extends LogicItem {
 
     toJS(state?: TranslatorState): string {
         let code = '';
-        code += this.each ? this.each.toJS(shiftState(state, code, {
+        const list = this.each ? this.each.toJS(shiftState(state, code, {
             tabSize: 0,
         })) : '';
-        code += '.slice(';
-        code += this.start && this.start.toJS() ? this.start.toJS() : '';
-        code += ', ';
-        code += this.end && this.end.toJS() ? this.end.toJS() : '';
-        code += ').forEach(async (';
-        code += this.item.name ? `${this.item.name}` : '';
-        code += ', ';
-        code += this.index.name ? `${this.index.name}` : '';
-        code += ') => {\n';
+        code += `if(Array.isArray(${list})) {\n`;
+        code += `for (let ${this.index.name} = ${this.start && this.start.toJS() ? this.start.toJS() : ''}; `;
+        code += `${this.index.name} < (${this.end && this.end.toJS() ? this.end.toJS() : ''}); ${this.index.name}++) {\n`;
+        code += `const ${this.item.name} = ${list}[${this.index.name}];\n`;
         if (Array.isArray(this.body)) {
             this.body.forEach((logicItem) => {
                 code
@@ -529,8 +524,8 @@ export class ForEachStatement extends LogicItem {
                     })) + '\n';
             });
         }
-        code += '})\n';
-
+        code += '}\n';
+        code += '}\n';
         return code;
     }
 

package/src/concepts/Function__.ts

@@ -170,7 +170,7 @@ export class Function extends BaseNode {
                 name: options,
             }, this, 'typeParams');
         } else if (options instanceof TypeParam) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             typeParam = options;
             Object.assign(typeParam, relationOptions);
         } else {
@@ -308,7 +308,7 @@ export class Function extends BaseNode {
                 name: options,
             }, this, 'params');
         } else if (options instanceof Param) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             param = options;
             Object.assign(param, relationOptions);
         } else {
@@ -446,7 +446,7 @@ export class Function extends BaseNode {
                 name: options,
             }, this, 'returns');
         } else if (options instanceof Return) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             ret = options;
             Object.assign(ret, relationOptions);
         } else {
@@ -584,7 +584,7 @@ export class Function extends BaseNode {
                 name: options,
             }, this, 'variables');
         } else if (options instanceof Variable) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             variable = options;
             Object.assign(variable, relationOptions);
         } else {

package/src/concepts/Identifier__.ts

@@ -38,8 +38,6 @@ export class Identifier extends LogicItem {
     @property()
     name: string = undefined;
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -53,13 +51,6 @@ export class Identifier extends LogicItem {
         return super.from(source, parentNode, parentKey) as Identifier;
     }
 
-    
-    
-
-    
-
-    
-
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
@@ -69,7 +60,7 @@ export class Identifier extends LogicItem {
     typeAnnotation: TypeAnnotation = undefined;
 
     globalDataMap: {
-        [name: string]: boolean
+        [name: string]: boolean;
     } = {
         $route: true,
         $global: true,
@@ -89,7 +80,7 @@ export class Identifier extends LogicItem {
                 if (last === 'enums') {
                     name = `$utils.EnumList("${this.name}")`;
                 }
-            } else if (this.namespace && this.namespace.endsWith('nasl.browser')) {
+            } else if (this.namespace && (this.namespace.endsWith('nasl.browser') || this.namespace.endsWith('nasl.auth') || this.namespace.endsWith('nasl.configuration'))) {
                 name = `$global.${this.name}`;
             }
         }
@@ -109,8 +100,8 @@ export class Identifier extends LogicItem {
                 if (last === 'enums') {
                     name = `$utils.EnumList("${this.name}")`;
                 }
-            } else if (namespace.endsWith('nasl.browser')) {
-                name = `$global.${this.name}`;
+            } else if (namespace.startsWith('nasl.')) {
+                name = `${namespace}.${this.name}`;
             }
         }
         return name;
@@ -118,7 +109,7 @@ export class Identifier extends LogicItem {
 
     toJS(): string {
         const dataMap: {
-            [name: string]: boolean
+            [name: string]: boolean;
         } = {};
         if (this.view) {
             const { params, variables } = this.view;
@@ -152,11 +143,17 @@ export class Identifier extends LogicItem {
                 if (last === 'enums') {
                     name = `$utils.EnumList("${this.name}")`;
                 }
-            } else if (namespace.endsWith('nasl.browser')) {
+            } else if (namespace.endsWith('nasl.browser') || namespace.endsWith('nasl.auth') || namespace.endsWith('nasl.configuration')) {
                 name = `$global.${this.name}`;
             }
         }
-        return (dataMap[name] || this.globalDataMap[name] || namespace?.endsWith('nasl.browser') || last === 'enums') && !isMemberExpression ? `this.${name}` : name;
+        return (dataMap[name]
+            || this.globalDataMap[name]
+            || namespace?.endsWith('nasl.browser')
+            || namespace?.endsWith('nasl.auth')
+            || namespace?.endsWith('nasl.configuration')
+            || last === 'enums')
+            && !isMemberExpression ? `this.${name}` : name;
     }
 
     @withSourceMap()
@@ -175,7 +172,7 @@ export class Identifier extends LogicItem {
             // 绑定类型
             if (this.parentNode instanceof BindAttribute) {
                 // this.parentNode.name === 'data-source'
-                return ((this.namespace + '.') || '') + this.name + '.toList';
+                return (this.namespace + '.' || '') + this.name + '.toList';
             }
         }
 
@@ -226,7 +223,7 @@ export class Identifier extends LogicItem {
     //================================================================================
 }
 
-classMap['Identifier'] = Identifier;
+classMap.Identifier = Identifier;
 export default Identifier;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/IfStatement__.ts

@@ -96,7 +96,7 @@ export class IfStatement extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'consequent' };
         let logicItem: LogicItem;
         if (options instanceof LogicItem) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
         } else {
@@ -200,7 +200,7 @@ export class IfStatement extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'alternate' };
         let logicItem: LogicItem;
         if (options instanceof LogicItem) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
         } else {

package/src/concepts/InterfaceParam__.ts

@@ -279,6 +279,17 @@ export class InterfaceParam extends BaseNode {
         // }
         return code;
     }
+
+    get hasChildren() {
+        const { typeKind } = this.typeAnnotation;
+        if (typeKind === 'reference' || typeKind === 'generic') {
+            return [{}];
+        }
+        return null;
+    }
+    get isTreeLeaf() {
+        return !this.hasChildren;
+    }
     getSelectRef() {
         const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
         let completionChildren;

package/src/concepts/Interface__.ts

@@ -171,7 +171,7 @@ export class Interface extends BaseNode {
                 name: options,
             }, this, 'params');
         } else if (options instanceof InterfaceParam) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             interfaceParam = options;
             Object.assign(interfaceParam, relationOptions);
         } else {
@@ -309,7 +309,7 @@ export class Interface extends BaseNode {
                 name: options,
             }, this, 'returns');
         } else if (options instanceof Return) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             ret = options;
             Object.assign(ret, relationOptions);
         } else {
@@ -522,7 +522,7 @@ export class Interface extends BaseNode {
     toService() {
         return {
             config: {
-                serviceType: 'export',
+                serviceType: 'external',
             },
             url: {
                 method: this.method,

package/src/concepts/LogicItem__.ts

@@ -1,6 +1,7 @@
 import { TranslatorState } from '../translator';
 import CallFunction from './CallFunction__';
 import { ElementToVueOptions } from './ViewElement__';
+import CallQueryComponent from './CallQueryComponent__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -224,6 +225,20 @@ export class LogicItem extends BaseNode {
         return this.toJS(state);
     }
 
+    delete() {
+        let actionMsg = '删除逻辑项';
+        if(this.name) actionMsg += `“${this.name}”`;
+        this.app?.emit('collect:start', {
+            actionMsg,
+        });
+        super.delete();
+        this.traverseChildren((el) => {
+            if(el?.concept === 'CallQueryComponent')
+                (el as CallQueryComponent).removeStructure();
+        });
+        this.app?.emit('collect:end');
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Logic__.ts

@@ -226,7 +226,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);
     }
@@ -270,7 +270,7 @@ export class Logic extends BaseNode {
                 name: options,
             }, this, 'typeParams');
         } else if (options instanceof TypeParam) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             typeParam = options;
             Object.assign(typeParam, relationOptions);
         } else {
@@ -367,7 +367,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames());
     }
@@ -408,7 +407,7 @@ export class Logic extends BaseNode {
                 name: options,
             }, this, 'params');
         } else if (options instanceof Param) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             param = options;
             Object.assign(param, relationOptions);
         } else {
@@ -505,7 +504,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getReturnUniqueName(name = 'result1') {
         return utils.unique(name, this.getVarExistingNames());
     }
@@ -546,7 +544,7 @@ export class Logic extends BaseNode {
                 name: options,
             }, this, 'returns');
         } else if (options instanceof Return) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             ret = options;
             Object.assign(ret, relationOptions);
         } else {
@@ -643,7 +641,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames());
     }
@@ -684,7 +681,7 @@ export class Logic extends BaseNode {
                 name: options,
             }, this, 'variables');
         } else if (options instanceof Variable) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             variable = options;
             Object.assign(variable, relationOptions);
         } else {
@@ -781,11 +778,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
-
-
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -805,7 +797,7 @@ export class Logic extends BaseNode {
         const relationOptions = { parentNode: this, parentKey: 'body' };
         let logicItem: LogicItem;
         if (options instanceof LogicItem) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
         } else {
@@ -818,8 +810,6 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -842,8 +832,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -863,8 +851,6 @@ export class Logic extends BaseNode {
         return this._insertItemInBodyAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -888,8 +874,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -909,7 +893,7 @@ export class Logic extends BaseNode {
         const relationOptions = { parentNode: this, parentKey: 'playground' };
         let logicItem: LogicItem;
         if (options instanceof LogicItem) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
         } else {
@@ -922,8 +906,6 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -946,8 +928,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -967,8 +947,6 @@ export class Logic extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -992,9 +970,6 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除事务
     * @param name 事务名称
@@ -1043,8 +1018,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除类型参数
     * @param name 类型参数名称
@@ -1093,8 +1066,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1143,8 +1114,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -1193,8 +1162,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除局部变量
     * @param name 局部变量名称
@@ -1243,8 +1210,6 @@ export class Logic extends BaseNode {
         return params;
     }
 
-
-
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1252,12 +1217,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 已有的逻辑项实例
@@ -1265,7 +1228,7 @@ export class Logic extends BaseNode {
     removeItemInPlayground(logicItem: LogicItem): void;
 
     removeItemInPlayground(options: LogicItem) {
-        let logicItem: LogicItem = options;
+        const logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
@@ -1296,6 +1259,10 @@ export class Logic extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    // 用于calllogic树中定位是那个logic，回显
+    get calleewholeKey() {
+        return this.getNamespace() + '.' + this.name;
+    }
     // 设置定时任务
     setCronAndTriggerType(cron: string, triggerType: string) {
         const object = {
@@ -1456,7 +1423,7 @@ export class Logic extends BaseNode {
     }
 
     @withSourceMap()
-    toEmbeddedTSInProcess(state?: TranslatorState, prependCode?: string, noName? :boolean): string {
+    toEmbeddedTSInProcess(state?: TranslatorState, prependCode?: string, noName?: boolean): string {
         let code = '';
         code += `${noName ? '' : `${this.name}:`} function(`;
         this.params.forEach((param, index) => {
@@ -1465,7 +1432,7 @@ export class Logic extends BaseNode {
                 code += ', ';
         });
         code += `) {\n`;
-        code += (prependCode || '');
+        code += prependCode || '';
         code += '\n';
         this.variables.forEach((variable) => {
             code += indent(state.tabSize + 1) + 'let ';
@@ -1563,7 +1530,8 @@ export class Logic extends BaseNode {
                 parentNodeNamespace = this.parentNode.getNamespace();
             }
 
-            parentNodeNamespace = (['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser'].includes(parentNodeNamespace) || parentNodeNamespace.includes('.logics')) ? parentNodeNamespace : `${parentNodeNamespace}.logics`;
+            parentNodeNamespace
+                = ['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration'].includes(parentNodeNamespace) || parentNodeNamespace.includes('.logics') ? parentNodeNamespace : `${parentNodeNamespace}.logics`;
             if (this.parentNode instanceof View) {
                 return (parentNodeNamespace = '');
             }
@@ -1643,13 +1611,29 @@ export class Logic extends BaseNode {
     fake: boolean;
 
     getPath: () => string;
+
+    // delete() {
+    //     let actionMsg = '删除逻辑项';
+    //     if (this.name)
+    //         actionMsg += `“${this.name}”`;
+    //     this.app?.emit('collect:start', {
+    //         actionMsg,
+    //     });
+    //     super.delete();
+    //     this.traverseChildren((el) => {
+    //         if (el?.concept === 'CallQueryComponent')
+    //             (el as CallQueryComponent).removeStructure();
+    //     });
+    //     this.app?.emit('collect:end');
+    // }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
     //================================================================================
 }
 
-classMap['Logic'] = Logic;
+classMap.Logic = Logic;
 export default Logic;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Module__.ts

@@ -198,7 +198,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'entities');
         } else if (options instanceof Entity) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             entity = options;
             Object.assign(entity, relationOptions);
         } else {
@@ -340,7 +340,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'structures');
         } else if (options instanceof Structure) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             structure = options;
             Object.assign(structure, relationOptions);
         } else {
@@ -482,7 +482,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'enums');
         } else if (options instanceof Enum) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             enumeration = options;
             Object.assign(enumeration, relationOptions);
         } else {
@@ -624,7 +624,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'logics');
         } else if (options instanceof Logic) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logic = options;
             Object.assign(logic, relationOptions);
         } else {
@@ -766,7 +766,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'interfaces');
         } else if (options instanceof Interface) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             itface = options;
             Object.assign(itface, relationOptions);
         } else {
@@ -908,7 +908,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'views');
         } else if (options instanceof View) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             view = options;
             Object.assign(view, relationOptions);
         } else {
@@ -1050,7 +1050,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'processes');
         } else if (options instanceof Process) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             process = options;
             Object.assign(process, relationOptions);
         } else {
@@ -1192,7 +1192,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'viewComponents');
         } else if (options instanceof ViewComponent) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             viewComponent = options;
             Object.assign(viewComponent, relationOptions);
         } else {