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

package/src/concepts/Function__.ts

@@ -13,25 +13,24 @@ import {
 import { ElementToVueOptions } from './ViewElement__';
 import asyncFuncMap from '../common/asyncFuncMap';
 
+import Module from './Module__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 BaseNode from '../common/BaseNode';
-import type TypeParam from './TypeParam__';
-import type Param from './Param__';
-import type Return from './Return__';
-import type Variable from './Variable__';
-import type LogicItem from './LogicItem__';
-import type Module from './Module__';
-import type App from './App__';
+import TypeParam from './TypeParam__';
+import Param from './Param__';
+import Return from './Return__';
+import Variable from './Variable__';
+import LogicItem from './LogicItem__';
 
 /**
  * 函数
@@ -40,7 +39,11 @@ import type App from './App__';
 export class Function extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'Function';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -50,18 +53,21 @@ export class Function extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Function';
-
   /**
    * 函数名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * 函数描述
    */
-  @property()
-  description!: string;
+  @property({
+    objectRef: '',
+  })
+  description: string;
 
   /**
    * 类型参数列表
@@ -109,20 +115,7 @@ export class Function extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  returnExpression!: LogicItem;
-
-  /**
-   * 祖先 Module
-   */
-  get module() {
-    return this.getAncestor('Module') as Module;
-  }
-  /**
-   * 祖先 App
-   */
-  get app() {
-    return this.getAncestor('App') as App;
-  }
+  returnExpression: LogicItem;
 
   /**
    * @param source 需要合并的部分参数
@@ -137,17 +130,6 @@ export class Function extends BaseNode {
     return super.from(source, parentNode, parentKey) as Function;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeFunction?.(this);
-    }
-    return params;
-  }
   /**
    * 设置函数名称
    */
@@ -190,7 +172,7 @@ export class Function extends BaseNode {
 
   getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
+    return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
   getTypeParamUniqueName(name = 'typeParam1') {
     return utils.unique(name, this.getTypeParamExistingNames(), undefined, false);
@@ -817,37 +799,6 @@ export class Function extends BaseNode {
     return typeParam.delete();
   }
 
-  __removeTypeParam(typeParam: TypeParam) {
-    const parentKey = typeParam.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: typeParam,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = typeParam.__v_raw || typeParam;
-      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 输入参数名称
@@ -873,37 +824,6 @@ export class Function extends BaseNode {
     return param.delete();
   }
 
-  __removeParam(param: Param) {
-    const parentKey = param.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: param,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = param.__v_raw || param;
-      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 输出参数名称
@@ -929,37 +849,6 @@ export class Function extends BaseNode {
     return ret.delete();
   }
 
-  __removeReturn(ret: Return) {
-    const parentKey = ret.parentKey;
-    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;
-  }
-
   /**
    * 删除变量
    * @param name 变量名称
@@ -985,97 +874,16 @@ export class Function extends BaseNode {
     return variable.delete();
   }
 
-  __removeVariable(variable: Variable) {
-    const parentKey = variable.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: variable,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = variable.__v_raw || variable;
-      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 逻辑项名称
-   */
-  removeReturnExpression(name: string): void;
-
-  /**
-   * 删除逻辑项
-   * @param returnExpression 已有的逻辑项实例
-   */
-  removeReturnExpression(returnExpression: LogicItem): void;
-
-  removeReturnExpression(options: string | LogicItem) {
-    let returnExpression: LogicItem;
-    if (typeof options === 'string') {
-      returnExpression = this.returnExpression;
-      if (!returnExpression) {
-        throw new Error('找不到逻辑项 ' + options);
-      }
-    } else {
-      returnExpression = options;
-    }
-    return returnExpression.delete();
-  }
-
-  __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logicItem.__v_raw || logicItem;
-      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;
+  }
 
   toJS(state?: TranslatorState): String {
     const grandParent = this.parentNode?.parentNode as any;

package/src/concepts/I18nInfo__.ts

@@ -3,7 +3,7 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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';
@@ -18,7 +18,11 @@ import BaseNode from '../common/BaseNode';
 export class I18nInfo extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'I18nInfo';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -28,24 +32,29 @@ export class I18nInfo extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'I18nInfo';
-
   /**
    * 是否开启
    */
-  @property()
-  enabled!: boolean;
+  @property({
+    objectRef: '',
+  })
+  enabled: boolean;
 
   /**
    * locale
    */
-  @property()
-  locale!: string;
+  @property({
+    objectRef: '',
+  })
+  locale: string;
 
   /**
    * 国际化配置列表
    */
-  @property()
-  messages!: Map<String, Map<String, String>>;
+  @property({
+    objectRef: '',
+  })
+  messages: Map<string, Map<string, string>>;
 
   /**
    * @param source 需要合并的部分参数
@@ -60,17 +69,6 @@ export class I18nInfo extends BaseNode {
     return super.from(source, parentNode, parentKey) as I18nInfo;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeI18nInfo?.(this);
-    }
-    return params;
-  }
   /**
    * 设置是否开启
    */

package/src/concepts/IconSetter__.ts

@@ -0,0 +1,72 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+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 BaseSetter from './BaseSetter__';
+
+/**
+ * 图标设置器
+ */
+@concept('图标设置器')
+export class IconSetter extends BaseSetter {
+  /** 类名 */
+  static readonly ConceptName: string = 'IconSetter';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['BaseSetter', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'IconSetter';
+  /**
+   * 图标标题
+   */
+  @property({
+    objectRef: '',
+  })
+  title?: string = null;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<IconSetter>) {
+    source = Object.assign({}, IconSetter.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): IconSetter {
+    return super.from(source, parentNode, parentKey) as IconSetter;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default IconSetter;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/Identifier__.ts

@@ -19,12 +19,13 @@ import FrontendType from './FrontendType__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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__';
 
 /**
@@ -34,7 +35,11 @@ import LogicItem from './LogicItem__';
 export class Identifier extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'Identifier';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -44,18 +49,21 @@ export class Identifier extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Identifier';
-
   /**
    * 命名空间
    */
-  @property()
-  namespace!: string;
+  @property({
+    objectRef: '',
+  })
+  namespace: string;
 
   /**
    * 标识符名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * @param source 需要合并的部分参数
@@ -81,10 +89,10 @@ export class Identifier extends LogicItem {
   globalDataMap: {
     [name: string]: boolean;
   } = {
-      $route: true,
-      $global: true,
-      $refs: true,
-    };
+    $route: true,
+    $global: true,
+    $refs: true,
+  };
 
   isEnum() {
     return findConceptKeyWordByNamespace(this.namespace) === 'enums';
@@ -92,7 +100,10 @@ export class Identifier extends LogicItem {
 
   get isFrontendVariables() {
     const frontendType = this.getAncestor('FrontendType') as FrontendType;
-    return this.namespace?.startsWith(`app.frontendTypes.${frontendType?.kind}.frontends`) && this.namespace?.endsWith('variables');
+    return (
+      this.namespace?.startsWith(`app.frontendTypes.${frontendType?.kind}.frontends`) &&
+      this.namespace?.endsWith('variables')
+    );
   }
 
   toVue(options?: ElementToVueOptions): string {
@@ -207,7 +218,7 @@ export class Identifier extends LogicItem {
         namespace?.endsWith('nasl.auth') ||
         namespace?.endsWith('nasl.configuration') ||
         namespace?.endsWith('nasl.process') ||
-        (this.isFrontendVariables) ||
+        this.isFrontendVariables ||
         this.isEnum()) &&
       !isMemberExpressionProperty
     );
@@ -229,12 +240,12 @@ export class Identifier extends LogicItem {
       return `__obj.${this.name}`;
     }
     // 只有data-source可以是函数 ，也可能是属性
-    if (asserts.isBindAttribute(self.parentNode) && self.parentNode.name === 'data-source') {
-      const view = self.view || self.getAncestor('BusinessComponent') as BusinessComponent;
+    if (asserts.isBindAttribute(self.parentNode) && ['data-source', 'dataSource'].includes(self.parentNode.name)) {
+      const view = self.view || (self.getAncestor('BusinessComponent') as BusinessComponent);
       const viewLogics = view.logics;
       const findLogic = viewLogics.find((item) => item.name === self.name);
       if (findLogic) {
-        return self.name;
+        return `${self.name}`;
       }
     }
     // 全局变量在不是页面的地方放置，就会报错