@lcap/nasl 2.16.1 → 2.17.1

package/src/concepts/BinaryExpression__.ts

@@ -1,6 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
-import * as jsoner from '../service/storage/jsoner';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -246,6 +245,32 @@ export class BinaryExpression extends LogicItem {
         let code = '';
         const left = this.left?.toJS(shiftState(state, code, { inline: true })) || '';
         const right = (this.right?.toJS(shiftState(state, code, { inline: true })) || '');
+        //if ([
+        //    '+', '-', '*', '/',
+        //    '==', '!=', '>', '>=',
+        //    '<', '<=', '&&', '||',
+        //].includes(this.operator)) {
+        //    const operatorMap: any = {
+        //        '+': 'add',
+        //        '-': 'minus',
+        //        '*': 'multiply',
+        //        '/': 'divide',
+        //        '==': 'isEqual',
+        //        '!=': 'isNotEqual',
+        //        '>': 'isGreater',
+        //        '>=': 'isGreaterOrEqual',
+        //        '<': 'isLess',
+        //        '<=': 'isLessOrEqual',
+        //        '&&': 'isAnd',
+        //        '||': 'isOr',
+        //    };
+        //    code += `this.$global.${operatorMap[this.operator as keyof typeof operatorMap]}(`;
+        //    code += left;
+        //    code += `,`;
+        //    code += right;
+        //    code += ')';
+        //    return code;
+
         if (['+', '-', '*', '/'].includes(this.operator)) {
             const operatorMap: any = {
                 '+': 'add',
@@ -260,16 +285,15 @@ export class BinaryExpression extends LogicItem {
             code += ')';
             return code;
         } else if (['>', '>=', '<', '<='].includes(this.operator)) {
-            const jsonNode = jsoner.queryNodeByPath(this.app.NaslAnnotatedString, this.getNodePath(false));
-            const leftType = jsonNode?.left?.typeAnnotation || {};
-            const rightType = jsonNode?.right?.typeAnnotation || {};
+            const leftType = this.left?.getCurrentAnnotatedJSON();
+            const rightType = this.right?.getCurrentAnnotatedJSON();
             // 如果两边类型一致可以做一些特殊比较
-            if (leftType.typeKey === rightType.typeKey) {
-                if (leftType.typeName === 'Time') {
+            if (leftType?.typeKey === rightType?.typeKey) {
+                if (leftType?.typeName === 'Time') {
                     code += `Date.parse('2000-01-01T' + ${left})`;
                     code += ` ${this.operator} `;
                     code += `Date.parse('2000-01-01T' + ${right})`;
-                } else if (leftType.typeName === 'Date' || leftType.typeName === 'DateTime') {
+                } else if (leftType?.typeName === 'Date' || leftType?.typeName === 'DateTime') {
                     code += `Date.parse(${left})`;
                     code += ` ${this.operator} `;
                     code += `Date.parse(${right})`;
@@ -293,8 +317,8 @@ export class BinaryExpression extends LogicItem {
         return code;
     }
 
-    toBrief(): string { 
-        return `(${this.left.toBrief()} ${this.operator} ${this.right.toBrief()})`
+    toBrief(): string {
+        return `(${this.left.toBrief()} ${this.operator} ${this.right.toBrief()})`;
     }
 
     @withSourceMap()

package/src/concepts/BindAttribute__.ts

@@ -724,10 +724,13 @@ export class BindAttribute extends BaseNode {
                 code += ';\n';
             }
         }
-        this.playground?.forEach((item, index) => {
-            code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-            code += ';\n';
-        });
+        if (this.type === 'dynamic') {
+            this.playground?.forEach((item, index) => {
+                code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+                code += ';\n';
+            });
+        }
+
         code += '}';
         return code;
     }

package/src/concepts/BindDirective__.ts

@@ -140,6 +140,10 @@ export class BindDirective extends BaseNode {
         });
     }
 
+    
+
+    
+
     /**
     * 插入逻辑项
     * @internal
@@ -172,6 +176,8 @@ export class BindDirective extends BaseNode {
         return logicItem;
     }
 
+    
+
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -194,6 +200,8 @@ export class BindDirective extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加逻辑项
      * @internal
@@ -213,6 +221,8 @@ export class BindDirective extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
+    
+
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -236,6 +246,9 @@ export class BindDirective extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -261,6 +274,8 @@ export class BindDirective extends BaseNode {
         return expression.delete();
     }
 
+    
+
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -268,7 +283,7 @@ export class BindDirective extends BaseNode {
     removeItemInPlayground(logicItem: LogicItem): void;
 
     removeItemInPlayground(options: LogicItem) {
-        const logicItem: LogicItem = options;
+        let logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
@@ -370,11 +385,13 @@ export class BindDirective extends BaseNode {
             code += this.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
             code += ';\n';
         }
-        this.playground?.forEach((item, index) => {
-            code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-            if (index !== this.playground.length - 1)
-                code += ';\n';
-        });
+        if (this.type === 'dynamic') {
+            this.playground?.forEach((item, index) => {
+                code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+                if (index !== this.playground.length - 1)
+                    code += ';\n';
+            });
+        }
         code += '}';
         return code;
     }

package/src/concepts/BindEvent__.ts

@@ -153,7 +153,7 @@ export class BindEvent extends BaseNode {
         });
     }
 
-        getLogicExistingNames(excludedList: Array<Logic> = []) {
+    getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
         return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -294,11 +294,6 @@ export class BindEvent extends BaseNode {
         return node;
     }
 
-
-
-
-    
-
     /**
     * 插入实际参数
     * @internal
@@ -331,8 +326,6 @@ export class BindEvent extends BaseNode {
         return argument;
     }
 
-    
-
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -355,8 +348,6 @@ export class BindEvent extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加实际参数
      * @internal
@@ -376,8 +367,6 @@ export class BindEvent extends BaseNode {
         return this._insertArgumentAt(options as any, index);
     }
 
-    
-
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -401,9 +390,6 @@ export class BindEvent extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -452,8 +438,6 @@ export class BindEvent extends BaseNode {
         return params;
     }
 
-
-
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -461,7 +445,7 @@ export class BindEvent extends BaseNode {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        let argument: Argument = options;
+        const argument: Argument = options;
         return argument.delete();
     }
 
@@ -695,7 +679,7 @@ export class BindEvent extends BaseNode {
                 let index = 0;
                 while (parent && parent.concept !== 'View') {
                     if ((parent as ViewElement).slotScope) {
-                        argsList.unshift(index === 0 ? 'scope' : 'scope' + index);
+                        argsList.unshift(index === 0 ? 'current' : 'current' + index);
                         index++;
                     }
                     parent = parent.parentNode;
@@ -725,7 +709,7 @@ export class BindEvent extends BaseNode {
             let index = 0;
             while (parent && parent.concept !== 'View') {
                 if ((parent as ViewElement).slotScope) {
-                    argsList.unshift(index === 0 ? 'scope' : 'scope' + index);
+                    argsList.unshift(index === 0 ? 'current' : 'current' + index);
                     index++;
                 }
                 parent = parent.parentNode;
@@ -760,8 +744,8 @@ export class BindEvent extends BaseNode {
 
             while (parent && parent.concept !== 'View') {
                 if ((parent as ViewElement).slotScope) {
-                    const param = Param.from({ name: index === 0 ? 'scope' : 'scope' + index }, logic, 'virtualParams');
-                    param.typeAnnotation = TypeAnnotation.createGeneric('ScopeOf', {
+                    const param = Param.from({ name: index === 0 ? 'current' : 'current' + index }, logic, 'virtualParams');
+                    param.typeAnnotation = TypeAnnotation.createGeneric('Current', {
                         typeNamespace: 'nasl.ui',
                         typeArguments: [],
                     });
@@ -776,17 +760,56 @@ export class BindEvent extends BaseNode {
 
     getPageViewEventChineseName() {
         const parent = this.parentNode;
+        const suffixRE = /时|前|后$/;
         if (parent instanceof View) {
-            const page = elementsEventsMap[this.name];
-            return `${parent.name}-${page.title}`;
+            const event = elementsEventsMap[this.name];
+            const cap = suffixRE.exec(event.title);
+            if (cap)
+                return `${event.title.replace(suffixRE, '')}“${parent.title || parent.name}”页面${cap[0]}`;
+            else
+                return `${event.title}“${parent.title || parent.name}”页面`;
         } else if (parent instanceof ViewElement) {
             const eventName = `${parent.tag}-${this.name}`;
             if (elementsEventsMap[eventName]) {
-                const page = elementsEventsMap[eventName];
-                return `${parent.name}-${page.title}`;
+                const event = elementsEventsMap[eventName];
+
+                let title = '';
+                const textChild = parent.children.find((item) => item.tag === 'u-text');
+                if (textChild) {
+                    const bindAttr = textChild.bindAttrs.find((bindAttr) => bindAttr.name === 'text' || bindAttr.name === 'title' || bindAttr.name === 'label');
+                    if (bindAttr && bindAttr.type === 'string')
+                        title = bindAttr.value;
+                } else {
+                    const bindAttr = parent.bindAttrs.find((bindAttr) => bindAttr.name === 'text' || bindAttr.name === 'title' || bindAttr.name === 'label');
+                    if (bindAttr && bindAttr.type === 'string')
+                        title = bindAttr.value;
+                }
+
+                const cap = suffixRE.exec(event.title);
+                if (cap)
+                    return `${event.title.replace(suffixRE, '')}${title ? `“${title}”` : ''}${parent.name}${cap[0]}`;
+                else
+                    return `${event.title}${title ? `“${title}”` : ''}${parent.name}`;
             } else if (['click', 'dblclick', 'contextmenu', 'mousedown', 'mouseup', 'mouseenter', 'mouseleave', 'focus', 'blur'].includes(this.name)) {
-                const page = elementsEventsMap[this.name];
-                return `${parent.name}-${page.title}`;
+                const event = elementsEventsMap[this.name];
+
+                let title = '';
+                const textChild = parent.children.find((item) => item.tag === 'u-text');
+                if (textChild) {
+                    const bindAttr = textChild.bindAttrs.find((bindAttr) => bindAttr.name === 'text' || bindAttr.name === 'title' || bindAttr.name === 'label');
+                    if (bindAttr && bindAttr.type === 'string')
+                        title = bindAttr.value;
+                } else {
+                    const bindAttr = parent.bindAttrs.find((bindAttr) => bindAttr.name === 'text' || bindAttr.name === 'title' || bindAttr.name === 'label');
+                    if (bindAttr && bindAttr.type === 'string')
+                        title = bindAttr.value;
+                }
+
+                const cap = suffixRE.exec(event.title);
+                if (cap)
+                    return `${event.title.replace(suffixRE, '')}${title ? `“${title}”` : ''}${parent.name}${cap[0]}`;
+                else
+                    return `${event.title}${title ? `“${title}”` : ''}${parent.name}`;
             }
             return `${parent.name}-${this.name}`;
         }
@@ -795,16 +818,16 @@ export class BindEvent extends BaseNode {
     getViewEventChineseName() {
         const parent = this.parentNode;
         if (parent instanceof View) {
-            const page = elementsEventsMap[this.name];
-            return `${page.title}`;
+            const event = elementsEventsMap[this.name];
+            return `${event.title}`;
         } else if (parent instanceof ViewElement) {
             const eventName = `${parent.tag}-${this.name}`;
             if (elementsEventsMap[eventName]) {
-                const page = elementsEventsMap[eventName];
-                return `${page.title}`;
+                const event = elementsEventsMap[eventName];
+                return `${event.title}`;
             } else if (['click', 'dblclick', 'contextmenu', 'mousedown', 'mouseup', 'mouseenter', 'mouseleave', 'focus', 'blur'].includes(this.name)) {
-                const page = elementsEventsMap[this.name];
-                return `${page.title}`;
+                const event = elementsEventsMap[this.name];
+                return `${event.title}`;
             }
             return `${this.name}`;
         }

package/src/concepts/BindStyle__.ts

@@ -119,16 +119,16 @@ export class BindStyle extends BaseNode {
     * @internal
     * @param logicItemOptions 逻辑项参数
     */
-    _insertItemAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
+    _insertItemInPlaygroundAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
 
     /**
     * 插入逻辑项
     * @internal
     * @param logicItem 已有的逻辑项实例
     */
-    _insertItemAt(logicItem: LogicItem, index: number): LogicItem;
+    _insertItemInPlaygroundAt(logicItem: LogicItem, index: number): LogicItem;
 
-    _insertItemAt(options: Partial<LogicItem> | LogicItem, index: number) {
+    _insertItemInPlaygroundAt(options: Partial<LogicItem> | LogicItem, index: number) {
         const logicItemOptions: any = {};
         const relationOptions = { parentNode: this, parentKey: 'playground' };
         let logicItem: LogicItem;
@@ -152,16 +152,16 @@ export class BindStyle extends BaseNode {
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
      */
-    insertItemAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
+    insertItemInPlaygroundAt(logicItemOptions: Partial<LogicItem>, index: number): LogicItem;
 
     /**
      * 插入逻辑项
      * @param logicItem 已有的逻辑项实例
      */
-    insertItemAt(logicItem: LogicItem, index: number): LogicItem;
+    insertItemInPlaygroundAt(logicItem: LogicItem, index: number): LogicItem;
 
-    insertItemAt(options: Partial<LogicItem> | LogicItem, index: number) {
-        const node = this._insertItemAt(options as any, index);
+    insertItemInPlaygroundAt(options: Partial<LogicItem> | LogicItem, index: number) {
+        const node = this._insertItemInPlaygroundAt(options as any, index);
         node.create({
             index,
             parentNode: this,
@@ -177,18 +177,18 @@ export class BindStyle extends BaseNode {
      * @internal
      * @param logicItemOptions 逻辑项参数
      */
-    _addItem(logicItemOptions: Partial<LogicItem>): LogicItem;
+    _addItemInPlayground(logicItemOptions: Partial<LogicItem>): LogicItem;
 
     /**
      * 添加逻辑项
      * @internal
      * @param logicItem 已有的逻辑项实例
      */
-    _addItem(logicItem: LogicItem): LogicItem;
+    _addItemInPlayground(logicItem: LogicItem): LogicItem;
 
-    _addItem(options?: Partial<LogicItem> | LogicItem) {
+    _addItemInPlayground(options?: Partial<LogicItem> | LogicItem) {
         const index = this.playground.length;
-        return this._insertItemAt(options as any, index);
+        return this._insertItemInPlaygroundAt(options as any, index);
     }
 
     
@@ -197,16 +197,16 @@ export class BindStyle extends BaseNode {
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
      */
-    addItem(logicItemOptions: Partial<LogicItem>): LogicItem;
+    addItemInPlayground(logicItemOptions: Partial<LogicItem>): LogicItem;
 
     /**
      * 添加逻辑项
      * @param logicItem 已有的逻辑项实例
      */
-    addItem(logicItem: LogicItem): LogicItem;
+    addItemInPlayground(logicItem: LogicItem): LogicItem;
 
-    addItem(options?: Partial<LogicItem> | LogicItem) {
-        const node = this._addItem(options as any);
+    addItemInPlayground(options?: Partial<LogicItem> | LogicItem) {
+        const node = this._addItemInPlayground(options as any);
         const index = this.playground.indexOf(node);
         node.create({
             index,

package/src/concepts/BooleanLiteral__.ts

@@ -65,6 +65,14 @@ export class BooleanLiteral extends LogicItem {
     }
 
     toJS(state?: TranslatorState): string {
+        //const scope = this.view ? 'this' : 'Vue.prototype';
+        //const code = `${scope}.$genInitFromSchema(${JSON.stringify({
+        //    concept: 'TypeAnnotation',
+        //    typeKind: 'primitive',
+        //    typeNamespace: 'nasl.core',
+        //    typeName: 'Boolean',
+        //})}, ${this.value})`;
+        //return code;
         return this.value;
     }
 
@@ -74,7 +82,7 @@ export class BooleanLiteral extends LogicItem {
 
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState) {
-        return this.value;
+        return `new nasl.core.Boolean(${this.value})`;
     }
 
     /**

package/src/concepts/CallFunction__.ts

@@ -2,6 +2,8 @@ import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
 import Identifier from './Identifier__';
+import { getBuildInFunction } from '../server/getFunctions';
+import AnonymousFunction from './AnonymousFunction__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -421,7 +423,8 @@ export class CallFunction extends LogicItem {
                 code += ', ';
         });
         if (this.typeArguments && this.typeArguments.length) {
-            if (this.arguments?.length) code += ', ';
+            if (this.arguments?.length)
+                code += ', ';
             this.typeArguments?.forEach((arg, index) => {
                 code += arg?.toJS(shiftState(state, code));
                 if (index !== this.typeArguments?.length - 1)
@@ -433,7 +436,7 @@ export class CallFunction extends LogicItem {
     }
 
     toBrief(): string {
-        return this.arguments.map(a => a.toBrief()).join('<br />')
+        return this.arguments.map((a) => a.toBrief()).join('<br />');
     }
 
     get calleeKey(): string {
@@ -481,7 +484,35 @@ export class CallFunction extends LogicItem {
             calleeName,
             arguments: params,
             typeArguments,
+            folded: false,
         });
+        this.detectArgs();
+    }
+
+    detectArgs(obj?: any) {
+        const func = getBuildInFunction(this.calleeName);
+        const shouldJudge = !!func && [
+            'ListDistinctBy',
+            'MapDistinctBy',
+            'ListGroupBy',
+            'ListToMap',
+            'MapFilter',
+        ].includes(this.calleeName);
+        if (shouldJudge && Array.isArray(this.arguments)) {
+            const depParamIdx = func.params.findIndex((param) => ['list', 'map'].includes(param.name));
+            if (depParamIdx !== -1) {
+                const depArgExpression = this.arguments?.[depParamIdx].expression;
+                this.arguments.forEach((arg, index) => {
+                    if (depParamIdx !== index && !depArgExpression) {
+                        (arg as any).illegalTip = `请先添加${func.params[depParamIdx].name}`;
+                    } else {
+                        if ((arg as any).illegalTip) {
+                            delete (arg as any).illegalTip;
+                        }
+                    }
+                });
+            }
+        }
     }
 
     @withSourceMap()
@@ -522,6 +553,16 @@ export class CallFunction extends LogicItem {
         }
         return code;
     }
+
+    checkParamNameOfAnonymousFunction() {
+        const fns = this.arguments.map(arg => arg.expression)
+            .filter(exp => exp instanceof AnonymousFunction) as unknown as AnonymousFunction[];
+
+        fns.forEach((fn) => {
+            fn.checkParamName();
+        });
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/CallInterface__.ts

@@ -471,6 +471,7 @@ export class CallInterface extends LogicItem {
             calleeNamespace,
             calleeName,
             arguments: params,
+            folded: false,
         });
     }
     // 通过内容过去节点

package/src/concepts/CallLogic__.ts

@@ -68,7 +68,7 @@ export class CallLogic extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
-    
+
 
     /**
      * @param source 需要合并的部分参数
@@ -83,12 +83,12 @@ export class CallLogic extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallLogic;
     }
 
-    
-    
 
-    
 
-    
+
+
+
+
 
     /**
     * 插入类型标注
@@ -122,7 +122,7 @@ export class CallLogic extends LogicItem {
         return typeAnnotation;
     }
 
-    
+
 
     /**
      * 插入类型标注
@@ -146,7 +146,7 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
      * 添加类型标注
@@ -167,7 +167,7 @@ export class CallLogic extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加类型标注
@@ -195,7 +195,7 @@ export class CallLogic extends LogicItem {
 
 
 
-    
+
 
     /**
     * 插入实际参数
@@ -229,7 +229,7 @@ export class CallLogic extends LogicItem {
         return argument;
     }
 
-    
+
 
     /**
      * 插入实际参数
@@ -253,7 +253,7 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
      * 添加实际参数
@@ -274,7 +274,7 @@ export class CallLogic extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加实际参数
@@ -300,7 +300,7 @@ export class CallLogic extends LogicItem {
     }
 
 
-    
+
 
     /**
      * 删除类型标注
@@ -490,6 +490,7 @@ export class CallLogic extends LogicItem {
             calleeName,
             arguments: params,
             typeArguments,
+            folded: false,
         });
     }
 
@@ -728,7 +729,6 @@ var __parseType = (root, prop) => {
                                 // filter回调函数
                                 if (arg.expression.returnExpression) {
                                     const argsStr = JSON.stringify(handleMember(arg.expression.returnExpression));
-                                    console.log(argsStr);
                                     return `${name}: {
                                         concept: 'Function',
                                         name: 'filter',
@@ -748,7 +748,6 @@ var __parseType = (root, prop) => {
                     case 'deleteBy': {
                         code += `body: `;
                         const argsStr = JSON.stringify(handleMember((logicArgs[0].expression as any).returnExpression));
-                        console.log(argsStr);
                         code += `{
                             concept: 'Function',
                             name: 'filter',