@lcap/nasl 2.12.0 → 2.13.0-beta

package/src/concepts/Configuration__.ts

@@ -281,7 +281,7 @@ export class Configuration extends BaseNode {
     //================================================================================
 }
 
-classMap['Configuration'] = Configuration;
+classMap.Configuration = Configuration;
 export default Configuration;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Constant__.ts

@@ -253,7 +253,7 @@ export class Constant extends BaseNode {
     //================================================================================
 }
 
-classMap['Constant'] = Constant;
+classMap.Constant = Constant;
 export default Constant;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/DataElement__.ts

@@ -127,7 +127,7 @@ export class DataElement extends BaseNode {
     //================================================================================
 }
 
-classMap['DataElement'] = DataElement;
+classMap.DataElement = DataElement;
 export default DataElement;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/DataSource__.ts

@@ -383,7 +383,7 @@ export class DataSource extends BaseNode {
     //================================================================================
 }
 
-classMap['DataSource'] = DataSource;
+classMap.DataSource = DataSource;
 export default DataSource;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Destination__.ts

@@ -392,6 +392,7 @@ export class Destination extends LogicItem {
             return '';
         }
         const namespaceAttr = this.viewNamespace.split('.');
+        namespaceAttr.push(this.viewName);
         const viewNameAttr: string[] = [];
         if (Array.isArray(namespaceAttr)) {
             namespaceAttr.forEach((item, index) => {
@@ -400,7 +401,7 @@ export class Destination extends LogicItem {
                 }
             });
         }
-        return `${viewNameAttr.join('/')}/`;
+        return `/${viewNameAttr.join('/')}`;
     }
     @withSourceMap()
     toEmbeddedTSInProcess(state: TranslatorState, prependCode: string): string {
@@ -480,7 +481,7 @@ export class Destination extends LogicItem {
     //================================================================================
 }
 
-classMap['Destination'] = Destination;
+classMap.Destination = Destination;
 export default Destination;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/End__.ts

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

package/src/concepts/EntityIndex__.ts

@@ -217,7 +217,7 @@ export class EntityIndex extends BaseNode {
     //================================================================================
 }
 
-classMap['EntityIndex'] = EntityIndex;
+classMap.EntityIndex = EntityIndex;
 export default EntityIndex;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/EntityProperty__.ts

@@ -581,7 +581,7 @@ export class EntityProperty extends BaseNode {
     //================================================================================
 }
 
-classMap['EntityProperty'] = EntityProperty;
+classMap.EntityProperty = EntityProperty;
 export default EntityProperty;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Entity__.ts

@@ -518,7 +518,6 @@ export class Entity extends BaseNode {
     getPropertyExistingNameList(excludedList: Array<EntityProperty> = []) {
         const excludedSet = Array.from(new Set(excludedList));
         const namelist = excludedSet.map((item) => item.name);
-        console.log(namelist);
 
         return (this.properties || []).filter((item) => !namelist.includes(item.name)).map((item) => item.name);
     }
@@ -740,7 +739,7 @@ export class Entity extends BaseNode {
     //================================================================================
 }
 
-classMap['Entity'] = Entity;
+classMap.Entity = Entity;
 export default Entity;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/EnumItem__.ts

@@ -132,7 +132,7 @@ export class EnumItem extends BaseNode {
     //================================================================================
 }
 
-classMap['EnumItem'] = EnumItem;
+classMap.EnumItem = EnumItem;
 export default EnumItem;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Enum__.ts

@@ -362,7 +362,7 @@ export class Enum extends BaseNode {
     //================================================================================
 }
 
-classMap['Enum'] = Enum;
+classMap.Enum = Enum;
 export default Enum;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Event__.ts

@@ -309,7 +309,7 @@ export class Event extends BaseNode {
     //================================================================================
 }
 
-classMap['Event'] = Event;
+classMap.Event = Event;
 export default Event;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/ForEachStatement__.ts

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

package/src/concepts/Function__.ts

@@ -1,6 +1,5 @@
 import Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
-import LogicItem from './LogicItem__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -17,6 +16,7 @@ import TypeParam from './TypeParam__';
 import Param from './Param__';
 import Return from './Return__';
 import Variable from './Variable__';
+import LogicItem from './LogicItem__';
 import Module from './Module__';
 import App from './App__';
 
@@ -67,6 +67,12 @@ export class Function extends BaseNode {
     @property('Variable')
     variables: Array<Variable> = [];
 
+    /**
+     * 逻辑项
+     */
+    @property('LogicItem')
+    returnExpression: LogicItem = undefined;
+
     /**
      * 祖先 Module
      */
@@ -129,6 +135,21 @@ export class Function extends BaseNode {
         });
     }
 
+    /**
+     * 设置逻辑项
+     */
+    setReturnExpression(returnExpression: LogicItem) {
+        returnExpression._delete();
+        const relationOptions = { parentNode: this, parentKey: 'returnExpression' };
+        Object.assign(returnExpression, relationOptions);
+        const object = {
+            returnExpression,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
         getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
         const excludedSet = new Set(excludedList);
         return (this.typeParams || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -885,54 +906,33 @@ export class Function extends BaseNode {
         return params;
     }
 
-    //================================================================================
-    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-    // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+
+
     /**
-     * returnExpression 输出的Lambda 表达式
-     */
-    @property('LogicItem')
-    returnExpression: LogicItem = undefined;
+    * 删除逻辑项
+    * @param name 逻辑项名称
+    */
+    removeReturnExpression(name: string): void;
 
     /**
-     * 设置returnExpression 输出的Lambda 表达式
+     * 删除逻辑项
+     * @param returnExpression 已有的逻辑项实例
      */
-    setReturnExpression(expression: LogicItem) {
-        expression._delete();
-        const relationOptions = { parentNode: this, parentKey: 'returnExpression' };
-        Object.assign(expression, relationOptions);
-        const object = {
-            returnExpression: expression,
-        };
-        this.update({
-            ...object,
-        });
-    }
+    removeReturnExpression(returnExpression: LogicItem): void;
 
-    toJS(state?: TranslatorState): String {
-        let code = '';
-        code += '(';
-        this.params.forEach((param, index) => {
-            code += param.toJS(shiftState(state, code));
-            if (index !== this.params.length - 1) {
-                code += ',';
+    removeReturnExpression(options: string | LogicItem) {
+        let returnExpression: LogicItem;
+        if (typeof options === 'string') {
+            returnExpression = this.returnExpression;
+            if (!returnExpression) {
+                throw new Error('找不到逻辑项 ' + options);
             }
-        });
-        code += ')';
-        code += ' => (';
-        if (this.returnExpression) {
-            code += this.returnExpression.toJS(shiftState(state, code));
+        } else {
+            returnExpression = options;
         }
-        code += ')';
-        return code;
+        return returnExpression.delete();
     }
 
-    /**
-     * 刪除LogicItem
-     * @param logicItem
-     * @returns
-     */
     __removeLogicItem(logicItem: LogicItem) {
         const parentKey = logicItem.parentKey;
         const params: Params = {
@@ -955,6 +955,30 @@ export class Function extends BaseNode {
         }
         return params;
     }
+
+    //================================================================================
+    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+    // 自动生成的代码已结束。下面可以手动编写。
+    //================================================================================
+
+    toJS(state?: TranslatorState): String {
+        let code = '';
+        code += '(';
+        this.params.forEach((param, index) => {
+            code += param.toJS(shiftState(state, code));
+            if (index !== this.params.length - 1) {
+                code += ',';
+            }
+        });
+        code += ')';
+        code += ' => (';
+        if (this.returnExpression) {
+            code += this.returnExpression.toJS(shiftState(state, code));
+        }
+        code += ')';
+        return code;
+    }
+
     getVarExistingNames(excludedList: Array<Param | Return | Variable> = []) {
         const excludedSet = new Set(excludedList);
         return [...this.params, ...this.returns, ...this.variables].filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1008,7 +1032,7 @@ export class Function extends BaseNode {
     //================================================================================
 }
 
-classMap['Function'] = Function;
+classMap.Function = Function;
 export default Function;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Identifier__.ts

@@ -111,7 +111,6 @@ export class Identifier extends LogicItem {
         const dataMap: {
             [name: string]: boolean;
         } = {};
-
         this.view?.params?.forEach((param) => {
             dataMap[param.name] = true;
         });
@@ -209,13 +208,14 @@ export class Identifier extends LogicItem {
             ...object,
         });
     }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
     //================================================================================
 }
 
-classMap['Identifier'] = Identifier;
+classMap.Identifier = Identifier;
 export default Identifier;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/IfStatement__.ts

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

package/src/concepts/InterfaceParam__.ts

@@ -333,7 +333,7 @@ export class InterfaceParam extends BaseNode {
     //================================================================================
 }
 
-classMap['InterfaceParam'] = InterfaceParam;
+classMap.InterfaceParam = InterfaceParam;
 export default InterfaceParam;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Interface__.ts

@@ -615,6 +615,7 @@ export class Interface extends BaseNode {
             'delete',
             'do',
             'double',
+            'decimal',
             'else',
             'enum',
             'eval',
@@ -762,7 +763,7 @@ export class Interface extends BaseNode {
     //================================================================================
 }
 
-classMap['Interface'] = Interface;
+classMap.Interface = Interface;
 export default Interface;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/JSBlock__.ts

@@ -35,6 +35,8 @@ export class JSBlock extends LogicItem {
     @property()
     code: string = undefined;
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -48,6 +50,7 @@ export class JSBlock extends LogicItem {
         return super.from(source, parentNode, parentKey) as JSBlock;
     }
 
+    
     /**
      * 设置代码内容
      */
@@ -60,6 +63,10 @@ export class JSBlock extends LogicItem {
         });
     }
 
+    
+
+    
+
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/LogicItem__.ts

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