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

package/src/concepts/MatchCase__.ts

@@ -19,14 +19,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 LogicItem from './LogicItem__';
-import type TypeAnnotation from './TypeAnnotation__';
+import TypeAnnotation from './TypeAnnotation__';
 
 /**
  * 匹配分支
@@ -35,7 +36,11 @@ import type TypeAnnotation from './TypeAnnotation__';
 export class MatchCase extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'MatchCase';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -45,7 +50,6 @@ export class MatchCase extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'MatchCase';
-
   /**
    * 条件表达式
    */
@@ -69,7 +73,9 @@ export class MatchCase extends LogicItem {
   /**
    * 是否可枚举
    */
-  @property()
+  @property({
+    objectRef: '',
+  })
   isMatchedTypeEnumable: boolean = false;
 
   /**
@@ -111,7 +117,7 @@ export class MatchCase extends LogicItem {
 
   getLogicItemExistingNames(excludedList: Array<LogicItem> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.patterns as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
+    return ((this.patterns as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
   getLogicItemUniqueName(name = 'logicItem1') {
     return utils.unique(name, this.getLogicItemExistingNames(), undefined, false);
@@ -368,7 +374,7 @@ export class MatchCase extends LogicItem {
     const excludedSet = new Set(excludedList);
     return ((this.patterns as TypeAnnotation[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item?.name);
+      .map((item) => item.name);
   }
   getTypeAnnotationUniqueName(name = 'typeAnnotation1') {
     return utils.unique(name, this.getTypeAnnotationExistingNames(), undefined, false);
@@ -556,37 +562,6 @@ export class MatchCase 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;
-  }
-
   /**
    * 删除类型标注
    * @param name 类型标注名称
@@ -612,37 +587,6 @@ export class MatchCase extends LogicItem {
     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;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
@@ -838,7 +782,9 @@ export class MatchCase extends LogicItem {
               shiftState(state, code, {
                 tabSize: state?.tabSize || 0,
               }),
-            )}\n`;
+            )}`;
+
+            code += ';\n';
           });
         }
         code += `${indent(state?.tabSize || 0)}}\n`;
@@ -855,7 +801,9 @@ export class MatchCase extends LogicItem {
               shiftState(state, code, {
                 tabSize: state?.tabSize || 0,
               }),
-            )}\n`;
+            )}`;
+
+            code += ';\n';
           });
         }
         code += `${indent(state?.tabSize || 0)}}\n`;
@@ -871,7 +819,9 @@ export class MatchCase extends LogicItem {
             shiftState(state, code, {
               tabSize: state?.tabSize || 0,
             }),
-          )}\n`;
+          )}`;
+
+          code += ';\n';
         });
       }
       code += '\n';

package/src/concepts/Match__.ts

@@ -18,20 +18,22 @@ import Identifier from './Identifier__';
 import Enum from './Enum__';
 import EnumItem from './EnumItem__';
 import { languageList } from '../utils/i18nInfo';
+import { invokeCommand } from '../common';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 LogicItem from './LogicItem__';
-import type MatchCase from './MatchCase__';
+import MatchCase from './MatchCase__';
 
 /**
  * 匹配
@@ -40,7 +42,11 @@ import type MatchCase from './MatchCase__';
 export class Match extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'Match';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -50,19 +56,20 @@ export class Match extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Match';
-
   /**
    * 逻辑项
    */
   @property({
     objectRef: 'LogicItem',
   })
-  expression!: LogicItem;
+  expression: LogicItem;
 
   /**
    * 是否表达式形态
    */
-  @property()
+  @property({
+    objectRef: '',
+  })
   isExpression: boolean = false;
 
   /**
@@ -189,77 +196,22 @@ export class Match extends LogicItem {
     return node;
   }
 
-  /**
-   * 删除逻辑项
-   * @param name 逻辑项名称
-   */
-  removeExpression(name: string): void;
-
-  /**
-   * 删除逻辑项
-   * @param expression 已有的逻辑项实例
-   */
-  removeExpression(expression: LogicItem): void;
-
-  removeExpression(options: string | LogicItem) {
-    let expression: LogicItem;
-    if (typeof options === 'string') {
-      expression = this.expression;
-      if (!expression) {
-        throw new Error('找不到逻辑项 ' + options);
-      }
-    } else {
-      expression = options;
-    }
-    return expression.delete();
-  }
-
   /**
    * 删除匹配分支
    * @param matchCase 已有的匹配分支实例
    */
-  removeMatchCaseInCases(matchCase: MatchCase): void;
+  removeMatchCase(matchCase: MatchCase): void;
 
-  removeMatchCaseInCases(options: MatchCase) {
+  removeMatchCase(options: MatchCase) {
     let matchCase: MatchCase = options;
     return matchCase.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;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
+
   enumerableItems: Array<LogicItem | TypeAnnotation>;
 
   get isEnumerable() {
@@ -394,12 +346,16 @@ export class Match extends LogicItem {
   // 设置 expression ，如果 expression 是可枚举类型，加上默认匹配条件
   async setExpressionWitchCase(expression: LogicItem) {
     const oldExpression = this.expression;
-    this.app.emit('collect:start', {
+    const event = {
       actionMsg: `修改${this?.name || this?.label || (this?.constructor as any)?.nodeTitle}`,
-    });
+      noTimer: true,
+    };
+    this.app.emit('collect:start', event);
     this.setExpression(expression);
     // expression切换并且自动生成分支
+    invokeCommand('openLoading', '正在为您生成匹配分支，请耐心等待');
     await this.autoGenCases(oldExpression);
+    invokeCommand('closeLoading');
     this.app.emit('collect:end');
   }
 
@@ -422,7 +378,7 @@ export class Match extends LogicItem {
       return;
     }
     const oldTypeAnnotation = oldExpression?.__TypeAnnotation;
-    const currTypeAnnotation = await expression?.getCurrentTypeAnnotation();
+    const currTypeAnnotation = await expression?.getCurrentTypeAnnotation(30000);
 
     // 如果nasl变了，但是新旧类型都是union就return
     if (currTypeAnnotation?.typeKind === 'union' && oldTypeAnnotation?.typeKind === 'union') {