@lcap/nasl 2.20.0-beta.4 → 2.20.1-beta.1

package/src/concepts/ProcessElement__.ts

@@ -257,7 +257,7 @@ export class ProcessElement extends BaseNode {
         });
     }
 
-    getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
+        getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -398,6 +398,7 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
+
     getPointExistingNames(excludedList: Array<Point> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.waypoints as Point[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -539,6 +540,7 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
+
     getVariableExistingNames(excludedList: Array<Variable> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.variables as Variable[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -680,6 +682,7 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
+
     getReturnExistingNames(excludedList: Array<Return> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.returns as Return[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -821,6 +824,7 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
+
     getConstantExistingNames(excludedList: Array<Constant> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.constants as Constant[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -962,6 +966,7 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
+
     getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindAttrs as BindAttribute[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1103,6 +1108,9 @@ export class ProcessElement extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1151,6 +1159,8 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除矩形信息
     * @param name 矩形信息名称
@@ -1199,6 +1209,8 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除点信息
     * @param name 点信息名称
@@ -1247,6 +1259,8 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1295,6 +1309,8 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除变量
     * @param name 变量名称
@@ -1343,6 +1359,8 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -1391,6 +1409,8 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除常量
     * @param name 常量名称
@@ -1439,6 +1459,8 @@ export class ProcessElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除元素绑定属性
     * @param name 元素绑定属性名称

package/src/concepts/Process__.ts

@@ -157,7 +157,7 @@ export class Process extends BaseNode {
         });
     }
 
-    getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
+        getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -298,6 +298,7 @@ export class Process extends BaseNode {
         return node;
     }
 
+
     getParamExistingNames(excludedList: Array<Param> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.params as Param[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -439,6 +440,7 @@ export class Process extends BaseNode {
         return node;
     }
 
+
     getReturnExistingNames(excludedList: Array<Return> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.returns as Return[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -580,6 +582,7 @@ export class Process extends BaseNode {
         return node;
     }
 
+
     getConstantExistingNames(excludedList: Array<Constant> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.constants as Constant[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -721,6 +724,7 @@ export class Process extends BaseNode {
         return node;
     }
 
+
     getElementExistingNames(excludedList: Array<ProcessElement> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.elements as ProcessElement[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -862,6 +866,9 @@ export class Process extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -910,6 +917,8 @@ export class Process extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -958,6 +967,8 @@ export class Process extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -1006,6 +1017,8 @@ export class Process extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除常量
     * @param name 常量名称
@@ -1054,6 +1067,8 @@ export class Process extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除流程元素
     * @param name 流程元素名称

package/src/concepts/Return__.ts

@@ -345,6 +345,8 @@ export class Return extends BaseNode {
                 this.completionChildren = [];
                 console.log(err);
             }
+        } else {
+            this.completionChildren = [];
         }
         const object: any = {
             typeAnnotation: typeAnnotation || null,

package/src/concepts/Slot__.ts

@@ -9,6 +9,7 @@ import * as utils from '../utils';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
+import Param from './Param__';
 import ViewComponent from './ViewComponent__';
 import Module from './Module__';
 import App from './App__';
@@ -54,6 +55,12 @@ export class Slot extends BaseNode {
     @property()
     advanced: boolean = undefined;
 
+    /**
+     * 是否为高级功能，不在低代码中显示
+     */
+    @property('Param')
+    slotProps: Param = undefined;
+
     /**
      * 祖先 ViewComponent
      */
@@ -103,6 +110,54 @@ export class Slot extends BaseNode {
 
     
 
+    /**
+    * 删除输入参数
+    * @param name 输入参数名称
+    */
+    removeSlotProps(name: string): void;
+
+    /**
+     * 删除输入参数
+     * @param slotProps 已有的输入参数实例
+     */
+    removeSlotProps(slotProps: Param): void;
+
+    removeSlotProps(options: string | Param) {
+        let slotProps: Param;
+        if (typeof options === 'string') {
+            slotProps = this.slotProps;
+            if (!slotProps) {
+                throw new Error('找不到输入参数 ' + options);
+            }
+        } else {
+            slotProps = options;
+        }
+        return slotProps.delete();
+    }
+
+    __removeParam(param: Param) {
+        const parentKey = param.parentKey;
+        const params: Params = {
+            parentNode: this,
+            parentKey,
+            index: -1,
+            object: null,
+            oldObject: param,
+        };
+        if (parentKey) {
+            params.parentKey = parentKey;
+            if (Array.isArray((this as any)[parentKey])) {
+                const index = (this as any)[parentKey].indexOf(param);
+                ~index && (this as any)[parentKey].splice(index, 1);
+                params.index = index;
+            } else if ((this as any)[parentKey] === param) {
+                params.index = 0;
+                (this as any)[parentKey] = undefined;
+            }
+        }
+        return params;
+    }
+
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/StringInterpolation__.ts

@@ -280,7 +280,7 @@ export class StringInterpolation extends LogicItem {
 
     toJS(): string {
         if (!this.expressions.length)
-            return '';
+            return `''`;
         return this.expressions.map((exp: any) => {
             const expTypeAnnotation = exp.typeAnnotation || exp.__TypeAnnotation;
             return `this.$utils['ToString'](${exp.toJS()}, '${expTypeAnnotation?.sortedTypeKey}')`;

package/src/concepts/TypeAnnotation__.ts

@@ -608,7 +608,7 @@ export class TypeAnnotation extends BaseNode {
     get sortedTypeKey(): string {
         if (this.typeKind === 'anonymousStructure') {
             // 按匿名数据结构的key排序
-            return `{${this.properties.sort(({ name: name1 }, { name: name2 }) => name1 > name2 ? 1 : -1).map(({ name, typeAnnotation }) =>
+            return `{${[...this.properties].sort(({ name: name1 }, { name: name2 }) => name1 > name2 ? 1 : -1).map(({ name, typeAnnotation }) =>
                 (`${name}: ${typeAnnotation ? typeAnnotation.sortedTypeKey : '未知'}`)).join(', ')}}`;
         } else if (this.typeKind === 'union') {
             // 按返回的每个具体项排序

package/src/concepts/ValidationRule__.ts

@@ -60,7 +60,7 @@ export class ValidationRule extends LogicItem {
     @property('LogicItem')
     errorMessage: LogicItem = undefined;
 
-
+    
 
     /**
      * @param source 需要合并的部分参数
@@ -75,7 +75,7 @@ export class ValidationRule extends LogicItem {
         return super.from(source, parentNode, parentKey) as ValidationRule;
     }
 
-
+    
     /**
      * 设置错误信息
      */
@@ -91,9 +91,9 @@ export class ValidationRule extends LogicItem {
         });
     }
 
+    
 
-
-
+    
 
     /**
     * 插入实际参数
@@ -127,7 +127,7 @@ export class ValidationRule extends LogicItem {
         return argument;
     }
 
-
+    
 
     /**
      * 插入实际参数
@@ -151,7 +151,7 @@ export class ValidationRule extends LogicItem {
         return node;
     }
 
-
+    
 
     /**
      * 添加实际参数
@@ -172,7 +172,7 @@ export class ValidationRule extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-
+    
 
     /**
      * 添加实际参数
@@ -198,7 +198,7 @@ export class ValidationRule extends LogicItem {
     }
 
 
-
+    
 
     /**
      * 删除实际参数
@@ -211,7 +211,7 @@ export class ValidationRule extends LogicItem {
         return argument.delete();
     }
 
-
+    
 
     /**
     * 删除逻辑项

package/src/concepts/Variable__.ts

@@ -388,6 +388,8 @@ export class Variable extends BaseNode {
                 this.completionChildren = [];
                 console.log(err);
             }
+        } else {
+            this.completionChildren = [];
         }
         const object: any = {
             typeAnnotation: typeAnnotation || null,

package/src/concepts/ViewBlock__.ts

@@ -0,0 +1,91 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property } from '../decorators';
+
+import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
+import BaseNode from '../common/BaseNode';
+import classMap from '../common/classMap';
+
+
+/**
+ * 代码块
+ */
+@concept('代码块')
+export class ViewBlock extends BaseNode {
+    /**
+     * 产品概念
+     */
+    @property()
+    concept: 'ViewBlock' = 'ViewBlock';
+
+    /**
+     * 描述
+     */
+    @property()
+    description: string = undefined;
+
+    /**
+     * 标题
+     */
+    @property()
+    title: string = undefined;
+
+    /**
+     * 代码
+     */
+    @property()
+    code: string = undefined;
+
+    
+
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<ViewBlock>) {
+        source = Object.assign({}, ViewBlock.getDefaultOptions(), source);
+        super(source);
+        super.subConstructor(source);
+    }
+
+    static from(source: any, parentNode?: any, parentKey?: string): ViewBlock {
+        return super.from(source, parentNode, parentKey) as ViewBlock;
+    }
+
+    /**
+     * 从父级删除该节点
+     * @internal
+     */
+    _delete() {
+        let params: Params = null;
+        if (this.parentNode) {
+            params = (this.parentNode as any)?.__removeViewBlock?.(this);
+        }
+        return params;
+    }
+    
+
+    
+
+    
+
+    //================================================================================
+    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+    // 自动生成的代码已结束。下面可以手动编写。
+    //================================================================================
+
+    //================================================================================
+    // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+    // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+    //================================================================================
+}
+
+classMap.ViewBlock = ViewBlock;
+export default ViewBlock;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/ViewComponent__.ts

@@ -13,6 +13,7 @@ import Attribute from './Attribute__';
 import Event from './Event__';
 import Slot from './Slot__';
 import Logic from './Logic__';
+import ViewBlock from './ViewBlock__';
 import Module from './Module__';
 import App from './App__';
 
@@ -81,6 +82,12 @@ export class ViewComponent extends BaseNode {
     @property('ViewComponent')
     children: Array<ViewComponent> = [];
 
+    /**
+     * 代码块列表
+     */
+    @property('ViewBlock')
+    blocks: Array<ViewBlock> = [];
+
     /**
      * 祖先 Module
      */
@@ -830,6 +837,148 @@ export class ViewComponent extends BaseNode {
     }
 
 
+    getViewBlockExistingNames(excludedList: Array<ViewBlock> = []) {
+        const excludedSet = new Set(excludedList);
+        return ((this.blocks as ViewBlock[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    }
+    getViewBlockUniqueName(name = 'viewBlock1') {
+        return utils.unique(name, this.getViewBlockExistingNames(), undefined, false);
+    }
+
+    /**
+    * 插入代码块
+    * @internal
+    * @param name 代码块名称，如果不填会自动生成一个唯一名称
+    */
+    _insertViewBlockAt(name: string, index: number): ViewBlock;
+
+    /**
+    * 插入代码块
+    * @internal
+    * @param viewBlockOptions 代码块参数
+    */
+    _insertViewBlockAt(viewBlockOptions: Partial<ViewBlock>, index: number): ViewBlock;
+
+    /**
+    * 插入代码块
+    * @internal
+    * @param viewBlock 已有的代码块实例
+    */
+    _insertViewBlockAt(viewBlock: ViewBlock, index: number): ViewBlock;
+
+    _insertViewBlockAt(options: string | Partial<ViewBlock> | ViewBlock, index: number) {
+        const viewBlockOptions: any = {};
+        const relationOptions = { parentNode: this, parentKey: 'blocks' };
+        let viewBlock: ViewBlock;
+        if (!options) {
+            viewBlock = ViewBlock.from({
+                ...viewBlockOptions,
+                name: this.getViewBlockUniqueName(),
+            }, this, 'blocks');
+        } else if (typeof options === 'string') {
+            viewBlock = ViewBlock.from({
+                ...viewBlockOptions,
+                name: options,
+            }, this, 'blocks');
+        } else if (options instanceof ViewBlock) {
+            options.ensureDelete(); // 同一实例不支持多处存在
+            viewBlock = options;
+            Object.assign(viewBlock, relationOptions);
+        } else {
+            viewBlock = ViewBlock.from({
+                ...viewBlockOptions,
+                ...options,
+            }, this, 'blocks');
+        }
+        this.blocks.splice(index, 0, viewBlock);
+        return viewBlock;
+    }
+
+    /**
+     * 插入代码块
+     * @param name 代码块名称，如果不填会自动生成一个唯一名称
+     */
+    insertViewBlockAt(name: string, index: number): ViewBlock;
+
+    /**
+     * 插入代码块
+     * @param viewBlockOptions 代码块参数
+     */
+    insertViewBlockAt(viewBlockOptions: Partial<ViewBlock>, index: number): ViewBlock;
+
+    /**
+     * 插入代码块
+     * @param viewBlock 已有的代码块实例
+     */
+    insertViewBlockAt(viewBlock: ViewBlock, index: number): ViewBlock;
+
+    insertViewBlockAt(options: string | Partial<ViewBlock> | ViewBlock, index: number) {
+        const node = this._insertViewBlockAt(options as any, index);
+        node.create({
+            index,
+            parentNode: this,
+            parentKey: 'blocks',
+        });
+        return node;
+    }
+
+    /**
+     * 添加代码块
+     * @internal
+     * @param name 代码块名称，如果不填会自动生成一个唯一名称
+     */
+    _addViewBlock(name?: string): ViewBlock;
+
+    /**
+     * 添加代码块
+     * @internal
+     * @param viewBlockOptions 代码块参数
+     */
+    _addViewBlock(viewBlockOptions: Partial<ViewBlock>): ViewBlock;
+
+    /**
+     * 添加代码块
+     * @internal
+     * @param viewBlock 已有的代码块实例
+     */
+    _addViewBlock(viewBlock: ViewBlock): ViewBlock;
+
+    _addViewBlock(options?: string | Partial<ViewBlock> | ViewBlock) {
+        const index = this.blocks.length;
+        return this._insertViewBlockAt(options as any, index);
+    }
+
+    /**
+     * 添加代码块
+     * @internal
+     * @param name 代码块名称，如果不填会自动生成一个唯一名称
+     */
+    addViewBlock(name?: string): ViewBlock;
+
+    /**
+     * 添加代码块
+     * @param viewBlockOptions 代码块参数
+     */
+    addViewBlock(viewBlockOptions: Partial<ViewBlock>): ViewBlock;
+
+    /**
+     * 添加代码块
+     * @param viewBlock 已有的代码块实例
+     */
+    addViewBlock(viewBlock: ViewBlock): ViewBlock;
+
+    addViewBlock(options?: string | Partial<ViewBlock> | ViewBlock) {
+        const node = this._addViewBlock(options as any);
+        const index = this.blocks.indexOf(node);
+        node.create({
+            index,
+            parentNode: this,
+            parentKey: 'blocks',
+        });
+        return node;
+    }
+
+
     
 
     /**
@@ -1080,6 +1229,56 @@ export class ViewComponent extends BaseNode {
         return params;
     }
 
+
+
+    /**
+    * 删除代码块
+    * @param name 代码块名称
+    */
+    removeViewBlock(name: string): void;
+
+    /**
+     * 删除代码块
+     * @param viewBlock 已有的代码块实例
+     */
+    removeViewBlock(viewBlock: ViewBlock): void;
+
+    removeViewBlock(options: string | ViewBlock) {
+        let viewBlock: ViewBlock;
+        if (typeof options === 'string') {
+            viewBlock = (this.blocks as ViewBlock[]).find((item) => item.name === options);
+            if (!viewBlock) {
+                throw new Error('找不到代码块 ' + options);
+            }
+        } else {
+            viewBlock = options;
+        }
+        return viewBlock.delete();
+    }
+
+    __removeViewBlock(viewBlock: ViewBlock) {
+        const parentKey = viewBlock.parentKey;
+        const params: Params = {
+            parentNode: this,
+            parentKey,
+            index: -1,
+            object: null,
+            oldObject: viewBlock,
+        };
+        if (parentKey) {
+            params.parentKey = parentKey;
+            if (Array.isArray((this as any)[parentKey])) {
+                const index = (this as any)[parentKey].indexOf(viewBlock);
+                ~index && (this as any)[parentKey].splice(index, 1);
+                params.index = index;
+            } else if ((this as any)[parentKey] === viewBlock) {
+                params.index = 0;
+                (this as any)[parentKey] = undefined;
+            }
+        }
+        return params;
+    }
+
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。