@lcap/nasl 3.3.0-beta.0 → 3.3.0-beta.2

package/src/concepts/NewComposite__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import MemberExpression from './MemberExpression__';
 import StructureProperty from './StructureProperty__';
@@ -1196,7 +1196,7 @@ export class NewComposite extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const indent0 = indent(state?.tabSize || 0);
     const indent1 = indent((state?.tabSize || 0) + 1);
     const indent2 = indent((state?.tabSize || 0) + 2);
@@ -1365,6 +1365,89 @@ export class NewComposite extends LogicItem {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    const indent0 = indent((state?.tabSize || 0));
+    const indent1 = indent((state?.tabSize || 0) + 1);
+    const indent2 = indent((state?.tabSize || 0) + 2);
+    let code = '';
+    if (!this.typeAnnotation) {
+      code += '__IDENTIFIER__';
+    } else if (this.typeAnnotation.typeKind !== 'anonymousStructure') {
+      const rightMap = new Map();
+      // 提供sourcemap，获取类型标注和上下文可选变量
+      this.rights.forEach((right) => {
+        code += indent1;
+        rightMap.set(right.expression, right.expression.toNaturalTS(shiftState(state, code, { inline: true })));
+        code += rightMap.get(right.expression);
+        code += ';\n';
+        if (right.members?.length) {
+          code += indent2;
+        }
+        right.members.forEach((member) => {
+          rightMap.set(member, member.toNaturalTS(shiftState(state, code, { inline: true })));
+          code += rightMap.get(member);
+          code += '; ';
+        });
+        code += right.members.length ? '\n' : '';
+      });
+      // 方便ts报错检查
+      // 是否是左边的顶层连线
+      const leftTopIndex = this.assignmentLines.findIndex(({ leftIndex }) => leftIndex[1] === undefined);
+      if (leftTopIndex !== -1) {
+        // const rightIndex = this.assignmentLines[leftTopIndex].rightIndex;
+        // const rightExpression = rightIndex[1] !== undefined ? this.rights[rightIndex[0]].members[rightIndex[1]] : this.rights[rightIndex[0]].expression;
+        // code += `__obj = ${rightExpression.toNaturalTS(shiftState(state, code, { inline: true }))};`;
+        // code += '\n';
+      } else {
+        code += `${indent0}new ${this.typeAnnotation.typeName}({\n`;
+        this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+          const leftSecondIndex = leftIndex[1];
+          const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
+          const leftItem = this.properties[leftSecondIndex];
+          const rightItem = rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
+          const rightTs = rightMap.get(rightItem);
+          code += `${indent1}${leftItem.toNaturalTS(shiftState(state, code, { inline: true }))}: ${['__IDENTIFIER__', '__IDENTIFIER__()'].includes(rightTs) ? 'null' : rightMap.get(rightItem)},\n`;
+        });
+        code += `${indent0}})`;
+      }
+    } else {
+      const nameMap = new Map();
+      const rightMap = new Map();
+      this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+        const leftSecondIndex = leftIndex[1];
+        const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
+        const leftItem = this.properties[leftSecondIndex];
+        const rightItem = rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
+        nameMap.set(leftItem.name, rightItem);
+        rightMap.set(rightItem, null);
+      });
+      code += `${indent0}{\n`;
+      this.properties.forEach((property, index) => {
+        const temp = `temp${index}`;
+        const propertyType = this.typeAnnotation.properties[index]?.typeAnnotation;
+        const { name } = property;
+        const rightItem = nameMap.get(name);
+        const ts = rightMap.get(rightItem);
+        if (ts !== undefined) {
+          if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
+            code += `${indent1}${temp}: null,\n`;
+          } else {
+            code += `${indent1}${temp}: ${ts},\n`;
+          }
+        } else if (propertyType) {
+          code += `${indent1}${property.name}: ${propertyType.toNaturalTS(shiftState(state, code, { inline: true }))},\n`;
+        } else {
+          code += `${indent1}`;
+          code += property.toNaturalTS(shiftState(state, code, { inline: true }));
+          code += ',\n';
+        }
+      });
+      code += `${indent0}}`;
+    }
+    return code;
+  }
+
   getInitCode(state?: TranslatorState): string {
     const indent1 = indent((state?.tabSize || 0) + 1);
     const indent2 = indent((state?.tabSize || 0) + 2);

package/src/concepts/NewList__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import ForEachStatement from './ForEachStatement__';
 import Logic from './Logic__';
 //================================================================================
@@ -377,7 +377,7 @@ export class NewList extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const indent0 = indent(state?.tabSize || 0);
     const indent1 = indent((state?.tabSize || 0) + 1);
     const indent2 = indent((state?.tabSize || 0) + 2);
@@ -445,6 +445,21 @@ export class NewList extends LogicItem {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    const indent0 = indent((state?.tabSize || 0));
+    let code = '';
+    if (this.typeAnnotation) {
+      code += `new ${this.typeAnnotation.typeName}(\n`;
+      this.items.forEach((item) => {
+        code += item.toNaturalTS(shiftState(state, code, { inline: true }));
+        code += ',\n';
+      });
+      code += `${indent0})\n`;
+    }
+    return code;
+  }
+
   getInitCode(state?: TranslatorState): string {
     const indent1 = indent((state?.tabSize || 0) + 1);
     const indent2 = indent((state?.tabSize || 0) + 2);

package/src/concepts/NewMap__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import ForEachStatement from './ForEachStatement__';
 import Logic from './Logic__';
@@ -585,7 +585,7 @@ export class NewMap extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const indent0 = indent(state?.tabSize || 0);
     const indent1 = indent((state?.tabSize || 0) + 1);
     const indent2 = indent((state?.tabSize || 0) + 2);
@@ -678,6 +678,15 @@ export class NewMap extends LogicItem {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = '';
+    if (this.typeAnnotation) {
+      code += `new ${this.typeAnnotation.sortedTypeKey}()`;
+    }
+    return code;
+  }
+
   getInitCode(state?: TranslatorState): string {
     let code = '';
     if (this.keys.some((key) => key) || this.values.some((value) => value)) {

package/src/concepts/New__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -50,7 +50,7 @@ export class New extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const code = '__IDENTIFIER__';
     return code;
   }

package/src/concepts/NullLiteral__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 
 //================================================================================
@@ -63,7 +63,7 @@ export class NullLiteral extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState) {
+  toEmbeddedTS(state = createCompilerState()) {
     return 'null';
   }
 

package/src/concepts/NumericLiteral__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 
 //================================================================================
@@ -130,12 +130,17 @@ export class NumericLiteral extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const type = `${this.typeAnnotation.typeNamespace}.${this.typeAnnotation.typeName}`;
     const code = this.value ? `new ${type}(${this.value})` : '__IDENTIFIER__';
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(): string {
+    return this.value;
+  }
+
   changeType(value: string | number) {
     const newValue = value.toString();
     let typeName = 'Long';

package/src/concepts/OqlQueryComponent__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import StructureProperty from './StructureProperty__';
 import Structure from './Structure__';
@@ -235,7 +235,7 @@ export class OqlQueryComponent extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code: string;
     const { typeAnnotation } = this;
     if (typeAnnotation) {
@@ -295,6 +295,12 @@ export class OqlQueryComponent extends LogicItem {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    const code: string = `nasl.oql.query(\`${this.code}\`)`;
+    return code;
+  }
+
   // 从服务端获取 SQL -> TS 的翻译和 sourceMap
   async requestEmbeddedTS(): Promise<any> {
     if (this.code) {

package/src/concepts/OverriddenLogic__.ts

@@ -1948,7 +1948,7 @@ export class OverriddenLogic extends BaseNode {
   handleForEachCode(code: string, forEachStatement: ForEachStatement): string {
     const { item, index, each } = forEachStatement;
     if (code.includes(item.name)) {
-      const eachTSCode = each.toEmbeddedTS();
+      const eachTSCode = each ? each.toEmbeddedTS() : '__IDENTIFIER__'
       code = this.handleReplaceCode(
         code,
         item.name,

package/src/concepts/Param__.ts

@@ -1,5 +1,5 @@
 import { dataTypesMap } from './basics/types';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import LogicItem from './LogicItem__';
 import EntityProperty from './EntityProperty__';
 import Structure from './Structure__';
@@ -386,6 +386,45 @@ export class Param extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState(), dontType?: boolean): string {
+    let code = this.name;
+    // 回调函数类的参数
+    if (this?.typeAnnotation?.typeKind === 'function') {
+      code += ':{(';
+      const paramTypes = this.typeAnnotation?.typeArguments || [];
+      paramTypes.forEach((type, index) => {
+        code += `type${index + 1}:${type.toNaturalTS(shiftState(state, code))}`;
+        if (index !== paramTypes.length - 1) {
+          code += ',';
+        } else {
+          code += ')';
+        }
+      });
+      code += ':';
+      const returnTypes = this.typeAnnotation?.returnType || [];
+      returnTypes.forEach((type) => {
+        code += type.toNaturalTS(shiftState(state, code));
+      });
+      code += '}';
+      return code;
+    }
+
+    if (this.defaultExpression instanceof Function || this.defaultExpression instanceof AnonymousFunction) {
+      code += this.required ? ': ' : '?: ';
+      code += this.defaultExpression.toEmbeddedTSDefinition(shiftState(state, code));
+    } else if (!dontType && this.typeAnnotation) {
+      code += ': ';
+      code += this.typeAnnotation.toNaturalTS(shiftState(state, code));
+      if (this.typeAnnotation?.typeKind !== 'primitive' && this.defaultValue) {
+        if (this.isEnum()) {
+          code += `= ${this.typeAnnotation.typeKey}['${this.defaultValue}']`;
+        }
+      }
+    }
+    return code;
+  }
+
   @withSourceMap()
   toEmbeddedNameTS(state?: TranslatorState): string {
     return `${this.name}`;

package/src/concepts/ProcessElement__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import {
   genUserTaskLogic,
   getPreviousTask,
@@ -1666,7 +1666,7 @@ export class ProcessElement extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     // this.syncLogic();
     const tab0 = indent(state?.tabSize || 0);
     const tab1 = indent((state?.tabSize || 0) + 1);

package/src/concepts/ProcessOutcome__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -71,7 +71,7 @@ export class ProcessOutcome extends LogicItem {
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const code = `return () => ${this.flowRef ? `"${this.flowRef}"` : '__IDENTIFIER__'}`;
     return code;
   }

package/src/concepts/ProcessOutcomes__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -69,7 +69,7 @@ export class ProcessOutcomes extends LogicItem {
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const code = `return () => ${this.flowRefs?.length > 0 ? `"${this.flowRefs}"` : '__IDENTIFIER__'}`;
     return code;
   }

package/src/concepts/QueryAggregateExpression__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -124,7 +124,7 @@ export class QueryAggregateExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     // const { aggregateName, aggregateParam, asName } = this;
     // let code = '';
     // if (aggregateName && aggregateParam) {

package/src/concepts/QueryFieldExpression__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 import CallQueryComponent from './CallQueryComponent__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -134,7 +134,7 @@ export class QueryFieldExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const { entityAsName, propertyName, isDotStar } = this;
     const callQueryComponent = this.getAncestor('CallQueryComponent') as CallQueryComponent;
     if (callQueryComponent) {

package/src/concepts/QueryFromExpression__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import type CallQueryComponent from './CallQueryComponent__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -249,7 +249,7 @@ export class QueryFromExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     code += `nasl.langUtil.FROM(new nasl.langUtil.Collection<[${this.entityKey}]>()`;
     if (this.joinParts.length) {

package/src/concepts/QueryJoinExpression__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import CallQueryComponent from './CallQueryComponent__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -461,7 +461,7 @@ export class QueryJoinExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     code += `.${this.joinType}_JOIN(new nasl.langUtil.Collection<[${this.entityKey}]>())\n`;
     if (this.onExpressions.length > 0) {

package/src/concepts/QueryLimitExpression__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -163,7 +163,7 @@ export class QueryLimitExpression extends LogicItem {
   //================================================================================
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const { pageElement, pageSizeElement } = this;
     let code = '[';
     code += `${pageElement.toEmbeddedTS(shiftState(state, code))}, `;

package/src/concepts/QueryOrderByExpression__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -177,7 +177,7 @@ export class QueryOrderByExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const { orderElement, order } = this;
     let code = '[';
     code += `${orderElement.toEmbeddedTS(shiftState(state, code))}, `;

package/src/concepts/Return__.ts

@@ -1,5 +1,5 @@
 import { dataTypesMap } from './basics/types';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import EntityProperty from './EntityProperty__';
 import StructureProperty from './StructureProperty__';
 
@@ -288,7 +288,7 @@ export class Return extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = this.name || '__return';
     if (this.typeAnnotation) {
       code += ': ';
@@ -308,6 +308,24 @@ export class Return extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = this.name || '__return';
+    if (this.typeAnnotation) {
+      code += ': ';
+      code += this.typeAnnotation.toNaturalTS(shiftState(state, code));
+      // toTS暂时只需要翻译引用数据类型的，因为值都是字符串
+      // 就不在这里赋值了，这里单纯就为了快速查找
+      // 并且屏蔽了一些异常的错误
+      if (this.typeAnnotation?.typeKind !== 'primitive' && this.defaultValue) {
+        if (this.isEnum()) {
+          code += `= ${this.typeAnnotation.typeKey}['${this.defaultValue}']`;
+        }
+      }
+    }
+    return code;
+  }
+
   isEnum() {
     return this.typeAnnotation?.typeNamespace?.endsWith('.enums');
   }

package/src/concepts/Role__.ts

@@ -104,7 +104,7 @@ export class Role extends BaseNode {
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = `export enum ${this.tsName} {\n`;
     code += `      ${this.tsName}='${this.tsName}'\n`;
     code += `${indent(state?.tabSize || 0)}}\n`;

package/src/concepts/SelectMembers__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import BatchAssignment from './BatchAssignment__';
 import AssignmentLine from './AssignmentLine__';
 //================================================================================
@@ -370,7 +370,7 @@ export class SelectMembers extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const code = '';
     return code;
   }

package/src/concepts/SqlQueryComponent__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import StructureProperty from './StructureProperty__';
 import Structure from './Structure__';
@@ -236,7 +236,7 @@ export class SqlQueryComponent extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code: string;
     if (this.ideVersion === '2.11') {
       code = `(function(): `;
@@ -268,6 +268,12 @@ export class SqlQueryComponent extends LogicItem {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    const code: string = `nasl.oql.query(\`${this.code}\`)`;
+    return code;
+  }
+
   /**
    * 获取添加时的默认选项
    * @returns

package/src/concepts/Start__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -56,7 +56,7 @@ export class Start extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     return '';
   }
 

package/src/concepts/StringInterpolation__.ts

@@ -1,5 +1,6 @@
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
+import { StringLiteral } from './StringLiteral__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -306,7 +307,7 @@ export class StringInterpolation extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = 'nasl.util.stringInterpolation(';
     this.expressions.forEach((exp, idx) => {
       code += exp.toEmbeddedTS(shiftState(state, code));
@@ -318,7 +319,23 @@ export class StringInterpolation extends LogicItem {
     return code;
   }
 
-  //================================================================================
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = '`';
+    this.expressions.forEach((exp) => {
+      if (exp.concept === 'StringLiteral') {
+        code += (exp as StringLiteral).value;
+      } else {
+        code += '${';
+        code += exp.toNaturalTS(shiftState(state, code));
+        code += '}';
+      }
+    });
+    code += '`\n';
+    return code;
+  }
+
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/StringLiteral__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -103,6 +103,11 @@ export class StringLiteral extends LogicItem {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState(), isRequired?: boolean): string {
+    return `'${this.value}'`;
+  }
+
   /**
    * 设置字符串内容
    */