@lcap/nasl 1.0.0-alpha.9 → 1.0.2

package/src/concepts/Logic__.ts

@@ -1,8 +1,7 @@
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, embeddedTSEmitter } from '../translator';
 import Namespace from './Namespace__';
 import CallQueryComponent from './CallQueryComponent__';
-import pluralize = require('pluralize');
-import { kebabCase } from 'lodash';
+import ForEachStatement from './ForEachStatement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -233,7 +232,7 @@ export class Logic extends BaseNode {
         return (this.typeParams || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getTypeParamUniqueName(name = 'typeParam1') {
-        return utils.unique(name, this.getTypeParamExistingNames());
+        return utils.unique(name, this.getTypeParamExistingNames(), undefined, false);
     }
 
     /**
@@ -272,7 +271,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 {
@@ -360,7 +359,7 @@ export class Logic extends BaseNode {
 
     addTypeParam(options?: string | Partial<TypeParam> | TypeParam) {
         const node = this._addTypeParam(options as any);
-        const index = this.typeParams.length;
+        const index = this.typeParams.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -371,7 +370,7 @@ export class Logic extends BaseNode {
 
 
     getParamUniqueName(name = 'param1') {
-        return utils.unique(name, this.getVarExistingNames());
+        return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
 
     /**
@@ -410,7 +409,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 {
@@ -498,7 +497,7 @@ export class Logic extends BaseNode {
 
     addParam(options?: string | Partial<Param> | Param) {
         const node = this._addParam(options as any);
-        const index = this.params.length;
+        const index = this.params.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -508,8 +507,8 @@ export class Logic extends BaseNode {
     }
 
 
-    getReturnUniqueName(name = 'result1') {
-        return utils.unique(name, this.getVarExistingNames());
+    getReturnUniqueName(name = 'result') {
+        return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
 
     /**
@@ -548,7 +547,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 {
@@ -636,7 +635,7 @@ export class Logic extends BaseNode {
 
     addReturn(options?: string | Partial<Return> | Return) {
         const node = this._addReturn(options as any);
-        const index = this.returns.length;
+        const index = this.returns.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -647,7 +646,7 @@ export class Logic extends BaseNode {
 
 
     getVariableUniqueName(name = 'variable1') {
-        return utils.unique(name, this.getVarExistingNames());
+        return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
 
     /**
@@ -686,7 +685,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 {
@@ -774,7 +773,7 @@ export class Logic extends BaseNode {
 
     addVariable(options?: string | Partial<Variable> | Variable) {
         const node = this._addVariable(options as any);
-        const index = this.variables.length;
+        const index = this.variables.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -807,7 +806,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 {
@@ -881,7 +880,7 @@ export class Logic extends BaseNode {
 
     addItemInBody(options?: Partial<LogicItem> | LogicItem) {
         const node = this._addItemInBody(options as any);
-        const index = this.body.length;
+        const index = this.body.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -911,7 +910,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 {
@@ -985,7 +984,7 @@ export class Logic extends BaseNode {
 
     addItemInPlayground(options?: Partial<LogicItem> | LogicItem) {
         const node = this._addItemInPlayground(options as any);
-        const index = this.playground.length;
+        const index = this.playground.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1298,6 +1297,10 @@ export class Logic extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    // 用于calllogic树中定位是那个logic，回显
+    get calleewholeKey() {
+        return this.getNamespace() + '.' + this.name;
+    }
     // 设置定时任务
     setCronAndTriggerType(cron: string, triggerType: string) {
         const object = {
@@ -1308,6 +1311,21 @@ export class Logic extends BaseNode {
             ...object,
         });
     }
+
+    /**
+     * 创建的时候 打开事务 通过开关设置数据库事务
+     */
+    openTransactional(flag: boolean) {
+        if (flag) {
+            const transactional = new Transactional({
+                enabled: flag,
+            });
+            transactional._delete();
+            const relationOptions = { parentNode: this, parentKey: 'transactional' };
+            Object.assign(transactional, relationOptions);
+            this.transactional = transactional;
+        }
+    }
     findLogicItemByConcept(concept: string) {
         let result: any;
 
@@ -1328,7 +1346,36 @@ export class Logic extends BaseNode {
 
     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);
+        const varList: any[] = [];
+        if (Array.isArray(this.params)) {
+            varList.push(...this.params);
+        }
+        if (Array.isArray(this.returns)) {
+            varList.push(...this.returns);
+        }
+        if (Array.isArray(this.variables)) {
+            varList.push(...this.variables);
+        }
+        if (this.view) {
+            if (Array.isArray(this.view.params)) {
+                varList.push(...this.view.params);
+            }
+            if (Array.isArray(this.view.variables)) {
+                varList.push(...this.view.variables);
+            }
+        }
+
+        this.traverseChildren((el) => {
+            if (el?.concept === 'ForEachStatement') {
+                if ((el as ForEachStatement)?.item) {
+                    varList.push((el as ForEachStatement)?.item);
+                }
+                if ((el as ForEachStatement)?.index) {
+                    varList.push((el as ForEachStatement)?.index);
+                }
+            }
+        });
+        return varList.filter((item) => !excludedSet.has(item)).map((item) => item?.name);
     }
 
     toJS(state?: TranslatorState): string {
@@ -1373,15 +1420,23 @@ export class Logic extends BaseNode {
             });
         }
 
-        if (Array.isArray(this.returns) && this.returns.length) {
-            code += `return ${this.returns[0].name};\n`;
-        }
-
         code += indent(state.tabSize) + '}\n';
 
         return code;
     }
 
+    toProcessService() {
+        return {
+            config: {
+                serviceType: 'micro',
+            },
+            url: {
+                method: 'POST',
+                path: this.getPath(),
+            },
+        };
+    }
+
     toService() {
         const parentNode = this.parentNode;
         const { concept, name: entityName } = parentNode || {};
@@ -1389,14 +1444,19 @@ export class Logic extends BaseNode {
         let serviceType = 'micro';
         let method = 'POST';
         let path = `/api/${logicName}`;
-        if (concept === 'Namespace') {
+        if (concept === 'Module') {
+            path = `/api/${entityName.replace('-', '_')}/${logicName}`;
+        } else if (concept === 'Namespace') {
             serviceType = 'entity';
-            const pluralized = pluralize(entityName);
-            path = `/api/${pluralized.toLowerCase()}`;
+            const entityPath = entityName.replace(/[A-Z]/g, (char, index) => {
+                const lowerChar = char.toLowerCase();
+                return index === 0 ? lowerChar : `-${lowerChar}`;
+            });
+            path = `/api/${entityPath}`;
             switch (this.name) {
                 case 'get':
                     method = 'GET';
-                    path = `/api/${pluralized.toLowerCase()}/{id}`;
+                    path = `/api/${entityPath}`;
                     break;
                 case 'create':
                     method = 'POST';
@@ -1406,23 +1466,23 @@ export class Logic extends BaseNode {
                     break;
                 case 'delete':
                     method = 'DELETE';
-                    path = `/api/${pluralized.toLowerCase()}/{id}`;
+                    path = `/api/${entityPath}`;
                     break;
                 case 'batchCreate':
                     method = 'POST';
-                    path = `/api/${pluralized.toLowerCase()}/batch`;
+                    path = `/api/${entityPath}/batch`;
                     break;
                 case 'batchUpdate':
                     method = 'PUT';
-                    path = `/api/${pluralized.toLowerCase()}/batch`;
+                    path = `/api/${entityPath}/batch`;
                     break;
                 case 'batchDelete':
                     method = 'DELETE';
-                    path = `/api/${pluralized.toLowerCase()}/batch`;
+                    path = `/api/${entityPath}/batch`;
                     break;
                 case 'import':
                     method = 'POST';
-                    path = `/api/${pluralized.toLowerCase()}/import`;
+                    path = `/api/${entityPath}/import`;
                     break;
                 default:
                     break;
@@ -1440,6 +1500,50 @@ export class Logic extends BaseNode {
         };
     }
 
+    @withSourceMap()
+    toEmbeddedTSInProcess(state?: TranslatorState, prependCode?: string, noName?: boolean): string {
+        let code = '';
+        code += `${noName ? '' : `${this.name}:`} function(`;
+        this.params.forEach((param, index) => {
+            code += param.toEmbeddedTS(shiftState(state, code, { inline: true }));
+            if (index !== this.params.length - 1)
+                code += ', ';
+        });
+        code += `) {\n`;
+        code += prependCode || '';
+        code += '\n';
+        this.variables.forEach((variable) => {
+            code += indent(state.tabSize + 1) + 'let ';
+            code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
+            code += ';\n';
+        });
+
+        this.returns.forEach((ret) => {
+            code += indent(state.tabSize + 1) + 'let ';
+            code += ret.toEmbeddedTS(shiftState(state, code, { inline: true }));
+            code += ';\n';
+        });
+
+        if (!this.body.length && this.returns.length) {
+            code += indent(state.tabSize + 1) + `return ${this.returns[0].name};\n`;
+        } else {
+            this.body.forEach((item) => {
+                code += item.toEmbeddedTS && item.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+                code += '\n';
+            });
+        }
+
+        // 在body渲染完成之后把其余的节点放到下面
+        this.playground.forEach((item) => {
+            code += item.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+            code += '\n';
+        });
+
+        code += indent(state.tabSize) + '}';
+        code += '\n';
+        return code;
+    }
+
     toEmbeddedTSNoExport(state?: TranslatorState): string {
         return this.toEmbeddedTS(state, 'noExport');
     }
@@ -1451,16 +1555,21 @@ export class Logic extends BaseNode {
         if (!prefix) {
             code += `export function ${this.name}(`;
         } else if (prefix === 'noExport') {
-            code += ` function ${this.name}(`;
+            code += `function ${this.name}(`;
         } else if (prefix === 'inObject') {
-            code += ` ${this.name}(`;
+            code += `${this.name}(`;
         }
         this.params.forEach((param, index) => {
             code += param.toEmbeddedTS(shiftState(state, code, { inline: true }));
             if (index !== this.params.length - 1)
                 code += ', ';
         });
-        code += `) {\n`;
+        code += ')';
+        if (this.returns.length) {
+            code += ': ';
+            code += this.returns[0].typeAnnotation.toEmbeddedTS(shiftState(state, code, { inline: true }));
+        }
+        code += '{\n';
 
         this.variables.forEach((variable) => {
             code += indent(state.tabSize + 1) + 'let ';
@@ -1503,7 +1612,28 @@ export class Logic extends BaseNode {
             if (this.parentNode instanceof Namespace || this.parentNode instanceof App || this.parentNode instanceof Module) {
                 parentNodeNamespace = this.parentNode.getNamespace();
             }
-            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 = '');
+            }
+            return parentNodeNamespace;
+        } else
+            throw new Error('无法获取命名空间，请设置 parentNode！');
+    }
+
+    getTsNamespace(): string {
+        if (this.parentNode) {
+            let parentNodeNamespace = '';
+            if (this.parentNode instanceof Namespace || this.parentNode instanceof App) {
+                parentNodeNamespace = this.parentNode.getNamespace();
+            } else if (this.parentNode instanceof Module) {
+                parentNodeNamespace = this.parentNode.getTsNamespace();
+            }
+
+            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 = '');
             }
@@ -1522,10 +1652,15 @@ export class Logic extends BaseNode {
     }
 
     toEmbeddedTSFile() {
-        let code = `namespace ${this.getNamespace()} {\n`;
+        let code = `namespace ${this.getTsNamespace()} {\n`;
 
         const state = createCompilerState(code, { tabSize: 1 });
-        code += this.toEmbeddedTS(state);
+        try {
+            code += this.toEmbeddedTS(state);
+        } catch (err) {
+            console.log(err, '有问题翻译失败');
+            code += '';
+        }
         code += '}\n';
         return {
             code,
@@ -1577,6 +1712,24 @@ 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 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/MemberExpression__.ts

@@ -1,6 +1,11 @@
 import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TypeAnnotation } from '..';
 import { ElementToVueOptions } from './ViewElement__';
-import BinaryExpression from './BinaryExpression__';
+import Identifier from './Identifier__';
+import BindAttribute from './BindAttribute__';
+import Assignment from './Assignment__';
+
+const Identifier_RE = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -139,25 +144,60 @@ export class MemberExpression extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-
+    // 选中的数据类型，这个用作暂存
+    typeAnnotation: TypeAnnotation = undefined;
     toVue(options?: ElementToVueOptions) {
-        const object: string = this.object.toVue(options);
-        const property = this.property.toVue(options);
+        //  如果是枚举取值
+        if (this.object?.concept === 'Identifier' && (this.object as Identifier)?.isEnum() && this.property?.concept === 'Identifier') {
+            return `"${this.property?.name}"`;
+        }
+        const object = String(this.object?.toVue(options)); // undefined 也让正常展示
+        const property = String(this.property?.toVue(options));
+
+        const bindAttr: BindAttribute = this.getAncestor('BindAttribute') as BindAttribute;
+        if (bindAttr && (bindAttr.sync || bindAttr.model))
+            return Identifier_RE.test(property) ? `${object}.${property}` : `${object}['${property}']`;
+
         const lastPart = object.split(' && ').pop();
-        return options?.finalCode === false ? `${object}.${property}` : `${object} && ${lastPart}.${property}`;
+        if (Identifier_RE.test(property))
+            return options?.finalCode === false ? `${object}.${property}` : `${object} && ${lastPart}.${property}`;
+        else
+            return options?.finalCode === false ? `${object}['${property}']` : `${object} && ${lastPart}['${property}']`;
     }
 
     toUI(): string {
-        const object: string = this.object.toUI();
-        const property = this.property.toUI();
-        return `${object}.${property}`;
+        //  如果是枚举取值
+        if (this.object?.concept === 'Identifier' && (this.object as Identifier)?.isEnum() && this.property?.concept === 'Identifier') {
+            return `${this.object?.name}.${this.property?.name}`;
+        }
+        const object: string = this.object?.toUI();
+        const property = this.property?.toUI();
+
+        return Identifier_RE.test(property) ? `${object}.${property}` : `${object}['${property}']`;
     }
 
     toJS(): string {
-        const object: string = this.object.toJS();
-        const property = this.property.toJS();
+        //  如果是枚举取值
+        if (this.object?.concept === 'Identifier' && (this.object as Identifier)?.isEnum() && this.property?.concept === 'Identifier') {
+            return `"${this.property?.name}"`;
+        }
+        const object: string = this.object?.toJS();
+        const property = this.property?.toJS();
+        // 在赋值语句的左侧，不能有 &&
+        const assignment: Assignment = this.getAncestor('Assignment') as Assignment;
+        if (assignment) {
+            const left = assignment.left;
+            let node: any = this;
+            while (node && node.concept === 'MemberExpression' && left !== node) {
+                node = node.parentNode;
+            }
+            // 在赋值语句的左侧
+            if (node) {
+                return Identifier_RE.test(property) ? `${object}.${property}` : `${object}['${property}']`;
+            }
+        }
         const lastPart = object.split(' && ').pop();
-        return `${object} && ${lastPart}.${property}`;
+        return Identifier_RE.test(property) ? `${object} && ${lastPart}.${property}` : `${object} && ${lastPart}['${property}']`;
     }
 
     setValue(newValue: string) {
@@ -190,7 +230,6 @@ export class MemberExpression extends LogicItem {
         };
         this.update({
             ...object,
-            field: 'name',
         });
     }
     // 方便快速取值,遍历获取value
@@ -224,9 +263,13 @@ export class MemberExpression extends LogicItem {
 
         // 就说明这是一个枚举取值操作，直接啊app.enums.color.red 要转成字符串
         code += leftCode + rightCode;
-        // if (leftCode.startsWith('app.enums.') && !(this.parentNode instanceof BinaryExpression)) {
-        //     code += '.toList()';
-        // }
+        // 解决枚举可能全是数字的问题
+        // app.enums.color  || extensions.tool.enums.color
+        if (leftCode.startsWith('app.enums.') || (leftCode.startsWith('extensions') && leftCode.includes('.enums.'))) {
+            const lastIndex = leftCode.lastIndexOf('.');
+            const newCode = `${code.substring(0, lastIndex)}['${code.substring(lastIndex + 1, code.length)}']`;
+            code = newCode;
+        }
         return code;
     }