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

package/src/concepts/NewMap__.ts

@@ -16,14 +16,15 @@ import { getNewCompositeQuickInfo, GetCode, Range } from './utils/quick-info';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 TypeAnnotation from './TypeAnnotation__';
 import LogicItem from './LogicItem__';
-import type TypeAnnotation from './TypeAnnotation__';
 
 /**
  * Map 构造器
@@ -32,7 +33,11 @@ import type TypeAnnotation from './TypeAnnotation__';
 export class NewMap extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'NewMap';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -42,14 +47,13 @@ export class NewMap extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'NewMap';
-
   /**
    * 类型
    */
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation!: TypeAnnotation;
+  typeAnnotation: TypeAnnotation;
 
   /**
    * 键
@@ -125,7 +129,7 @@ export class NewMap extends LogicItem {
 
   getItemExistingNames(excludedList: Array<LogicItem> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.keys as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
+    return ((this.keys as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
   getItemUniqueName(name = 'logicItem1') {
     return utils.unique(name, this.getItemExistingNames(), undefined, false);
@@ -423,62 +427,6 @@ export class NewMap extends LogicItem {
     return node;
   }
 
-  /**
-   * 删除类型标注
-   * @param name 类型标注名称
-   */
-  removeTypeAnnotation(name: string): void;
-
-  /**
-   * 删除类型标注
-   * @param typeAnnotation 已有的类型标注实例
-   */
-  removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
-
-  removeTypeAnnotation(options: string | TypeAnnotation) {
-    let typeAnnotation: TypeAnnotation;
-    if (typeof options === 'string') {
-      typeAnnotation = this.typeAnnotation;
-      if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
-      }
-    } else {
-      typeAnnotation = options;
-    }
-    return typeAnnotation.delete();
-  }
-
-  __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: typeAnnotation,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = typeAnnotation.__v_raw || typeAnnotation;
-      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 逻辑项名称
@@ -529,41 +477,11 @@ export class NewMap extends LogicItem {
     return logicItem.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;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+
   getIterator() {
     return this.keys.map((k, idx) => ({
       key: k,
@@ -606,7 +524,7 @@ export class NewMap extends LogicItem {
   }
 
   toUI(state?: TranslatorState, hideDetails?: boolean): string {
-    let code = '';
+    let code = '新建：';
     code += '{ ';
     this.keys.forEach((key, index) => {
       if (index) {

package/src/concepts/New__.ts

@@ -13,12 +13,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__';
 
 /**
@@ -28,7 +29,11 @@ import LogicItem from './LogicItem__';
 export class New extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'New';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -56,6 +61,12 @@ export class New extends LogicItem {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
+    let code = '新建：';
+    return code;
+  }
+
   toJS(state?: TranslatorState): string {
     const code = '';
     return code;

package/src/concepts/NullLiteral__.ts

@@ -14,12 +14,13 @@ import { ElementToVueOptions } from './ViewElement__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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__';
 
 /**
@@ -29,7 +30,11 @@ import LogicItem from './LogicItem__';
 export class NullLiteral extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'NullLiteral';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -57,6 +62,7 @@ export class NullLiteral extends LogicItem {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+
   toVue(options?: ElementToVueOptions): string {
     return 'undefined';
   }

package/src/concepts/NumberInputSetter__.ts

@@ -0,0 +1,104 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 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 NumberInputSetter extends BaseSetter {
+  /** 类名 */
+  static readonly ConceptName: string = 'NumberInputSetter';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['BaseSetter', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'NumberInputSetter';
+  /**
+   * 按钮位置
+   */
+  @property({
+    objectRef: '',
+  })
+  placement?: string = null;
+
+  /**
+   * 最小值
+   */
+  @property({
+    objectRef: '',
+  })
+  min?: number = null;
+
+  /**
+   * 最大值
+   */
+  @property({
+    objectRef: '',
+  })
+  max?: number = null;
+
+  /**
+   * 精度
+   */
+  @property({
+    objectRef: '',
+  })
+  precision?: number = null;
+
+  /**
+   * 占位文本
+   */
+  @property({
+    objectRef: '',
+  })
+  placeholder?: string = null;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<NumberInputSetter>) {
+    source = Object.assign({}, NumberInputSetter.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): NumberInputSetter {
+    return super.from(source, parentNode, parentKey) as NumberInputSetter;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default NumberInputSetter;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/NumericLiteral__.ts

@@ -14,14 +14,15 @@ import { ElementToVueOptions } from './ViewElement__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 TypeAnnotation from './TypeAnnotation__';
 import LogicItem from './LogicItem__';
-import type TypeAnnotation from './TypeAnnotation__';
 
 /**
  * 数字字面量
@@ -30,7 +31,11 @@ import type TypeAnnotation from './TypeAnnotation__';
 export class NumericLiteral extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'NumericLiteral';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -40,12 +45,13 @@ export class NumericLiteral extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'NumericLiteral';
-
   /**
    * 字面量的值
    */
-  @property()
-  value!: string;
+  @property({
+    objectRef: '',
+  })
+  value: string;
 
   /**
    * 类型
@@ -53,7 +59,7 @@ export class NumericLiteral extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation!: TypeAnnotation;
+  typeAnnotation: TypeAnnotation;
 
   /**
    * @param source 需要合并的部分参数
@@ -68,62 +74,6 @@ export class NumericLiteral extends LogicItem {
     return super.from(source, parentNode, parentKey) as NumericLiteral;
   }
 
-  /**
-   * 删除类型标注
-   * @param name 类型标注名称
-   */
-  removeTypeAnnotation(name: string): void;
-
-  /**
-   * 删除类型标注
-   * @param typeAnnotation 已有的类型标注实例
-   */
-  removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
-
-  removeTypeAnnotation(options: string | TypeAnnotation) {
-    let typeAnnotation: TypeAnnotation;
-    if (typeof options === 'string') {
-      typeAnnotation = this.typeAnnotation;
-      if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
-      }
-    } else {
-      typeAnnotation = options;
-    }
-    return typeAnnotation.delete();
-  }
-
-  __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: typeAnnotation,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = typeAnnotation.__v_raw || typeAnnotation;
-      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;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/OqlQueryComponent__.ts

@@ -22,14 +22,15 @@ import logicService from '../service/logic';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 TypeAnnotation from './TypeAnnotation__';
 import LogicItem from './LogicItem__';
-import type TypeAnnotation from './TypeAnnotation__';
 
 /**
  * SQL 查询
@@ -38,7 +39,11 @@ import type TypeAnnotation from './TypeAnnotation__';
 export class OqlQueryComponent extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'OqlQueryComponent';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -48,18 +53,13 @@ export class OqlQueryComponent extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'OqlQueryComponent';
-
-  /**
-   * SQL 查询标题
-   */
-  @property()
-  label: string = 'SQL 查询';
-
   /**
    * SQL 查询
    */
-  @property()
-  code!: string;
+  @property({
+    objectRef: '',
+  })
+  code: string;
 
   /**
    * 相关类型
@@ -67,13 +67,15 @@ export class OqlQueryComponent extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation!: TypeAnnotation;
+  typeAnnotation: TypeAnnotation;
 
   /**
    * 数据源
    */
-  @property()
-  dataSource!: string;
+  @property({
+    objectRef: '',
+  })
+  dataSource: string;
 
   /**
    * @param source 需要合并的部分参数
@@ -100,62 +102,6 @@ export class OqlQueryComponent extends LogicItem {
     });
   }
 
-  /**
-   * 删除类型标注
-   * @param name 类型标注名称
-   */
-  removeTypeAnnotation(name: string): void;
-
-  /**
-   * 删除类型标注
-   * @param typeAnnotation 已有的类型标注实例
-   */
-  removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
-
-  removeTypeAnnotation(options: string | TypeAnnotation) {
-    let typeAnnotation: TypeAnnotation;
-    if (typeof options === 'string') {
-      typeAnnotation = this.typeAnnotation;
-      if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
-      }
-    } else {
-      typeAnnotation = options;
-    }
-    return typeAnnotation.delete();
-  }
-
-  __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: typeAnnotation,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = typeAnnotation.__v_raw || typeAnnotation;
-      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;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
@@ -258,6 +204,12 @@ export class OqlQueryComponent extends LogicItem {
     return sqlTypeBan;
   }
 
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
+    let code = '';
+    code += `SQL查询（数据源：${this.dataSource || '-'}）`;
+    return code;
+  }
+
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;