@lcap/nasl 1.0.0-alpha → 1.0.0-alpha.3

package/src/concepts/ForEachStatement__.ts

@@ -9,10 +9,11 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
-import Identifier from './Identifier__';
+import Param from './Param__';
 
 /**
  * For 循环分支
@@ -25,12 +26,6 @@ export class ForEachStatement extends LogicItem {
     @property()
     concept: 'ForEachStatement' = 'ForEachStatement';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Statement';
-
     /**
      * 循环列表
      */
@@ -38,25 +33,25 @@ export class ForEachStatement extends LogicItem {
     each: LogicItem = undefined;
 
     /**
-     * 循环列表
+     * 循环项参数
      */
-    @property('Identifier')
-    item: Identifier = undefined;
+    @property('Param')
+    item: Param = undefined;
 
     /**
-     * 循环列表
+     * 循环项索引
      */
-    @property('Identifier')
-    index: Identifier = undefined;
+    @property('Param')
+    index: Param = undefined;
 
     /**
-     * 循环列表
+     * 循环开始值
      */
     @property('LogicItem')
     start: LogicItem = undefined;
 
     /**
-     * 循环列表
+     * 循环结束值
      */
     @property('LogicItem')
     end: LogicItem = undefined;
@@ -99,9 +94,9 @@ export class ForEachStatement extends LogicItem {
     }
 
     /**
-     * 设置循环列表
+     * 设置循环项参数
      */
-    setItem(item: Identifier) {
+    setItem(item: Param) {
         item._delete();
         const relationOptions = { parentNode: this, parentKey: 'item' };
         Object.assign(item, relationOptions);
@@ -114,9 +109,9 @@ export class ForEachStatement extends LogicItem {
     }
 
     /**
-     * 设置循环列表
+     * 设置循环项索引
      */
-    setIndex(index: Identifier) {
+    setIndex(index: Param) {
         index._delete();
         const relationOptions = { parentNode: this, parentKey: 'index' };
         Object.assign(index, relationOptions);
@@ -129,7 +124,7 @@ export class ForEachStatement extends LogicItem {
     }
 
     /**
-     * 设置循环列表
+     * 设置循环开始值
      */
     setStart(start: LogicItem) {
         start._delete();
@@ -144,7 +139,7 @@ export class ForEachStatement extends LogicItem {
     }
 
     /**
-     * 设置循环列表
+     * 设置循环结束值
      */
     setEnd(end: LogicItem) {
         end._delete();
@@ -183,13 +178,13 @@ export class ForEachStatement extends LogicItem {
         if (options instanceof LogicItem) {
             options.delete(); // 同一实例不支持多处存在
             logicItem = options;
+            Object.assign(logicItem, relationOptions);
         } else {
             logicItem = LogicItem.from({
                 ...logicItemOptions,
                 ...options,
-            }, this);
+            }, this, 'body');
         }
-        Object.assign(logicItem, relationOptions);
         this.body.splice(index, 0, logicItem);
         return logicItem;
     }
@@ -294,60 +289,6 @@ export class ForEachStatement extends LogicItem {
 
     
 
-    /**
-    * 删除标识符
-    * @param name 标识符名称
-    */
-    removeItem(name: string): void;
-
-    /**
-     * 删除标识符
-     * @param item 已有的标识符实例
-     */
-    removeItem(item: Identifier): void;
-
-    removeItem(options: string | Identifier) {
-        let item: Identifier;
-        if (typeof options === 'string') {
-            item = this.item;
-            if (!item) {
-                throw new Error('找不到标识符 ' + options);
-            }
-        } else {
-            item = options;
-        }
-        return item.delete();
-    }
-
-    
-
-    /**
-    * 删除标识符
-    * @param name 标识符名称
-    */
-    removeIndex(name: string): void;
-
-    /**
-     * 删除标识符
-     * @param index 已有的标识符实例
-     */
-    removeIndex(index: Identifier): void;
-
-    removeIndex(options: string | Identifier) {
-        let index: Identifier;
-        if (typeof options === 'string') {
-            index = this.index;
-            if (!index) {
-                throw new Error('找不到标识符 ' + options);
-            }
-        } else {
-            index = options;
-        }
-        return index.delete();
-    }
-
-    
-
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -436,11 +377,110 @@ export class ForEachStatement extends LogicItem {
         return params;
     }
 
+
+
+    /**
+    * 删除输入参数
+    * @param name 输入参数名称
+    */
+    removeItem(name: string): void;
+
+    /**
+     * 删除输入参数
+     * @param item 已有的输入参数实例
+     */
+    removeItem(item: Param): void;
+
+    removeItem(options: string | Param) {
+        let item: Param;
+        if (typeof options === 'string') {
+            item = this.item;
+            if (!item) {
+                throw new Error('找不到输入参数 ' + options);
+            }
+        } else {
+            item = options;
+        }
+        return item.delete();
+    }
+
+    
+
+    /**
+    * 删除输入参数
+    * @param name 输入参数名称
+    */
+    removeIndex(name: string): void;
+
+    /**
+     * 删除输入参数
+     * @param index 已有的输入参数实例
+     */
+    removeIndex(index: Param): void;
+
+    removeIndex(options: string | Param) {
+        let index: Param;
+        if (typeof options === 'string') {
+            index = this.index;
+            if (!index) {
+                throw new Error('找不到输入参数 ' + options);
+            }
+        } else {
+            index = options;
+        }
+        return index.delete();
+    }
+
+    __removeParam(param: Param) {
+        const parentKey = param.parentKey;
+        const params: Params = {
+            parentNode: this,
+            parentKey,
+            index: -1,
+            object: null,
+            oldObject: param,
+        };
+        if (parentKey) {
+            params.parentKey = parentKey;
+            if (Array.isArray((this as any)[parentKey])) {
+                const index = (this as any)[parentKey].indexOf(param);
+                ~index && (this as any)[parentKey].splice(index, 1);
+                params.index = index;
+            } else if ((this as any)[parentKey] === param) {
+                params.index = 0;
+                (this as any)[parentKey] = undefined;
+            }
+        }
+        return params;
+    }
+
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
+    public checkItemIndexName() {
+        const itemNames = [];
+        const idxNames = [];
+        let n = this.parentNode;
+        while(n && n.concept !== 'Logic') {
+            if(n instanceof ForEachStatement){
+                itemNames.push(n.item.name);
+                idxNames.push(n.index.name);
+            }
+            n = n.parentNode;
+        }
+        const uniqueItemName = utils.unique('item', itemNames);
+        const uniqueIdxName = utils.unique('index', idxNames);
+        if(this.item.name !== uniqueItemName) {
+            this.item.setName(uniqueItemName);
+        }
+        if(this.index.name !== uniqueIdxName) {
+            this.index.setName(uniqueIdxName);
+        }
+    }
+
+
     public static getDefaultOptions() {
         return {
             label: 'ForEach 循环分支',
@@ -467,33 +507,6 @@ export class ForEachStatement extends LogicItem {
         };
     }
 
-    toUI(state?: TranslatorState): string {
-        let code = '';
-        code += this.each ? this.each.toUI(shiftState(state, code, {
-            tabSize: 0,
-        })) : '';
-        code += '.slice(';
-        code += this.start && this.start.toUI() ? this.start.toUI() : '';
-        code += ', ';
-        code += this.end && this.end.toUI() ? this.end.toUI() : '';
-        code += ').forEach((';
-        code += this.item.name ? `${this.item.name}` : '';
-        code += ', ';
-        code += this.index.name ? `${this.index.name}` : '';
-        code += ') => {\n';
-        if (Array.isArray(this.body)) {
-            this.body.forEach((logicItem) => {
-                code
-                    += logicItem.toUI(shiftState(state, code, {
-                        tabSize: 0,
-                    })) + '\n';
-            });
-        }
-        code += '})\n';
-
-        return code;
-    }
-
     toJS(state?: TranslatorState): string {
         let code = '';
         code += this.each ? this.each.toJS(shiftState(state, code, {
@@ -528,9 +541,9 @@ export class ForEachStatement extends LogicItem {
             tabSize: 0,
         })) : '__IDENTIFIER__';
         code += '.__slice(';
-        code += this.start.toEmbeddedTS(shiftState(state, code)) || '__IDENTIFIER__';
+        code += this.start ? this.start.toEmbeddedTS(shiftState(state, code)) : '__IDENTIFIER__';
         code += ', ';
-        code += this.end.toEmbeddedTS(shiftState(state, code)) || '__IDENTIFIER__';
+        code += this.end ? this.end.toEmbeddedTS(shiftState(state, code)) : '__IDENTIFIER__';
         code += ').__forEach((';
         code += this.item.name ? `${this.item.name}` : '__IDENTIFIER__';
         code += ', ';

package/src/concepts/Function__.ts

@@ -7,6 +7,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import TypeParam from './TypeParam__';
@@ -127,7 +128,7 @@ export class Function extends BaseNode {
 
         getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
         const excludedSet = new Set(excludedList);
-        return this.typeParams.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.typeParams || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getTypeParamUniqueName(name = 'typeParam1') {
         return utils.unique(name, this.getTypeParamExistingNames());
@@ -162,22 +163,22 @@ export class Function extends BaseNode {
             typeParam = TypeParam.from({
                 ...typeParamOptions,
                 name: this.getTypeParamUniqueName(),
-            }, this);
+            }, this, 'typeParams');
         } else if (typeof options === 'string') {
             typeParam = TypeParam.from({
                 ...typeParamOptions,
                 name: options,
-            }, this);
+            }, this, 'typeParams');
         } else if (options instanceof TypeParam) {
             options.delete(); // 同一实例不支持多处存在
             typeParam = options;
+            Object.assign(typeParam, relationOptions);
         } else {
             typeParam = TypeParam.from({
                 ...typeParamOptions,
                 ...options,
-            }, this);
+            }, this, 'typeParams');
         }
-        Object.assign(typeParam, relationOptions);
         this.typeParams.splice(index, 0, typeParam);
         return typeParam;
     }
@@ -300,22 +301,22 @@ export class Function extends BaseNode {
             param = Param.from({
                 ...paramOptions,
                 name: this.getParamUniqueName(),
-            }, this);
+            }, this, 'params');
         } else if (typeof options === 'string') {
             param = Param.from({
                 ...paramOptions,
                 name: options,
-            }, this);
+            }, this, 'params');
         } else if (options instanceof Param) {
             options.delete(); // 同一实例不支持多处存在
             param = options;
+            Object.assign(param, relationOptions);
         } else {
             param = Param.from({
                 ...paramOptions,
                 ...options,
-            }, this);
+            }, this, 'params');
         }
-        Object.assign(param, relationOptions);
         this.params.splice(index, 0, param);
         return param;
     }
@@ -438,22 +439,22 @@ export class Function extends BaseNode {
             ret = Return.from({
                 ...retOptions,
                 name: this.getReturnUniqueName(),
-            }, this);
+            }, this, 'returns');
         } else if (typeof options === 'string') {
             ret = Return.from({
                 ...retOptions,
                 name: options,
-            }, this);
+            }, this, 'returns');
         } else if (options instanceof Return) {
             options.delete(); // 同一实例不支持多处存在
             ret = options;
+            Object.assign(ret, relationOptions);
         } else {
             ret = Return.from({
                 ...retOptions,
                 ...options,
-            }, this);
+            }, this, 'returns');
         }
-        Object.assign(ret, relationOptions);
         this.returns.splice(index, 0, ret);
         return ret;
     }
@@ -576,22 +577,22 @@ export class Function extends BaseNode {
             variable = Variable.from({
                 ...variableOptions,
                 name: this.getVariableUniqueName(),
-            }, this);
+            }, this, 'variables');
         } else if (typeof options === 'string') {
             variable = Variable.from({
                 ...variableOptions,
                 name: options,
-            }, this);
+            }, this, 'variables');
         } else if (options instanceof Variable) {
             options.delete(); // 同一实例不支持多处存在
             variable = options;
+            Object.assign(variable, relationOptions);
         } else {
             variable = Variable.from({
                 ...variableOptions,
                 ...options,
-            }, this);
+            }, this, 'variables');
         }
-        Object.assign(variable, relationOptions);
         this.variables.splice(index, 0, variable);
         return variable;
     }
@@ -896,7 +897,7 @@ export class Function extends BaseNode {
             if ((this.parentNode as Namespace).getNamespace) {
                 parentNodeNamespace = (this.parentNode as Namespace).getNamespace();
             }
-            return `${parentNodeNamespace}.functions`;
+            return `${parentNodeNamespace}`;
         } else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }

package/src/concepts/Identifier__.ts

@@ -1,4 +1,7 @@
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import { BindAttribute } from '..';
+import { ElementToVueOptions } from './ViewElement__';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -7,6 +10,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
@@ -22,12 +26,6 @@ export class Identifier extends LogicItem {
     @property()
     concept: 'Identifier' = 'Identifier';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Expression';
-
     /**
      * namespace
      */
@@ -66,11 +64,6 @@ export class Identifier extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-
-    toUI(state?: TranslatorState): string {
-        return this.name;
-    }
-
     globalDataMap: {
         [name: string]: boolean
     } = {
@@ -79,9 +72,15 @@ export class Identifier extends LogicItem {
         $refs: true,
     };
 
-    toJS(state?: TranslatorState): string {
-        console.log(this.view);
-        console.log(this.logic);
+    toVue(options?: ElementToVueOptions): string {
+        return this.name;
+    }
+
+    toUI(): string {
+        return this.name;
+    }
+
+    toJS(): string {
         const dataMap: {
             [name: string]: boolean
         } = {};
@@ -98,34 +97,30 @@ export class Identifier extends LogicItem {
                 });
             }
         }
-        if (this.logic) {
-            const { params, returns, variables } = this.logic;
-            if (Array.isArray(params)) {
-                params.forEach((param) => {
-                    dataMap[param.name] = true;
-                });
-            }
-            if (Array.isArray(variables)) {
-                variables.forEach((variable) => {
-                    dataMap[variable.name] = true;
-                });
-            }
-            if (Array.isArray(params)) {
-                params.forEach((param) => {
-                    dataMap[param.name] = true;
-                });
-            }
-            if (Array.isArray(returns)) {
-                returns.forEach((returnItem) => {
-                    dataMap[returnItem.name] = true;
-                });
-            }
+        const parentNode = this.parentNode;
+        const grandParentNode = parentNode?.parentNode;
+        let isMemberExpression = false;
+        if (parentNode?.concept === 'MemberExpression' && (grandParentNode?.concept === 'MemberExpression' || this.parentKey === 'property')) {
+            isMemberExpression = true;
         }
-        return dataMap[this.name] || this.globalDataMap[this.name] ? `this.${this.name}` : this.name;
+        return (dataMap[this.name] || this.globalDataMap[this.name]) && !isMemberExpression ? `this.${this.name}` : this.name;
     }
 
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
+        // 只有data-source可以是函数 ，也可能是属性
+        if (this.parentNode instanceof BindAttribute && this.parentNode.name === 'data-source') {
+            const view = this.view;
+            const viewLogics = view.logics;
+            const findLogic = viewLogics.find((item) => item.name === this.name);
+            if (findLogic) {
+                return 'logics.' + this.name;
+            }
+        }
+        // 因为右侧枚举要赋值就赋值toList方法一下
+        if (this.namespace && this.namespace.endsWith('enums')) {
+            return ((this.namespace + '.') || '') + this.name + '.toList()';
+        }
         // 如果是identifier 而且枚举
         return this.namespace ? this.namespace + '.' + this.name : this.name || '__IDENTIFIER__';
     }

package/src/concepts/IfStatement__.ts

@@ -8,6 +8,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
@@ -23,12 +24,6 @@ export class IfStatement extends LogicItem {
     @property()
     concept: 'IfStatement' = 'IfStatement';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Statement';
-
     /**
      * 条件表达式
      */
@@ -103,13 +98,13 @@ export class IfStatement extends LogicItem {
         if (options instanceof LogicItem) {
             options.delete(); // 同一实例不支持多处存在
             logicItem = options;
+            Object.assign(logicItem, relationOptions);
         } else {
             logicItem = LogicItem.from({
                 ...logicItemOptions,
                 ...options,
-            }, this);
+            }, this, 'consequent');
         }
-        Object.assign(logicItem, relationOptions);
         this.consequent.splice(index, 0, logicItem);
         return logicItem;
     }
@@ -207,13 +202,13 @@ export class IfStatement extends LogicItem {
         if (options instanceof LogicItem) {
             options.delete(); // 同一实例不支持多处存在
             logicItem = options;
+            Object.assign(logicItem, relationOptions);
         } else {
             logicItem = LogicItem.from({
                 ...logicItemOptions,
                 ...options,
-            }, this);
+            }, this, 'alternate');
         }
-        Object.assign(logicItem, relationOptions);
         this.alternate.splice(index, 0, logicItem);
         return logicItem;
     }
@@ -370,37 +365,6 @@ export class IfStatement extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-    toUI(state?: TranslatorState): string {
-        let code = '';
-        code += 'if (';
-        code += this.test ? this.test.toUI(shiftState(state, code, {
-            tabSize: state.tabSize + 1,
-        })) : '';
-
-        code += ') {\n';
-
-        if (Array.isArray(this.consequent)) {
-            this.consequent.forEach((logicItem) => {
-                code
-                    += logicItem.toUI(shiftState(state, code, {
-                        tabSize: state.tabSize + 1,
-                    })) + '\n';
-            });
-        }
-        code += '}';
-        if (Array.isArray(this.alternate)) {
-            code += indent(state.tabSize) + ' else {\n';
-            this.alternate.forEach((logicItem) => {
-                code
-                    += logicItem.toUI(shiftState(state, code, {
-                        tabSize: state.tabSize + 1,
-                    })) + '\n';
-            });
-            code += '}\n';
-        }
-        return code;
-    }
-
     toJS(state?: TranslatorState) {
         let code = '';
         code += 'if (';

package/src/concepts/InterfaceParam__.ts

@@ -11,6 +11,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';
@@ -258,7 +259,7 @@ export class InterfaceParam extends BaseNode {
      * 是否可编辑
      * */
     get nodeReadonly() {
-        return this.parentNode.parentNode.concept !== 'app';
+        return !!this.module;
     }
 
     @withSourceMap()