@lcap/nasl 1.0.0-alpha.13 → 1.0.0-alpha.14

package/src/concepts/View__.ts

@@ -234,8 +234,6 @@ export class View extends BaseNode {
         });
     }
 
-    
-
     /**
     * 插入页面元素
     * @internal
@@ -272,7 +270,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'elements');
         } else if (options instanceof ViewElement) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             viewElement = options;
             Object.assign(viewElement, relationOptions);
         } else {
@@ -369,7 +367,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getParamExistingNames(excludedList: Array<Param> = []) {
         const excludedSet = new Set(excludedList);
         return (this.params || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -414,7 +411,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'params');
         } else if (options instanceof Param) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             param = options;
             Object.assign(param, relationOptions);
         } else {
@@ -511,7 +508,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getVariableExistingNames(excludedList: Array<Variable> = []) {
         const excludedSet = new Set(excludedList);
         return (this.variables || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -556,7 +552,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'variables');
         } else if (options instanceof Variable) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             variable = options;
             Object.assign(variable, relationOptions);
         } else {
@@ -653,7 +649,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
         return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -698,7 +693,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'logics');
         } else if (options instanceof Logic) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logic = options;
             Object.assign(logic, relationOptions);
         } else {
@@ -795,7 +790,6 @@ export class View 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);
@@ -840,7 +834,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'bindEvents');
         } else if (options instanceof BindEvent) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             bindEvent = options;
             Object.assign(bindEvent, relationOptions);
         } else {
@@ -937,9 +931,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
-
-
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return (this.children || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -984,7 +975,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'children');
         } else if (options instanceof View) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             view = options;
             Object.assign(view, relationOptions);
         } else {
@@ -1081,9 +1072,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1132,8 +1120,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1182,8 +1168,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除局部变量
     * @param name 局部变量名称
@@ -1232,8 +1216,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1282,8 +1264,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1332,8 +1312,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面
     * @param name 页面名称
@@ -1746,13 +1724,14 @@ export class View extends BaseNode {
         code += '\n' + indent(state.tabSize + 1) + '}\n';
 
         if (Array.isArray(this.params)) {
-            code += indent(state.tabSize + 1) + `export function $destination(`;
+            code += indent(state.tabSize + 1) + `export function $destination(options: {`;
             this.params.forEach((param, index) => {
-                code += `${param.toEmbeddedTS(shiftState(state, code, { inline: true }), true)}`;
+                code += param.name + '?: ';
+                code += param.typeAnnotation.toEmbeddedTS(shiftState(state, code));
                 if (index !== this.params.length - 1)
                     code += ', ';
             });
-            code += '){}\n';
+            code += '}){}\n';
         }
         code += indent(state.tabSize) + '}\n';
         return code;
@@ -1810,6 +1789,25 @@ export class View extends BaseNode {
         return arr.length ? subView.findViewByPath(arr.join('/')) : subView;
     }
 
+    findViewByName(name: string): View {
+        return utils.traverse((current) => {
+            if (current.node.name === name)
+                return current.node;
+        }, { node: this });
+    }
+
+    findElementByName(name: string): ViewElement {
+        return this.elements[0]?.findElementByName(name);
+    }
+
+    findElementByTag(tag: string): ViewElement {
+        return this.elements[0]?.findElementByName(tag);
+    }
+
+    findElementByAttr(name: string, value: string): ViewElement {
+        return this.elements[0]?.findElementByAttr(name, value);
+    }
+
     _setAsIndexView(isIndex: boolean) {
         let views: View[] = [];
         if (this.parentNode.concept !== 'View') {
@@ -1856,7 +1854,7 @@ export class View extends BaseNode {
     //================================================================================
 }
 
-classMap['View'] = View;
+classMap.View = View;
 export default View;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/WhileStatement__.ts

@@ -89,7 +89,7 @@ export class WhileStatement extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'body' };
         let logicItem: LogicItem;
         if (options instanceof LogicItem) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
         } else {

package/src/concepts/basics/stdlib/index.ts

@@ -10,11 +10,13 @@ import naslUtil from './nasl.util';
 import naslProcess from './nasl.process';
 import naslValidation from './nasl.validation';
 import naslBrowser from './nasl.browser';
+import naslAuth from './nasl.auth';
+import naslConfiguration from './nasl.configuration';
 
 export { reference2TypeAnnotationList } from './reference2TypeAnnotationList';
 export const stdlibNamespace = new Namespace({
     name: 'nasl',
     path: 'nasl',
-    children: [naslCore, naslCollection, naslInterface, naslUi, naslUtil, naslProcess, naslValidation, naslBrowser],
+    children: [naslCore, naslCollection, naslInterface, naslUi, naslUtil, naslProcess, naslValidation, naslBrowser, naslAuth, naslConfiguration],
 });
 export default stdlibNamespace;

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

@@ -0,0 +1,35 @@
+import Namespace from '../../Namespace__';
+import Param from '../../Param__';
+import Return from '../../Return__';
+import Logic from '../../Logic__';
+import TypeAnnotation from '../../TypeAnnotation__';
+
+export default new Namespace({
+    name: 'auth',
+    logics: [
+        new Logic({
+            name: 'hasAuth',
+            params: [
+                new Param({
+                    name: 'authPath',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                }),
+            ],
+            returns: [],
+        }),
+        new Logic({
+            name: 'logout',
+            params: [
+                new Param({
+                    name: 'Point1',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                }),
+                new Param({
+                    name: 'Point2',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                }),
+            ],
+            returns: [],
+        }),
+    ],
+});

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

@@ -9,22 +9,13 @@ export default new Namespace({
     logics: [
         new Logic({
             name: 'requestFullscreen',
-            params: [
-            ],
+            params: [],
+            body: [],
         }),
         new Logic({
             name: 'exitFullscreen',
-        }),
-        new Logic({
-            name: 'hasAuth',
-            params: [
-                new Param({
-                    name: 'authPath',
-                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                }),
-            ],
-            returns: [
-            ],
+            params: [],
+            body: [],
         }),
         new Logic({
             name: 'getDistance',
@@ -32,40 +23,15 @@ export default new Namespace({
                 new Param({
                     name: 'Point1',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    required: true,
                 }),
                 new Param({
                     name: 'Point2',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    required: true,
                 }),
             ],
-            returns: [
-            ],
-        }),
-        new Logic({
-            name: 'logOut',
-            params: [
-                new Param({
-                    name: 'Point1',
-                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                }),
-                new Param({
-                    name: 'Point2',
-                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                }),
-            ],
-            returns: [
-            ],
-        }),
-        new Logic({
-            name: 'getConfiguration',
-            params: [
-                new Param({
-                    name: 'name',
-                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                }),
-            ],
-            returns: [
-            ],
+            body: [],
         }),
     ],
 });

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

@@ -0,0 +1,21 @@
+import Namespace from '../../Namespace__';
+import Param from '../../Param__';
+import Return from '../../Return__';
+import Logic from '../../Logic__';
+import TypeAnnotation from '../../TypeAnnotation__';
+
+export default new Namespace({
+    name: 'configuration',
+    logics: [
+        new Logic({
+            name: 'getConfig',
+            params: [
+                new Param({
+                    name: 'name',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                }),
+            ],
+            returns: [],
+        }),
+    ],
+});

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

@@ -88,11 +88,6 @@ export default new Namespace({
         new Function({
             name: 'IndexOf',
             description: '搜索字符串位置',
-            typeParams: [
-                new TypeParam({
-                    name: 'T',
-                }),
-            ],
             params: [
                 new Param({
                     name: 'str',
@@ -126,11 +121,6 @@ export default new Namespace({
         new Function({
             name: 'LastIndexOf',
             description: '从末尾搜索字符串位置',
-            typeParams: [
-                new TypeParam({
-                    name: 'T',
-                }),
-            ],
             params: [
                 new Param({
                     name: 'str',
@@ -159,11 +149,6 @@ export default new Namespace({
         new Function({
             name: 'Replace',
             description: '字符串替换',
-            typeParams: [
-                new TypeParam({
-                    name: 'T',
-                }),
-            ],
             params: [
                 new Param({
                     name: 'str',
@@ -187,11 +172,6 @@ export default new Namespace({
         new Function({
             name: 'SubString',
             description: '字符串截取',
-            typeParams: [
-                new TypeParam({
-                    name: 'T',
-                }),
-            ],
             params: [
                 new Param({
                     name: 'str',
@@ -356,7 +336,6 @@ export default new Namespace({
         new Function({
             name: 'Get',
             description: '获得集合指定索引的项',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -378,7 +357,6 @@ export default new Namespace({
         new Function({
             name: 'Set',
             description: '为集合指定索引赋值（覆盖原索引项）',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -404,7 +382,6 @@ export default new Namespace({
         new Function({
             name: 'Contains',
             description: '返回集合是否包含某一项',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -426,7 +403,6 @@ export default new Namespace({
         new Function({
             name: 'Add',
             description: '为集合末尾添加项，并返回集合长度',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -443,7 +419,6 @@ export default new Namespace({
         new Function({
             name: 'Insert',
             description: '为集合指定索引插入项（原索引项依次后推）',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -464,7 +439,6 @@ export default new Namespace({
         new Function({
             name: 'Remove',
             description: '删除集合的项',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -481,7 +455,6 @@ export default new Namespace({
         new Function({
             name: 'RemoveAt',
             description: '删除集合位于某个索引的项',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -691,7 +664,6 @@ export default new Namespace({
         new Function({
             name: 'Clone',
             description: '复制一个所选参数的实例',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'struct',
@@ -707,7 +679,6 @@ export default new Namespace({
         new Function({
             name: 'Clear',
             description: '清除对象数据',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'struct',

package/src/enums/KEYWORDS.ts

@@ -104,6 +104,7 @@ export const KEYWORDS = [
     'is',
     'it',
     'lazy',
+    'length',
     'let',
     'logging',
     'logic',