@lcap/nasl 1.0.0-alpha.2 → 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 循环分支
@@ -32,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;
@@ -93,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);
@@ -108,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);
@@ -123,7 +124,7 @@ export class ForEachStatement extends LogicItem {
     }
 
     /**
-     * 设置循环列表
+     * 设置循环开始值
      */
     setStart(start: LogicItem) {
         start._delete();
@@ -138,7 +139,7 @@ export class ForEachStatement extends LogicItem {
     }
 
     /**
-     * 设置循环列表
+     * 设置循环结束值
      */
     setEnd(end: LogicItem) {
         end._delete();
@@ -288,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 逻辑项名称
@@ -430,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 循环分支',

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());

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__';
@@ -68,7 +72,7 @@ export class Identifier extends LogicItem {
         $refs: true,
     };
 
-    toVue(): string {
+    toVue(options?: ElementToVueOptions): string {
         return this.name;
     }
 
@@ -104,6 +108,19 @@ export class Identifier extends LogicItem {
 
     @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__';

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()

package/src/concepts/Interface__.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 InterfaceParam from './InterfaceParam__';
@@ -514,10 +515,22 @@ export class Interface extends BaseNode {
     /**
      * 是否可编辑
      * */
-    get nodeReadonly() {
+    get readonly() {
         return !!this.module;
     }
 
+    /**
+     * 设置逻辑名称
+     */
+    setOriginLogicName(originLogicName: string) {
+        const object = {
+            originLogicName,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
     toEmbeddedTSFile() {
         let code = `namespace ${this.getNamespace()} {\n`;
 
@@ -547,7 +560,8 @@ export class Interface extends BaseNode {
 
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
-        let code = `export function ${this.name}(`;
+        let code = '';
+        code += `export function ${this.name}(`;
         this.params.forEach((param, index) => {
             if (index === 0) {
                 code += '{';
@@ -576,10 +590,13 @@ export class Interface extends BaseNode {
                 code += ret.typeAnnotation.toEmbeddedTS(shiftState(state, code));
             });
             code += '{\n';
+            code += 'let logic =' + (this.parentNode as Namespace).getNamespace() + '.logics.' + this.originLogicName + '\n';
             code += `return new ${this.returns[0].typeAnnotation.toEmbeddedTS(shiftState(state, code))}();`;
             code += '\n }';
         } else {
-            code += 'void {};';
+            code += 'void {';
+            code += 'let logic =' + (this.parentNode as Namespace).getNamespace() + '.logics.' + this.originLogicName + '\n';
+            code += '};';
         }
         code += '\n';
         return code;
@@ -587,8 +604,7 @@ export class Interface extends BaseNode {
 
     getNamespace() {
         if (this.parentNode && (this.parentNode as Namespace).getNamespace)
-            return this.module ? `${(this.parentNode as Module).getNamespaceAndKey()}.interfaces` : `${(this.parentNode as Namespace).getNamespace()}.interfaces`;
-        // return `${(this.parentNode as Namespace).getNamespace()}.interfaces`;
+            return `${(this.parentNode as Namespace).getNamespace()}.interfaces`;
         else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }

package/src/concepts/JSBlock__.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 LogicItem from './LogicItem__';

package/src/concepts/LogicItem__.ts

@@ -1,5 +1,6 @@
 import { TranslatorState } from '../translator';
 import CallFunction from './CallFunction__';
+import { ElementToVueOptions } from './ViewElement__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -9,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 Logic from './Logic__';
@@ -27,44 +29,7 @@ export class LogicItem extends BaseNode {
      * 产品概念
      */
     @property()
-    concept:
-        | 'LogicItem'
-        | 'Start'
-        | 'End'
-        | 'IfStatement'
-        | 'SwitchStatement'
-        | 'SwitchCase'
-        | 'ForEachStatement'
-        | 'WhileStatement'
-        | 'Assignment'
-        | 'Comment'
-        | 'CallLogic'
-        | 'CallFunction'
-        | 'CallInterface'
-        | 'Destination'
-        | 'ValidationRule'
-        | 'Argument'
-        | 'JSBlock'
-        | 'Identifier'
-        | 'NullLiteral'
-        | 'BooleanLiteral'
-        | 'StringLiteral'
-        | 'NumericLiteral'
-        | 'BinaryExpression'
-        | 'UnaryExpression'
-        | 'MemberExpression'
-        | 'Unparsed'
-        | 'CallQueryComponent'
-        | 'QueryFromExpression'
-        | 'QueryJoinExpression'
-        | 'QueryFieldExpression'
-        | 'QueryAggregateExpression'
-        | 'QueryOrderByExpression'
-        | 'QueryGroupByExpression'
-        | 'QuerySelectExpression'
-        | 'QueryLimitExpression'
-        | 'SqlQueryComponent'
-        | 'ProcessOutcome' = 'LogicItem';
+    concept: 'LogicItem' | 'Start' | 'End' | 'IfStatement' | 'SwitchStatement' | 'SwitchCase' | 'ForEachStatement' | 'WhileStatement' | 'Assignment' | 'Comment' | 'CallLogic' | 'CallFunction' | 'CallInterface' | 'Destination' | 'ValidationRule' | 'Argument' | 'JSBlock' | 'Identifier' | 'NullLiteral' | 'BooleanLiteral' | 'StringLiteral' | 'NumericLiteral' | 'BinaryExpression' | 'UnaryExpression' | 'MemberExpression' | 'Unparsed' | 'CallQueryComponent' | 'QueryFromExpression' | 'QueryJoinExpression' | 'QueryFieldExpression' | 'QueryAggregateExpression' | 'QueryOrderByExpression' | 'QueryGroupByExpression' | 'QuerySelectExpression' | 'QueryLimitExpression' | 'SqlQueryComponent' | 'ProcessOutcome' = 'LogicItem';
 
     /**
      * 逻辑项标题
@@ -193,6 +158,10 @@ export class LogicItem extends BaseNode {
         });
     }
 
+    
+
+    
+
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
@@ -220,7 +189,7 @@ export class LogicItem extends BaseNode {
         return '[编译方法未实现]';
     }
 
-    toVue(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions) {
         return '[编译方法未实现]';
     }
 
@@ -261,7 +230,7 @@ export class LogicItem extends BaseNode {
     //================================================================================
 }
 
-classMap.LogicItem = LogicItem;
+classMap['LogicItem'] = LogicItem;
 export default LogicItem;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑