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

package/src/concepts/View__.ts

@@ -1,5 +1,20 @@
+import {
+  wrapForEachToGenerator as wrapForEach,
+  wrapIteratorToGenerator as wrapIterator,
+  returnOrigin,
+} from '../utils/time-slicing';
+import type { EmbeddedTSFileGenerator } from '../utils';
 import Namespace from './Namespace__';
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import translator from '../bak/translator';
 import { ElementToVueOptions } from './ViewElement__';
 import { Structure } from './Structure__';
@@ -10,6 +25,12 @@ import Match from './Match__';
 import BatchAssignment from './BatchAssignment__';
 import CallInterface from './CallInterface__';
 import CallLogic from './CallLogic__';
+import BindAttribute from './BindAttribute__';
+const getBranchCopyUniCode = () => (window as any)?.BranchCopyUniCode
+
+const removedViewElementCache: {
+  [key: string]: number | bigint;
+} = {} // 临时记录删除的页面元素计数的最大值
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -29,11 +50,6 @@ import BindEvent from './BindEvent__';
 import Module from './Module__';
 import Frontend from './Frontend__';
 import App from './App__';
-
-const getBranchCopyUniCode = () => (window as any)?.BranchCopyUniCode
-const removedViewElementCache : {
-  [key: string]: number | bigint;
-}= {} // 临时记录删除的页面元素计数的最大值
 /**
  * 页面
  */
@@ -1567,7 +1583,7 @@ export class View extends BaseNode {
     }
     const newPrefix = newName.replace(/\d*$/, '');
     const newPrefixNum = removedViewElementCache?.[newPrefix] ? removedViewElementCache[newPrefix] : 1
-    const startNum = newPrefixNum < Number.MAX_SAFE_INTEGER ?  newPrefixNum as number + 1 : BigInt(newPrefixNum) + BigInt(1);
+    const startNum = newPrefixNum < Number.MAX_SAFE_INTEGER ? newPrefixNum as number + 1 : BigInt(newPrefixNum) + BigInt(1);
     const viewElementUniqueName = utils.uniqueMax(newName, this.existingViewElement, removedViewElementCache?.[newPrefix] ? startNum : newPrefixNum);
     this.existingViewElement.add(viewElementUniqueName);
     return viewElementUniqueName;
@@ -1819,6 +1835,7 @@ export class View extends BaseNode {
       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,
@@ -1837,15 +1854,15 @@ export class View extends BaseNode {
             methods: {
                 async onKeyDown(e) {
                     ${this.bindEvents
-                      .filter((event) => ['keydown'].includes(event.name))
-                      .map((event) => `await this.${event.view.name}_${event.name}(e);`)
-                      .join('\n')}
+        .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')}
+        .filter((event) => ['keyup'].includes(event.name))
+        .map((event) => `await this.${event.view.name}_${event.name}(e);`)
+        .join('\n')}
                 }
             }
         };`;
@@ -1870,7 +1887,7 @@ export class View extends BaseNode {
     code += translator(definition, this);
     code += '};\n';
     return code;
-    }
+  }
 
   genVueTemplate(options?: ElementToVueOptions) {
     return this.elements?.map((element) => `${element?.toVue(options)}\n`).join('');
@@ -1989,9 +2006,7 @@ export class View extends BaseNode {
   elementsAttrsAll(elements: Array<ViewElement>, componentListExtra: Array<ViewElement>) {
     if (elements) {
       elements.forEach((item: ViewElement) => {
-        if (!PAGE_COMPONENT_INCLUDE_TAG_MAP?.[item.tag]) {
-          componentListExtra.push(item);
-        }
+        componentListExtra.push(item);
         if (item.children.length > 0) {
           this.elementsAttrsAll(item.children, componentListExtra);
         }
@@ -1999,8 +2014,9 @@ export class View extends BaseNode {
     }
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     function chineseTsName(name: string) {
       let tsName = name;
       // 匹配所有特殊字符都转为_
@@ -2009,16 +2025,15 @@ export class View extends BaseNode {
     }
     // 获取虚拟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 += indent((state?.tabSize || 0) + 1);
       code += 'export let __bindRoles = [\n';
-      this.bindRoles.forEach((role) => {
+      yield* wrapForEach(self.bindRoles, function* warpForEachGenerator(role) {
         code += 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';
@@ -2027,24 +2042,24 @@ export class View extends BaseNode {
     }
     // 需要类型推导的局部变量/返回值需要调整申明顺序
     const advanceMap: Map<Variable, Assignment | BatchAssignment> = new Map();
-    this.traverseChildren((el) => {
+    yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
       if (el && (el instanceof BatchAssignment || (el instanceof Assignment && el.left?.name))) {
         // 子页面内部逻辑过滤
-        if (el.view !== this) return;
+        if (el.view !== self) return;
         if (el instanceof Assignment) {
-          const advanceVar = this.variables?.find(
+          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) {
-          el.assignmentLines.forEach(({ leftIndex }) => {
+          yield* wrapForEach(el.assignmentLines, function* warpForEachGenerator({ leftIndex }) {
             const leftCode =
               leftIndex.length === 1
-                ? el.left?.expression?.toEmbeddedTS(shiftState(state, code, { inline: true }))
-                : el.left?.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
-            const advanceVar = this.variables?.find(
+                ? yield* el.left?.expression?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('')
+                : yield* el.left?.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');
+            const advanceVar = self.variables?.find(
               (variable) => !variable.typeAnnotation && leftCode === variable.name,
             );
             if (advanceVar && !advanceMap.get(advanceVar)) {
@@ -2054,40 +2069,40 @@ export class View extends BaseNode {
         }
       }
     });
-    if (Array.isArray(this.params)) {
-      this.params.forEach((param) => {
+    if (Array.isArray(self.params)) {
+      yield* wrapForEach(self.params, function* warpForEachGenerator(param) {
         code += `${indent((state?.tabSize || 0) + 1)}let `;
-        code += param.toEmbeddedTS(shiftState(state, code, { inline: true }));
+        code += yield* param.toEmbeddedTS(shiftState(state, code, { inline: true }));
         code += ';\n';
       });
     }
-    if (Array.isArray(this.variables)) {
-      this.variables.forEach((variable) => {
+    if (Array.isArray(self.variables)) {
+      yield* wrapForEach(self.variables, function* warpForEachGenerator(variable) {
         if (!advanceMap.get(variable)) {
           code += `${indent((state?.tabSize || 0) + 1)}let `;
-          code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
+          code += yield* variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
           code += ';\n';
         }
       });
     }
-    advanceMap.forEach((assignment, variable) => {
+    yield* wrapIterator(advanceMap.entries(), function* warpForEachGenerator([variable, assignment]) {
       code += `${indent((state?.tabSize || 0) + 1)}// @ts-ignore\n`;
       code += `${indent((state?.tabSize || 0) + 1)}let `;
-      code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
+      code += yield* variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
       code += ' = ';
       if (assignment instanceof BatchAssignment) {
-        assignment.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+        yield* wrapForEach(assignment.assignmentLines, function* warpForEachGenerator({ leftIndex, rightIndex }) {
           const leftCode =
             leftIndex.length === 1
-              ? assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
-              : assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
+              ? yield* assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
+              : yield* assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? 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(shiftState(state, code, { inline: true }));
-            code += this.getRightCode(rightCode, assignment, rightNode);
+            const rightCode = yield* rightNode?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');
+            code += yield* self.getRightCode(rightCode, assignment, rightNode);
           }
         });
       } else {
@@ -2103,18 +2118,17 @@ export class View extends BaseNode {
         }
         rightCode +=
           assignment.right && assignment.right.toEmbeddedTS
-            ? assignment.right.toEmbeddedTS(shiftState(state, code, { inline: true }))
+            ? yield* assignment.right.toEmbeddedTS(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(
+    yield* wrapForEach(self.elements, function* warpForEachGenerator(element) {
+      code += yield* element.toEmbeddedTSDefinition(
         shiftState(state, code, {
           tabSize: (state?.tabSize || 0) + 1,
         }),
@@ -2122,40 +2136,37 @@ export class View extends BaseNode {
     });
     code += `${indent((state?.tabSize || 0) + 1)}}\n`;
     code += `let __elements: __elements;\n`;
-
-    if (Array.isArray(this.elements)) {
+    if (Array.isArray(self.elements)) {
       code += `${indent((state?.tabSize || 0) + 1)}interface `;
       code += `__elements_completionProperty {\n`;
       const componentList: Array<ViewElement> = [];
-      this.elementsAttrs(this.elements, componentList);
+      self.elementsAttrs(self.elements, componentList);
       const variableList: string[] = [];
-      this.elements.forEach((item) => {
-        code += item.toEmbeddedTSVariableDefinition(shiftState(state, code, { inline: true }), variableList);
+      yield* wrapForEach(self.elements, function* warpForEachGenerator(item) {
+        code += yield* item.toEmbeddedTSVariableDefinition(shiftState(state, code, { inline: true }), variableList);
       });
       code += indent((state?.tabSize || 0) + 1) + `}\n`;
       code += indent((state?.tabSize || 0) + 1);
       code += `let __elements_completionProperty: __elements_completionProperty;\n`;
-
       code += indent((state?.tabSize || 0) + 1);
       code += `let __elements_variable_function = {\n`;
-      this.elements.forEach((item) => {
-        code += item.toEmbeddedTSVariableFunctionDefinition(shiftState(state, code, { inline: true }));
+      yield* wrapForEach(self.elements, function* warpForEachGenerator(item) {
+        code += yield* item.toEmbeddedTSVariableFunctionDefinition(shiftState(state, code, { inline: true }));
       });
       code += indent((state?.tabSize || 0) + 1) + `}\n`;
-
       code += indent((state?.tabSize || 0) + 1);
       code += `let __elements_stashFunctionVariable = {\n`;
-      variableList.forEach((item) => {
+      yield* wrapForEach(variableList, function* warpForEachGenerator(item) {
         code += indent((state?.tabSize || 0) + 2);
         code += `${item}`;
       });
       code += indent((state?.tabSize || 0) + 1) + `}\n`;
     }
     // 逻辑
-    if (Array.isArray(this.logics) && this.logics.length) {
+    if (Array.isArray(self.logics) && self.logics.length) {
       code += indent((state?.tabSize || 0) + 1);
-      this.logics.forEach((logic) => {
-        code += logic.toEmbeddedTS(
+      yield* wrapForEach(self.logics, function* warpForEachGenerator(logic) {
+        code += yield* logic.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 2,
           }),
@@ -2166,9 +2177,9 @@ export class View extends BaseNode {
       code += indent((state?.tabSize || 0) + 1);
     }
     // 事件
-    if (Array.isArray(this.bindEvents)) {
-      this.bindEvents.forEach((event) => {
-        code += event.toEmbeddedTS(
+    if (Array.isArray(self.bindEvents)) {
+      yield* wrapForEach(self.bindEvents, function* warpForEachGenerator(event) {
+        code += yield* event.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: state?.tabSize || 0,
           }),
@@ -2177,18 +2188,16 @@ export class View extends BaseNode {
         code += '\n';
       });
     }
-
     // render函数
     code += `\n${indent((state?.tabSize || 0) + 1)}`;
     code += `export function __render(`;
     code += `){\n`;
     code += indent(state?.tabSize || 0);
-
     // elements 元素
-    if (Array.isArray(this.elements)) {
+    if (Array.isArray(self.elements)) {
       // 生成嵌套式的内容
-      this.elements.forEach((element) => {
-        code += element.toEmbeddedTS(
+      yield* wrapForEach(self.elements, function* warpForEachGenerator(element) {
+        code += yield* element.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 3,
           }),
@@ -2196,20 +2205,16 @@ export class View extends BaseNode {
         code += '\n';
       });
     }
-
     code += `\n${indent((state?.tabSize || 0) + 1)}}\n`;
-
-    if (Array.isArray(this.params)) {
+    if (Array.isArray(self.params)) {
       code += `${indent((state?.tabSize || 0) + 1)}export function $destination(options: {`;
-      this.params.forEach((param, index) => {
+      yield* wrapForEach(self.params, function* warpForEachGenerator(param, index) {
         code += `${param.name}?: `;
-        code += param.typeAnnotation.toEmbeddedTS(shiftState(state, code));
+        code += yield* param.typeAnnotation.toEmbeddedTS(shiftState(state, code));
         code += ', ';
       });
-
       // 锚点
       code += `_anchor?: nasl.core.String`;
-
       code += '}){}\n';
     }
     code += `${indent(state?.tabSize || 0)}}\n`;
@@ -2327,14 +2332,14 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
     return code;
   }
 
-  toEmbeddedTSFile() {
+  *toEmbeddedTSFile(): EmbeddedTSFileGenerator {
     let code = `namespace ${this.getTsNamespace()} {\n`;
     const state = createCompilerState(code, {
       tabSize: 1,
     });
 
     try {
-      code += this.toEmbeddedTS(state);
+      code += yield* this.toEmbeddedTS(state);
     } catch (err) {
       code += '';
       console.log(err);
@@ -2464,6 +2469,20 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
     return bindEvents;
   }
 
+  // 获取页面内所有开启了双向绑定的属性
+  getViewBindSyncAttrs() {
+    const bindSyncAttrs: BindAttribute[] = [];
+    this.elements.forEach((item) => {
+      utils.traverse(
+        (current) => {
+          bindSyncAttrs.push(...(current.node as ViewElement).getSyncBindAttrs())
+        },
+        { node: item },
+      );
+    });
+    return bindSyncAttrs;
+  }
+
   // 获取页面上需要替换的表达式
   getViewExpressions() {
     const bindExpressions: any[] = [];
@@ -2588,7 +2607,7 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
 
     const prefix = viewElement?.name.replace(/\d*$/, '');
     let lastDigit = viewElement?.name.match(/\d+$/)?.[0];
-    if(lastDigit === undefined) return;
+    if (lastDigit === undefined) return;
 
     //@ts-ignore
     lastDigit = lastDigit < Number.MAX_SAFE_INTEGER ? parseInt(lastDigit) : BigInt(lastDigit);
@@ -2596,15 +2615,15 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
     if (removedViewElementCache?.[prefix]) {
       //@ts-ignore
       if (lastDigit > removedViewElementCache[prefix])
-      //@ts-ignore
-      removedViewElementCache[prefix] = lastDigit;
-    }else {
+        //@ts-ignore
+        removedViewElementCache[prefix] = lastDigit;
+    } else {
       //@ts-ignore
       removedViewElementCache[prefix] = lastDigit;
     }
   }
 
-  getRightCode(code: string, assignment: Assignment | BatchAssignment, rightNode: any): string {
+  *getRightCode(code: string, assignment: Assignment | BatchAssignment, rightNode: any) {
     code = code.replaceAll('\n', ' ');
     const logic = assignment.logic;
     const logicRtn = logic?.returns[0];
@@ -2637,7 +2656,7 @@ ${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;
     }
 
@@ -2682,16 +2701,16 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
     return viewElements;
   }
 
-  handleCurrentItemCode(code: string, logic: Logic): string {
+  *handleCurrentItemCode(code: string, logic: Logic) {
     const viewElementsWithDataSource: ViewElement[] = this.getAncestorViewElementsWithDataSource(logic);
-    viewElementsWithDataSource.forEach((viewElement, index) => {
+    yield* wrapForEach(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') as 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(

package/src/concepts/WhileStatement__.ts

@@ -1,4 +1,14 @@
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -269,29 +279,28 @@ export class WhileStatement extends LogicItem {
     return code;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
     code += 'while (nasl.core.ensureBoolean(';
-    code += this.test
-      ? this.test.toEmbeddedTS(
+    code += self.test
+      ? yield* self.test.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: 0,
           }),
         )
       : '__IDENTIFIER__';
     code += ')) {\n';
-
-    if (Array.isArray(this.body)) {
-      this.body.forEach((logicItem) => {
-        code += `${logicItem.toEmbeddedTS(
+    if (Array.isArray(self.body)) {
+      yield* wrapForEach(self.body, function* warpForEachGenerator(logicItem) {
+        code += `${yield* logicItem.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 1,
           }),
         )};\n`;
       });
     }
-
     code += `${indent(state?.tabSize || 0)}}\n`;
     return code;
   }

package/src/concepts/types__.ts

@@ -245,4 +245,4 @@ export type SyntaxNode =
     | CallConnector
     | Connection;
 
-export type SyntaxNodeConcept = SyntaxNode['concept'];
+export type SyntaxNodeConcept = SyntaxNode['concept'];

package/src/manager/diagnostic.ts

@@ -1,5 +1,6 @@
 import * as tsProtocol from 'typescript/lib/protocol';
-import { LogicItem, BaseNode } from '../concepts';
+import { BaseNode } from '../concepts';
+import { timeSlicingWithList } from '../utils';
 
 // export interface TypeCheckNote {
 //     status: string,
@@ -99,9 +100,7 @@ export class DiagnosticManager {
   }
 
   pushAll(records: DiagnosticRecord[]) {
-    for (const record of records) {
-      this.push(record);
-    }
+    return timeSlicingWithList(records, (record) => this.push(record));
   }
 
   filterDiagnostics(showTSError?: boolean) {