@lcap/nasl 2.18.0-beta.3 → 2.18.0-beta.5

package/src/concepts/Destination__.ts

@@ -66,7 +66,7 @@ export class Destination extends LogicItem {
     @property()
     target: string = '_self';
 
-
+    
 
     /**
      * @param source 需要合并的部分参数
@@ -81,7 +81,7 @@ export class Destination extends LogicItem {
         return super.from(source, parentNode, parentKey) as Destination;
     }
 
-
+    
     /**
      * 设置viewNamespace
      */
@@ -133,9 +133,9 @@ export class Destination extends LogicItem {
         });
     }
 
+    
 
-
-
+    
 
     /**
     * 插入实际参数
@@ -169,7 +169,7 @@ export class Destination extends LogicItem {
         return argument;
     }
 
-
+    
 
     /**
      * 插入实际参数
@@ -193,7 +193,7 @@ export class Destination extends LogicItem {
         return node;
     }
 
-
+    
 
     /**
      * 添加实际参数
@@ -214,7 +214,7 @@ export class Destination extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-
+    
 
     /**
      * 添加实际参数
@@ -240,7 +240,7 @@ export class Destination extends LogicItem {
     }
 
 
-
+    
 
     /**
      * 删除实际参数
@@ -253,7 +253,7 @@ export class Destination extends LogicItem {
         return argument.delete();
     }
 
-
+    
 
     /**
     * 删除锚点参数

package/src/concepts/ExternalDestination__.ts

@@ -47,7 +47,7 @@ export class ExternalDestination extends LogicItem {
     @property('Anchor')
     anchor: Anchor = undefined;
 
-
+    
 
     /**
      * @param source 需要合并的部分参数
@@ -62,7 +62,7 @@ export class ExternalDestination extends LogicItem {
         return super.from(source, parentNode, parentKey) as ExternalDestination;
     }
 
-
+    
     /**
      * 设置外部链接
      */
@@ -105,9 +105,9 @@ export class ExternalDestination extends LogicItem {
         });
     }
 
+    
 
-
-
+    
 
     /**
     * 删除逻辑项
@@ -134,7 +134,7 @@ export class ExternalDestination extends LogicItem {
         return link.delete();
     }
 
-
+    
 
     /**
     * 删除锚点参数

package/src/concepts/LogicItem__.ts

@@ -158,6 +158,10 @@ export class LogicItem extends BaseNode {
         });
     }
 
+    
+
+    
+
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/Logic__.ts

@@ -238,7 +238,7 @@ export class Logic extends BaseNode {
         });
     }
 
-    getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
+        getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -379,6 +379,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -516,6 +517,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
     getReturnUniqueName(name = 'result') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -653,6 +655,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -790,6 +793,11 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+
+
+
+
     /**
     * 插入逻辑项
     * @internal
@@ -822,6 +830,8 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
+
+
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -844,6 +854,8 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+
     /**
      * 添加逻辑项
      * @internal
@@ -863,6 +875,8 @@ export class Logic extends BaseNode {
         return this._insertItemInBodyAt(options as any, index);
     }
 
+
+
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -886,6 +900,8 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+
     /**
     * 插入逻辑项
     * @internal
@@ -918,6 +934,8 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
+
+
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -940,6 +958,8 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+
     /**
      * 添加逻辑项
      * @internal
@@ -959,6 +979,8 @@ export class Logic extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
+
+
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -982,6 +1004,9 @@ export class Logic extends BaseNode {
         return node;
     }
 
+
+
+
     /**
     * 删除事务
     * @param name 事务名称
@@ -1030,6 +1055,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除类型参数
     * @param name 类型参数名称
@@ -1078,6 +1105,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1126,6 +1155,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输出参数
     * @param name 输出参数名称
@@ -1174,6 +1205,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除变量
     * @param name 变量名称
@@ -1222,6 +1255,8 @@ export class Logic extends BaseNode {
         return params;
     }
 
+
+
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1229,10 +1264,12 @@ export class Logic extends BaseNode {
     removeItemInBody(logicItem: LogicItem): void;
 
     removeItemInBody(options: LogicItem) {
-        const logicItem: LogicItem = options;
+        let logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
+
+
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -1240,7 +1277,7 @@ export class Logic extends BaseNode {
     removeItemInPlayground(logicItem: LogicItem): void;
 
     removeItemInPlayground(options: LogicItem) {
-        const logicItem: LogicItem = options;
+        let logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
@@ -1747,14 +1784,14 @@ export class Logic extends BaseNode {
         // 调用接口，参数替换成 null
         if (rightNode instanceof CallInterface) {
             const { _interface } = rightNode.getModuleInterface();
-            return `${rightNode.tsCalleeKey}(${_interface.params.map(() => 'null').join(',')})`;
+            return _interface ? `${rightNode.tsCalleeKey}(${_interface.params.map(() => 'null').join(',')})` : null;
         }
 
         // 调用全局逻辑，参数替换成 null
         if (rightNode instanceof CallLogic && rightNode.calleeNamespace === 'app.logics') {
             const calleeName = rightNode?.calleeName;
             const calleeLogic = this.app.logics.find((l) => l.name === calleeName);
-            return `app.logics.${calleeName}(${calleeLogic.params.map(() => 'null').join(',')})`;
+            return calleeLogic ? `app.logics.${calleeName}(${calleeLogic.params.map(() => 'null').join(',')})` : null;
         }
 
         // ForEachStatement 内部变量需要替换处理，如 item、index

package/src/concepts/Match__.ts

@@ -49,6 +49,8 @@ export class Match extends LogicItem {
     @property('MatchCase')
     cases: Array<MatchCase> = [];
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -62,6 +64,13 @@ export class Match extends LogicItem {
         return super.from(source, parentNode, parentKey) as Match;
     }
 
+    
+    
+
+    
+
+    
+
     /**
     * 插入匹配分支
     * @internal
@@ -94,6 +103,8 @@ export class Match extends LogicItem {
         return matchCase;
     }
 
+    
+
     /**
      * 插入匹配分支
      * @param matchCaseOptions 匹配分支参数
@@ -116,6 +127,8 @@ export class Match extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加匹配分支
      * @internal
@@ -135,6 +148,8 @@ export class Match extends LogicItem {
         return this._insertMatchCaseAt(options as any, index);
     }
 
+    
+
     /**
      * 添加匹配分支
      * @param matchCaseOptions 匹配分支参数
@@ -158,6 +173,9 @@ export class Match extends LogicItem {
         return node;
     }
 
+
+    
+
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -183,6 +201,8 @@ export class Match extends LogicItem {
         return expression.delete();
     }
 
+    
+
     /**
      * 删除匹配分支
      * @param matchCase 已有的匹配分支实例
@@ -190,7 +210,7 @@ export class Match extends LogicItem {
     removeMatchCaseInCases(matchCase: MatchCase): void;
 
     removeMatchCaseInCases(options: MatchCase) {
-        const matchCase: MatchCase = options;
+        let matchCase: MatchCase = options;
         return matchCase.delete();
     }
 

package/src/concepts/MemberExpression__.ts

@@ -44,6 +44,8 @@ export class MemberExpression extends LogicItem {
     @property('LogicItem')
     property: LogicItem = undefined;
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -57,6 +59,13 @@ export class MemberExpression extends LogicItem {
         return super.from(source, parentNode, parentKey) as MemberExpression;
     }
 
+    
+    
+
+    
+
+    
+
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -82,6 +91,8 @@ export class MemberExpression extends LogicItem {
         return object.delete();
     }
 
+    
+
     /**
     * 删除逻辑项
     * @param name 逻辑项名称

package/src/concepts/OqlQueryComponent__.ts

@@ -54,6 +54,8 @@ export class OqlQueryComponent extends LogicItem {
     @property()
     dataSource: string = undefined;
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -67,6 +69,7 @@ export class OqlQueryComponent extends LogicItem {
         return super.from(source, parentNode, parentKey) as OqlQueryComponent;
     }
 
+    
     /**
      * 设置SQL 查询
      */
@@ -79,6 +82,10 @@ export class OqlQueryComponent extends LogicItem {
         });
     }
 
+    
+
+    
+
     /**
     * 删除类型标注
     * @param name 类型标注名称

package/src/concepts/Param__.ts

@@ -292,7 +292,8 @@ export class Param extends BaseNode {
                     parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
                 }
             }
-            code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$route.query.${this.name} : ${JSON.stringify(this.defaultValue)})`;
+            code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${JSON.stringify(this.defaultValue)})`;
+
             if (needGenInitFromSchema) {
                 code += `)`;
             }
@@ -303,7 +304,7 @@ export class Param extends BaseNode {
     }
 
     isEnum() {
-        return this.typeAnnotation?.typeNamespace.endsWith('.enums');
+        return this.typeAnnotation?.typeNamespace?.endsWith('.enums');
     }
 
     @withSourceMap()

package/src/concepts/Return__.ts

@@ -167,6 +167,10 @@ export class Return extends BaseNode {
         });
     }
 
+    
+
+    
+
     /**
     * 删除类型标注
     * @param name 类型标注名称
@@ -288,7 +292,7 @@ export class Return extends BaseNode {
         return code;
     }
     isEnum() {
-        return this.typeAnnotation?.typeNamespace.endsWith('.enums');
+        return this.typeAnnotation?.typeNamespace?.endsWith('.enums');
     }
     @withSourceMap()
     toEmbeddedTSInProcess(state?: TranslatorState): string {

package/src/concepts/StringInterpolation__.ts

@@ -58,12 +58,12 @@ export class StringInterpolation extends LogicItem {
         });
     }
 
-        getLogicItemExistingNames(excludedList: Array<LogicItem> = []) {
+        getItemExistingNames(excludedList: Array<LogicItem> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.expressions as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
-    getLogicItemUniqueName(name = 'logicItem1') {
-        return utils.unique(name, this.getLogicItemExistingNames(), undefined, false);
+    getItemUniqueName(name = 'logicItem1') {
+        return utils.unique(name, this.getItemExistingNames(), undefined, false);
     }
 
     /**
@@ -71,30 +71,30 @@ export class StringInterpolation extends LogicItem {
     * @internal
     * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
     */
-    _insertLogicItemAt(name: string, index: number): LogicItem;
+    _insertItemAt(name: string, index: number): LogicItem;
 
     /**
     * 插入逻辑项
     * @internal
     * @param logicItemOptions 逻辑项参数
     */
-    _insertLogicItemAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
+    _insertItemAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
 
     /**
     * 插入逻辑项
     * @internal
     * @param logicItem 已有的逻辑项实例
     */
-    _insertLogicItemAt(logicItem: LogicItem, index: number): LogicItem;
+    _insertItemAt(logicItem: LogicItem, index: number): LogicItem;
 
-    _insertLogicItemAt(options: string | Partial<LogicItem> | LogicItem, index: number) {
+    _insertItemAt(options: string | Partial<LogicItem> | LogicItem, index: number) {
         const logicItemOptions: any = {};
         const relationOptions = { parentNode: this, parentKey: 'expressions' };
         let logicItem: LogicItem;
         if (!options) {
             logicItem = LogicItem.from({
                 ...logicItemOptions,
-                name: this.getLogicItemUniqueName(),
+                name: this.getItemUniqueName(),
             }, this, 'expressions');
         } else if (typeof options === 'string') {
             logicItem = LogicItem.from({
@@ -119,22 +119,22 @@ export class StringInterpolation extends LogicItem {
      * 插入逻辑项
      * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
      */
-    insertLogicItemAt(name: string, index: number): LogicItem;
+    insertItemAt(name: string, index: number): LogicItem;
 
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
      */
-    insertLogicItemAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
+    insertItemAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
 
     /**
      * 插入逻辑项
      * @param logicItem 已有的逻辑项实例
      */
-    insertLogicItemAt(logicItem: LogicItem, index: number): LogicItem;
+    insertItemAt(logicItem: LogicItem, index: number): LogicItem;
 
-    insertLogicItemAt(options: string | Partial<LogicItem> | LogicItem, index: number) {
-        const node = this._insertLogicItemAt(options as any, index);
+    insertItemAt(options: string | Partial<LogicItem> | LogicItem, index: number) {
+        const node = this._insertItemAt(options as any, index);
         node.create({
             index,
             parentNode: this,
@@ -148,25 +148,25 @@ export class StringInterpolation extends LogicItem {
      * @internal
      * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
      */
-    _addLogicItem(name?: string): LogicItem;
+    _addItem(name?: string): LogicItem;
 
     /**
      * 添加逻辑项
      * @internal
      * @param logicItemOptions 逻辑项参数
      */
-    _addLogicItem(logicItemOptions: Partial<LogicItem>): LogicItem;
+    _addItem(logicItemOptions: Partial<LogicItem>): LogicItem;
 
     /**
      * 添加逻辑项
      * @internal
      * @param logicItem 已有的逻辑项实例
      */
-    _addLogicItem(logicItem: LogicItem): LogicItem;
+    _addItem(logicItem: LogicItem): LogicItem;
 
-    _addLogicItem(options?: string | Partial<LogicItem> | LogicItem) {
+    _addItem(options?: string | Partial<LogicItem> | LogicItem) {
         const index = this.expressions.length;
-        return this._insertLogicItemAt(options as any, index);
+        return this._insertItemAt(options as any, index);
     }
 
     /**
@@ -174,22 +174,22 @@ export class StringInterpolation extends LogicItem {
      * @internal
      * @param name 逻辑项名称，如果不填会自动生成一个唯一名称
      */
-    addLogicItem(name?: string): LogicItem;
+    addItem(name?: string): LogicItem;
 
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
      */
-    addLogicItem(logicItemOptions: Partial<LogicItem>): LogicItem;
+    addItem(logicItemOptions: Partial<LogicItem>): LogicItem;
 
     /**
      * 添加逻辑项
      * @param logicItem 已有的逻辑项实例
      */
-    addLogicItem(logicItem: LogicItem): LogicItem;
+    addItem(logicItem: LogicItem): LogicItem;
 
-    addLogicItem(options?: string | Partial<LogicItem> | LogicItem) {
-        const node = this._addLogicItem(options as any);
+    addItem(options?: string | Partial<LogicItem> | LogicItem) {
+        const node = this._addItem(options as any);
         const index = this.expressions.indexOf(node);
         node.create({
             index,
@@ -206,15 +206,15 @@ export class StringInterpolation extends LogicItem {
     * 删除逻辑项
     * @param name 逻辑项名称
     */
-    removeLogicItem(name: string): void;
+    removeItem(name: string): void;
 
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
      */
-    removeLogicItem(logicItem: LogicItem): void;
+    removeItem(logicItem: LogicItem): void;
 
-    removeLogicItem(options: string | LogicItem) {
+    removeItem(options: string | LogicItem) {
         let logicItem: LogicItem;
         if (typeof options === 'string') {
             logicItem = (this.expressions as LogicItem[]).find((item) => item.name === options);

package/src/concepts/UnaryExpression__.ts

@@ -37,7 +37,7 @@ export class UnaryExpression extends LogicItem {
     @property()
     operator: '!' | 'isNull' = undefined;
 
-
+    
 
     /**
      * @param source 需要合并的部分参数
@@ -52,7 +52,7 @@ export class UnaryExpression extends LogicItem {
         return super.from(source, parentNode, parentKey) as UnaryExpression;
     }
 
-
+    
     /**
      * 设置参数
      */
@@ -68,9 +68,9 @@ export class UnaryExpression extends LogicItem {
         });
     }
 
+    
 
-
-
+    
 
     /**
     * 删除逻辑项

package/src/concepts/ValidationRule__.ts

@@ -3,6 +3,7 @@ import Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
 import { getValidationInFunction } from '../server/getFunctions';
 import defaultErrorMessage = require('../service/defaultErrorMessage.json');
+import BindAttribute from './BindAttribute__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -17,7 +18,6 @@ import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import Argument from './Argument__';
 import LogicItem from './LogicItem__';
-import BindAttribute from './BindAttribute__';
 
 /**
  * 验证规则