@lcap/nasl 3.4.0-beta.5 → 3.4.0-beta.6

package/src/concepts/Block__.ts

@@ -1,4 +1,13 @@
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -24,6 +33,13 @@ export class Block extends LogicItem {
   /** 继承链 */
   static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
 
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'Block';
+
   /**
    * 内容
    */
@@ -224,13 +240,13 @@ export class Block extends LogicItem {
     return code;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     let code = '';
-    this.logicItems.forEach((item) => {
-      code += item.toEmbeddedTS && item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+    for (const item of this.logicItems) {
+      code += yield* item?.toEmbeddedTS?.(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 })) ?? utils.returnOrigin('');
       code += ';\n';
-    });
+    }
     return code;
   }
 

package/src/concepts/BooleanLiteral__.ts

@@ -1,4 +1,12 @@
-import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -72,8 +80,8 @@ export class BooleanLiteral extends LogicItem {
     return this.value;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()) {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     return `new nasl.core.Boolean(${this.value})`;
   }
 

package/src/concepts/CallAuthInterface__.ts

@@ -1,7 +1,20 @@
+import { wrapForEachToGenerator as wrapForEach, returnOrigin } from '../utils/time-slicing';
 import Param from './Param__';
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { getNodeByNodeCallee } from '../automate/engine/utils.js';
 import AuthLogicForCallInterface from './AuthLogicForCallInterface__';
+import type AuthInterface from './AuthInterface__';
+import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
+
+
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -344,37 +357,46 @@ export class CallAuthInterface extends CallInterface {
     if (this.connector) {
       tsAuthLogicNamespace = `connector.${this.connector.name}.authLogicsForCallInterface`;
     }
-    const callee = getNodeByNodeCallee(this.app, this.calleewholeKey);
-    const authLogicName = callee?.authLogic;
+    let callee = null;
+    let authLogicName = null;
+    // 编辑态的需要从 ingetration 下的 connector 中获取
+    if(this.connector && this.integration) {
+      callee = this.connector.interfaces.find(itf => itf.name === this.calleeName);
+      authLogicName = `${(callee as AuthInterface)?.authLogic}${CUSTOM_CONNECTOR_EDITABLE_SUFFIX}`;
+    } else {
+      callee = getNodeByNodeCallee(this.app, this.calleewholeKey);
+      authLogicName = callee?.authLogic;
+    }
     return authLogicName ? `${tsAuthLogicNamespace}.${authLogicName}` : '__IDENTIFIER__';
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    let code = this.tsAuthLogicKey;
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    let code = self.tsAuthLogicKey;
     // 目前没有任何其他范型，故这里先支持默认俩范型
     // FIXME
     // fix: http://projectmanage.netease-official.lcap.163yun.com/dashboard/BugDetail?id=2676637477443328
     if (code !== '__IDENTIFIER__') {
-      code += `<Parameters<typeof ${this.tsCalleeKey}>[0], ReturnType<typeof ${this.tsCalleeKey}>>`;
+      code += `<Parameters<typeof ${self.tsCalleeKey}>[0], ReturnType<typeof ${self.tsCalleeKey}>>`;
     }
     code += '(';
-    const { completeAuthArguments } = this;
+    const { completeAuthArguments } = self;
     if (completeAuthArguments?.length) {
       code += '{';
-      completeAuthArguments?.forEach((arg, index) => {
-        code += arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true);
+      yield* wrapForEach(completeAuthArguments, function* warpForEachGenerator(arg, index) {
+        code += yield* arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true) ?? returnOrigin('');
         code += ',';
       });
       code += `api: `;
-      code += this.tsCalleeKey;
-      const { completeArguments } = this;
+      code += self.tsCalleeKey;
+      const { completeArguments } = self;
       code += '(';
       if (completeArguments?.length) {
         code += '{';
-        completeArguments?.forEach((arg, index) => {
-          code += arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true);
-          if (index !== this.arguments?.length - 1) code += ', ';
+        yield* wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
+          code += yield* arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true) ?? returnOrigin('');
+          if (index !== self.arguments?.length - 1) code += ', ';
         });
         code += '}';
       }
@@ -383,35 +405,33 @@ export class CallAuthInterface extends CallInterface {
     } else {
       code += '{';
       code += 'api: ';
-      code += this.tsCalleeKey;
-      const { completeArguments } = this;
+      code += self.tsCalleeKey;
+      const { completeArguments } = self;
       code += '(';
       if (completeArguments?.length) {
         code += '{';
-        completeArguments?.forEach((arg, index) => {
-          code += arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true);
-          if (index !== this.arguments?.length - 1) code += ', ';
+        yield* wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
+          code += yield* arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true) ?? returnOrigin('');
+          if (index !== self.arguments?.length - 1) code += ', ';
         });
         code += '}';
       }
       code += ')';
       code += '}';
     }
-
     code += ')';
-
     if (
-      this.parentNode.concept !== 'Argument' &&
-      this.parentKey !== 'test' &&
-      this.parentKey !== 'patterns' &&
-      this.parentNode.concept !== 'Assignment' &&
-      this.parentNode.concept !== 'ForEachStatement' &&
-      this.parentNode.concept !== 'SelectMembers' &&
-      this.parentNode.concept !== 'BinaryExpression' &&
-      this.parentNode.concept !== 'MemberExpression' &&
-      this.parentNode.concept !== 'StringInterpolation' &&
-      !['NewMap', 'NewList'].includes(this.parentNode.concept) &&
-      this.parentKey !== 'returnExpression'
+      self.parentNode.concept !== 'Argument' &&
+      self.parentKey !== 'test' &&
+      self.parentKey !== 'patterns' &&
+      self.parentNode.concept !== 'Assignment' &&
+      self.parentNode.concept !== 'ForEachStatement' &&
+      self.parentNode.concept !== 'SelectMembers' &&
+      self.parentNode.concept !== 'BinaryExpression' &&
+      self.parentNode.concept !== 'MemberExpression' &&
+      self.parentNode.concept !== 'StringInterpolation' &&
+      !['NewMap', 'NewList'].includes(self.parentNode.concept) &&
+      self.parentKey !== 'returnExpression'
     ) {
       code += ';';
     }
@@ -519,6 +539,11 @@ export class CallAuthInterface extends CallInterface {
       authArguments: newArgs,
     });
   }
+
+  // 是否来自于 集成中心
+  get integration() {
+    return this.getAncestor('Integration');
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/CallConnector__.ts

@@ -1,3 +1,4 @@
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import type Connector from './Connector__';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
 import Logic from './Logic__';
@@ -5,7 +6,15 @@ import Argument from './Argument__';
 import Identifier from './Identifier__';
 import TypeAnnotation from './TypeAnnotation__';
 import Connection from './Connection__';
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import Namespace from './Namespace__';
 
 //================================================================================
@@ -222,49 +231,48 @@ export class CallConnector extends CallLogic {
     });
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
-    if (this.handleError) {
+    if (self.handleError) {
       code += 'nasl.util.autoHandleError(';
     }
-    code += this.calleeTSConnectionKey;
+    code += self.calleeTSConnectionKey;
     code += '(() => ';
-    code += this.calleeKey;
-    if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+    code += self.calleeKey;
+    if (Array.isArray(self.typeArguments) && self.typeArguments.length) {
       // 如果有内容
-      const typeAnnotation = this.typeArguments[0];
+      const typeAnnotation = self.typeArguments[0];
       code += `<`;
-      code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
+      code += `${yield* typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
     }
-
-    const { completeArguments } = this;
+    const { completeArguments } = self;
     if (completeArguments.length) {
       code += '(';
-      completeArguments.forEach((arg, index) => {
+      yield* wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
         // 取到是不是必填放入参数中
-        code += arg.toEmbeddedTS(shiftState(state, code), arg?.paramRequired);
-        if (index !== this.arguments.length - 1) code += ', ';
+        code += yield* arg.toEmbeddedTS(shiftState(state, code), arg?.paramRequired);
+        if (index !== self.arguments.length - 1) code += ', ';
       });
       code += ')';
     } else {
       code += '()';
     }
-
-    if (this.handleError) {
+    if (self.handleError) {
       code += ')';
     }
     if (
-      this.parentNode.concept !== 'Argument' &&
-      this.parentKey !== 'test' &&
-      this.parentKey !== 'patterns' &&
-      this.parentNode.concept !== 'Assignment' &&
-      this.parentNode.concept !== 'ForEachStatement' &&
-      this.parentNode.concept !== 'SelectMembers' &&
-      this.parentNode.concept !== 'BinaryExpression' &&
-      this.parentNode.concept !== 'StringInterpolation' &&
-      this.parentNode.concept !== 'MemberExpression' &&
-      !['NewMap', 'NewList'].includes(this.parentNode.concept)
+      self.parentNode.concept !== 'Argument' &&
+      self.parentKey !== 'test' &&
+      self.parentKey !== 'patterns' &&
+      self.parentNode.concept !== 'Assignment' &&
+      self.parentNode.concept !== 'ForEachStatement' &&
+      self.parentNode.concept !== 'SelectMembers' &&
+      self.parentNode.concept !== 'BinaryExpression' &&
+      self.parentNode.concept !== 'StringInterpolation' &&
+      self.parentNode.concept !== 'MemberExpression' &&
+      !['NewMap', 'NewList'].includes(self.parentNode.concept)
     ) {
       code += ');';
     }

package/src/concepts/CallFunction__.ts

@@ -1,3 +1,4 @@
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import {
   TranslatorState,
   shiftState,
@@ -6,6 +7,9 @@ import {
   createCompilerState,
   transfromMetadataType,
   transfromUnionTypeAnnotation,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
 } from '../translator';
 import Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
@@ -630,39 +634,40 @@ export class CallFunction extends LogicItem {
     }
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
-    const { calleeKey } = this;
+    const { calleeKey } = self;
     if (['nasl.util.Convert', 'nasl.util.FromString'].includes(calleeKey)) {
       // nasl.util.Convert(variable1)<nasl.core.String>();
       // 单独处理
-
       code = calleeKey;
       code += '(';
-      this.arguments.forEach((arg, index) => {
-        code += arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
-        if (index !== this.arguments.length - 1) code += ', ';
+      yield* wrapForEach(self.arguments, function* warpForEachGenerator(arg, index) {
+        code += yield* arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
+        if (index !== self.arguments.length - 1) code += ', ';
       });
       code += ')';
       // 如果有内容
-      const typeAnnotation = this.typeArguments[0];
+      const typeAnnotation = self.typeArguments[0];
       code += `<`;
-      code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>()`;
+      code += `${yield* typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>()`;
     } else {
-      code = this.calleeKey;
-      if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+      code = self.calleeKey;
+      if (Array.isArray(self.typeArguments) && self.typeArguments.length) {
         // 如果有内容
-        const typeAnnotation = this.typeArguments[0];
+        const typeAnnotation = self.typeArguments[0];
         code += `<`;
-        code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
+        code += `${yield* typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
       }
       code += '(';
-      Array.isArray(this.arguments) &&
-        this.arguments.forEach((arg, index) => {
-          code += arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
-          if (index !== this.arguments.length - 1) code += ', ';
+      if (Array.isArray(self.arguments)) {
+        yield* wrapForEach(self.arguments, function* wrapForEach(arg, index) {
+          code += yield* arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
+          if (index !== self.arguments.length - 1) code += ', ';
         });
+      }
       code += ')';
     }
     return code;

package/src/concepts/CallInterface__.ts

@@ -1,4 +1,13 @@
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach, returnOrigin } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import Interface from './Interface__';
 import { ElementToVueOptions } from './ViewElement__';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
@@ -9,6 +18,8 @@ import AuthInterface from './AuthInterface__';
 import type { MemberExpression } from './MemberExpression__';
 import Frontend from './Frontend__';
 import type Connector from './Connector__';
+import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -446,17 +457,16 @@ export class CallInterface extends LogicItem {
     return code;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    const { completeArguments, parentNode, parentKey, tsCalleeKey } = this;
-
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    const { completeArguments, parentNode, parentKey, tsCalleeKey } = self;
     let code = `${tsCalleeKey}(`;
-
     if (completeArguments?.length) {
       code += '{';
-      completeArguments?.forEach((arg, index) => {
-        code += arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true);
-        if (index !== this.arguments?.length - 1) code += ', ';
+      yield* wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
+        code += yield* arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true) ?? returnOrigin('');
+        if (index !== self.arguments?.length - 1) code += ', ';
       });
       code += '}';
     }
@@ -610,6 +620,10 @@ export class CallInterface extends LogicItem {
     if (excludeds.includes(this.calleeName)) {
       return `_${this.calleeName}`;
     }
+    // 来自集成中心，且是连接内部的逻辑，则认为是编辑态的，需要加上后缀
+    if (this.connector && this.integration) {
+      return `${this.calleeName}${CUSTOM_CONNECTOR_EDITABLE_SUFFIX}`;
+    }
     return this.calleeName;
   }
 
@@ -790,7 +804,7 @@ export class CallInterface extends LogicItem {
       }
     }
 
-    let targetItf = module.interfaces.find((item) => item.name === itfData.name) as Interface;
+    let targetItf = module.interfaces.find((item) => item.name === itfData.name) as Interface | AuthInterface;
     // 根据 targetItf 是否是AuthInterface 来确定生成什么类型的接口
     let newItf;
     if (targetItf && targetItf.concept === 'AuthInterface') {
@@ -807,7 +821,7 @@ export class CallInterface extends LogicItem {
       targetItf.update(newItf.toJSON());
     } else {
       targetItf = newItf;
-      module.addInterface(targetItf);
+      module.addInterface(targetItf as Interface);
     }
 
     // 计算之前选择的接口的引用次数
@@ -860,7 +874,7 @@ export class CallInterface extends LogicItem {
       }
     }
 
-    this.setCallee(targetItf);
+    this.setCallee(targetItf as Interface);
 
     const oldStructuresSet = targetItf.getRefStructures(targetItf.module.structures);
     // 递归找出 response/request 的 Body/Returns 引用的数据结构
@@ -877,6 +891,10 @@ export class CallInterface extends LogicItem {
     newStructuresSet.forEach((s) => module.addStructure(Structure.from(s)));
     this.app.emit('collect:end');
   }
+
+  get integration() {
+    return this.getAncestor('Integration');
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓