@lcap/nasl 3.4.0-beta.3 → 3.4.0-beta.4

package/src/concepts/Function__.ts

@@ -31,6 +31,9 @@ export class Function extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'Function';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -819,7 +822,8 @@ export class Function extends BaseNode {
       // @ts-ignore
       const n = typeParam.__v_raw || typeParam;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -871,7 +875,8 @@ export class Function extends BaseNode {
       // @ts-ignore
       const n = param.__v_raw || param;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -923,7 +928,8 @@ export class Function extends BaseNode {
       // @ts-ignore
       const n = ret.__v_raw || ret;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -975,7 +981,8 @@ export class Function extends BaseNode {
       // @ts-ignore
       const n = variable.__v_raw || variable;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1027,7 +1034,8 @@ export class Function extends BaseNode {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -1160,7 +1168,7 @@ export class Function extends BaseNode {
     return code;
   }
 
-  toUI(state?: TranslatorState): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = '(';
     this.params.forEach((param, index) => {
       code += param.name;
@@ -1170,7 +1178,7 @@ export class Function extends BaseNode {
     code += ` => (`;
 
     if (this.returnExpression) {
-      code += this.returnExpression.toUI && this.returnExpression.toUI();
+      code += this.returnExpression.toUI && this.returnExpression.toUI(state, hideDetails);
     }
     code += ')';
     return code;

package/src/concepts/I18nInfo__.ts

@@ -22,6 +22,7 @@ export class I18nInfo extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'I18nInfo';
 

package/src/concepts/Identifier__.ts

@@ -25,6 +25,9 @@ export class Identifier extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'Identifier';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -105,7 +108,7 @@ export class Identifier extends LogicItem {
     return name;
   }
 
-  toUI(): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let { name } = this;
     const { namespace } = this;
     if (namespace) {
@@ -198,7 +201,11 @@ export class Identifier extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  toEmbeddedTS(state = createCompilerState(), options?: any): string {
+    // new实体，连线修改实体字段，无法同步到new实体的字段上，因为解构赋值后的property查找不回去，所以改成obj.
+    if (options?.isNewcomposite){
+      return `__obj.${this.name}`;
+    }
     // 只有data-source可以是函数 ，也可能是属性
     if (this.parentNode instanceof BindAttribute && this.parentNode.name === 'data-source') {
       const { view } = this;

package/src/concepts/IfStatement__.ts

@@ -22,6 +22,9 @@ export class IfStatement extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'IfStatement';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -373,7 +376,8 @@ export class IfStatement extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -484,28 +488,27 @@ export class IfStatement extends LogicItem {
 
     code += ') {\n';
 
-    if (Array.isArray(this.consequent)) {
-      this.consequent.forEach((logicItem) => {
-        code += `${logicItem.toNaturalTS(
-          shiftState(state, code, {
-            tabSize: (state?.tabSize || 0) + 1,
-          }),
-        )};\n`;
-      });
-    }
-
+    this.consequent.forEach((item) => {
+      code += `${item.toNaturalTS(
+        shiftState(state, code, {
+          tabSize: (state?.tabSize || 0) + 1,
+        }),
+      )}\n`;
+    });
+    if (state.focusedNodePath === `${this.nodePath}.consequent[${this.consequent.length}]`)
+      code += `${indent((state?.tabSize || 0) + 1)}// 当前位置\n`;
+
+    code += `${indent(state?.tabSize || 0)}} else {\n`;
+    this.alternate.forEach((item) => {
+      code += `${item.toNaturalTS(
+        shiftState(state, code, {
+          tabSize: (state?.tabSize || 0) + 1,
+        }),
+      )}\n`;
+    });
+    if (state.focusedNodePath === `${this.nodePath}.alternate[${this.alternate.length}]`)
+      code += `${indent((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;
   }
 

package/src/concepts/Integration__.ts

@@ -1,5 +1,3 @@
-import type { Module } from './Module__';
-
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -13,6 +11,7 @@ import BaseNode from '../common/BaseNode';
 import MicroApp from './MicroApp__';
 import Connector from './Connector__';
 import App from './App__';
+import Module from './Module__';
 
 /**
  * 集成
@@ -24,6 +23,9 @@ export class Integration extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'Integration';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -302,7 +304,8 @@ export class Integration extends BaseNode {
       // @ts-ignore
       const n = microApp.__v_raw || microApp;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -354,7 +357,8 @@ export class Integration extends BaseNode {
       // @ts-ignore
       const n = module.__v_raw || module;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {

package/src/concepts/InterfaceFromExample__.ts

@@ -0,0 +1,194 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+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 Interface from './Interface__';
+import Module from './Module__';
+import Connector from './Connector__';
+import App from './App__';
+import View from './View__';
+import Frontend from './Frontend__';
+import ProcessElement from './ProcessElement__';
+import Process from './Process__';
+import AbstractInterface from './AbstractInterface__';
+
+/**
+ * 由JSON生成接口
+ */
+@className
+@concept('由JSON生成接口')
+// @ts-ignore
+export class InterfaceFromExample extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'InterfaceFromExample';
+
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  // @ts-ignore
+  readonly concept!: 'InterfaceFromExample';
+
+  /**
+   * 接口
+   */
+  @property({
+    objectRef: 'Interface',
+  })
+  // @ts-ignore
+  inter!: Interface;
+
+  /**
+   * exampleMap
+   */
+  @property()
+  // @ts-ignore
+  exampleMap!: Map<'responseBody' | 'requestBody', string>;
+
+  /**
+   * 祖先 Module
+   */
+  get module() {
+    return this.getAncestor('Module') as Module;
+  }
+  /**
+   * 祖先 App
+   */
+  get app() {
+    return this.getAncestor('App') as App;
+  }
+  /**
+   * 祖先 Connector
+   */
+  get connector() {
+    return this.getAncestor('Connector') as Connector;
+  }
+  /**
+   * 祖先 View
+   */
+  get view() {
+    return this.getAncestor('View') as View;
+  }
+  /**
+   * 祖先 Frontend
+   */
+  get frontend() {
+    return this.getAncestor('Frontend') as Frontend;
+  }
+  /**
+   * 祖先 ProcessElement
+   */
+  get processElement() {
+    return this.getAncestor('ProcessElement') as ProcessElement;
+  }
+  /**
+   * 祖先 Process
+   */
+  get process() {
+    return this.getAncestor('Process') as Process;
+  }
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<InterfaceFromExample>) {
+    source = Object.assign({}, InterfaceFromExample.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): InterfaceFromExample {
+    return super.from(source, parentNode, parentKey) as InterfaceFromExample;
+  }
+
+  /**
+   * 从父级删除该节点
+   * @internal
+   */
+  _delete() {
+    let params: Params = null;
+    if (this.parentNode) {
+      params = (this.parentNode as any)?.__removeInterfaceFromExample?.(this);
+    }
+    return params;
+  }
+
+  /**
+   * 删除接口
+   * @param name 接口名称
+   */
+  removeInter(name: string): void;
+
+  /**
+   * 删除接口
+   * @param itface 已有的接口实例
+   */
+  removeInter(itface: Interface): void;
+
+  removeInter(options: string | Interface) {
+    let itface: Interface;
+    if (typeof options === 'string') {
+      itface = this.inter;
+      if (!itface) {
+        throw new Error('找不到接口 ' + options);
+      }
+    } else {
+      itface = options;
+    }
+    return itface.delete();
+  }
+
+  __removeAbstractInterface(itface: AbstractInterface) {
+    const parentKey = itface.parentKey;
+    const params: Params = {
+      parentNode: this,
+      parentKey,
+      index: -1,
+      object: null,
+      oldObject: itface,
+    };
+    if (parentKey) {
+      params.parentKey = parentKey;
+      if (Array.isArray((this as any)[parentKey])) {
+        const index = (this as any)[parentKey].indexOf(itface);
+        ~index && (this as any)[parentKey].splice(index, 1);
+        params.index = index;
+      } else if ((this as any)[parentKey] === itface) {
+        params.index = 0;
+        (this as any)[parentKey] = undefined;
+      }
+    }
+    return params;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+  toEmbeddedTSFile() {
+    // 实际生成文件为 Interface 对应的文件
+    return this.inter.toEmbeddedTSFile();
+  }
+
+  getEmbeddedFilePath() {
+    return this.inter.getEmbeddedFilePath();
+  }
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default InterfaceFromExample;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/InterfaceParam__.ts

@@ -24,6 +24,7 @@ import View from './View__';
 import Frontend from './Frontend__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
+import InterfaceFromExample from './InterfaceFromExample__';
 
 /**
  * 接口参数
@@ -35,6 +36,9 @@ export class InterfaceParam extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'InterfaceParam';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -136,6 +140,12 @@ export class InterfaceParam extends BaseNode {
   get process() {
     return this.getAncestor('Process') as Process;
   }
+  /**
+   * 祖先 InterfaceFromExample
+   */
+  get interfaceFromExample() {
+    return this.getAncestor('InterfaceFromExample') as InterfaceFromExample;
+  }
 
   /**
    * @param source 需要合并的部分参数
@@ -251,7 +261,8 @@ export class InterfaceParam extends BaseNode {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -303,7 +314,8 @@ export class InterfaceParam extends BaseNode {
       // @ts-ignore
       const n = defaultValue.__v_raw || defaultValue;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
       } else if ((t as any)[parentKey] === n) {
@@ -339,9 +351,13 @@ export class InterfaceParam extends BaseNode {
       const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
       Object.assign(typeAnnotation, relationOptions);
     }
-    const object = {
+    const object: any = {
       typeAnnotation,
     };
+    if (this.defaultValue) {
+      object.defaultValue = null;
+      this.updateRelyFileNode(this.app);
+    }
     return this.update({
       ...object,
     });
@@ -366,7 +382,7 @@ export class InterfaceParam extends BaseNode {
     }
     if (
       this.defaultValue?.expression &&
-      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(this.defaultValue?.expression?.toEmbeddedTS())
+      !['__IDENTIFIER__', '__IDENTIFIER__()'].includes(this.defaultValue?.toEmbeddedTS())
     ) {
       if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation?.typeKey)) {
         code += this.defaultValue.toEmbeddedTS(shiftState(state, code), true);