@lcap/nasl 3.4.0-beta.3 → 3.4.0-beta.4

package/sandbox-natural/stdlib/nasl.core.ts

@@ -1,9 +1,11 @@
 type Any = any;
-// type Boolean = boolean;
+type Long = number;
 type Integer = number;
 type Decimal = number;
+// type Boolean = boolean;
 // type String = string;
 // type Date = globalThis.Date;
+
 class Time {
     accept: 'Time';
 }
@@ -13,13 +15,14 @@ class DateTime {
 type List<T> = Array<T>;
 
 interface Entity<T> {
+    /**
+     * 只能获取一条
+     */
     get(id: Long): T;
     create(entity: T): T;
     update(entity: T): T;
     delete(id: Long): void;
     createOrUpdate(body: T): T;
-    updateBy(body: T, filter: (_: T) => Boolean): Integer;
-    deleteBy(filter: (_: T) => Boolean): void;
     batchCreate(list: List<T>): List<T>;
     batchUpdate(list: List<T>): List<T>;
     batchDelete(list: List<Long>): void;

package/sandbox-natural/stdlib/nasl.oql.ts

@@ -3,6 +3,12 @@ declare namespace nasl.oql {
      * 数据查询
      * @param sql 数据查询需要的 SQL
      * @returns 返回类型中的 T 为 sql 根据 SQL 中 select 的字段推导
+     * 
+     * 所有变量格式为：${variable}，不能用''包裹，不能用函数处理。
+     * 所有枚举类型值的格式为：${app.enums.Enum.Value}，不能用''包裹，不能用函数处理。
+     * 尽可能使用 join 进行关联查询。
+     * @example `SELECT * FROM Student WHERE id = ${id}`
+     * @example `SELECT OrderProduct.*, Product.price as price FROM OrderProduct JOIN Product WHERE orderId = ${id}`
      */
     export function query<T>(sql: string): List<T>;
 }

package/sandbox-natural/stdlib/nasl.util.ts

@@ -85,6 +85,7 @@ declare namespace nasl.util {
     export function Clear<T>(struct: T): T;
     export function Clone<T>(struct: T): T;
     export function HasValue(...args: Any[]): Boolean;
+    // RandomInt 生成的数字为整数，如果需要指定位数的随机数，需要在数字前按照位数要求补 0
     export function RandomInt(start: Integer, end: Integer): Integer;
 
     // New 系列函数使用
@@ -107,7 +108,7 @@ declare namespace nasl.util {
     /**
     * @example const variable1 = nasl.util.NewAnonymityStructure({property1: '123', property2: '456'})
     */
-    export function NewAnonymityStructure(arg: any): any;
+    export function NewAnonymityStructure(arg: Any): Any;
 
     export function consoleLog(arg: Any): void;
     export function jsonSerialize(arg: Any): String;

package/src/automate/template/myProcess.js

@@ -5,7 +5,7 @@ export const processComponent = (function () {
         return [];
     };
 
-    const execTemplate = function (app, frontend, view, viewElement) {
+    const execTemplate = function (app, frontend, view, insetProcess) {
         const _templateObjects = [];
         const {
             _set,
@@ -11501,7 +11501,8 @@ export const processComponent = (function () {
         _push(view, 'logics', t_Logic_getTaskDefListByProcessDef_1123);
         _push(view, 'logics', t_Logic_getUsersList_1169);
         _push(view, 'logics', t_Logic_reloadProcess_1199);
-        _push(viewElement, 'children', t_ViewElement_tabs1_4);
+        // _push(viewElement, 'children', t_ViewElement_tabs1_4);
+        insetProcess(t_ViewElement_tabs1_4);
         view.collectExistingViewElementName();
 
         /*---- add module ----*/

package/src/common/BaseNode.ts

@@ -13,7 +13,6 @@ import { sentryMonitorNaslNode } from '../sentry';
 import operations from '../breakpoint/shared/operations';
 import type { SyntaxNode, SyntaxNodeConcept, ViewElement, TypeAnnotation, App, Namespace } from '../concepts';
 
-
 /**
  * 顶点类
  * 属性均为只读，仅在初始化和 load 的情况下可以修改
@@ -22,6 +21,8 @@ import type { SyntaxNode, SyntaxNodeConcept, ViewElement, TypeAnnotation, App, N
 export class BaseNode extends EventEmitter {
   static readonly ConceptName: string = 'BaseNode';
 
+  static readonly inheritanceChain: string[] = [];
+
   /**
    * 可修改标志，内部属性
    * 标记在构造函数结束后是否可修改
@@ -164,10 +165,10 @@ export class BaseNode extends EventEmitter {
   @excludedInJSON()
   dataTreeNodeHidden!: boolean;
 
-    /**
-   * 数据树节点是否显示
-   * 前端 UI 状态
-   */
+  /**
+ * 数据树节点是否显示
+ * 前端 UI 状态
+ */
   @excludedInJSON()
   processTreeNodeHidden!: boolean;
 
@@ -418,6 +419,11 @@ export class BaseNode extends EventEmitter {
       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();
@@ -552,15 +558,15 @@ export class BaseNode extends EventEmitter {
     const oldProperty = (this as any)[key] ?? null;
     oldObject[key] = oldProperty;
     if (Array.isArray(oldProperty)) {
-        oldObject[key] = oldProperty.map((item) => {
-            let propertyItem = item ?? null;
-            if (item instanceof BaseNode) {
-                propertyItem = item.toJSON();
-            }
-            return propertyItem;
-        });
+      oldObject[key] = oldProperty.map((item) => {
+        let propertyItem = item ?? null;
+        if (item instanceof BaseNode) {
+          propertyItem = item.toJSON();
+        }
+        return propertyItem;
+      });
     } else if (oldProperty instanceof BaseNode) {
-        oldObject[key] = oldProperty.toJSON();
+      oldObject[key] = oldProperty.toJSON();
     }
   }
 
@@ -570,33 +576,33 @@ export class BaseNode extends EventEmitter {
     const propertyMap = getConceptPropertyMap(this.concept ?? this.constructor.name);
     const property = propertyMap.get(key);
     if (property) {
-        const objProperty = object[key] ?? null;
-        const propertyConcept = property?.objectRef;
-        // 在定义中该属性是否为数组
-        const propertyIsArray = property?.isArray;
-        const propertyDefaultValue = property?.defaultValue;
-        if (propertyIsArray && (!Array.isArray(objProperty) && objProperty != propertyDefaultValue)) {
-          riskList?.push(`将Nasl节点“${this.concept}”上声明为数组的属性“${key}”赋值为“${objProperty}”`);
-        }
-        if (propertyConcept) {
-          if (Array.isArray(objProperty)) {
-            newObject[key] = objProperty.map((objItem: any) => {
-              return this.ensureDefined({
-                object: objItem,
-                concept: propertyConcept,
-                riskList
-              });
-            });
-          } else {
-            newObject[key] = this.ensureDefined({
-              object: objProperty,
+      const objProperty = object[key] ?? null;
+      const propertyConcept = property?.objectRef;
+      // 在定义中该属性是否为数组
+      const propertyIsArray = property?.isArray;
+      const propertyDefaultValue = property?.defaultValue;
+      if (propertyIsArray && (!Array.isArray(objProperty) && objProperty != propertyDefaultValue)) {
+        riskList?.push(`将Nasl节点“${this.concept}”上声明为数组的属性“${key}”赋值为“${objProperty}”`);
+      }
+      if (propertyConcept) {
+        if (Array.isArray(objProperty)) {
+          newObject[key] = objProperty.map((objItem: any) => {
+            return this.ensureDefined({
+              object: objItem,
               concept: propertyConcept,
               riskList
             });
-          }
+          });
         } else {
-          newObject[key] = objProperty;
+          newObject[key] = this.ensureDefined({
+            object: objProperty,
+            concept: propertyConcept,
+            riskList
+          });
         }
+      } else {
+        newObject[key] = objProperty;
+      }
     }
   }
 
@@ -624,7 +630,7 @@ export class BaseNode extends EventEmitter {
           if (propertyConcept) {
             if (Array.isArray(objProperty)) {
               newObject[key] = objProperty.map((objItem: any) => {
-                return  this.ensureDefined({
+                return this.ensureDefined({
                   object: objItem,
                   concept: propertyConcept,
                   riskList,
@@ -649,7 +655,7 @@ export class BaseNode extends EventEmitter {
 
   // 更新实例上的属性
   updateInstance(object: any) {
-     for (const key in object) {
+    for (const key in object) {
       if (key === 'concept') {
         continue;
       }
@@ -738,9 +744,9 @@ export class BaseNode extends EventEmitter {
           // 如果存在同名节点，使用下标来表示NodePath
           const siblingNode: BaseNode = name
             ? (parentProperty as BaseNode[]).find((child) => {
-                // 因为proxy的关系，导致两边的引用不相同，所以这里需要判断id
-                return child?.name === name && child !== node && child?.id !== node?.id;
-              })
+              // 因为proxy的关系，导致两边的引用不相同，所以这里需要判断id
+              return child?.name === name && child !== node && child?.id !== node?.id;
+            })
             : null;
           if (siblingNode || !name || (useIndex && isNodeSelf) || useIndexKeys.includes(node.concept)) {
             const index = parentProperty.findIndex((item) => {
@@ -790,7 +796,10 @@ export class BaseNode extends EventEmitter {
   getAncestor<Node extends SyntaxNode>(concept: Node['concept']): Node;
   getAncestor<Node extends SyntaxNode = SyntaxNode>(concept: SyntaxNode['concept']): Node {
     let { upperNode } = this;
-    while (upperNode && upperNode.concept && upperNode.concept !== concept) {
+    while (upperNode && upperNode.concept && (
+      (upperNode.concept !== concept)
+      && (!(upperNode.constructor as any).inheritanceChain?.includes(concept))
+    )) {
       upperNode = upperNode.upperNode;
     }
     return upperNode as Node;
@@ -1169,6 +1178,32 @@ export class BaseNode extends EventEmitter {
     }
   }
 
+  // 查找当前节点所有引用并进行同步更新
+  async updateRelyFileNode(app: any) {
+    let relyfileNode = []
+    try {
+    // 获取old接口的依赖放到一起更新,可以让使用方重新生成内容
+      relyfileNode = await app.naslServer.findCallLogicFileRef(this.parentNode);
+    } catch (err) {
+      console.log('更新对应引用方失败', err);
+    }
+    // 如果依赖项有值，只要是为了触发更新，为了重新取到引用生成代码
+    if (relyfileNode.length) {
+      relyfileNode.forEach((fileNode: any) => {
+        app.naslServer?.embeddedTSEmitter.emit('change', {
+          value: [
+            {
+              originEvent: {
+                action: 'update',
+                target: fileNode,
+              }
+            }
+          ]
+        })
+      });
+    }
+  }
+
   /**
    * 获取添加时的默认选项
    * @returns
@@ -1177,8 +1212,13 @@ export class BaseNode extends EventEmitter {
     return {};
   }
 
-  public traverseChildren(cb: (ele: SyntaxNode) => void): void {
-    function traverse(node: SyntaxNode) {
+  /**
+   * 迭代所有属性
+   *
+   * @description 是所有属性！！不是所有子节点！！
+   */
+  traverseChildren(cb: (el: any) => void): void {
+    function traverse(node: any) {
       cb(node);
 
       const propertyMap = getConceptPropertyMap(node?.concept);
@@ -1195,6 +1235,23 @@ export class BaseNode extends EventEmitter {
     traverse(this as unknown as SyntaxNode);
   }
 
+  /**
+   * 迭代所有子节点
+   *
+   * @description 严格迭代所有子节点！排除属性！
+   */
+  traverseStrictChildren(cb: (el: SyntaxNode) => void): void {
+    const isNode = (node: unknown): node is SyntaxNode => {
+      return Boolean(node) && typeof node === 'object' && ('concept' in node) && typeof (node as any).concept === 'string';
+    };
+
+    this.traverseChildren((el) => {
+      if (isNode(el)) {
+        cb(el);
+      }
+    });
+  }
+
   /**
    *  获取当前节点在nasl标注节点上的节点
    */
@@ -1290,11 +1347,11 @@ export class BaseNode extends EventEmitter {
   changeConceptNode(concept: SyntaxNodeConcept) {
     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];
       },
     })
   }
@@ -1304,13 +1361,13 @@ export class BaseNode extends EventEmitter {
   /** 收集特定类型的子节点 */
   collectNodes(concept: SyntaxNodeConcept): SyntaxNode[];
   /** 收集断言返回`true`的子节点 */
-  collectNodes(pre: (node: SyntaxNode) => boolean): SyntaxNode[];
-  collectNodes(input?: SyntaxNodeConcept | ((node: SyntaxNode) => boolean)) {
+  collectNodes(pre: (node?: SyntaxNode) => boolean): SyntaxNode[];
+  collectNodes(input?: SyntaxNodeConcept | ((node?: SyntaxNode) => boolean)) {
     const pre =
       typeof input === 'undefined'
-        ? (node: SyntaxNode) => typeof node.concept === 'string'
+        ? (node: SyntaxNode) => typeof node?.concept === 'string'
         : typeof input === 'string'
-          ? (node: SyntaxNode) => node.concept === input
+          ? (node: SyntaxNode) => node?.concept === input
           : input;
     const nodes: SyntaxNode[] = [];
     const self = this as unknown as SyntaxNode;

package/src/concepts/Abort__.ts

@@ -21,6 +21,9 @@ export class Abort extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'Abort';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -51,7 +54,7 @@ export class Abort extends LogicItem {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
-  toUI(): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     return '中止';
   }
 

package/src/concepts/AbstractInterface__.ts

@@ -0,0 +1,64 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, className } from '../decorators';
+
+import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
+import BaseNode from '../common/BaseNode';
+
+/**
+ * 接口
+ */
+@className
+@concept('接口')
+// @ts-ignore
+export abstract class AbstractInterface extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'AbstractInterface';
+
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<AbstractInterface>) {
+    source = Object.assign({}, AbstractInterface.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): AbstractInterface {
+    return super.from(source, parentNode, parentKey) as AbstractInterface;
+  }
+
+  /**
+   * 从父级删除该节点
+   * @internal
+   */
+  _delete() {
+    let params: Params = null;
+    if (this.parentNode) {
+      params = (this.parentNode as any)?.__removeAbstractInterface?.(this);
+    }
+    return params;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default AbstractInterface;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/Anchor__.ts

@@ -23,6 +23,9 @@ export class Anchor extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'Anchor';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -108,7 +111,8 @@ export class Anchor extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -128,7 +132,7 @@ export class Anchor extends LogicItem {
     return this.expression ? this.expression.toVue(options) : '';
   }
 
-  toUI(state?: TranslatorState): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = '';
     if (this.expression) {
       code += this.expression.toUI(shiftState(state, code));

package/src/concepts/AnonymousFunction__.ts

@@ -34,6 +34,9 @@ export class AnonymousFunction extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'AnonymousFunction';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -319,7 +322,8 @@ export class AnonymousFunction extends LogicItem {
       // @ts-ignore
       const n = param.__v_raw || param;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -371,7 +375,8 @@ export class AnonymousFunction extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -423,7 +428,8 @@ export class AnonymousFunction extends LogicItem {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @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 if ((t as any)[parentKey] === n) {
@@ -606,7 +612,7 @@ export class AnonymousFunction extends LogicItem {
     return code;
   }
 
-  toUI(state?: TranslatorState): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = '(';
     this.params.forEach((param, index) => {
       code += param.name;
@@ -616,7 +622,7 @@ export class AnonymousFunction extends LogicItem {
     code += ` => (`;
 
     if (this.body) {
-      code += this.body.toUI && this.body.toUI();
+      code += this.body.toUI && this.body.toUI(state, hideDetails);
     }
     code += ')';
     return code;