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

package/src/concepts/Entity__.ts

@@ -810,7 +810,7 @@ export class Entity extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = `export class ${this.name} {\n`;
     code += indent((state?.tabSize || 0) + 1);
     code += `__name: '${this.getNamespace()}.${this.name}';\n`;
@@ -848,6 +848,32 @@ export class Entity extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = `class ${this.name} {\n`;
+    // code += `${indent(state.tabSize + 1)}__name: '${this.getNamespace()}.${this.name}';\n`;
+    this.properties.forEach((property) => {
+      code += `${property.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }))};\n`;
+    });
+    if (this.indexes && this.indexes.length) {
+      code += indent(state.tabSize + 1);
+      code += `__IndexList() {\n`;
+      code += `            return [`;
+      this.indexes.forEach((entityIndex) => {
+        code += indent(state.tabSize + 1);
+        code += '\n                ';
+        code += entityIndex.toEmbeddedTS(shiftState(state, code, { inline: true }));
+      });
+      code += `${indent(state.tabSize)}\n            ];\n        }\n`;
+    }
+
+    code += `${indent(state.tabSize)}}\n`;
+
+    code += `const ${this.name}Entity = createEntity<${this.name}>();\n`;
+
+    return code;
+  }
+
   getNamespace() {
     if (this.parentNode && (this.parentNode as DataSource).getNamespace)
       return `${(this.parentNode as DataSource).getNamespace()}.${this.parentNode.name}.entities`;

package/src/concepts/EnumItem__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -121,10 +121,15 @@ export class EnumItem extends BaseNode {
   expression: undefined;
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     return `static '${this.value}': ${this.enumeration.name}`;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    return `'${this.value}' = '${this.label}'`;
+  }
+
   setName(value: string) {
     this.setValue(value);
   }

package/src/concepts/Enum__.ts

@@ -295,7 +295,7 @@ export class Enum extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = `export class ${this.name} extends nasl.core.Enums {\n`;
     // 增加一个单独的标签
     code += `${indent((state?.tabSize || 0) + 1)}__name: '${this.getNamespace()}.${this.name}';\n`;
@@ -315,6 +315,19 @@ export class Enum extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = `enum ${this.name} {\n`;
+    this.enumItems.forEach((property) => {
+      code += indent(state.tabSize + 1);
+      code += property.toNaturalTS(shiftState(state, code, { tabSize: 0 }));
+      code += ',\n';
+    });
+    code += `${indent(state?.tabSize || 0)}}\n`;
+
+    return code;
+  }
+
   getNamespace() {
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();

package/src/concepts/ForEachStatement__.ts

@@ -1,4 +1,5 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { v4 as uuidv4 } from 'uuid';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import TypeAnnotation from './TypeAnnotation__';
 import Identifier from './Identifier__';
 import MemberExpression from './MemberExpression__';
@@ -11,7 +12,6 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
-import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
 import Param from './Param__';
@@ -532,7 +532,7 @@ export class ForEachStatement extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     code += this.each
       ? this.each.toEmbeddedTS(
@@ -565,7 +565,51 @@ export class ForEachStatement extends LogicItem {
 
     return code;
   }
-  //================================================================================
+
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = '';
+    code += this.each
+      ? this.each.toNaturalTS(
+        shiftState(state, code, {
+          tabSize: 0,
+        })
+      )
+      : '__IDENTIFIER__';
+    if (['NewList', 'NewMap'].includes(this.each?.concept)) code += '\n';
+    code += '.__slice(';
+    code += this.start ? this.start.toNaturalTS(shiftState(state, code)) : '__IDENTIFIER__';
+    code += ', ';
+    let virtualEnd: LogicItem = this.end;
+    if (!virtualEnd && this.each) {
+      // if (['List', 'String', 'Email', 'Text', 'Map'].includes(this.each.__TypeAnnotation?.typeName)) {
+      virtualEnd = new MemberExpression({
+        object: BaseNode.from({ ...this.each.toJSON(), name: this.each.name }) as LogicItem,
+        property: new Identifier({ name: 'length' }),
+      });
+      // }
+    }
+    code += virtualEnd ? virtualEnd.toNaturalTS(shiftState(state, code)) : '__IDENTIFIER__';
+    code += ').__forEach((';
+    code += this.item ? this.item.toNaturalTS(shiftState(state, code), true) : '__IDENTIFIER__';
+    code += ', ';
+    code += this.index ? this.index.toNaturalTS(shiftState(state, code), true) : '__IDENTIFIER__';
+    code += ') => {\n';
+    if (Array.isArray(this.body)) {
+      this.body.forEach((logicItem) => {
+        code += `${logicItem.toNaturalTS(
+          shiftState(state, code, {
+            tabSize: (state?.tabSize || 0) + 1,
+          })
+        )};\n`;
+      });
+    }
+    code += `${indent(state?.tabSize || 0)}})\n`;
+
+    return code;
+  }
+
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/Frontend__.ts

@@ -1167,7 +1167,7 @@ export class Frontend extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = `export namespace ${this.name} {\n`;
     code += 'const name = ';
     code += `"${this.name}";\n`;

package/src/concepts/Function__.ts

@@ -1,5 +1,5 @@
 import Namespace from './Namespace__';
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import asyncFuncMap from '../common/asyncFuncMap';
 
@@ -1048,7 +1048,7 @@ export class Function extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     if (this.returnExpression) {
       code += `(`;
@@ -1076,6 +1076,34 @@ export class Function extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = '';
+    if (this.returnExpression) {
+      code += `(`;
+      this.params.forEach((param, index) => {
+        code += param.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (index !== this.params.length - 1)
+          code += ', ';
+      });
+      code += `)`;
+      if (this.returns.length) {
+        code += ': ';
+        code += this.returns[0].typeAnnotation?.toNaturalTS(shiftState(state, code, { inline: true }));
+      }
+      code += ` => (`;
+
+      if (this.returnExpression) {
+        code += this.returnExpression.toNaturalTS && this.returnExpression.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }));
+      }
+      code += `${indent(state.tabSize)})`;
+    } else {
+      code += '__IDENTIFIER__';
+    }
+
+    return code;
+  }
+
   toVue(options?: ElementToVueOptions): string {
     let code = '(';
     this.params.forEach((param, index) => {

package/src/concepts/Identifier__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 import { BindAttribute, CallLogic, TypeAnnotation } from '..';
 import { ElementToVueOptions } from './ViewElement__';
 import { findConceptKeyWordByNamespace } from '../utils';
@@ -197,7 +197,7 @@ export class Identifier extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     // 只有data-source可以是函数 ，也可能是属性
     if (this.parentNode instanceof BindAttribute && this.parentNode.name === 'data-source') {
       const { view } = this;

package/src/concepts/IfStatement__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -417,7 +417,7 @@ export class IfStatement extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     code += 'if (nasl.core.ensureBoolean(';
     code += this.test
@@ -454,7 +454,43 @@ export class IfStatement extends LogicItem {
     }
     return code;
   }
-  //================================================================================
+
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = '';
+    code += 'if (';
+    code += this.test ? this.test.toNaturalTS(shiftState(state, code, {
+      inline: true,
+    })) : '__IDENTIFIER__';
+
+    code += ') {\n';
+
+    if (Array.isArray(this.consequent)) {
+      this.consequent.forEach((logicItem) => {
+        code += `${logicItem.toNaturalTS(
+          shiftState(state, code, {
+            tabSize: (state?.tabSize || 0) + 1,
+          })
+        )};\n`;
+      });
+    }
+
+    code += `${indent(state?.tabSize || 0)}}\n`;
+    if (Array.isArray(this.alternate)) {
+      code += ' else {\n';
+      this.alternate.forEach((logicItem) => {
+        code += `${logicItem.toNaturalTS(
+          shiftState(state, code, {
+            tabSize: (state?.tabSize || 0) + 1,
+          })
+        )};\n`;
+      });
+      code += `${indent(state?.tabSize || 0)}}\n`;
+    }
+    return code;
+  }
+
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/Interface__.ts

@@ -939,7 +939,7 @@ export class Interface extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     const getCheckerCode = () => {
       if (this.validation) {
@@ -1045,7 +1045,7 @@ export class Interface extends BaseNode {
   }
 
   // 递归找出 response/request 的 Body/Returns 引用的数据结构
-  getRefStructures(structures: Structure[] = []): Set<Structure> {
+  getRefStructures(structures: Structure[] = [], includeNameList?: string[] ): Set<Structure> {
     const structuresSet: Set<Structure> = new Set();
     const loopSaveStructure = (typeAnnotation: TypeAnnotation) => {
       if (!typeAnnotation) return;
@@ -1063,7 +1063,11 @@ export class Interface extends BaseNode {
     };
 
     const { params = [], returns = [] } = this;
-    [...params, ...returns].forEach((p) => {
+    let targetList = [...params, ...returns]
+    if (includeNameList && includeNameList.length > 0) {
+      targetList = targetList.filter((item) => includeNameList.includes(item.name))
+    }
+    targetList.forEach((p) => {
       if ('in' in p && p.in === 'cookie') {
         p.in = 'header';
         return;
@@ -1073,6 +1077,19 @@ export class Interface extends BaseNode {
     return structuresSet;
   }
 
+  deleteRefStructures(includeNameList?: string[]) {
+    if (this.upperNode instanceof Connector) {
+      const module = this.upperNode
+      const oldStructuresSet = this.getRefStructures(module.structures, includeNameList);
+      oldStructuresSet.forEach((s: Structure) => s.delete());
+    }
+  }
+
+  deleteInterface() {
+    this.deleteRefStructures()
+    this.delete()
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/JSBlock__.ts

@@ -1,4 +1,4 @@
-import { withSourceMap, TranslatorState } from '../translator';
+import { withSourceMap, TranslatorState, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -80,10 +80,15 @@ export class JSBlock extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     return 'nasl.core.universalVariable';
   }
 
+  @withSourceMap()
+  toNaturalTS(): string {
+    return ``;
+  }
+
   toBrief(): string {
     if (!this.code) {
       return '';

package/src/concepts/JavaLogic__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, indent } from '../translator';
+import { TranslatorState, indent, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -83,7 +83,7 @@ export class JavaLogic extends LogicItem {
    * @param state 编译状态
    * @returns 生成的代码
    */
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     const ret = this.logic.returns[0];
     if (ret) {

package/src/concepts/LogicItem__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState } from '../translator';
+import { TranslatorState, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import CallQueryComponent from './CallQueryComponent__';
 import CallInterface from './CallInterface__';
@@ -322,10 +322,19 @@ export class LogicItem extends BaseNode {
    * @param state 编译状态
    * @returns 生成的代码
    */
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     return this.toJS(state);
   }
 
+  /**
+     * 生成自然的 TS 代码
+     * @param state 编译状态
+     * @returns 生成的代码
+     */
+  toNaturalTS(state = createCompilerState()): string {
+    return this.toEmbeddedTS(state);
+  }
+
   delete() {
     let actionMsg = '删除逻辑项';
     if (this.name) actionMsg += `“${this.name}”`;