@lcap/nasl 2.12.0-beta → 2.12.0-beta.1

package/src/concepts/QueryFromExpression__.ts

@@ -259,7 +259,7 @@ export class QueryFromExpression extends LogicItem {
     //================================================================================
 }
 
-classMap.QueryFromExpression = QueryFromExpression;
+classMap['QueryFromExpression'] = QueryFromExpression;
 export default QueryFromExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/QueryGroupByExpression__.ts

@@ -154,7 +154,7 @@ export class QueryGroupByExpression extends LogicItem {
     //================================================================================
 }
 
-classMap.QueryGroupByExpression = QueryGroupByExpression;
+classMap['QueryGroupByExpression'] = QueryGroupByExpression;
 export default QueryGroupByExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/QueryJoinExpression__.ts

@@ -446,7 +446,7 @@ export class QueryJoinExpression extends LogicItem {
     //================================================================================
 }
 
-classMap.QueryJoinExpression = QueryJoinExpression;
+classMap['QueryJoinExpression'] = QueryJoinExpression;
 export default QueryJoinExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/QueryLimitExpression__.ts

@@ -180,7 +180,7 @@ export class QueryLimitExpression extends LogicItem {
     //================================================================================
 }
 
-classMap.QueryLimitExpression = QueryLimitExpression;
+classMap['QueryLimitExpression'] = QueryLimitExpression;
 export default QueryLimitExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/QueryOrderByExpression__.ts

@@ -194,7 +194,7 @@ export class QueryOrderByExpression extends LogicItem {
     //================================================================================
 }
 
-classMap.QueryOrderByExpression = QueryOrderByExpression;
+classMap['QueryOrderByExpression'] = QueryOrderByExpression;
 export default QueryOrderByExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/QuerySelectExpression__.ts

@@ -272,7 +272,7 @@ export class QuerySelectExpression extends LogicItem {
     //================================================================================
 }
 
-classMap.QuerySelectExpression = QuerySelectExpression;
+classMap['QuerySelectExpression'] = QuerySelectExpression;
 export default QuerySelectExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Rect__.ts

@@ -89,7 +89,7 @@ export class Rect extends BaseNode {
     //================================================================================
 }
 
-classMap.Rect = Rect;
+classMap['Rect'] = Rect;
 export default Rect;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Return__.ts

@@ -332,7 +332,7 @@ export class Return extends BaseNode {
             const { typeName, typeKind, typeNamespace } = newTypeAnnotation || this.typeAnnotation;
             let completionChildren;
             if (typeKind === 'reference') {
-                if (typeNamespace === 'nasl.ui') {
+                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process') {
                     const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
                     const properties = node.properties || [];
                     completionChildren = properties;
@@ -368,7 +368,7 @@ export class Return extends BaseNode {
     //================================================================================
 }
 
-classMap.Return = Return;
+classMap['Return'] = Return;
 export default Return;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Role__.ts

@@ -161,7 +161,7 @@ export class Role extends BaseNode {
     //================================================================================
 }
 
-classMap.Role = Role;
+classMap['Role'] = Role;
 export default Role;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Slot__.ts

@@ -114,7 +114,7 @@ export class Slot extends BaseNode {
     //================================================================================
 }
 
-classMap.Slot = Slot;
+classMap['Slot'] = Slot;
 export default Slot;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/SqlQueryComponent__.ts

@@ -129,6 +129,18 @@ export class SqlQueryComponent extends LogicItem {
     @property()
     dataSource: string = undefined;
 
+    /**
+     * 设置SQL 查询
+     */
+    setDataSource(dataSource: string) {
+        const object = {
+            dataSource,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code;
@@ -139,6 +151,11 @@ export class SqlQueryComponent extends LogicItem {
             code = `(function(): nasl.collection.List<`;
             code += `${this.typeAnnotation ? this.typeAnnotation.toEmbeddedTS(shiftState(state, code)) : '__IDENTIFIER__'}> {\n`;
         }
+        // app.dataSources.defaultDS;
+        if (this.dataSource) {
+            code += indent((state?.tabSize || 0) + 1);
+            code += `const dataSource = app.dataSources.${this.dataSource};`;
+        }
         code += '\n';
         code += indent((state?.tabSize || 0) + 1) + 'return;\n';
         code += indent((state?.tabSize || 0)) + '})();\n';

package/src/concepts/Start__.ts

@@ -71,7 +71,7 @@ export class Start extends LogicItem {
     //================================================================================
 }
 
-classMap.Start = Start;
+classMap['Start'] = Start;
 export default Start;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/StringLiteral__.ts

@@ -102,7 +102,7 @@ export class StringLiteral extends LogicItem {
     }
 
     /**
-     * 设置数组内容
+     * 设置字符串内容
      */
     setValue(value: string) {
         const object = {
@@ -125,7 +125,7 @@ export class StringLiteral extends LogicItem {
     //================================================================================
 }
 
-classMap.StringLiteral = StringLiteral;
+classMap['StringLiteral'] = StringLiteral;
 export default StringLiteral;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/StructureProperty__.ts

@@ -171,10 +171,6 @@ export class StructureProperty extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
     * 删除类型标注
     * @param name 类型标注名称
@@ -251,7 +247,7 @@ export class StructureProperty extends BaseNode {
             const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
             let completionChildren;
             if (typeKind === 'reference') {
-                if (typeNamespace === 'nasl.ui') {
+                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process') {
                     const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
                     const properties = node.properties || [];
                     completionChildren = properties;
@@ -284,9 +280,10 @@ export class StructureProperty extends BaseNode {
             code += ': ';
             code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code));
         }
-        if (this.defaultValue) {
-            code += ` = ${this.defaultValue}`;
-        } // else
+        // StructureProperty 暂不支持默认值
+        // if (this.defaultValue) {
+        //     code += ` = ${this.defaultValue}`;
+        // }
         return code;
     }
 

package/src/concepts/Structure__.ts

@@ -603,7 +603,7 @@ export class Structure extends BaseNode {
     //================================================================================
 }
 
-classMap.Structure = Structure;
+classMap['Structure'] = Structure;
 export default Structure;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/SwitchCase__.ts

@@ -241,37 +241,33 @@ export class SwitchCase extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-    toJS(state?: TranslatorState, isLast?: boolean): string {
+    toJS(state?: TranslatorState, index?: number, length?: number): string {
         let code = '';
-        if (!isLast) {
+        if (index === 0) {
             code = 'if (';
             code += this.test ? this.test.toJS(shiftState(state, code, {
                 tabSize: 0,
             })) : '';
-
             code += ') {\n';
-
-            if (Array.isArray(this.consequent)) {
-                this.consequent.forEach((logicItem) => {
-                    code
-                        += logicItem.toJS(shiftState(state, code, {
-                            tabSize: 0,
-                        })) + '\n';
-                });
-            }
-            code += '}\n';
+        } else if (index !== length - 1) {
+            code = 'else if (';
+            code += this.test ? this.test.toJS(shiftState(state, code, {
+                tabSize: 0,
+            })) : '';
+            code += ') {\n';
         } else {
             code += 'else {\n';
-            if (Array.isArray(this.consequent)) {
-                this.consequent.forEach((logicItem) => {
-                    code
-                        += logicItem.toJS(shiftState(state, code, {
-                            tabSize: 0,
-                        })) + '\n';
-                });
-            }
-            code += '}\n';
         }
+        if (Array.isArray(this.consequent)) {
+            this.consequent.forEach((logicItem) => {
+                code
+                    += logicItem.toJS(shiftState(state, code, {
+                        tabSize: 0,
+                    })) + '\n';
+            });
+        }
+        code += '}\n';
+
         return code;
     }
 
@@ -317,7 +313,7 @@ export class SwitchCase extends LogicItem {
     //================================================================================
 }
 
-classMap.SwitchCase = SwitchCase;
+classMap['SwitchCase'] = SwitchCase;
 export default SwitchCase;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/SwitchStatement__.ts

@@ -213,11 +213,7 @@ export class SwitchStatement extends LogicItem {
         let code = '';
         this.cases.forEach((item, index) => {
             // 如果是最后一项
-            if (index === this.cases.length - 1) {
-                code += item.toJS(state, true);
-            } else {
-                code += item.toJS(state);
-            }
+            code += item.toJS(state, index, this.cases.length);
         });
         return code;
     }
@@ -248,7 +244,7 @@ export class SwitchStatement extends LogicItem {
     //================================================================================
 }
 
-classMap.SwitchStatement = SwitchStatement;
+classMap['SwitchStatement'] = SwitchStatement;
 export default SwitchStatement;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Theme__.ts

@@ -87,7 +87,7 @@ export class Theme extends BaseNode {
     //================================================================================
 }
 
-classMap.Theme = Theme;
+classMap['Theme'] = Theme;
 export default Theme;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Transactional__.ts

@@ -157,7 +157,7 @@ export class Transactional extends BaseNode {
     //================================================================================
 }
 
-classMap.Transactional = Transactional;
+classMap['Transactional'] = Transactional;
 export default Transactional;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/TypeAnnotation__.ts

@@ -40,6 +40,7 @@ import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 
+
 /**
  * 类型标注
  */
@@ -81,6 +82,8 @@ export class TypeAnnotation extends BaseNode {
     @property()
     inferred?: boolean = undefined;
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -94,6 +97,13 @@ export class TypeAnnotation extends BaseNode {
         return super.from(source, parentNode, parentKey) as TypeAnnotation;
     }
 
+    
+    
+
+    
+
+    
+
     /**
     * 插入类型标注
     * @internal
@@ -126,6 +136,8 @@ export class TypeAnnotation extends BaseNode {
         return typeAnnotation;
     }
 
+    
+
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -148,6 +160,8 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加类型标注
      * @internal
@@ -167,6 +181,8 @@ export class TypeAnnotation extends BaseNode {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
+    
+
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -190,6 +206,9 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -197,7 +216,7 @@ export class TypeAnnotation extends BaseNode {
     removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotation(options: TypeAnnotation) {
-        const typeAnnotation: TypeAnnotation = options;
+        let typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -452,7 +471,7 @@ export class TypeAnnotation extends BaseNode {
     //================================================================================
 }
 
-classMap.TypeAnnotation = TypeAnnotation;
+classMap['TypeAnnotation'] = TypeAnnotation;
 export default TypeAnnotation;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/TypeParam__.ts

@@ -61,7 +61,7 @@ export class TypeParam extends BaseNode {
     //================================================================================
 }
 
-classMap.TypeParam = TypeParam;
+classMap['TypeParam'] = TypeParam;
 export default TypeParam;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/UnaryExpression__.ts

@@ -176,7 +176,7 @@ export class UnaryExpression extends LogicItem {
     //================================================================================
 }
 
-classMap.UnaryExpression = UnaryExpression;
+classMap['UnaryExpression'] = UnaryExpression;
 export default UnaryExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Unparsed__.ts

@@ -90,7 +90,7 @@ export class Unparsed extends LogicItem {
     //================================================================================
 }
 
-classMap.Unparsed = Unparsed;
+classMap['Unparsed'] = Unparsed;
 export default Unparsed;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/UseComponent__.ts

@@ -77,7 +77,7 @@ export class UseComponent extends BaseNode {
     //================================================================================
 }
 
-classMap.UseComponent = UseComponent;
+classMap['UseComponent'] = UseComponent;
 export default UseComponent;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/ValidationRule__.ts

@@ -324,7 +324,7 @@ export class ValidationRule extends LogicItem {
     //================================================================================
 }
 
-classMap.ValidationRule = ValidationRule;
+classMap['ValidationRule'] = ValidationRule;
 export default ValidationRule;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Variable__.ts

@@ -329,7 +329,7 @@ export class Variable extends BaseNode {
             const { typeName, typeKind, typeNamespace } = newTypeAnnotation || this.typeAnnotation;
             let completionChildren;
             if (typeKind === 'reference') {
-                if (typeNamespace === 'nasl.ui') {
+                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process') {
                     const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
                     const properties = node.properties || [];
                     completionChildren = properties;
@@ -365,7 +365,7 @@ export class Variable extends BaseNode {
     //================================================================================
 }
 
-classMap.Variable = Variable;
+classMap['Variable'] = Variable;
 export default Variable;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/ViewComponent__.ts

@@ -1091,7 +1091,7 @@ export class ViewComponent extends BaseNode {
     //================================================================================
 }
 
-classMap.ViewComponent = ViewComponent;
+classMap['ViewComponent'] = ViewComponent;
 export default ViewComponent;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/ViewElement__.ts

@@ -262,8 +262,6 @@ export class ViewElement extends BaseNode {
         super.subConstructor(source);
     }
 
-
-
     /**
      * 从父级删除该节点
      * @internal
@@ -300,7 +298,7 @@ export class ViewElement extends BaseNode {
         });
     }
 
-        getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
+    getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindAttrs || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -441,7 +439,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindEvents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -583,7 +580,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
     getBindDirectiveExistingNames(excludedList: Array<BindDirective> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindDirectives || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -725,11 +721,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
-
-
-
-
     /**
     * 插入页面元素
     * @internal
@@ -863,9 +854,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除元素绑定属性
     * @param name 元素绑定属性名称
@@ -914,8 +902,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -964,8 +950,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素指令
     * @param name 元素指令名称
@@ -1014,8 +998,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1120,7 +1102,7 @@ export class ViewElement extends BaseNode {
 
     haveScope(node: ViewElement): boolean {
         // uGallery 没有子集不需要scope
-        const dataSourcePcList = ['uTableView', 'uListView', 'uGridView', 'uCalendarView', 'uListComponents', 'uSelect', 'devopsDragTable', 'uTreeViewNew'];
+        const dataSourcePcList = ['uTableView', 'uListView', 'uGridView', 'uCalendarView', 'uListComponents', 'uSelect', 'devopsDragTable', 'uTreeViewNew', 'uTreeSelectNew'];
         const dataSourceH5List = ['vanRadioGroup', 'vanCheckboxGroup', 'vanListView', 'vanGridView', 'vanForComponents', 'lcapEchartsLine', 'lcapEchartsBar', 'lcapEchartsPie'];
         const dataSourceList = [...dataSourcePcList, ...dataSourceH5List];
         return dataSourceList.includes(node.toHump(node.tag));
@@ -1550,7 +1532,7 @@ export class ViewElement extends BaseNode {
                 tag: tagName,
                 name: view.getViewElementUniqueName(`${baseName}1`),
             });
-            const value = astNode.text.match(/{{(.*?)}}/)[1].trim();
+            const value = astNode.text?.match(/{{(.*?)}}/)[1].trim();
             const expression = <any> this._parseExpression(value);
             element.addBindAttribute(new BindAttribute({
                 type: 'dynamic',
@@ -1568,7 +1550,7 @@ export class ViewElement extends BaseNode {
             element.addBindAttribute(new BindAttribute({
                 name: 'text',
                 type: 'string',
-                value: astNode.text,
+                value: astNode.text?.trim(),
             }));
         }
         return element;
@@ -1615,6 +1597,11 @@ export class ViewElement extends BaseNode {
                     const apiOfAttr = api && api.attrs && api.attrs.find((_attr) => _attr.name === attr.name);
                     if (apiOfAttr && apiOfAttr['designer-value'] !== undefined) {
                         let designerValue = apiOfAttr['designer-value'];
+                        //对流程模板拖拽进行特判
+                        element.bindAttrs.forEach((property) => {
+                            if (property.name === 'repeat' && property.value === '1')
+                                designerValue = '[{}, {}]';
+                        });
                         if (typeof designerValue === 'string') {
                             designerValue = designerValue.replace(/"/g, "'");
                         }
@@ -1673,7 +1660,7 @@ export class ViewElement extends BaseNode {
                             if (hasAuto)
                                 addEmpty = false;
                         }
-                        if (['u-select', 'u-dropdown', 'u-panel','u-toc','u-toc-item', 'u-tree-view-new','u-tree-view-node-new', 'u-tree-select', 'u-anchor'].includes(el.tag)) {
+                        if (['u-select', 'u-dropdown', 'u-panel', 'u-toc', 'u-toc-item', 'u-tree-view-new', 'u-tree-view-node-new', 'u-tree-select', 'u-tree-select-new', 'u-anchor'].includes(el.tag)) {
                             addEmpty = false;
                         }
                         const background = (emptySlot && emptySlot['empty-background']) || (hasSupport ? 'add-sub' : '');