@lcap/nasl 3.3.3-beta.6 → 3.3.3-beta.7

package/out/concepts/View__.js

@@ -34,6 +34,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var View_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PAGE_COMPONENT_INCLUDE_TAG_MAP = exports.View = void 0;
+const time_slicing_1 = require("../utils/time-slicing");
 const translator_1 = require("../translator");
 const translator_2 = __importDefault(require("../bak/translator"));
 const Structure__1 = require("./Structure__");
@@ -42,6 +43,8 @@ const Assignment__1 = __importDefault(require("./Assignment__"));
 const BatchAssignment__1 = __importDefault(require("./BatchAssignment__"));
 const CallInterface__1 = __importDefault(require("./CallInterface__"));
 const CallLogic__1 = __importDefault(require("./CallLogic__"));
+const getBranchCopyUniCode = () => window?.BranchCopyUniCode;
+const removedViewElementCache = {}; // 临时记录删除的页面元素计数的最大值
 const decorators_1 = require("../decorators");
 const utils = __importStar(require("../utils"));
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
@@ -50,8 +53,6 @@ const Param__1 = __importDefault(require("./Param__"));
 const Variable__1 = __importDefault(require("./Variable__"));
 const Logic__1 = __importDefault(require("./Logic__"));
 const BindEvent__1 = __importDefault(require("./BindEvent__"));
-const getBranchCopyUniCode = () => window?.BranchCopyUniCode;
-const removedViewElementCache = {}; // 临时记录删除的页面元素计数的最大值
 /**
  * 页面
  */
@@ -1116,6 +1117,7 @@ class View extends BaseNode_1.default {
             first: this.children.find((child) => child.isIndex)?.name,
             auth: this.auth ? 'loginAuth' : undefined,
             viewBindEvents: this.getViewBindEvents(),
+            viewBindSyncAttrs: this.getViewBindSyncAttrs(),
             viewExpressions: this.getViewExpressions(),
             elements: componentList,
             elementsAll: componentListExtra,
@@ -1275,16 +1277,15 @@ class View extends BaseNode_1.default {
     elementsAttrsAll(elements, componentListExtra) {
         if (elements) {
             elements.forEach((item) => {
-                if (!exports.PAGE_COMPONENT_INCLUDE_TAG_MAP?.[item.tag]) {
-                    componentListExtra.push(item);
-                }
+                componentListExtra.push(item);
                 if (item.children.length > 0) {
                     this.elementsAttrsAll(item.children, componentListExtra);
                 }
             });
         }
     }
-    toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
+    *toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
+        const self = this;
         function chineseTsName(name) {
             let tsName = name;
             // 匹配所有特殊字符都转为_
@@ -1293,15 +1294,15 @@ class View extends BaseNode_1.default {
         }
         // 获取虚拟logic的参数和内容
         // 用作展示和tots查找引用
-        this.getElementLogicRoot();
-        let code = `export namespace ${this.tsName} {\n`;
+        self.getElementLogicRoot();
+        let code = `export namespace ${self.tsName} {\n`;
         // 角色
-        if (Array.isArray(this.bindRoles) && this.bindRoles.length) {
+        if (Array.isArray(self.bindRoles) && self.bindRoles.length) {
             code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
             code += 'export let __bindRoles = [\n';
-            this.bindRoles.forEach((role) => {
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.bindRoles, function* warpForEachGenerator(role) {
                 code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
-                code += `${this.app.getNamespace()}.roles.${chineseTsName(role)}.${chineseTsName(role)},`;
+                code += `${self.app.getNamespace()}.roles.${chineseTsName(role)}.${chineseTsName(role)},`;
                 code += '\n';
             });
             code += '\n';
@@ -1310,23 +1311,23 @@ class View extends BaseNode_1.default {
         }
         // 需要类型推导的局部变量/返回值需要调整申明顺序
         const advanceMap = new Map();
-        this.traverseChildren((el) => {
+        yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
             if (el && (el instanceof BatchAssignment__1.default || (el instanceof Assignment__1.default && el.left?.name))) {
                 // 子页面内部逻辑过滤
-                if (el.view !== this)
+                if (el.view !== self)
                     return;
                 if (el instanceof Assignment__1.default) {
-                    const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && el.left?.name === variable.name);
+                    const advanceVar = self.variables?.find((variable) => !variable.typeAnnotation && el.left?.name === variable.name);
                     if (advanceVar && !advanceMap.get(advanceVar)) {
                         advanceMap.set(advanceVar, el);
                     }
                 }
                 else if (el instanceof BatchAssignment__1.default) {
-                    el.assignmentLines.forEach(({ leftIndex }) => {
+                    yield* (0, time_slicing_1.wrapForEachToGenerator)(el.assignmentLines, function* warpForEachGenerator({ 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 advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && leftCode === variable.name);
+                            ? yield* el.left?.expression?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) ?? (0, time_slicing_1.returnOrigin)('')
+                            : yield* el.left?.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) ?? (0, time_slicing_1.returnOrigin)('');
+                        const advanceVar = self.variables?.find((variable) => !variable.typeAnnotation && leftCode === variable.name);
                         if (advanceVar && !advanceMap.get(advanceVar)) {
                             advanceMap.set(advanceVar, el);
                         }
@@ -1334,38 +1335,38 @@ class View extends BaseNode_1.default {
                 }
             }
         });
-        if (Array.isArray(this.params)) {
-            this.params.forEach((param) => {
+        if (Array.isArray(self.params)) {
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.params, function* warpForEachGenerator(param) {
                 code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
-                code += param.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                code += yield* param.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += ';\n';
             });
         }
-        if (Array.isArray(this.variables)) {
-            this.variables.forEach((variable) => {
+        if (Array.isArray(self.variables)) {
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.variables, function* warpForEachGenerator(variable) {
                 if (!advanceMap.get(variable)) {
                     code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
-                    code += variable.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                    code += yield* variable.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                     code += ';\n';
                 }
             });
         }
-        advanceMap.forEach((assignment, variable) => {
+        yield* (0, time_slicing_1.wrapIteratorToGenerator)(advanceMap.entries(), function* warpForEachGenerator([variable, assignment]) {
             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 += yield* variable.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
             code += ' = ';
             if (assignment instanceof BatchAssignment__1.default) {
-                assignment.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+                yield* (0, time_slicing_1.wrapForEachToGenerator)(assignment.assignmentLines, function* warpForEachGenerator({ 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 }));
+                        ? yield* assignment.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
+                        : yield* assignment.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) ?? (0, time_slicing_1.returnOrigin)('');
                     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 }));
-                        code += this.getRightCode(rightCode, assignment, rightNode);
+                        const rightCode = yield* rightNode?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) ?? (0, time_slicing_1.returnOrigin)('');
+                        code += yield* self.getRightCode(rightCode, assignment, rightNode);
                     }
                 });
             }
@@ -1380,53 +1381,53 @@ class View extends BaseNode_1.default {
                 }
                 rightCode +=
                     assignment.right && assignment.right.toEmbeddedTS
-                        ? assignment.right.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
+                        ? yield* assignment.right.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
                         : '__RIGHT__';
-                code += this.getRightCode(rightCode, assignment, assignment.right);
+                code += yield* self.getRightCode(rightCode, assignment, assignment.right);
             }
             code += ';\n';
         });
         // elements类型声明定义
         code += `interface __elements {\n`;
         // 生成所有的name和类型定义
-        this.elements.forEach((element) => {
-            code += element.toEmbeddedTSDefinition((0, translator_1.shiftState)(state, code, {
+        yield* (0, time_slicing_1.wrapForEachToGenerator)(self.elements, function* warpForEachGenerator(element) {
+            code += yield* element.toEmbeddedTSDefinition((0, translator_1.shiftState)(state, code, {
                 tabSize: (state?.tabSize || 0) + 1,
             }));
         });
         code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}}\n`;
         code += `let __elements: __elements;\n`;
-        if (Array.isArray(this.elements)) {
+        if (Array.isArray(self.elements)) {
             code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}interface `;
             code += `__elements_completionProperty {\n`;
             const componentList = [];
-            this.elementsAttrs(this.elements, componentList);
+            self.elementsAttrs(self.elements, componentList);
             const variableList = [];
-            this.elements.forEach((item) => {
-                code += item.toEmbeddedTSVariableDefinition((0, translator_1.shiftState)(state, code, { inline: true }), variableList);
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.elements, function* warpForEachGenerator(item) {
+                code += yield* item.toEmbeddedTSVariableDefinition((0, translator_1.shiftState)(state, code, { inline: true }), variableList);
             });
             code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + `}\n`;
             code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
             code += `let __elements_completionProperty: __elements_completionProperty;\n`;
             code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
             code += `let __elements_variable_function = {\n`;
-            this.elements.forEach((item) => {
-                code += item.toEmbeddedTSVariableFunctionDefinition((0, translator_1.shiftState)(state, code, { inline: true }));
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.elements, function* warpForEachGenerator(item) {
+                code += yield* item.toEmbeddedTSVariableFunctionDefinition((0, translator_1.shiftState)(state, code, { inline: true }));
             });
             code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + `}\n`;
             code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
             code += `let __elements_stashFunctionVariable = {\n`;
-            variableList.forEach((item) => {
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(variableList, function* warpForEachGenerator(item) {
                 code += (0, translator_1.indent)((state?.tabSize || 0) + 2);
                 code += `${item}`;
             });
             code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + `}\n`;
         }
         // 逻辑
-        if (Array.isArray(this.logics) && this.logics.length) {
+        if (Array.isArray(self.logics) && self.logics.length) {
             code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
-            this.logics.forEach((logic) => {
-                code += logic.toEmbeddedTS((0, translator_1.shiftState)(state, code, {
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.logics, function* warpForEachGenerator(logic) {
+                code += yield* logic.toEmbeddedTS((0, translator_1.shiftState)(state, code, {
                     tabSize: (state?.tabSize || 0) + 2,
                 }), 'noExport');
                 code += '\n';
@@ -1434,9 +1435,9 @@ class View extends BaseNode_1.default {
             code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
         }
         // 事件
-        if (Array.isArray(this.bindEvents)) {
-            this.bindEvents.forEach((event) => {
-                code += event.toEmbeddedTS((0, translator_1.shiftState)(state, code, {
+        if (Array.isArray(self.bindEvents)) {
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.bindEvents, function* warpForEachGenerator(event) {
+                code += yield* event.toEmbeddedTS((0, translator_1.shiftState)(state, code, {
                     tabSize: state?.tabSize || 0,
                 }), true);
                 code += '\n';
@@ -1448,21 +1449,21 @@ class View extends BaseNode_1.default {
         code += `){\n`;
         code += (0, translator_1.indent)(state?.tabSize || 0);
         // elements 元素
-        if (Array.isArray(this.elements)) {
+        if (Array.isArray(self.elements)) {
             // 生成嵌套式的内容
-            this.elements.forEach((element) => {
-                code += element.toEmbeddedTS((0, translator_1.shiftState)(state, code, {
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.elements, function* warpForEachGenerator(element) {
+                code += yield* element.toEmbeddedTS((0, translator_1.shiftState)(state, code, {
                     tabSize: (state?.tabSize || 0) + 3,
                 }));
                 code += '\n';
             });
         }
         code += `\n${(0, translator_1.indent)((state?.tabSize || 0) + 1)}}\n`;
-        if (Array.isArray(this.params)) {
+        if (Array.isArray(self.params)) {
             code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}export function $destination(options: {`;
-            this.params.forEach((param, index) => {
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.params, function* warpForEachGenerator(param, index) {
                 code += `${param.name}?: `;
-                code += param.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code));
+                code += yield* param.typeAnnotation.toEmbeddedTS((0, translator_1.shiftState)(state, code));
                 code += ', ';
             });
             // 锚点
@@ -1561,13 +1562,13 @@ ${(0, translator_1.indent)(state.tabSize)}export function ${this.tsName}_view`;
         code += `${(0, translator_1.indent)(state.tabSize)}}\n`;
         return code;
     }
-    toEmbeddedTSFile() {
+    *toEmbeddedTSFile() {
         let code = `namespace ${this.getTsNamespace()} {\n`;
         const state = (0, translator_1.createCompilerState)(code, {
             tabSize: 1,
         });
         try {
-            code += this.toEmbeddedTS(state);
+            code += yield* this.toEmbeddedTS(state);
         }
         catch (err) {
             code += '';
@@ -1680,6 +1681,16 @@ ${(0, translator_1.indent)(state.tabSize)}export function ${this.tsName}_view`;
         });
         return bindEvents;
     }
+    // 获取页面内所有开启了双向绑定的属性
+    getViewBindSyncAttrs() {
+        const bindSyncAttrs = [];
+        this.elements.forEach((item) => {
+            utils.traverse((current) => {
+                bindSyncAttrs.push(...current.node.getSyncBindAttrs());
+            }, { node: item });
+        });
+        return bindSyncAttrs;
+    }
     // 获取页面上需要替换的表达式
     getViewExpressions() {
         const bindExpressions = [];
@@ -1806,7 +1817,7 @@ ${(0, translator_1.indent)(state.tabSize)}export function ${this.tsName}_view`;
             removedViewElementCache[prefix] = lastDigit;
         }
     }
-    getRightCode(code, assignment, rightNode) {
+    *getRightCode(code, assignment, rightNode) {
         code = code.replaceAll('\n', ' ');
         const logic = assignment.logic;
         const logicRtn = logic?.returns[0];
@@ -1838,7 +1849,7 @@ ${(0, translator_1.indent)(state.tabSize)}export function ${this.tsName}_view`;
         }
         // 处理 current.item、current1.item 等数据
         if (/current(\d)*\.item/.test(code)) {
-            code = this.handleCurrentItemCode(code, logic);
+            code = yield* this.handleCurrentItemCode(code, logic);
             return code;
         }
         // 直接赋值 logic 内局部变量、输入参数直接提示系统无法推断类型
@@ -1885,16 +1896,16 @@ ${(0, translator_1.indent)(state.tabSize)}export function ${this.tsName}_view`;
         }
         return viewElements;
     }
-    handleCurrentItemCode(code, logic) {
+    *handleCurrentItemCode(code, logic) {
         const viewElementsWithDataSource = this.getAncestorViewElementsWithDataSource(logic);
-        viewElementsWithDataSource.forEach((viewElement, index) => {
+        yield* (0, time_slicing_1.wrapForEachToGenerator)(viewElementsWithDataSource, function* wrapForEach(viewElement, index) {
             const currentIndex = viewElementsWithDataSource.length - 1 - index;
             const currentItemCode = `current${currentIndex === 0 ? '' : currentIndex}.item`;
             if (code.includes(currentItemCode)) {
                 const dataSource = viewElement.bindAttrs.find((bAttr) => bAttr.name === 'data-source');
                 if (dataSource) {
                     const view = viewElement.getAncestor('View');
-                    const dataSourceTS = dataSource.expression.toEmbeddedTS();
+                    const dataSourceTS = yield* dataSource.expression.toEmbeddedTS();
                     const logic = view.logics.find((logic) => logic.name === dataSourceTS);
                     if (logic) {
                         code = code.replaceAll(currentItemCode, `nasl.ui.getCurrentItemType(${dataSourceTS}(${logic.params.map(() => 'null').join(',')}))`);
@@ -1976,7 +1987,7 @@ __decorate([
     (0, decorators_1.property)('View')
 ], View.prototype, "children", void 0);
 __decorate([
-    (0, translator_1.withSourceMap)()
+    translator_1.withSourceMapGenerator
 ], View.prototype, "toEmbeddedTS", null);
 __decorate([
     (0, translator_1.withSourceMap)()