@lcap/nasl 3.2.0-beta.4 → 3.3.0-alpha

package/out/concepts/View__.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.View = void 0;
 const translator_1 = require("../translator");
 const translator_2 = __importDefault(require("../bak/translator"));
+const ViewElement__1 = __importDefault(require("./ViewElement__"));
 const Structure__1 = require("./Structure__");
 const Identifier__1 = __importDefault(require("./Identifier__"));
 const Assignment__1 = __importDefault(require("./Assignment__"));
@@ -46,7 +47,6 @@ const decorators_1 = require("../decorators");
 const utils = __importStar(require("../utils"));
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
 const classMap_1 = __importDefault(require("../common/classMap"));
-const ViewElement__1 = __importDefault(require("./ViewElement__"));
 const Param__1 = __importDefault(require("./Param__"));
 const Variable__1 = __importDefault(require("./Variable__"));
 const Logic__1 = __importDefault(require("./Logic__"));
@@ -153,7 +153,8 @@ let View = View_1 = class View extends BaseNode_1.default {
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, View_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...View_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -587,7 +588,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         if (typeof options === 'string') {
             viewElement = this.elements.find((item) => item.name === options);
             if (!viewElement) {
-                throw new Error('找不到页面元素 ' + options);
+                throw new Error(`找不到页面元素 ${options}`);
             }
         }
         else {
@@ -596,7 +597,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         return viewElement.delete();
     }
     __removeViewElement(viewElement) {
-        const parentKey = viewElement.parentKey;
+        const { parentKey } = viewElement;
         const params = {
             parentNode: this,
             parentKey,
@@ -623,7 +624,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         if (typeof options === 'string') {
             param = this.params.find((item) => item.name === options);
             if (!param) {
-                throw new Error('找不到输入参数 ' + options);
+                throw new Error(`找不到输入参数 ${options}`);
             }
         }
         else {
@@ -632,7 +633,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         return param.delete();
     }
     __removeParam(param) {
-        const parentKey = param.parentKey;
+        const { parentKey } = param;
         const params = {
             parentNode: this,
             parentKey,
@@ -659,7 +660,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         if (typeof options === 'string') {
             variable = this.variables.find((item) => item.name === options);
             if (!variable) {
-                throw new Error('找不到变量 ' + options);
+                throw new Error(`找不到变量 ${options}`);
             }
         }
         else {
@@ -668,7 +669,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         return variable.delete();
     }
     __removeVariable(variable) {
-        const parentKey = variable.parentKey;
+        const { parentKey } = variable;
         const params = {
             parentNode: this,
             parentKey,
@@ -695,7 +696,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         if (typeof options === 'string') {
             logic = this.logics.find((item) => item.name === options);
             if (!logic) {
-                throw new Error('找不到逻辑 ' + options);
+                throw new Error(`找不到逻辑 ${options}`);
             }
         }
         else {
@@ -704,7 +705,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         return logic.delete();
     }
     __removeLogic(logic) {
-        const parentKey = logic.parentKey;
+        const { parentKey } = logic;
         const params = {
             parentNode: this,
             parentKey,
@@ -731,7 +732,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         if (typeof options === 'string') {
             bindEvent = this.bindEvents.find((item) => item.name === options);
             if (!bindEvent) {
-                throw new Error('找不到元素绑定事件 ' + options);
+                throw new Error(`找不到元素绑定事件 ${options}`);
             }
         }
         else {
@@ -740,7 +741,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         return bindEvent.delete();
     }
     __removeBindEvent(bindEvent) {
-        const parentKey = bindEvent.parentKey;
+        const { parentKey } = bindEvent;
         const params = {
             parentNode: this,
             parentKey,
@@ -767,7 +768,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         if (typeof options === 'string') {
             view = this.children.find((item) => item.name === options);
             if (!view) {
-                throw new Error('找不到页面 ' + options);
+                throw new Error(`找不到页面 ${options}`);
             }
         }
         else {
@@ -776,7 +777,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         return view.delete();
     }
     __removeView(view) {
-        const parentKey = view.parentKey;
+        const { parentKey } = view;
         const params = {
             parentNode: this,
             parentKey,
@@ -798,10 +799,10 @@ let View = View_1 = class View extends BaseNode_1.default {
         }
         return params;
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+    //= ===============================================================================
     /* 主页面有没有权限 */
     get parentAuth() {
         const _nameSpace = this.getTsNamespace();
@@ -963,7 +964,7 @@ let View = View_1 = class View extends BaseNode_1.default {
                 }
                 else {
                     const index = bindEvent.logics.length;
-                    newLogic.name = newLogic.name + index;
+                    newLogic.name += index;
                     bindEvent.addLogic(newLogic);
                 }
             });
@@ -1050,10 +1051,16 @@ let View = View_1 = class View extends BaseNode_1.default {
             },
             methods: {
                 async onKeyDown(e) {
-                    ${this.bindEvents.filter(event => ['keydown'].includes(event.name)).map((event) => `await this.${event.view.name}_${event.name}(e);`).join('\n')}
+                    ${this.bindEvents
+            .filter((event) => ['keydown'].includes(event.name))
+            .map((event) => `await this.${event.view.name}_${event.name}(e);`)
+            .join('\n')}
                 },
                 async onKeyUp(e) {
-                    ${this.bindEvents.filter(event => ['keyup'].includes(event.name)).map((event) => `await this.${event.view.name}_${event.name}(e);`).join('\n')}
+                    ${this.bindEvents
+            .filter((event) => ['keyup'].includes(event.name))
+            .map((event) => `await this.${event.view.name}_${event.name}(e);`)
+            .join('\n')}
                 }
             }
         };`;
@@ -1080,7 +1087,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         return code;
     }
     genVueTemplate(options) {
-        return this.elements?.map((element) => element?.toVue(options) + '\n').join('');
+        return this.elements?.map((element) => `${element?.toVue(options)}\n`).join('');
     }
     /**
      * 转换成 Vue 文件
@@ -1096,7 +1103,7 @@ let View = View_1 = class View extends BaseNode_1.default {
      * @param options
      */
     genDesignerVueTemplate() {
-        return this.elements.map((element) => element.toDesignerVue() + '\n').join('');
+        return this.elements.map((element) => `${element.toDesignerVue()}\n`).join('');
     }
     /**
      * 转换成设计器中使用的 Vue 文件
@@ -1125,7 +1132,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         let parent = this.parentNode;
         if (parent) {
             while (parent && parent instanceof View_1) {
-                pathName = parent.name + '/' + pathName;
+                pathName = `${parent.name}/${pathName}`;
                 parent = parent.parentNode;
             }
         }
@@ -1141,8 +1148,7 @@ let View = View_1 = class View extends BaseNode_1.default {
             }
             return `${arr.join('.')}.views`;
         }
-        else
-            throw new Error('无法获取命名空间，请设置 parentNode！');
+        throw new Error('无法获取命名空间，请设置 parentNode！');
     }
     getTsNamespace() {
         const parentNodeNamespace = this.getNamespace();
@@ -1155,7 +1161,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         if (elements) {
             elements.forEach((item) => {
                 const { bindAttrs = [], name } = item;
-                const isDataSource = bindAttrs.some(attr => attr.name === 'data-source');
+                const isDataSource = bindAttrs.some((attr) => attr.name === 'data-source');
                 const isInclude = parentNodeNames.includes(name);
                 allMethods.push(item);
                 if (item.children) {
@@ -1210,7 +1216,9 @@ let View = View_1 = class View extends BaseNode_1.default {
                 }
                 else if (el instanceof BatchAssignment__1.default) {
                     el.assignmentLines.forEach(({ leftIndex }) => {
-                        const leftCode = leftIndex.length === 1 ? el.left?.expression?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) : el.left?.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                        const leftCode = leftIndex.length === 1
+                            ? el.left?.expression?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
+                            : el.left?.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                         const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && leftCode === variable.name);
                         if (advanceVar && !advanceMap.get(advanceVar)) {
                             advanceMap.set(advanceVar, el);
@@ -1221,7 +1229,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         });
         if (Array.isArray(this.params)) {
             this.params.forEach((param) => {
-                code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'let ';
+                code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
                 code += param.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += ';\n';
             });
@@ -1229,20 +1237,22 @@ let View = View_1 = class View extends BaseNode_1.default {
         if (Array.isArray(this.variables)) {
             this.variables.forEach((variable) => {
                 if (!advanceMap.get(variable)) {
-                    code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'let ';
+                    code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
                     code += variable.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                     code += ';\n';
                 }
             });
         }
         advanceMap.forEach((assignment, variable) => {
-            code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + '// @ts-ignore\n';
-            code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'let ';
+            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}// @ts-ignore\n`;
+            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
             code += variable.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
             code += ' = ';
             if (assignment instanceof BatchAssignment__1.default) {
                 assignment.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
-                    const leftCode = leftIndex.length === 1 ? assignment.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) : assignment.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                    const leftCode = leftIndex.length === 1
+                        ? assignment.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
+                        : assignment.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                     if (leftCode === variable.name) {
                         const rightNode = rightIndex.length === 1 ? assignment.rights[rightIndex[0]]?.expression : assignment.rights[rightIndex[0]]?.members[rightIndex[1]];
                         const rightCode = rightNode?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
@@ -1253,10 +1263,14 @@ let View = View_1 = class View extends BaseNode_1.default {
             else {
                 let rightCode = '';
                 // 因为右侧枚举要赋值就得new 一下；
-                if (assignment.right && assignment.right instanceof Identifier__1.default && assignment.right.namespace && assignment.right.namespace.endsWith('enums')) {
+                if (assignment.right &&
+                    assignment.right instanceof Identifier__1.default &&
+                    assignment.right.namespace &&
+                    assignment.right.namespace.endsWith('enums')) {
                     rightCode += 'new ';
                 }
-                rightCode += (assignment.right && assignment.right.toEmbeddedTS) ? assignment.right.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) : '__RIGHT__';
+                rightCode +=
+                    assignment.right && assignment.right.toEmbeddedTS ? assignment.right.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) : '__RIGHT__';
                 code += this.getRightCode(rightCode, assignment, assignment.right);
             }
             code += ';\n';
@@ -1269,7 +1283,7 @@ let View = View_1 = class View extends BaseNode_1.default {
                 tabSize: (state?.tabSize || 0) + 1,
             }));
         });
-        code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + '}\n';
+        code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}}\n`;
         code += `let __elements: __elements;\n`;
         // 逻辑
         if (Array.isArray(this.logics) && this.logics.length) {
@@ -1286,16 +1300,16 @@ let View = View_1 = class View extends BaseNode_1.default {
         if (Array.isArray(this.bindEvents)) {
             this.bindEvents.forEach((event) => {
                 code += event.toEmbeddedTS((0, translator_1.shiftState)(state, code, {
-                    tabSize: (state?.tabSize || 0),
+                    tabSize: state?.tabSize || 0,
                 }), true);
                 code += '\n';
             });
         }
         // render函数
-        code += '\n' + (0, translator_1.indent)((state?.tabSize || 0) + 1);
+        code += `\n${(0, translator_1.indent)((state?.tabSize || 0) + 1)}`;
         code += `export function __render(`;
         code += `){\n`;
-        code += (0, translator_1.indent)((state?.tabSize || 0));
+        code += (0, translator_1.indent)(state?.tabSize || 0);
         // elements 元素
         if (Array.isArray(this.elements)) {
             // 生成嵌套式的内容
@@ -1306,11 +1320,11 @@ let View = View_1 = class View extends BaseNode_1.default {
                 code += '\n';
             });
         }
-        code += '\n' + (0, translator_1.indent)((state?.tabSize || 0) + 1) + '}\n';
+        code += `\n${(0, translator_1.indent)((state?.tabSize || 0) + 1)}}\n`;
         if (Array.isArray(this.params)) {
-            code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + `export function $destination(options: {`;
+            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}export function $destination(options: {`;
             this.params.forEach((param, index) => {
-                code += param.name + '?: ';
+                code += `${param.name}?: `;
                 code += param.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code));
                 code += ', ';
             });
@@ -1318,7 +1332,66 @@ let View = View_1 = class View extends BaseNode_1.default {
             code += `_anchor?: nasl.core.String`;
             code += '}){}\n';
         }
-        code += (0, translator_1.indent)((state?.tabSize || 0)) + '}\n';
+        code += `${(0, translator_1.indent)(state?.tabSize || 0)}}\n`;
+        return code;
+    }
+    toNaturalTS(state, currentNode) {
+        let code = `export function ${this.tsName}_view`;
+        const advanceMap = new Map();
+        this.traverseChildren((el) => {
+            if (el && (el instanceof BatchAssignment__1.default || (el instanceof Assignment__1.default && el.left?.name))) {
+                // 子页面内部逻辑过滤
+                if (el.view !== this)
+                    return;
+                const jsCode = el.toJS();
+                const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && jsCode.includes(`this.${variable.name} = `));
+                if (advanceVar && !advanceMap.get(advanceVar)) {
+                    advanceMap.set(advanceVar, el);
+                }
+            }
+        });
+        // 有参数长度
+        code += '(';
+        this.params.forEach((param, index) => {
+            code += param.toNaturalTS((0, translator_1.shiftState)(state, code, { inline: true }));
+            if (index !== this.params.length - 1)
+                code += ', ';
+        });
+        code += ')';
+        code += ' {\n';
+        this.variables.forEach((variable) => {
+            if (!advanceMap.get(variable)) {
+                code += `${(0, translator_1.indent)(state.tabSize + 1)}let `;
+                code += variable.toNaturalTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                code += ';\n';
+            }
+        });
+        code += `\n${(0, translator_1.indent)(state.tabSize + 1)}const $refs = {\n`;
+        // 生成所有的name和类型定义
+        this.elements.forEach((element) => {
+            code += element.toNaturalTSDefinition((0, translator_1.shiftState)(state, code, {
+                tabSize: state.tabSize + 1,
+            }));
+        });
+        code += `${(0, translator_1.indent)(state.tabSize + 1)}}\n`;
+        // 逻辑
+        if (currentNode?.concept === 'Logic') {
+            code += '\n';
+            code += currentNode.toNaturalTS((0, translator_1.shiftState)(state, code, {
+                tabSize: state.tabSize + 1,
+            }), 'noExport');
+            code += '\n';
+        }
+        else if (this.logics.length) {
+            code += '\n';
+            this.logics.forEach((logic) => {
+                code += logic.toNaturalTS((0, translator_1.shiftState)(state, code, {
+                    tabSize: state.tabSize + 1,
+                }), 'noExport');
+                code += '\n';
+            });
+        }
+        code += `${(0, translator_1.indent)(state.tabSize)}}\n`;
         return code;
     }
     toEmbeddedTSFile() {
@@ -1342,7 +1415,7 @@ let View = View_1 = class View extends BaseNode_1.default {
     }
     // IDE内展示需要屏蔽掉“系统统一路径前缀”
     get uiPath() {
-        const basePath = this.frontend.basePath;
+        const { basePath } = this.frontend;
         const _path = [];
         let view = this;
         while (view.concept === 'View') {
@@ -1356,7 +1429,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         return `${basePath}${path}`;
     }
     get path() {
-        const prefixPath = this.frontend.prefixPath;
+        const { prefixPath } = this.frontend;
         const _path = [];
         let view = this;
         while (view.concept === 'View') {
@@ -1390,7 +1463,7 @@ let View = View_1 = class View extends BaseNode_1.default {
                         Param__1.default.from({
                             name: 'event',
                             typeAnnotation: null,
-                        }, logic, 'virtualParams')
+                        }, logic, 'virtualParams'),
                     ];
                 }
                 // 生命周期没有event
@@ -1413,11 +1486,13 @@ let View = View_1 = class View extends BaseNode_1.default {
         });
         if (logics.length) {
             const expanded = (this.elementLogicRoot.length && this.elementLogicRoot[0].expanded) || false;
-            this.elementLogicRoot = [{
+            this.elementLogicRoot = [
+                {
                     concept: 'elementLogicRoot',
                     expanded,
                     children: logics,
-                }];
+                },
+            ];
         }
         else {
             this.elementLogicRoot = [];
@@ -1444,13 +1519,13 @@ let View = View_1 = class View extends BaseNode_1.default {
         this.elements.forEach((item) => {
             utils.traverse((current) => {
                 const { node } = current;
-                //// 处理三种情况
-                //if (
+                /// / 处理三种情况
+                // if (
                 //    ['BindAttribute', 'BindDirective', 'BindStyle'].includes(node.concept)
                 //    && node.needReplaceWithIdentifier
-                //) {
+                // ) {
                 //    bindExpressions.push(node);
-                //}
+                // }
                 if (node.concept === 'Match') {
                     bindExpressions.push(node);
                 }
@@ -1520,7 +1595,7 @@ let View = View_1 = class View extends BaseNode_1.default {
             // 设为默认跳转页时，将之前的默认跳转页取消设置
             if (isIndex) {
                 views.forEach((view) => {
-                    if (view !== this && view.isIndex) {
+                    if (view !== this && view.id !== this.id && view.isIndex) {
                         view.setIsIndex(false);
                     }
                 });
@@ -1545,7 +1620,7 @@ let View = View_1 = class View extends BaseNode_1.default {
     }
     getRightCode(code, assignment, rightNode) {
         code = code.replaceAll('\n', ' ');
-        const logic = assignment.logic;
+        const { logic } = assignment;
         const logicRtn = logic?.returns[0];
         // 调用接口，参数替换成 null
         if (rightNode instanceof CallInterface__1.default) {
@@ -1579,8 +1654,7 @@ let View = View_1 = class View extends BaseNode_1.default {
             return code;
         }
         // 直接赋值 logic 内局部变量、输入参数直接提示系统无法推断类型
-        const useLogicVar = logic.params.find((param) => (code.includes(param.name)))
-            || logic.variables.find((variable) => (code.includes(variable.name)));
+        const useLogicVar = logic.params.find((param) => code.includes(param.name)) || logic.variables.find((variable) => code.includes(variable.name));
         return useLogicVar ? 'null' : code;
     }
     handleReplaceCode(code, variable, replaceCode) {
@@ -1613,9 +1687,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         let element = logic;
         const viewElements = [];
         while (element) {
-            if (element.concept
-                && element.concept === 'ViewElement'
-                && element.bindAttrs.find((bAttr) => bAttr.name === 'data-source')) {
+            if (element.concept && element.concept === 'ViewElement' && element.bindAttrs.find((bAttr) => bAttr.name === 'data-source')) {
                 viewElements.push(element);
             }
             element = element.parentNode;
@@ -1649,7 +1721,7 @@ let View = View_1 = class View extends BaseNode_1.default {
         const callbackLogics = [];
         this.traverseChildren((el) => {
             if (el instanceof Identifier__1.default && el.namespace?.endsWith('logics')) {
-                callbackLogics.push(el.namespace + '.' + el.name);
+                callbackLogics.push(`${el.namespace}.${el.name}`);
             }
         });
         return callbackLogics;
@@ -1715,14 +1787,17 @@ __decorate([
 __decorate([
     (0, translator_1.withSourceMap)()
 ], View.prototype, "toEmbeddedTS", null);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], View.prototype, "toNaturalTS", null);
 View = View_1 = __decorate([
     (0, decorators_1.concept)('页面')
 ], View);
 exports.View = View;
 classMap_1.default.View = View;
 exports.default = View;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=View__.js.map