@lcap/nasl 3.3.2-beta.3 → 3.3.3-beta.1

package/src/common/BaseNode.ts

@@ -12,6 +12,12 @@ import { Diagnostic } from '../manager/diagnostic';
 import { sentryMonitorNaslNode } from '../sentry';
 import operations from '../breakpoint/shared/operations';
 import type { SynatxNode, SynatxNodeConcept, ViewElement, TypeAnnotation, App, Namespace } from '../concepts';
+import eventBus from '../eventBus';
+
+let actionable = true;
+export function setActionable(value: boolean) {
+  actionable = value;
+}
 
 // 确保属性都是定义过的
 function ensureDefined(object: any, concept: string) {
@@ -46,6 +52,10 @@ function ensureDefined(object: any, concept: string) {
   return newObject;
 }
 
+type NodePathOption = {
+  useName?: boolean,
+}
+
 /**
  * 顶点类
  * 属性均为只读，仅在初始化和 load 的情况下可以修改
@@ -196,7 +206,7 @@ export class BaseNode extends EventEmitter {
   @excludedInJSON()
   dataTreeNodeHidden!: boolean;
 
-    /**
+  /**
    * 数据树节点是否显示
    * 前端 UI 状态
    */
@@ -401,6 +411,11 @@ export class BaseNode extends EventEmitter {
   }
 
   createNode({ parentNode, parentKey, index }: { parentNode: SynatxNode; parentKey: string; index: number }) {
+    if(!actionable) {
+      eventBus.emit('NotActionable')
+      return;
+    }
+
     if (parentNode) {
       const property = parentNode[parentKey as keyof SynatxNode];
       if (Array.isArray(property) && index !== -1) {
@@ -428,6 +443,11 @@ export class BaseNode extends EventEmitter {
    * 创建节点
    */
   create(parentParams: Params) {
+    if(!actionable) {
+      this._delete();
+      eventBus.emit('NotActionable');
+      return;
+    }
     this.emit('create', {
       action: 'create',
       path: this.getNodePath(true),
@@ -441,12 +461,22 @@ export class BaseNode extends EventEmitter {
    * 如果有父节点，则删除节点，在添加时调用
    */
   ensureDelete() {
+    if(!actionable) {
+      eventBus.emit('NotActionable');
+      return;
+    }
+
     // 批量赋值因为连线的问题需要特殊处理一下.
     if (this.parentNode?.concept === 'SelectMembers') {
       this.parentNode.ensureDelete();
       return;
     }
 
+    if (this.concept === 'SelectMembers' && this.parentNode) {
+      const node: any = this.parentNode;
+      node.changeLinesLocation(this);
+    }
+
     if (this.parentNode && this.parentKey) {
       const path = this.getNodePath(false);
       const parentParams = this._delete();
@@ -479,6 +509,11 @@ export class BaseNode extends EventEmitter {
    * 删除节点
    */
   delete() {
+    if(!actionable) {
+      eventBus.emit('NotActionable');
+      return;
+    }
+
     if (this.parentNode?.concept === 'Match' && this.parentKey === 'expression') {
       (this.parentNode as any).setExpressionWitchCase(null);
       return;
@@ -533,6 +568,11 @@ export class BaseNode extends EventEmitter {
    * 更新节点
    */
   update({ field, ...object }: any) {
+    if(!actionable) {
+      eventBus.emit('NotActionable');
+      return;
+    }
+
     const path = this.getNodePath(false);
     const oldObject: any = {};
     for (const key in object) {
@@ -649,12 +689,16 @@ export class BaseNode extends EventEmitter {
 
   getNodePath(useIndex: boolean): string;
   getNodePath(useIndexKeys: string[]): string;
-  getNodePath(useIndex: boolean | string[]) {
+  getNodePath(option: NodePathOption): string;
+  getNodePath(useIndex: boolean | string[] | NodePathOption) {
     let node: BaseNode = this;
     let useIndexKeys: string[] = [];
+    let option: NodePathOption = {};
     if (Array.isArray(useIndex)) {
       useIndexKeys = useIndex;
       useIndex = false;
+    } else if(useIndex && typeof useIndex === 'object') {
+      option = useIndex;
     }
     let isNodeSelf = true;
     const pathArr = [];
@@ -674,7 +718,7 @@ export class BaseNode extends EventEmitter {
                 return child?.name === name && child !== node && child?.id !== node?.id;
               })
             : null;
-          if (siblingNode || !name || (useIndex && isNodeSelf) || useIndexKeys.includes(node.concept)) {
+          if (!(option.useName && name) && (siblingNode || !name || (useIndex && isNodeSelf) || useIndexKeys.includes(node.concept))) {
             const index = parentProperty.findIndex((item) => {
               if (item === node) {
                 return true;
@@ -1009,6 +1053,11 @@ export class BaseNode extends EventEmitter {
    * @param position
    */
   moveNode(options: { sourceNode: BaseNode; position: 'append' | 'insertBefore' | 'insertAfter'; action?: string }) {
+    if (!actionable) {
+      eventBus.emit('NotActionable');
+      return;
+    }
+
     const { sourceNode, position } = options;
     if (this.concept === 'App') {
       return;
@@ -1045,7 +1094,8 @@ export class BaseNode extends EventEmitter {
           parentKey,
         });
 
-        if (this.concept === 'ViewElement') this.name = (this as unknown as ViewElement).getViewElementUniqueName(this.name);
+        // 和原开发沟通过，可注释掉这行，否则拖拽的时候会更新name
+        // if (this.concept === 'ViewElement') this.name = (this as unknown as ViewElement).getViewElementUniqueName(this.name);
 
         list.splice(index, 0, this);
         this.create({
@@ -1186,7 +1236,8 @@ export class BaseNode extends EventEmitter {
       this.concept === 'Param' ||
       this.concept === 'Return' ||
       this.concept === 'StructureProperty' ||
-      this.concept === 'Variable'
+      this.concept === 'Variable' ||
+      this.concept === 'FrontendVariable'
     ) {
       if ((this as any).typeAnnotation || (this.__TypeAnnotation && this.parentKey === 'virtualParams')) {
         return !this.hasChildren;
@@ -1221,11 +1272,11 @@ export class BaseNode extends EventEmitter {
   changeConceptNode(concept: SynatxNodeConcept) {
     return new Proxy(this, {
       get(target, p: keyof BaseNode, receiver) {
-          if (p === 'concept') {
-            return concept;
-          }
+        if (p === 'concept') {
+          return concept;
+        }
 
-          return target[p];
+        return target[p];
       },
     })
   }
@@ -1235,13 +1286,13 @@ export class BaseNode extends EventEmitter {
   /** 收集特定类型的子节点 */
   collectNodes(concept: SynatxNodeConcept): SynatxNode[];
   /** 收集断言返回`true`的子节点 */
-  collectNodes(pre: (node: SynatxNode) => boolean): SynatxNode[];
-  collectNodes(input?: SynatxNodeConcept | ((node: SynatxNode) => boolean)) {
+  collectNodes(pre: (node?: SynatxNode) => boolean): SynatxNode[];
+  collectNodes(input?: SynatxNodeConcept | ((node?: SynatxNode) => boolean)) {
     const pre =
       typeof input === 'undefined'
-        ? (node: SynatxNode) => typeof node.concept === 'string'
+        ? (node: SynatxNode) => node && typeof node.concept === 'string'
         : typeof input === 'string'
-          ? (node: SynatxNode) => node.concept === input
+          ? (node: SynatxNode) => node?.concept === input
           : input;
     const nodes: SynatxNode[] = [];
     const self = this as unknown as SynatxNode;

package/src/concepts/Abort__.ts

@@ -24,6 +24,7 @@ export class Abort extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Abort';
 

package/src/concepts/Anchor__.ts

@@ -26,6 +26,7 @@ export class Anchor extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Anchor';
 
@@ -100,11 +101,15 @@ export class Anchor extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -162,19 +167,19 @@ export class Anchor extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState(), isHaveKeyWord?: boolean): string {
-      let code = '';
-      if (isHaveKeyWord) {
-          code += `_anchor: `;
-      }
-      if (this.expression) {
-          code += (this.expression as StringLiteral).toNaturalTS(shiftState(state, code, { inline: true }), false);
-      } else {
-          code += 'undefined';
-      }
-      return code;
+    let code = '';
+    if (isHaveKeyWord) {
+      code += `_anchor: `;
+    }
+    if (this.expression) {
+      code += (this.expression as StringLiteral).toNaturalTS(shiftState(state, code, { inline: true }), false);
+    } else {
+      code += 'undefined';
+    }
+    return code;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/AnonymousFunction__.ts

@@ -37,6 +37,7 @@ export class AnonymousFunction extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'AnonymousFunction';
 
@@ -305,11 +306,15 @@ export class AnonymousFunction extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(param);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = param.__v_raw || param;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === param) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -353,11 +358,15 @@ export class AnonymousFunction extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -401,11 +410,15 @@ export class AnonymousFunction extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -549,14 +562,15 @@ export class AnonymousFunction extends LogicItem {
       code += `(`;
       this.params.forEach((param, index) => {
         code += param.toNaturalTS(shiftState(state, code, { inline: true }));
-        if (index !== this.params.length - 1)
-          code += ', ';
+        if (index !== this.params.length - 1) code += ', ';
       });
       code += `)`;
       code += ` => (`;
 
       if (this.body) {
-        code += this.body.toNaturalTS && this.body.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }));
+        code +=
+          this.body.toNaturalTS &&
+          this.body.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }));
       }
       code += ')';
       code += ';';