@lcap/nasl 2.18.0 → 2.20.0-beta.2

package/src/concepts/View__.ts

@@ -28,6 +28,7 @@ import Variable from './Variable__';
 import Logic from './Logic__';
 import BindEvent from './BindEvent__';
 import Module from './Module__';
+import Frontend from './Frontend__';
 import App from './App__';
 
 /**
@@ -161,6 +162,12 @@ export class View extends BaseNode {
     get app() {
         return this.getAncestor('App') as App;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
 
     /**
      * @param source 需要合并的部分参数
@@ -259,8 +266,6 @@ export class View extends BaseNode {
         });
     }
 
-
-
     /**
     * 插入页面元素
     * @internal
@@ -394,7 +399,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -532,7 +536,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -670,7 +673,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getLogicUniqueName(name = 'logic1') {
         return utils.unique(name, this.getLogicExistingNames(), undefined, false);
     }
@@ -808,7 +810,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -950,9 +951,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
-
-
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.children as View[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1094,9 +1092,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
-
-
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1145,8 +1140,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1195,8 +1188,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除变量
     * @param name 变量名称
@@ -1245,8 +1236,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1295,8 +1284,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1345,8 +1332,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面
     * @param name 页面名称
@@ -1404,7 +1389,7 @@ export class View extends BaseNode {
     get parentAuth() {
         const _nameSpace = this.getTsNamespace();
         const mainViewName = _nameSpace.split('.')[2];
-        return mainViewName ? this.app.views.find((item) => item.name === mainViewName)?.auth : this.auth;
+        return mainViewName ? this.frontend.views.find((item) => item.name === mainViewName)?.auth : this.auth;
     }
     /**
      * 设置页面权限
@@ -1710,7 +1695,7 @@ export class View extends BaseNode {
                 parent = parent.parentNode;
             }
         }
-        return `/embedded/${this.app.name}/views/${pathName}.ts`;
+        return `/embedded/${this.app.name}/frontends/${this.frontend.name}/views/${pathName}.ts`;
     }
 
     getNamespace(): string {
@@ -1918,6 +1903,7 @@ export class View extends BaseNode {
     }
 
     get path() {
+        const basePath = this.frontend.basePath;
         const _path = [];
         let view: View = this;
         while (view.concept === 'View') {
@@ -1928,7 +1914,7 @@ export class View extends BaseNode {
         if (_path.length) {
             path += `${_path.reverse().join('/')}`;
         }
-        return path;
+        return `${basePath}${path}`;
     }
 
     /**
@@ -2063,7 +2049,7 @@ export class View extends BaseNode {
     _setAsIndexView(isIndex: boolean) {
         let views: View[] = [];
         if (this.parentNode.concept !== 'View') {
-            views = (this.parentNode as App).views;
+            views = (this.parentNode as Frontend).views;
         } else if (this.parentNode.concept === 'View') {
             views = (this.parentNode as View).children;
         }
@@ -2153,6 +2139,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 +2196,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(),
                 }),
             ],
         }),