@lcap/nasl 3.7.0-alpha.1 → 3.7.0-beta.1

package/src/concepts/Interface__.ts

@@ -1,4 +1,3 @@
-import { v4 as uuidv4 } from 'uuid';
 import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import type { EmbeddedTSFileGenerator } from '../utils';
 import {
@@ -15,27 +14,28 @@ import type TypeAnnotation from './TypeAnnotation__';
 import type Structure from './Structure__';
 import type Param from './Param__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
+import Module from './Module__';
+import Connector from './Connector__';
+import View from './View__';
+import Frontend from './Frontend__';
+import ProcessElement from './ProcessElement__';
+import Process from './Process__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
+import { v4 as uuidv4 } from 'uuid';
+
+import InterfaceParam from './InterfaceParam__';
+import Return from './Return__';
+import BindAttribute from './BindAttribute__';
 import ImportedInterface from './ImportedInterface__';
-import type InterfaceParam from './InterfaceParam__';
-import type Return from './Return__';
-import type BindAttribute from './BindAttribute__';
-import type Module from './Module__';
-import type Connector from './Connector__';
-import type App from './App__';
-import type View from './View__';
-import type Frontend from './Frontend__';
-import type ProcessElement from './ProcessElement__';
-import type Process from './Process__';
 
 /**
  * 接口
@@ -44,7 +44,11 @@ import type Process from './Process__';
 export class Interface extends ImportedInterface {
   /** 类名 */
   static readonly ConceptName: string = 'Interface';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['ImportedInterface', 'AbstractInterface', 'BaseNode'];
 
@@ -54,36 +58,45 @@ export class Interface extends ImportedInterface {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Interface' | 'AuthInterface';
-
   /**
    * 接口名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * 导出的来源
    */
-  @property()
-  originLogicName!: string;
+  @property({
+    objectRef: '',
+  })
+  originLogicName: string;
 
   /**
    * 接口路径
    */
-  @property()
-  path!: string;
+  @property({
+    objectRef: '',
+  })
+  path: string;
 
   /**
    * 接口方法
    */
-  @property()
-  method!: 'GET' | 'POST' | 'PUT' | 'DELETE';
+  @property({
+    objectRef: '',
+  })
+  method: 'GET' | 'POST' | 'PUT' | 'DELETE';
 
   /**
    * 接口描述
    */
-  @property()
-  description!: string;
+  @property({
+    objectRef: '',
+  })
+  description: string;
 
   /**
    * 接口参数列表
@@ -111,62 +124,13 @@ export class Interface extends ImportedInterface {
   @property({
     objectRef: 'BindAttribute',
   })
-  validation!: BindAttribute;
-
-  /**
-   * 祖先 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;
-  }
+  validation: BindAttribute;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Interface>) {
-    source = { ...Interface.getDefaultOptions(), ...source};
+    source = Object.assign({}, Interface.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
@@ -188,6 +152,30 @@ export class Interface extends ImportedInterface {
     });
   }
 
+  /**
+   * 设置接口路径
+   */
+  setPath(path: string) {
+    const object = {
+      path,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  /**
+   * 设置接口方法
+   */
+  setMethod(method: 'GET' | 'POST' | 'PUT' | 'DELETE') {
+    const object = {
+      method,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
   /**
    * 设置接口描述
    */
@@ -532,7 +520,7 @@ export class Interface extends ImportedInterface {
     if (typeof options === 'string') {
       interfaceParam = (this.params as InterfaceParam[]).find((item) => item.name === options);
       if (!interfaceParam) {
-        throw new Error(`找不到接口参数 ${  options}`);
+        throw new Error('找不到接口参数 ' + options);
       }
     } else {
       interfaceParam = options;
@@ -540,37 +528,6 @@ export class Interface extends ImportedInterface {
     return interfaceParam.delete();
   }
 
-  __removeInterfaceParam(interfaceParam: InterfaceParam) {
-    const {parentKey} = interfaceParam;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: interfaceParam,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = interfaceParam.__v_raw || interfaceParam;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @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 {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
-  }
-
   /**
    * 删除输出参数
    * @param name 输出参数名称
@@ -588,7 +545,7 @@ export class Interface extends ImportedInterface {
     if (typeof options === 'string') {
       ret = (this.returns as Return[]).find((item) => item.name === options);
       if (!ret) {
-        throw new Error(`找不到输出参数 ${  options}`);
+        throw new Error('找不到输出参数 ' + options);
       }
     } else {
       ret = options;
@@ -596,97 +553,46 @@ export class Interface extends ImportedInterface {
     return ret.delete();
   }
 
-  __removeReturn(ret: Return) {
-    const {parentKey} = ret;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: ret,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = ret.__v_raw || ret;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @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 {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+  /**
+   * 祖先 Module
+   */
+  get module() {
+    return this.getAncestor('Module') as Module;
   }
-
   /**
-   * 删除元素绑定属性
-   * @param name 元素绑定属性名称
+   * 祖先 Connector
    */
-  removeValidation(name: string): void;
-
+  get connector() {
+    return this.getAncestor('Connector') as Connector;
+  }
   /**
-   * 删除元素绑定属性
-   * @param validation 已有的元素绑定属性实例
+   * 祖先 View
    */
-  removeValidation(validation: BindAttribute): void;
-
-  removeValidation(options: string | BindAttribute) {
-    let validation: BindAttribute;
-    if (typeof options === 'string') {
-      validation = this.validation;
-      if (!validation) {
-        throw new Error(`找不到元素绑定属性 ${  options}`);
-      }
-    } else {
-      validation = options;
-    }
-    return validation.delete();
+  get view() {
+    return this.getAncestor('View') as View;
   }
-
-  __removeBindAttribute(bindAttribute: BindAttribute) {
-    const {parentKey} = bindAttribute;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: bindAttribute,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = bindAttribute.__v_raw || bindAttribute;
-      if (Array.isArray((t as any)[parentKey])) {
-        // @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 {
-        const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
-          params.index = 0;
-          (this as any)[parentKey] = undefined;
-        }
-      }
-    }
-    return params;
+  /**
+   * 祖先 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;
   }
-
-  //================================================================================
-  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-  // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
 
   /**
    * 协议
@@ -734,15 +640,13 @@ export class Interface extends ImportedInterface {
     }
   }
 
-
   toMockService() {
-       const mockService:any = this.toService()
-       mockService.returns = {
-          typeAnnotation : this?.__TypeAnnotation?.toJS()
-       }
-      return mockService
-    }
-
+    const mockService: any = this.toService();
+    mockService.returns = {
+      typeAnnotation: this?.__TypeAnnotation?.toJS(),
+    };
+    return mockService;
+  }
 
   toService() {
     return {
@@ -1062,6 +966,7 @@ export class Interface extends ImportedInterface {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里
     if (this.parentNode?.concept === 'Connector') {
+      // return `connector.${this.parentNode.name}.interfaces`;
       return `extensions.${this.parentNode.name}.interfaces`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
@@ -1081,6 +986,7 @@ export class Interface extends ImportedInterface {
     // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
     // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
     if (this.parentNode?.concept === 'Connector') {
+      // return `connector.${this.parentNode.tsName}.interfaces`;
       return `extensions.${this.parentNode.tsName}.interfaces`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {

package/src/concepts/JSBlock__.ts

@@ -12,12 +12,13 @@ import {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
+
 import LogicItem from './LogicItem__';
 
 /**
@@ -27,7 +28,11 @@ import LogicItem from './LogicItem__';
 export class JSBlock extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'JSBlock';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -37,18 +42,13 @@ export class JSBlock extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'JSBlock';
-
-  /**
-   * JS 代码块标题
-   */
-  @property()
-  label: string = 'JS 代码块';
-
   /**
    * 代码内容
    */
-  @property()
-  code!: string;
+  @property({
+    objectRef: '',
+  })
+  code: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/JavaLogic__.ts

@@ -12,12 +12,13 @@ import {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
+
 import LogicItem from './LogicItem__';
 
 /**
@@ -27,7 +28,11 @@ import LogicItem from './LogicItem__';
 export class JavaLogic extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'JavaLogic';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -37,24 +42,29 @@ export class JavaLogic extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'JavaLogic';
-
   /**
    * 包名
    */
-  @property()
-  packageName!: string;
+  @property({
+    objectRef: '',
+  })
+  packageName: string;
 
   /**
    * className
    */
-  @property()
-  className!: string;
+  @property({
+    objectRef: '',
+  })
+  className: string;
 
   /**
    * 代码内容
    */
-  @property()
-  code!: string;
+  @property({
+    objectRef: '',
+  })
+  code: string;
 
   /**
    * @param source 需要合并的部分参数