@lcap/nasl 1.0.0-alpha.8 → 1.0.1

package/src/concepts/View__.ts

@@ -234,6 +234,8 @@ export class View extends BaseNode {
         });
     }
 
+    
+
     /**
     * 插入页面元素
     * @internal
@@ -270,7 +272,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 {
@@ -358,7 +360,7 @@ export class View extends BaseNode {
 
     addViewElement(options?: string | Partial<ViewElement> | ViewElement) {
         const node = this._addViewElement(options as any);
-        const index = this.elements.length;
+        const index = this.elements.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -367,12 +369,13 @@ 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);
     }
     getParamUniqueName(name = 'param1') {
-        return utils.unique(name, this.getParamExistingNames());
+        return utils.unique(name, this.getParamExistingNames(), undefined, false);
     }
 
     /**
@@ -411,7 +414,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 {
@@ -499,7 +502,7 @@ export class View extends BaseNode {
 
     addParam(options?: string | Partial<Param> | Param) {
         const node = this._addParam(options as any);
-        const index = this.params.length;
+        const index = this.params.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -508,12 +511,13 @@ 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);
     }
     getVariableUniqueName(name = 'variable1') {
-        return utils.unique(name, this.getVariableExistingNames());
+        return utils.unique(name, this.getVariableExistingNames(), undefined, false);
     }
 
     /**
@@ -552,7 +556,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 {
@@ -640,7 +644,7 @@ export class View extends BaseNode {
 
     addVariable(options?: string | Partial<Variable> | Variable) {
         const node = this._addVariable(options as any);
-        const index = this.variables.length;
+        const index = this.variables.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -649,12 +653,13 @@ 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);
     }
     getLogicUniqueName(name = 'logic1') {
-        return utils.unique(name, this.getLogicExistingNames());
+        return utils.unique(name, this.getLogicExistingNames(), undefined, false);
     }
 
     /**
@@ -693,7 +698,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 {
@@ -781,7 +786,7 @@ export class View extends BaseNode {
 
     addLogic(options?: string | Partial<Logic> | Logic) {
         const node = this._addLogic(options as any);
-        const index = this.logics.length;
+        const index = this.logics.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -790,12 +795,13 @@ 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);
     }
     getBindEventUniqueName(name = 'bindEvent1') {
-        return utils.unique(name, this.getBindEventExistingNames());
+        return utils.unique(name, this.getBindEventExistingNames(), undefined, false);
     }
 
     /**
@@ -834,7 +840,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 {
@@ -922,7 +928,7 @@ export class View extends BaseNode {
 
     addBindEvent(options?: string | Partial<BindEvent> | BindEvent) {
         const node = this._addBindEvent(options as any);
-        const index = this.bindEvents.length;
+        const index = this.bindEvents.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -931,12 +937,15 @@ 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);
     }
     getViewUniqueName(name = 'view1') {
-        return utils.unique(name, this.getViewExistingNames());
+        return utils.unique(name, this.getViewExistingNames(), undefined, false);
     }
 
     /**
@@ -975,7 +984,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 {
@@ -1063,7 +1072,7 @@ export class View extends BaseNode {
 
     addView(options?: string | Partial<View> | View) {
         const node = this._addView(options as any);
-        const index = this.children.length;
+        const index = this.children.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1072,6 +1081,9 @@ export class View extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1120,6 +1132,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1168,6 +1182,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除局部变量
     * @param name 局部变量名称
@@ -1216,6 +1232,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1264,6 +1282,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1312,6 +1332,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除页面
     * @param name 页面名称
@@ -1365,6 +1387,12 @@ 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;
+    }
     /**
      * 设置页面权限
      */
@@ -1452,15 +1480,6 @@ export class View extends BaseNode {
                 }
             }
         }
-        // 全局结构体
-        if (Array.isArray(definition.structures)) {
-            definition.structures.forEach((structureOption: any) => {
-                const structure = Structure.from({
-                    ...structureOption,
-                }, this.rootNode, 'structures');
-                (this.rootNode as App).addStructure(structure);
-            });
-        }
 
         // 全局逻辑
         if (Array.isArray(definition.logics)) {
@@ -1472,6 +1491,16 @@ export class View extends BaseNode {
             });
         }
 
+        // 全局结构体
+        if (Array.isArray(definition.structures)) {
+            definition.structures.forEach((structureOption: any) => {
+                const structure = Structure.from({
+                    ...structureOption,
+                }, this.rootNode, 'structures');
+                (this.rootNode as App).addStructure(structure);
+            });
+        }
+
         // 页面入参
         if (Array.isArray(definition.viewParams)) {
             definition.viewParams.forEach((paramsOption: any) => {
@@ -1518,37 +1547,27 @@ export class View extends BaseNode {
 
     getVarExistingNames(excludedList: Array<Param | Variable> = []) {
         const excludedSet = new Set(excludedList);
-        return [...this.params, ...this.variables].filter((item) => !excludedSet.has(item)).map((item) => item.name);
-    }
-
-    /**
-     * 角色
-     */
-    @property()
-    roles: Array<{
-        namespace: string;
-        name: string;
-    }> = [];
-
-    toggleRole(role: Role) {
-        const index = this.roles.findIndex((roleItem) => roleItem.name === role.name);
-        const roles = [...this.roles];
-        if (index !== -1) {
-            roles.splice(index, 1);
-            this.roles = roles;
-        } else {
-            roles.push({
-                namespace: role.getNamespace(),
-                name: role.name,
+        const varList: any[] = [];
+        if (Array.isArray(this.params)) {
+            varList.push(...this.params);
+        }
+        if (Array.isArray(this.variables)) {
+            varList.push(...this.variables);
+        }
+        if (Array.isArray(this.logics)) {
+            this.logics.forEach((logic) => {
+                if (Array.isArray(logic.params)) {
+                    varList.push(...logic.params);
+                }
+                if (Array.isArray(logic.returns)) {
+                    varList.push(...logic.returns);
+                }
+                if (Array.isArray(logic.variables)) {
+                    varList.push(...logic.variables);
+                }
             });
         }
-        const object = {
-            roles,
-        };
-
-        this.update({
-            ...object,
-        });
+        return varList.filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
 
     /**
@@ -1567,7 +1586,7 @@ export class View extends BaseNode {
             events: this.bindEvents,
             title: this.title,
             crumb: this.crumb,
-            first: this.isIndex,
+            first: this.children.find((child) => child.isIndex)?.name,
         };
         return `${componentOptions}
             ${translator(definition)}
@@ -1575,7 +1594,7 @@ export class View extends BaseNode {
 `;
     }
     genVueTemplate(options?: ElementToVueOptions) {
-        return this.elements.map((element) => element.toVue(options) + '\n').join('');
+        return this.elements?.map((element) => element?.toVue(options) + '\n').join('');
     }
     /**
      * 转换成 Vue 文件
@@ -1638,6 +1657,12 @@ export class View extends BaseNode {
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
 
+    getTsNamespace() {
+        const parentNodeNamespace = this.getNamespace();
+        let tsCalleeNamespace = parentNodeNamespace.replace(/\.[0-9]/g, (m) => m.replace('.', '.$'));
+        tsCalleeNamespace = tsCalleeNamespace.replace(/-/g, '_');
+        return tsCalleeNamespace;
+    }
 
     // 获取当前element，铺平
     elementsMethods(elements: Array<ViewElement>, allMethods: Array<ViewElement>) {
@@ -1655,9 +1680,6 @@ export class View extends BaseNode {
     toEmbeddedTS(state?: TranslatorState): string {
         function chineseTsName(name: string) {
             let tsName = name;
-            if (/^\d/.test(tsName)) {
-                tsName = '$' + tsName;
-            }
             // 匹配所有特殊字符都转为_
             tsName = tsName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '_');
             return tsName;
@@ -1665,21 +1687,9 @@ export class View extends BaseNode {
 
         let code = `export namespace ${this.tsName} {\n`;
         // 角色
-        // if (this.auth && Array.isArray(this.roles) && this.roles.length) {
-        //     code += indent(state.tabSize + 1);
-        //     code += 'export let roles = [\n';
-        //     this.roles.forEach((role) => {
-        //         code += indent(state.tabSize + 1);
-        //         `${this.app.getNamespace()}.${role.name}`;
-        //         code += `${role.namespace}.${role.name},`;
-        //         code += '\n';
-        //     });
-        //     code += indent(state.tabSize + 1);
-        //     code += '];\n';
-        // }
-        if (this.auth && Array.isArray(this.bindRoles) && this.bindRoles.length) {
+        if (Array.isArray(this.bindRoles) && this.bindRoles.length) {
             code += indent(state.tabSize + 1);
-            code += 'export let bindRoles = [\n';
+            code += 'export let __bindRoles = [\n';
             this.bindRoles.forEach((role) => {
                 code += indent(state.tabSize + 1);
                 code += `${this.app.getNamespace()}.roles.${chineseTsName(role)}.${chineseTsName(role)},`;
@@ -1705,7 +1715,7 @@ export class View extends BaseNode {
         }
 
         // elements类型声明定义
-        code += indent(state.tabSize + 1) + `let __elements = {\n`;
+        code += `interface __elements {\n`;
         // 生成所有的name和类型定义
         this.elements.forEach((element) => {
             code += element.toEmbeddedTSDefinition(shiftState(state, code, {
@@ -1713,29 +1723,27 @@ export class View extends BaseNode {
             }));
         });
         code += indent(state.tabSize + 1) + '}\n';
+        code += `let __elements: __elements;\n`;
         // 逻辑
         if (Array.isArray(this.logics) && this.logics.length) {
             code += indent(state.tabSize + 1);
-            code += `export namespace logics {\n`;
             this.logics.forEach((logic) => {
                 code += logic.toEmbeddedTS(shiftState(state, code, {
                     tabSize: state.tabSize + 2,
-                }));
+                }), 'noExport');
                 code += '\n';
             });
             code += indent(state.tabSize + 1);
-            code += '}\n';
         }
         // 事件
-        // bindEvent暂时不用生成，生成就会校验参数
-        // if (Array.isArray(this.events) && this.events.length) {
-        //     this.events.forEach((event) => {
-        //         code += event.toObjectTS(shiftState(state, code, {
-        //             tabSize: state.tabSize,
-        //         }));
-        //         code += '\n';
-        //     });
-        // }
+        if (Array.isArray(this.bindEvents)) {
+            this.bindEvents.forEach((event) => {
+                code += event.toEmbeddedTS(shiftState(state, code, {
+                    tabSize: state.tabSize,
+                }), true);
+                code += '\n';
+            });
+        }
 
         // render函数
         code += '\n' + indent(state.tabSize + 1);
@@ -1757,25 +1765,30 @@ 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;
     }
 
     toEmbeddedTSFile() {
-        let code = `namespace ${this.getNamespace()} {\n`;
+        let code = `namespace ${this.getTsNamespace()} {\n`;
         const state = createCompilerState(code, {
             tabSize: 1,
         });
 
-        code += this.toEmbeddedTS(state);
+        try {
+            code += this.toEmbeddedTS(state);
+        } catch (err) {
+            code += '';
+        }
 
         code += '}\n';
 
@@ -1795,11 +1808,18 @@ export class View extends BaseNode {
         }
         let path = '/';
         if (_path.length) {
-            path += `${_path.join('/')}`;
+            path += `${_path.reverse().join('/')}`;
         }
         return path;
     }
 
+    /**
+     * 权限领域的资源路径
+     */
+    get authPath() {
+        return this.path;
+    }
+
     /**
      * @param path 子路径
      * 比如当前页面路径为：/dashboard
@@ -1817,6 +1837,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') {
@@ -1851,13 +1890,19 @@ export class View extends BaseNode {
         this.rootNode.emit('collect:end');
     }
 
+    removeExistingViewElement(viewElement: ViewElement) {
+        if (this.existingViewElement.has(viewElement.name)) {
+            this.existingViewElement.delete(viewElement.name);
+        }
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
     //================================================================================
 }
 
-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 {
@@ -163,7 +163,7 @@ export class WhileStatement extends LogicItem {
 
     addItem(options?: Partial<LogicItem> | LogicItem) {
         const node = this._addItem(options as any);
-        const index = this.body.length;
+        const index = this.body.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -243,7 +243,7 @@ export class WhileStatement extends LogicItem {
     public static getDefaultOptions() {
         return {
             label: 'While 循环分支',
-        }
+        };
     }
     toJS(state?: TranslatorState): string {
         let code = '';
@@ -251,7 +251,7 @@ export class WhileStatement extends LogicItem {
         code += this.test ? this.test.toJS(shiftState(state, code, {
             tabSize: 0,
         })) : '';
-        code += ')) {\n';
+        code += ') {\n';
 
         if (Array.isArray(this.body)) {
             this.body.forEach((logicItem) => {

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

@@ -9,12 +9,14 @@ import naslInterface from './nasl.interface';
 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],
+    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,26 @@
+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: [],
+            returns: [],
+        }),
+    ],
+});

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

@@ -0,0 +1,37 @@
+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: 'browser',
+    logics: [
+        new Logic({
+            name: 'requestFullscreen',
+            params: [],
+            body: [],
+        }),
+        new Logic({
+            name: 'exitFullscreen',
+            params: [],
+            body: [],
+        }),
+        new Logic({
+            name: 'getDistance',
+            params: [
+                new Param({
+                    name: 'Point1',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    required: true,
+                }),
+                new Param({
+                    name: 'Point2',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    required: true,
+                }),
+            ],
+            body: [],
+        }),
+    ],
+});