@lcap/nasl 2.12.0 → 2.13.0-beta.1

package/src/concepts/Return__.ts

@@ -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

@@ -43,11 +43,19 @@ export class SqlQueryComponent extends LogicItem {
     typeAnnotation: TypeAnnotation = undefined;
 
     /**
-     * 局部版本
+     * 数据源
+     */
+    @property()
+    dataSource: string = undefined;
+
+    /**
+     * 查询组件的局部版本
      */
     @property()
     ideVersion: string = undefined;
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -61,6 +69,7 @@ export class SqlQueryComponent extends LogicItem {
         return super.from(source, parentNode, parentKey) as SqlQueryComponent;
     }
 
+    
     /**
      * 设置SQL 查询
      */
@@ -73,6 +82,10 @@ export class SqlQueryComponent extends LogicItem {
         });
     }
 
+    
+
+    
+
     /**
     * 删除类型标注
     * @param name 类型标注名称
@@ -126,9 +139,6 @@ export class SqlQueryComponent extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-    @property()
-    dataSource: string = undefined;
-
     /**
      * 设置SQL 查询
      */

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

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

package/src/concepts/StructureProperty__.ts

@@ -171,6 +171,10 @@ export class StructureProperty extends BaseNode {
         });
     }
 
+    
+
+    
+
     /**
     * 删除类型标注
     * @param name 类型标注名称

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

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

package/src/concepts/SwitchStatement__.ts

@@ -244,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

@@ -5,6 +5,7 @@ export enum PRIMITIVE_TYPE {
     Integer = 'Integer',
     Long = 'Long',
     Double = 'Double',
+    Decimal = 'Decimal',
     String = 'String',
     Text = 'Text',
     Binary = 'Binary',
@@ -19,6 +20,7 @@ export const PRIMITIVE_TITLE: Record<string, string> = {
     Integer: '整数',
     Long: '长整数',
     Double: '小数',
+    Decimal: '精确小数',
     String: '字符串',
     Text: '长文本',
     Binary: '二进制流',
@@ -82,6 +84,12 @@ export class TypeAnnotation extends BaseNode {
     @property()
     inferred?: boolean = undefined;
 
+    /**
+     * 规则对象
+     */
+    @property()
+    ruleMap: Object = undefined;
+
     
 
     /**
@@ -97,8 +105,28 @@ export class TypeAnnotation extends BaseNode {
         return super.from(source, parentNode, parentKey) as TypeAnnotation;
     }
 
-    
-    
+    /**
+     * 从父级删除该节点
+     * @internal
+     */
+    _delete() {
+        let params: Params = null;
+        if (this.parentNode) {
+            params = (this.parentNode as any)?.__removeTypeAnnotation?.(this);
+        }
+        return params;
+    }
+    /**
+     * 设置规则对象
+     */
+    setRuleMap(ruleMap: Object) {
+        const object = {
+            ruleMap,
+        };
+        this.update({
+            ...object,
+        });
+    }
 
     
 
@@ -451,6 +479,7 @@ export class TypeAnnotation extends BaseNode {
             } else if (!isNaN(Number(code))) {
                 if (code.indexOf('.') !== -1) {
                     return this.createPrimitive('Double');
+                    // return this.createPrimitive('Decimal');
                 }
                 if (code.length > 8) {
                     return this.createPrimitive('Long');
@@ -471,7 +500,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

@@ -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

@@ -7,7 +7,7 @@ import * as compiler from 'vue-template-compiler';
 
 import LogicItem from './LogicItem__';
 
-import { config } from '..';
+import { config, Logic } from '..';
 
 export interface ParseContext {
     [key: string]: any;
@@ -262,6 +262,8 @@ export class ViewElement extends BaseNode {
         super.subConstructor(source);
     }
 
+
+
     /**
      * 从父级删除该节点
      * @internal
@@ -298,7 +300,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);
     }
@@ -439,6 +441,7 @@ 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);
@@ -580,6 +583,7 @@ 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);
@@ -721,6 +725,11 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
+
+
+
+
+
     /**
     * 插入页面元素
     * @internal
@@ -854,6 +863,9 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除元素绑定属性
     * @param name 元素绑定属性名称
@@ -902,6 +914,8 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -950,6 +964,8 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除元素指令
     * @param name 元素指令名称
@@ -998,6 +1014,8 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1264,9 +1282,12 @@ export class ViewElement extends BaseNode {
 
             let levelIndex = parentLevel || 0;
             if (this.haveScope(this)) {
+                code += indent((state?.tabSize || 0) + 2);
+                // code += `slotDefault: (scope${levelIndex === 0 ? '' : levelIndex})=> [\n`;
                 code += `slotDefault: (scope)=> [\n`;
                 levelIndex++;
             } else {
+                code += indent((state?.tabSize || 0) + 2);
                 code += `slotDefault: ()=> [\n`;
             }
 
@@ -1454,7 +1475,7 @@ export class ViewElement extends BaseNode {
                     .forEach((name) => {
                         const oldEvent = astNode.events[name] as compiler.ASTElementHandler;
                         const str = oldEvent.value;
-                        let calleeName = str.split('(')[0];
+                        const calleeName = str.split('(')[0];
                         const matchArr = str.match(/\(([^)]*)\)/) || [];
                         let argsStr = '';
                         if (matchArr?.length >= 2) {
@@ -1471,21 +1492,17 @@ export class ViewElement extends BaseNode {
                                     expression: genArgumentMemberExpression(keyword),
                                 };
                             });
-                        let calleeNamespace = '';
-                        if (calleeName) {
-                            const namespaceArr = calleeName.split('.');
-                            const start = namespaceArr.shift();
-                            if (start === '$refs' && namespaceArr.length === 2) {
-                                calleeNamespace = `elements.${namespaceArr[0]}.logics`;
-                                calleeName = namespaceArr[1];
-                            }
+                        const viewLogics = context?.definition?.viewLogics || [];
+                        const currentLogic = viewLogics.find((item: Logic) => item.name === calleeName);
+                        if (currentLogic) {
+                            element.addBindEvent(new BindEvent({
+                                name,
+                                calleeNamespace: '',
+                                calleeName: '',
+                                arguments: args,
+                                logics: [currentLogic],
+                            }));
                         }
-                        element.addBindEvent(new BindEvent({
-                            name,
-                            calleeNamespace,
-                            calleeName,
-                            arguments: args,
-                        }));
                     });
 
             astNode.directives

package/src/concepts/View__.ts

@@ -234,7 +234,7 @@ export class View extends BaseNode {
         });
     }
 
-
+    
 
     /**
     * 插入页面元素
@@ -1070,7 +1070,7 @@ export class View extends BaseNode {
     }
 
 
-
+    
 
     /**
     * 删除页面元素
@@ -1453,6 +1453,7 @@ export class View extends BaseNode {
         if (template) {
             const node = ViewElement.fromHTML(template, {
                 view: this,
+                definition,
             });
             if (!parentNode) {
                 return;
@@ -1511,20 +1512,38 @@ export class View extends BaseNode {
         // 页面逻辑
         if (Array.isArray(definition.viewLogics)) {
             definition.viewLogics.forEach((logicOption: any) => {
-                const logic = Logic.from({
-                    ...logicOption,
-                }, this, 'logics');
-                this.addLogic(logic);
+                // 页面逻辑只有load函数的走之前的逻辑其余不用创建
+                if (logicOption.name.startsWith('load')) {
+                    const logic = Logic.from({
+                        ...logicOption,
+                    }, this, 'logics');
+                    this.addLogic(logic);
+                }
             });
         }
-
         // 页面事件
         if (Array.isArray(definition.viewBindEvents)) {
             definition.viewBindEvents.forEach((eventOption: any) => {
-                const event = BindEvent.from({
-                    ...eventOption,
-                }, this, 'events');
-                this.addBindEvent(event);
+                const newLogic = definition.viewLogics.find((logic: Logic) => {
+                    return eventOption.calleeName === logic.name;
+                });
+                const bindEvent = this.bindEvents.find((currentEventItem) => {
+                    return currentEventItem.name === eventOption.name;
+                });
+
+                // 如果没有event对象就先新增一个，如果已经有了就在内部添加logic
+                if (!bindEvent) {
+                    const event = BindEvent.from({
+                        ...eventOption,
+                        calleeName: '',
+                        logics: [newLogic],
+                    }, this, 'events');
+                    this.addBindEvent(event);
+                } else {
+                    const index = bindEvent.logics.length;
+                    newLogic.name = newLogic.name + index;
+                    bindEvent.addLogic(newLogic);
+                }
             });
         }
     }
@@ -1592,6 +1611,7 @@ export class View extends BaseNode {
             crumb: this.crumb,
             first: this.children.find((child) => child.isIndex)?.name,
             auth: this.auth ? 'loginAuth' : undefined,
+            viewBindEvents: this.getViewBindEvents(),
         };
         return `${componentOptions}
             ${translator(definition)}
@@ -1826,6 +1846,49 @@ export class View extends BaseNode {
     get authPath() {
         return this.path;
     }
+    /**
+     * 获取当前页面下所有elements上bindEvents下的logic
+     */
+    get elementLogicRoot() {
+        const logics: Array<Logic> = [];
+        // 页面上的绑定的事件
+        this.bindEvents.forEach((bindEvent) => {
+            bindEvent.logics.forEach((logic) => {
+                // logic.virtualParams = bindEvent.getContextRenderLogicParams(logic);
+                logics.push(logic);
+            });
+        });
+        this.elements.forEach((item) => {
+            utils.traverse((current) => {
+                current.node.bindEvents.forEach((bindEvent) => {
+                    bindEvent.logics.forEach((logic) => {
+                        // logic.virtualParams = bindEvent.getContextRenderLogicParams(logic);
+                        logics.push(logic);
+                    });
+                });
+            }, { node: item });
+        });
+        return [{
+            concept: 'elementLogicRoot',
+            expanded: false,
+            children: logics,
+        }];
+    }
+    getViewBindEvents() {
+        const bindEvents: Array<BindEvent> = [];
+        // 页面上的绑定的事件
+        this.bindEvents.forEach((bindEvent) => {
+            bindEvents.push(bindEvent);
+        });
+        this.elements.forEach((item) => {
+            utils.traverse((current) => {
+                current.node.bindEvents.forEach((bindEvent) => {
+                    bindEvents.push(bindEvent);
+                });
+            }, { node: item });
+        });
+        return bindEvents;
+    }
 
     /**
      * @param path 子路径
@@ -1909,7 +1972,7 @@ export class View extends BaseNode {
     //================================================================================
 }
 
-classMap['View'] = View;
+classMap.View = View;
 export default View;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/WhileStatement__.ts

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

package/src/concepts/basics/stdlib/nasl.ui.ts

@@ -38,6 +38,10 @@ export const uiStructures = [
             }),
         ],
     }),
+    new Structure({
+        name: 'BaseEvent',
+        properties: [],
+    }),
     new Structure({
         name: 'DataSourceParams',
         properties: [

package/src/concepts/basics/stdlib/nasl.util.ts

@@ -571,8 +571,8 @@ export default new Namespace({
             description: '返回格式化的数字字符串',
             params: [
                 new Param({
-                    name: 'doubleValue',
-                    typeAnnotation: TypeAnnotation.createPrimitive('Double'),
+                    name: 'value',
+                    typeAnnotation: TypeAnnotation.createPrimitive('Decimal'),
                     defaultExpression: new Identifier(),
                 }),
                 new Param({

package/src/concepts/basics/types/coreTypeList.ts

@@ -5,6 +5,7 @@ export const primitiveTypeList: Array<TypeAnnotation> = [
     TypeAnnotation.createPrimitive('Integer'),
     TypeAnnotation.createPrimitive('Long'),
     TypeAnnotation.createPrimitive('Double'),
+    TypeAnnotation.createPrimitive('Decimal'),
     TypeAnnotation.createPrimitive('String'),
     TypeAnnotation.createPrimitive('Text'),
     TypeAnnotation.createPrimitive('Binary'),

package/src/enums/KEYWORDS.ts

@@ -53,6 +53,7 @@ export const KEYWORDS = [
     'deps',
     'do',
     'double',
+    'decimal',
     'dynamic',
     'elements',
     'element',
@@ -404,6 +405,7 @@ export const ENTITY_KEYWORDS = [
     'DOCS',
     'DOCUMENT',
     'DOUBLE',
+    'Decimal',
     'DROP',
     'DUAL',
     'DUMP',
@@ -1115,6 +1117,7 @@ export const ENTITY_PROPERTY_KEYWORDS = [
     'THIS',
     'BREAK',
     'DOUBLE',
+    'Decimal',
     'IMPLEMENTS',
     'PROTECTED',
     'THROW',