@lcap/nasl 1.0.0-alpha.9 → 1.0.2

package/src/concepts/Interface__.ts

@@ -132,7 +132,7 @@ export class Interface extends BaseNode {
     }
 
         getInterfaceParamUniqueName(name = 'interfaceParam1') {
-        return utils.unique(name, this.getVarExistingNames());
+        return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
 
     /**
@@ -171,7 +171,7 @@ export class Interface extends BaseNode {
                 name: options,
             }, this, 'params');
         } else if (options instanceof InterfaceParam) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             interfaceParam = options;
             Object.assign(interfaceParam, relationOptions);
         } else {
@@ -259,7 +259,7 @@ export class Interface extends BaseNode {
 
     addInterfaceParam(options?: string | Partial<InterfaceParam> | InterfaceParam) {
         const node = this._addInterfaceParam(options as any);
-        const index = this.params.length;
+        const index = this.params.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -269,8 +269,8 @@ export class Interface extends BaseNode {
     }
 
 
-    getReturnUniqueName(name = 'result1') {
-        return utils.unique(name, this.getVarExistingNames());
+    getReturnUniqueName(name = 'result') {
+        return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
 
     /**
@@ -309,7 +309,7 @@ export class Interface extends BaseNode {
                 name: options,
             }, this, 'returns');
         } else if (options instanceof Return) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             ret = options;
             Object.assign(ret, relationOptions);
         } else {
@@ -397,7 +397,7 @@ export class Interface 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,
@@ -519,6 +519,18 @@ export class Interface extends BaseNode {
         return !!this.module;
     }
 
+    toService() {
+        return {
+            config: {
+                serviceType: 'external',
+            },
+            url: {
+                method: this.method,
+                path: this.path,
+            },
+        };
+    }
+
     /**
      * 设置接口描述
      */
@@ -551,10 +563,14 @@ export class Interface 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) {
+            code += '';
+        }
         code += '}\n';
 
         return {
@@ -565,9 +581,12 @@ export class Interface extends BaseNode {
     }
 
     get calleeKey(): string {
-        return `${this.getNamespace()}.${this.name} `;
+        return `${this.getTsNamespace()}.${this.name} `;
     }
 
+    get calleewholeKey() {
+        return this.getNamespace() + '.' + this.name;
+    }
     /**
      * 生成宿主语言的文件路径
      * @param name 一般不用传，用于 rename
@@ -577,15 +596,95 @@ export class Interface extends BaseNode {
         return `/embedded/${this.app.name}${_path}/interfaces/${name}.ts`;
     }
 
+    get tsName(): string {
+        const excludeds = [
+            'abstract',
+            'arguments',
+            'await',
+            'boolean',
+            'break',
+            'byte',
+            'case',
+            'catch',
+            'char',
+            'class',
+            'const',
+            'continue',
+            'debugger',
+            'default',
+            'delete',
+            'do',
+            'double',
+            'else',
+            'enum',
+            'eval',
+            'export',
+            'extends',
+            'false',
+            'final',
+            'finally',
+            'float',
+            'for',
+            'function',
+            'goto',
+            'if',
+            'implements',
+            'import',
+            'in',
+            'instanceof',
+            'int',
+            'interface',
+            'let',
+            'long',
+            'native',
+            'new',
+            'null',
+            'package',
+            'private',
+            'protected',
+            'public',
+            'return',
+            'short',
+            'static',
+            'super',
+            'switch',
+            'synchronized',
+            'this',
+            'throw',
+            'throws',
+            'transient',
+            'true',
+            'try',
+            'typeof',
+            'var',
+            'void',
+            'volatile',
+            'while',
+            'with',
+            'yield,as',
+            'any',
+            'number',
+            'string',
+            'get',
+            'type',
+            'typeof',
+            'instanceof',
+            'require',
+        ];
+        if (excludeds.includes(this.name)) {
+            return '_' + this.name;
+        }
+        return this.name;
+    }
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code = '';
-        code += `export function ${this.name}(`;
+        code += `export function ${this.tsName}(`;
         this.params.forEach((param, index) => {
             if (index === 0) {
                 code += '{';
             }
-            code += param.name;
+            code += param.tsName;
             if (index !== this.params.length - 1) {
                 code += ', ';
             } else {
@@ -596,7 +695,7 @@ export class Interface extends BaseNode {
             if (index === 0) {
                 code += '{';
             }
-            code += param.toEmbeddedTS(shiftState(state, code));
+            code += param.toEmbeddedTS(shiftState(state, code), !(param as InterfaceParam).required);
             if (index !== this.params.length - 1) {
                 code += ', ';
             } else {
@@ -610,12 +709,16 @@ export class Interface extends BaseNode {
             });
             code += '{\n';
 
-            code += this.module ? '' : 'let logic =' + (this.parentNode as Namespace).getNamespace() + '.logics.' + this.originLogicName + '\n';
-            code += `return new ${this.returns[0].typeAnnotation.toEmbeddedTS(shiftState(state, code))}();`;
+            code += this.module ? '' : 'let logic =' + (this.parentNode as Namespace).getTsNamespace() + '.logics.' + this.originLogicName + '\n';
+            code += 'let ';
+            code += this.returns[0].toEmbeddedTS(shiftState(state, code, { inline: true }));
+            code += ';\n';
+            code += `return `;
+            code += this.returns[0].tsName || '__return;';
             code += '\n }';
         } else {
             code += 'void {';
-            code += this.module ? '' : 'let logic =' + (this.parentNode as Namespace).getNamespace() + '.logics.' + this.originLogicName + '\n';
+            code += this.module ? '' : 'let logic =' + (this.parentNode as Namespace).getTsNamespace() + '.logics.' + this.originLogicName + '\n';
             code += '};';
         }
         code += '\n';
@@ -628,6 +731,17 @@ export class Interface extends BaseNode {
         else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
+    getTsNamespace() {
+        if (this.parentNode.concept === 'App') {
+            return `${(this.parentNode as Namespace).getNamespace()}.interfaces`;
+        } else {
+            if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {
+                return `${(this.parentNode as Namespace).getTsNamespace()}.interfaces`;
+            } else {
+                throw new Error('无法获取命名空间，请设置 parentNode！');
+            }
+        }
+    }
 
     getVarExistingNames(excludedList: Array<InterfaceParam | Return> = []) {
         const excludedSet = new Set(excludedList);

package/src/concepts/JSBlock__.ts

@@ -83,6 +83,10 @@ export class JSBlock extends LogicItem {
         await jsBlock_number();`;
     }
 
+    toEmbeddedTS(state?: TranslatorState): string {
+        return '';
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/LogicItem__.ts

@@ -1,6 +1,7 @@
 import { TranslatorState } from '../translator';
 import CallFunction from './CallFunction__';
 import { ElementToVueOptions } from './ViewElement__';
+import CallQueryComponent from './CallQueryComponent__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -29,7 +30,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' | 'Assignee' = 'LogicItem';
 
     /**
      * 逻辑项标题
@@ -224,6 +225,20 @@ export class LogicItem extends BaseNode {
         return this.toJS(state);
     }
 
+    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 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓