@lcap/nasl 2.18.0 → 2.19.0-beta.2

package/src/concepts/ViewElement__.ts

@@ -1501,7 +1501,7 @@ export class ViewElement extends BaseNode {
             this.children.forEach((element) => {
                 code += element.toEmbeddedTS(shiftState(state, code, {
                     tabSize: (state?.tabSize || 0),
-                }));
+                }), levelIndex);
             });
             code += indent((state?.tabSize || 0) + 2);
             code += ']';
@@ -1669,7 +1669,7 @@ export class ViewElement extends BaseNode {
                     expression: transAstNodeToNaslNode(Object.assign({}, argument)),
                 }));
             }
-        } catch (error) {}
+        } catch (error) { }
         return {
             concept: 'ValidationRule',
             name: '',
@@ -1766,7 +1766,7 @@ export class ViewElement extends BaseNode {
                         }
                         attr = new BindAttribute(source);
                     } catch (e) {
-                        const expression = <any> this._parseExpression(oldAttr.value);
+                        const expression = <any>this._parseExpression(oldAttr.value);
                         attr = new BindAttribute({
                             type: 'dynamic',
                             name: oldAttr.name,
@@ -1823,7 +1823,7 @@ export class ViewElement extends BaseNode {
                     if (directive.name === 'model') {
                         const valueAttr = astNode.attrs && astNode.attrs.find((attr) => attr.name === 'value');
                         if (!valueAttr) {
-                            const expression = <any> this._parseExpression(directive.value);
+                            const expression = <any>this._parseExpression(directive.value);
                             element.addBindAttribute(new BindAttribute({
                                 type: 'dynamic',
                                 name: 'value',
@@ -1833,7 +1833,7 @@ export class ViewElement extends BaseNode {
                             }));
                         }
                     } else {
-                        const expression = <any> this._parseExpression(directive.value);
+                        const expression = <any>this._parseExpression(directive.value);
                         element.addBindDirective(new BindDirective({
                             type: expression ? 'string' : 'dynamic',
                             name: directive.name,
@@ -1852,7 +1852,7 @@ export class ViewElement extends BaseNode {
                     name: 'if',
                     rawName: 'v-if',
                     value: '',
-                    expression: <any> this._parseExpression(astNode.if),
+                    expression: <any>this._parseExpression(astNode.if),
                 }));
             }
         } else if (astNode.type === 2) {
@@ -1863,7 +1863,7 @@ export class ViewElement extends BaseNode {
                 name: view.getViewElementUniqueName(`${baseName}1`),
             });
             const value = astNode.text?.match(/{{(.*?)}}/)[1].trim();
-            const expression = <any> this._parseExpression(value);
+            const expression = <any>this._parseExpression(value);
             element.addBindAttribute(new BindAttribute({
                 type: 'dynamic',
                 name: 'text',
@@ -1925,7 +1925,7 @@ export class ViewElement extends BaseNode {
             finalCode: false,
             nodePathAttr: true,
             attrFormat: (attr: BindAttribute | BindEvent | BindDirective, element?: ViewElement, defaultResult?: string) => {
-                if (attr.concept === 'BindAttribute') {
+                if (attr.concept === 'BindAttribute' && !['href', 'destination', 'externalDestination', 'download'].includes(attr.name)) {
                     const api = config.allNodesAPI[element.tag];
                     const apiOfAttr = api && api.attrs && api.attrs.find((_attr) => _attr.name === attr.name);
                     if (['u-form-item', 'u-validator', 'van-field'].includes(element.tag) && attr.name === 'rules') {
@@ -2084,11 +2084,27 @@ export class ViewElement extends BaseNode {
         this.staticClass && parts.push(`class="${this.staticClass}"`);
         this.staticStyle && parts.push(`style="${this.staticStyle}"`);
 
+        const vIfs: string[] = [];
         [].concat(this.bindAttrs, this.bindDirectives, this.bindEvents).forEach((attr: BindAttribute | BindDirective | BindEvent) => {
             const result = newOptions.attrFormat(attr, this, attr?.toVue(newOptions));
+
+            // v-auth v-if 都翻译成 v-if
+            if(attr instanceof BindDirective && ['if', 'auth'].includes(attr.name) && result !== false) {
+                const expr = result.replace(/v-(if|auth)="(.*)"/, (match, p1, p2) => p2);
+                if(expr)
+                    vIfs.push(attr.name === 'if' ? expr : `$auth.has(${expr})`);
+
+                return;
+            }
+
             result && parts.push(result);
         });
 
+        if(vIfs.length === 2)
+            parts.push(`v-if="(${vIfs[0]}) && (${vIfs[1]})"`);
+        else if(vIfs.length === 1)
+            parts.push(`v-if="${vIfs[0]}"`)
+
         const bindStyles = newOptions.bindStylesFormat(this.bindStyles, this);
         if (bindStyles)
             parts.push(bindStyles);

package/src/concepts/View__.ts

@@ -259,7 +259,7 @@ export class View extends BaseNode {
         });
     }
 
-
+    
 
     /**
     * 插入页面元素
@@ -1095,7 +1095,7 @@ export class View extends BaseNode {
     }
 
 
-
+    
 
     /**
     * 删除页面元素
@@ -2153,6 +2153,10 @@ export class View extends BaseNode {
                 return replaceCode;
 
             let fnCode = $1;
+            if ($1.startsWith(`${variable}.`))
+                fnCode = $1.replaceAll(`${variable}.`, `${replaceCode}.`);
+            if ($1.startsWith(`${variable},`))
+                fnCode = $1.replaceAll(`${variable},`, `${replaceCode},`);
             if ($1.includes(`(${variable},`))
                 fnCode = $1.replaceAll(`(${variable},`, `(${replaceCode},`);
             if ($1.includes(`(${variable}.`))
@@ -2206,6 +2210,16 @@ export class View extends BaseNode {
         return code;
     }
 
+    getViewCallLogics():string[] {
+        const callbackLogics :string[] = [];
+        this.traverseChildren((el) => {
+            if (el instanceof Identifier && el.namespace?.endsWith('logics')) {
+                callbackLogics.push(el.namespace + '.' + el.name);
+            }
+        });
+        return callbackLogics;
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

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

@@ -93,7 +93,7 @@ export default new Namespace({
             returns: [],
         }),
         new Logic({
-            name: 'getProcessStartBy',
+            name: 'getUserList',
             params: [
                 new Param({
                     name: 'userNameFilter',

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

@@ -12,6 +12,7 @@ import NumericLiteral from '../../NumericLiteral__';
 import Identifier from '../../Identifier__';
 import BooleanLiteral from '../../BooleanLiteral__';
 import StringLiteral from '../../StringLiteral__';
+import StringInterpolation from '../../StringInterpolation__';
 
 export default new Namespace({
     name: 'logging',
@@ -22,6 +23,7 @@ export default new Namespace({
                 new Param({
                     name: '模板',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    defaultExpression: new StringInterpolation(),
                 }),
             ],
         }),
@@ -31,6 +33,7 @@ export default new Namespace({
                 new Param({
                     name: '模板',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    defaultExpression: new StringInterpolation(),
                 }),
             ],
         }),
@@ -40,6 +43,7 @@ export default new Namespace({
                 new Param({
                     name: '模板',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    defaultExpression: new StringInterpolation(),
                 }),
             ],
         }),
@@ -49,6 +53,7 @@ export default new Namespace({
                 new Param({
                     name: '模板',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    defaultExpression: new StringInterpolation(),
                 }),
             ],
         }),

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

@@ -6,6 +6,7 @@ import StructureProperty from '../../StructureProperty__';
 import TypeAnnotation from '../../TypeAnnotation__';
 import TypeParam from '../../TypeParam__';
 import { reference2TypeAnnotationList } from './reference2TypeAnnotationList';
+import StringInterpolation from '../../StringInterpolation__';
 
 export const uiStructures = [
     new Structure({
@@ -919,6 +920,7 @@ export default new Namespace({
                 new Param({
                     name: 'text',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    defaultExpression: new StringInterpolation(),
                 }),
             ],
         }),