@lcap/nasl 1.0.0-alpha.2 → 1.0.0-alpha.5

package/src/concepts/Logic__.ts

@@ -1,7 +1,7 @@
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, embeddedTSEmitter } from '../translator';
 import Namespace from './Namespace__';
 import CallQueryComponent from './CallQueryComponent__';
-import pluralize = require('pluralize')
+import pluralize = require('pluralize');
 import { kebabCase } from 'lodash';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -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 Transactional from './Transactional__';
@@ -188,9 +189,9 @@ 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);
+        return (this.typeParams || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getTypeParamUniqueName(name = 'typeParam1') {
         return utils.unique(name, this.getTypeParamExistingNames());
@@ -329,6 +330,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames());
     }
@@ -466,6 +468,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
     getReturnUniqueName(name = 'result1') {
         return utils.unique(name, this.getVarExistingNames());
     }
@@ -603,6 +606,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames());
     }
@@ -740,6 +744,11 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+
+
+    
+
     /**
     * 插入逻辑项
     * @internal
@@ -772,6 +781,8 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
+    
+
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -794,6 +805,8 @@ export class Logic extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加逻辑项
      * @internal
@@ -813,6 +826,8 @@ export class Logic extends BaseNode {
         return this._insertItemInBodyAt(options as any, index);
     }
 
+    
+
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -836,6 +851,8 @@ export class Logic extends BaseNode {
         return node;
     }
 
+    
+
     /**
     * 插入逻辑项
     * @internal
@@ -868,6 +885,8 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
+    
+
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -890,6 +909,8 @@ export class Logic extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加逻辑项
      * @internal
@@ -909,6 +930,8 @@ export class Logic extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
+    
+
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -932,6 +955,9 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除事务
     * @param name 事务名称
@@ -980,6 +1006,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除类型参数
     * @param name 类型参数名称
@@ -1028,6 +1056,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1076,6 +1106,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -1124,6 +1156,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除局部变量
     * @param name 局部变量名称
@@ -1172,6 +1206,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1179,10 +1215,12 @@ export class Logic extends BaseNode {
     removeItemInBody(logicItem: LogicItem): void;
 
     removeItemInBody(options: LogicItem) {
-        const logicItem: LogicItem = options;
+        let logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
+    
+
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1190,7 +1228,7 @@ export class Logic extends BaseNode {
     removeItemInPlayground(logicItem: LogicItem): void;
 
     removeItemInPlayground(options: LogicItem) {
-        const logicItem: LogicItem = options;
+        let logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
@@ -1414,12 +1452,12 @@ export class Logic extends BaseNode {
     getNamespace(): string {
         if (this.parentNode) {
             let parentNodeNamespace = '';
-            if (this.parentNode instanceof Namespace || this.parentNode instanceof App) {
+            if (this.parentNode instanceof Namespace || this.parentNode instanceof App || this.parentNode instanceof Module) {
                 parentNodeNamespace = this.parentNode.getNamespace();
             }
             parentNodeNamespace = parentNodeNamespace.includes('.logics') ? parentNodeNamespace : `${parentNodeNamespace}.logics`;
             if (this.parentNode instanceof View) {
-                return parentNodeNamespace = '';
+                return (parentNodeNamespace = '');
             }
             return parentNodeNamespace;
         } else
@@ -1431,7 +1469,8 @@ export class Logic extends BaseNode {
      * @param name 一般不用传，用于 rename
      */
     getEmbeddedFilePath(name = this.name) {
-        return `/embedded/${this.app.name}/logics/${name}.ts`;
+        const _path = this.module ? `/${this.module.parentKey}/${this.module.name}` : '';
+        return `/embedded/${this.app.name}${_path}/logics/${name}.ts`;
     }
 
     toEmbeddedTSFile() {
@@ -1490,7 +1529,7 @@ export class Logic extends BaseNode {
     //================================================================================
 }
 
-classMap.Logic = Logic;
+classMap['Logic'] = Logic;
 export default Logic;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/MemberExpression__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { ElementToVueOptions } from './ViewElement__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -8,6 +9,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__';
@@ -137,26 +139,21 @@ export class MemberExpression extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-    /**
-     * object的替代品(用object值会丢失)
-     */
-    @property('LogicItem')
-    objectqwer: LogicItem = undefined;
-
-    toVue() {
-        const object: string = this.objectqwer.toVue();
-        const property = this.property.toVue();
-        return `${object}.${property}`;
+    toVue(options?: ElementToVueOptions) {
+        const object: string = this.object.toVue(options);
+        const property = this.property.toVue(options);
+        const lastPart = object.split(' && ').pop();
+        return options?.finalCode === false ? `${object}.${property}` : `${object} && ${lastPart}.${property}`;
     }
 
     toUI(): string {
-        const object: string = this.objectqwer.toUI();
+        const object: string = this.object.toUI();
         const property = this.property.toUI();
         return `${object}.${property}`;
     }
 
     toJS(): string {
-        const object: string = this.objectqwer.toJS();
+        const object: string = this.object.toJS();
         const property = this.property.toJS();
         const lastPart = object.split(' && ').pop();
         return `${object} && ${lastPart}.${property}`;
@@ -168,12 +165,12 @@ export class MemberExpression extends LogicItem {
         let arrIndex = 0;
 
         let current: any = this;
-        while (current.objectqwer) {
+        while (current.object) {
             if (current.property.name !== newValueList[arrIndex]) {
                 current.property.setName(newValueList[arrIndex]);
                 return;
             }
-            current = current.objectqwer;
+            current = current.object;
             arrIndex++;
         }
         // 前面没有找到，到这里就是最后一项的值要修改
@@ -201,10 +198,10 @@ export class MemberExpression extends LogicItem {
         let value: string = '';
         // MemberExpression 有两个属性object代表父级，property代表自己
         // 先向上找父级的值在获取自己的值进行拼接
-        while (current.objectqwer) {
+        while (current.object) {
             const currentValue = current.property.name;
             value = value ? currentValue + '.' + value : currentValue;
-            current = current.objectqwer;
+            current = current.object;
         }
 
         // 最后一个是Identifier,他的值是自己的name
@@ -221,7 +218,7 @@ export class MemberExpression extends LogicItem {
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code = '';
-        code += this.objectqwer ? this.objectqwer.toEmbeddedTS(shiftState(state, code, { inline: true })) + '.' : '';
+        code += this.object ? this.object.toEmbeddedTS(shiftState(state, code, { inline: true })) + '.' : '';
         code += this.property ? this.property.toEmbeddedTS(shiftState(state, code, { inline: true })) : '';
         return code;
     }