@lcap/nasl 3.4.0-alpha.1 → 3.4.0-alpha.2

package/src/common/BaseNode.ts

@@ -1,22 +1,17 @@
 import { at } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 
-import { config } from '../config';
 import { SourceMap } from '../translator';
-import storageService from '../service/storage/service';
 import { getSourceFromMap } from '../service/storage/map';
-import { loadThen } from '../service/storage/storagePoint';
 
-import { EventEmitter, EventPayload, Params } from './EventEmitter';
 import * as utils from '../utils';
-import classMap from './classMap';
-import { action, circular, excludedInJSON, property, getConceptConstructor, getConceptPropertyMap } from '../decorators';
+import { EventEmitter, EventPayload, Params } from './EventEmitter';
+import { action, circular, excludedInJSON, property, getConceptConstructor, getConceptPropertyMap, classMap } from '../decorators';
 import { Diagnostic } from '../manager/diagnostic';
-import type { ViewElement, TypeAnnotation, App } from '..';
 
 import { sentryMonitorNaslNode } from '../sentry';
 import operations from '../breakpoint/shared/operations';
-import type { SynatxNode, SynatxNodeConcept } from '../concepts';
+import type { SynatxNode, SynatxNodeConcept, ViewElement, TypeAnnotation, App, Namespace } from '../concepts';
 
 // 确保属性都是定义过的
 function ensureDefined(object: any, concept: string) {
@@ -45,6 +40,8 @@ function ensureDefined(object: any, concept: string) {
         }
       }
     }
+
+    newObject.concept = actualConcept;
   }
   return newObject;
 }
@@ -55,6 +52,8 @@ function ensureDefined(object: any, concept: string) {
  */
 @sentryMonitorNaslNode
 export class BaseNode extends EventEmitter {
+  static readonly ConceptName: string = 'BaseNode';
+
   /**
    * 可修改标志，内部属性
    * 标记在构造函数结束后是否可修改
@@ -62,11 +61,28 @@ export class BaseNode extends EventEmitter {
   @excludedInJSON()
   _mutable = true;
 
+  /** 节点类别缓存 */
+  @excludedInJSON()
+  private _concept!: string;
+
   /**
    * 概念
    */
   @property()
-  concept: string = undefined;
+  get concept() {
+    return this._concept ?? (this.constructor as any).ConceptName as string;
+  }
+  set concept(val: string) {
+    console.warn(`[警告] 尽快移除变更 concept 值的操作，下个版本 concept 将会改为只读。\n当前变更：${this.concept} -> ${val}，原始节点类别：${(this.constructor as any).ConceptName}`);
+    if (val !== this.concept) {
+      if (val === (this.constructor as any).ConceptName as string) {
+        delete this._concept;
+      } else {
+        this._concept = val;
+      }
+    }
+  }
+
 
   /**
    * toJSON 时需要去除的键，为了避免出现 CircularJSON
@@ -82,22 +98,22 @@ export class BaseNode extends EventEmitter {
    * 变动时间
    */
   @property()
-  changedTime: number = undefined;
+  changedTime!: number;
 
   /**
    * 分支名称
    */
   @property()
-  branchName: string = undefined;
+  branchName!: string;
 
   /**
    * 合并代码相关
    */
   @property()
-  workingCopy: object = undefined;
+  workingCopy!: object;
 
   @property()
-  branch: object = undefined;
+  branch!: object;
 
   /**
    * 断点状态
@@ -107,7 +123,7 @@ export class BaseNode extends EventEmitter {
    * 'DISABLED' ==> 禁用断点
    */
   @property()
-  breakpoint: 'ENABLED' | 'DISABLED' | null | undefined = undefined;
+  breakpoint!: 'ENABLED' | 'DISABLED' | null | undefined;
 
   /**
    * 父节点
@@ -122,91 +138,98 @@ export class BaseNode extends EventEmitter {
    * 前端 UI 状态
    */
   @excludedInJSON()
-  editable: boolean = undefined;
+  editable!: boolean;
 
   /**
    * 是否可以删除
    * 前端 UI 状态
    */
   @excludedInJSON()
-  removable: boolean = undefined;
+  removable!: boolean;
 
   /**
    * 是否正在编辑
    * 前端 UI 状态
    */
   @excludedInJSON()
-  editing: boolean = false;
+  editing!: boolean;
 
   /**
    * 是否正在请求
    * 前端 UI 状态
    */
   @excludedInJSON()
-  loading: boolean = false;
+  loading!: boolean;
 
   /**
    * 节点是否为展开状态
    * 前端 UI 状态
    */
   @excludedInJSON()
-  expanded: boolean = false;
+  expanded!: boolean;
 
   /**
    * 节点是否显示
    * 前端 UI 状态
    */
   @excludedInJSON()
-  hidden: boolean = false;
+  hidden!: boolean;
 
   /**
    * 页面树节点是否显示
    * 前端 UI 状态
    */
   @excludedInJSON()
-  pageTreeNodeHidden: boolean = false;
+  pageTreeNodeHidden!: boolean;
 
   /**
    * 逻辑树节点是否显示
    * 前端 UI 状态
    */
   @excludedInJSON()
-  logicTreeNodeHidden: boolean = false;
+  logicTreeNodeHidden!: boolean;
 
   /**
    * 数据树节点是否显示
    * 前端 UI 状态
    */
   @excludedInJSON()
-  dataTreeNodeHidden: boolean = false;
+  dataTreeNodeHidden!: boolean;
+
+    /**
+   * 数据树节点是否显示
+   * 前端 UI 状态
+   */
+  @excludedInJSON()
+  processTreeNodeHidden!: boolean;
 
   /**
    * 数据树节点是否展开
    * 前端 UI 状态
    */
   @excludedInJSON()
-  logicTreeNodeExpanded: boolean = false;
+  logicTreeNodeExpanded!: boolean;
 
   /**
    * 用于挂 embeddedTS 的 sourceMap
    */
   @excludedInJSON()
-  sourceMap: SourceMap = undefined;
+  sourceMap!: SourceMap;
 
   /**
    * 是否为叶子节点
    * 前端 UI 状态
    */
   @excludedInJSON()
-  isLeaf: boolean = false;
+  isLeaf!: boolean;
 
   @excludedInJSON()
-  storageJSON: any;
+  storageJSON!: any;
 
   /**
    * 当前节点上报错详细信息
    */
-  tsErrorDetail: Diagnostic | undefined = undefined;
+  tsErrorDetail!: Diagnostic | undefined;
 
   @property()
   name: string = '';
@@ -215,13 +238,13 @@ export class BaseNode extends EventEmitter {
    * 当前节点的类型标注
    */
   @excludedInJSON()
-  __TypeAnnotation: TypeAnnotation = undefined;
+  __TypeAnnotation!: TypeAnnotation;
 
   /**
    * 当前节点的类型标注是不是正确的
    */
   @excludedInJSON()
-  __isCorrectTypeAnnotation: boolean = false;
+  __isCorrectTypeAnnotation!: boolean;
 
   /**
    * @param source 需要合并的部分参数
@@ -242,26 +265,33 @@ export class BaseNode extends EventEmitter {
     this.on('create', () => operations.create(this));
     this.on('delete', () => operations.delete(this));
     this.on('update', () => operations.update(this));
-  }
 
-  // static constructorName = 'BaseNode'
-  getClassName() {
-    return 'BaseNode';
   }
 
   subConstructor(source?: Partial<BaseNode>) {
-    const propertyMap = getConceptPropertyMap(this.getClassName() || this.constructor.name);
+    const propertyMap = getConceptPropertyMap(this.concept || this.constructor.name);
     const properties = Array.from(new Set([...Object.keys(this), ...Object.keys(source)])).filter((key) => propertyMap.has(key));
 
     // 测试时用的标记属性
     if (process.env.NODE_ENV === 'testing') {
-      properties.push('__$Selected');
+      properties.push('__$Selected', '__TypeAnnotation');
     }
 
     properties.forEach((key) => {
-      const property = propertyMap.get(key);
+      if (key === 'concept') {
+        return;
+      }
+
       const sourceItem = (source as any)[key] !== undefined ? (source as any)[key] : (this as any)[key];
+
+      let property = propertyMap.get(key);
       let objectRefCtor: any;
+
+      // 测试环境下，类型节点由外部注入，所以需要在初始化的时候必须带上类型节点
+      if (process.env.NODE_ENV === 'testing' && key === '__TypeAnnotation' && sourceItem) {
+        property = { objectRef: 'TypeAnnotation' };
+      }
+
       try {
         if (property?.objectRef) {
           const arr = property.objectRef.split(' | ');
@@ -274,47 +304,31 @@ export class BaseNode extends EventEmitter {
             }
           }
         }
+
         // 数组的情况也在这里做掉了
-        (this as any)[key] =
-          objectRefCtor && sourceItem && !(sourceItem instanceof objectRefCtor) ? this.instantiateSub(sourceItem, key) : sourceItem;
+        const val = objectRefCtor && sourceItem && !(sourceItem instanceof objectRefCtor) ? this.instantiateSub(sourceItem, key) : sourceItem;
+
+        if (val !== undefined) {
+          (this as any)[key] = val;
+        }
       } catch (e) {
         // Function has non-object prototype 'undefined' in instanceof check
         if (!e.message.includes('Function has non-object prototype')) throw e;
       }
     });
+
     operations.create(this);
-    // if (config.storage.protocol === 'http' && loadThen[source.concept as 'App' | 'View']) {
-    //     const { childNodes } = loadThen[source.concept as 'App' | 'View'] || {};
-    //     const queryList = childNodes.map(({ field, concept }) => {
-    //         const path = [this.nodePath, field].join('.');
-    //         return {
-    //             path,
-    //             excludes: loadThen[concept as 'App' | 'View'].childNodes.map(({ field }) => field),
-    //         };
-    //     });
-    //     storageService
-    //         .batchQuery({
-    //             body: queryList,
-    //             headers: {
-    //                 appId: this.rootNode?.id || this.id,
-    //             },
-    //         })
-    //         .then((data: any) =>
-    //             data.forEach((sourceItem: any, index: number) => {
-    //                 const { field, concept } = childNodes[index];
-    //                 if (!sourceItem || (Array.isArray((this as any)[field]) && !Array.isArray(sourceItem))) {
-    //                     return;
-    //                 }
-    //                 const objectRefCtor = getConceptConstructor(concept);
-    //                 (this as any)[field] = objectRefCtor ? this.instantiateSub(sourceItem, field) : sourceItem;
-    //             }));
-    // }
+
+    // node 环境下需要删除当前节点的 concept 属性
+    if (utils.isNode && ('concept' in this) && !this.concept) {
+      Reflect.deleteProperty(this, 'concept');
+    }
   }
 
   fixInstantiate() {
-    const propertyMap = getConceptPropertyMap(this.getClassName() || this.constructor.name);
-
+    const propertyMap = getConceptPropertyMap(this.concept ?? this.constructor.name);
     const properties = Object.keys(this).filter((key) => propertyMap.has(key));
+
     properties.forEach((key) => {
       const property = propertyMap.get(key);
       const sourceItem = (this as any)[key];
@@ -480,11 +494,19 @@ export class BaseNode extends EventEmitter {
       node.changeLinesLocation(this);
     }
 
+    // 自定义连接器下的namespace删除的时候需要同时删除对应的logic
+    if (this.concept === 'Namespace' && this.parentNode.concept === 'Connector') {
+      (this as unknown as Namespace).logics.forEach(logic => logic?.delete())
+    }
+
     const useIndex = ['BindEvent', 'Identifier'].includes(this.concept);
     const path = this.getNodePath(useIndex);
     const parentParams = this._delete();
     if (parentParams && parentParams.index !== -1) {
       if (Array.isArray((this.parentNode as any)[this.parentKey])) {
+        if (process.env.NODE_ENV === 'development') {
+          console.log('删除节点', this);
+        }
         this.emit('delete', {
           action: 'delete',
           path,
@@ -514,6 +536,10 @@ export class BaseNode extends EventEmitter {
     const path = this.getNodePath(false);
     const oldObject: any = {};
     for (const key in object) {
+      if (key === 'concept') {
+        continue;
+      }
+
       if (Object.prototype.hasOwnProperty.call(object, key)) {
         const oldProperty = (this as any)[key] ?? null;
         oldObject[key] = oldProperty;
@@ -546,7 +572,7 @@ export class BaseNode extends EventEmitter {
       }
     }
     const newObject: any = {};
-    const propertyMap = getConceptPropertyMap(this.getClassName() || this.constructor.name);
+    const propertyMap = getConceptPropertyMap(this.concept ?? this.constructor.name);
     for (const key in object) {
       const property = propertyMap.get(key);
       if (property) {
@@ -565,6 +591,9 @@ export class BaseNode extends EventEmitter {
         }
       }
     }
+    if (process.env.NODE_ENV === 'development') {
+      console.log('更新节点', 'path', path, 'oldObject', oldObject, 'newObject', newObject);
+    }
     this.emit('update', {
       action: 'update',
       path,
@@ -586,7 +615,7 @@ export class BaseNode extends EventEmitter {
 
   static from(source: any, parentNode?: BaseNode, parentKey?: string): BaseNode {
     // 有一些继承的情况
-    const Ctor = classMap?.[source?.concept] || this;
+    const Ctor = classMap.get(source?.concept) || this;
     if (Ctor && source instanceof Ctor) {
       if (parentNode) {
         source.parentNode = parentNode;
@@ -607,7 +636,7 @@ export class BaseNode extends EventEmitter {
       }
       instance.subConstructor({
         ...source,
-        concept: source.concept || this?.prototype?.getClassName() || Ctor.name,
+        concept: source?.concept ?? this?.prototype?.concept ?? (Ctor as any).ConceptName as string ?? Ctor.name,
         parentNode,
       });
       return instance;
@@ -646,7 +675,13 @@ export class BaseNode extends EventEmitter {
               })
             : null;
           if (siblingNode || !name || (useIndex && isNodeSelf) || useIndexKeys.includes(node.concept)) {
-            const index = parentProperty.indexOf(node);
+            const index = parentProperty.findIndex((item) => {
+              if (item === node) {
+                return true;
+              }
+
+              return item?.id && item?.id === node?.id;
+            });
             path += `[${index}]`;
           } else {
             path += `[name=${name}]`;
@@ -752,8 +787,8 @@ export class BaseNode extends EventEmitter {
       }
       return source;
     }
-    if (source && source.concept && classMap[source.concept]) {
-      const Ctor = classMap[source.concept] as any;
+    if (source && source.concept && classMap.get(source.concept)) {
+      const Ctor = classMap.get(source.concept) as any;
       const instance = Ctor.from(source, parentNode, parentKey);
       if (instance && instance.toStorageJSON) instance.storageJSON = instance.toStorageJSON();
       return instance;
@@ -770,7 +805,7 @@ export class BaseNode extends EventEmitter {
       return;
     }
     const completeList: any[] = [];
-    let isArray = false;
+    let isArray;
     // 暂时通过是否有name判断数据是否全
     if (Array.isArray(source)) {
       isArray = true;
@@ -848,7 +883,7 @@ export class BaseNode extends EventEmitter {
   }
 
   _toJSON(filerFn?: (source: Partial<BaseNode>) => {}): any {
-    const propertyMap = getConceptPropertyMap(this.getClassName() || this.constructor.name);
+    const propertyMap = getConceptPropertyMap(this.concept || this.constructor.name);
     const source: Partial<BaseNode> = {};
     propertyMap.forEach((property, key: string) => {
       if (property) {
@@ -861,6 +896,10 @@ export class BaseNode extends EventEmitter {
         }
       }
     });
+
+    // @ts-ignore
+    source.concept = this.concept;
+
     return filerFn ? filerFn(source) : source;
   }
 
@@ -1176,12 +1215,34 @@ export class BaseNode extends EventEmitter {
     return null;
   }
 
+  /**
+   * 使用新的 concept 在当前节点生成新的数据
+   */
+  changeConceptNode(concept: SynatxNodeConcept) {
+    return new Proxy(this, {
+      get(target, p: keyof BaseNode, receiver) {
+          if (p === 'concept') {
+            return concept;
+          }
+
+          return target[p];
+      },
+    })
+  }
+
+  /** 收集所有节点 */
+  collectNodes(): SynatxNode[];
   /** 收集特定类型的子节点 */
-  collectNodes(concept: SynatxNodeConcept): void;
-  /** 收集判定为真的子节点 */
-  collectNodes(pre: (node: SynatxNode) => boolean): void;
-  collectNodes(input: SynatxNodeConcept | ((node: SynatxNode) => boolean)) {
-    const pre = typeof input === 'string' ? (node: SynatxNode) => node.concept === input : input;
+  collectNodes(concept: SynatxNodeConcept): SynatxNode[];
+  /** 收集断言返回`true`的子节点 */
+  collectNodes(pre: (node: SynatxNode) => boolean): SynatxNode[];
+  collectNodes(input?: SynatxNodeConcept | ((node: SynatxNode) => boolean)) {
+    const pre =
+      typeof input === 'undefined'
+        ? (node: SynatxNode) => typeof node.concept === 'string'
+        : typeof input === 'string'
+          ? (node: SynatxNode) => node.concept === input
+          : input;
     const nodes: SynatxNode[] = [];
     const self = this as unknown as SynatxNode;
 

package/src/common/Command.ts

@@ -36,7 +36,9 @@ export function unregisterCommand(command: string, execute?: CommandExecute) {
     if (execute) {
       const index = cmds.findIndex((cmd) => cmd.execute === execute);
       if (index !== -1) {
-        console.log(command);
+        if (process.env.NODE === 'development') {
+          console.log('unregisterCommand', command);
+        }
         cmds.splice(index, 1);
       }
       if (cmds.length) {
@@ -62,6 +64,9 @@ export function invokeOnlyCommand(command: string, ...args: any[]) {
   if (!cmds?.length) {
     console.warn(`Command ${command} not found!`);
   }
+  if (process.env.NODE === 'development') {
+    console.log('invokeOnlyCommand', command);
+  }
   return cmds[0]?.execute(...args);
 }
 

package/src/common/EventEmitter.ts

@@ -4,13 +4,11 @@ import { excludedInJSON } from '../decorators';
 export type EventListener = (...args: Array<any>) => any;
 
 export class EventEmitter {
+  static readonly ConceptName: string = 'EventEmitter';
+
   @excludedInJSON()
   private readonly _events: { [name: string]: Array<EventListener> } = {};
 
-  getClassName() {
-    return 'EventEmitter';
-  }
-
   /**
    * 监听事件
    * @param eventName 事件名

package/src/common/index.ts

@@ -1,4 +1,3 @@
 export * from './BaseNode';
 export * from './EventEmitter';
 export * from './Command';
-export * from './classMap';

package/src/concepts/Abort__.ts

@@ -1,27 +1,31 @@
-import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, indent, createCompilerState } from '../translator';
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
 
 /**
  * 中止表达式
  */
+@className
 @concept('中止表达式')
+// @ts-ignore
 export class Abort extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'Abort';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'Abort' = 'Abort';
+  // @ts-ignore
+  readonly concept!: 'Abort';
 
   /**
    * 中止表达式标题
@@ -33,24 +37,19 @@ export class Abort extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Abort>) {
-    // @ts-ignore
-    source = { ...Abort.getDefaultOptions(), ...source };
+    source = Object.assign({}, Abort.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'Abort';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): Abort {
     return super.from(source, parentNode, parentKey) as Abort;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
   toUI(): string {
     return '中止';
   }
@@ -69,15 +68,14 @@ export class Abort extends LogicItem {
     }
     return code;
   }
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.Abort = Abort;
 export default Abort;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================