@lcap/nasl 3.8.3-beta.1 → 3.8.3-beta.2

package/src/concepts/SubLogic__.ts

@@ -63,6 +63,7 @@ import Param from './Param__';
 import Return from './Return__';
 import Variable from './Variable__';
 import LogicItem from './LogicItem__';
+import { reCollectTyInferCtx, varScopeCtx } from '../../../nasl/src/server/semanticData';
 
 /**
  * 子逻辑
@@ -1181,61 +1182,7 @@ export class SubLogic extends LogicItem {
     code += ')';
     const advanceMap: Map<Return | Variable, Assignment | BatchAssignment> = new Map();
     const callFunctionAdvanceMap: Map<Return | Variable, CallFunction> = new Map();
-    yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
-      if (
-        el &&
-        // 批量赋值
-        (asserts.isBatchAssignment(el) ||
-          // 赋值
-          (asserts.isAssignment(el) && el.left?.name) ||
-          // 内置函数对集合类型的推导
-          (asserts.isCallFunction(el) && el.derivablecollection?.name))
-      ) {
-        if (el?.getAncestor('SubLogic') !== self) {
-          return;
-        }
-        if (asserts.isAssignment(el)) {
-          const advanceVar = self.variables?.find(
-            (variable) => !variable.typeAnnotation && el.left?.name === variable.name,
-          );
-          if (advanceVar && !advanceMap.get(advanceVar)) {
-            advanceMap.set(advanceVar, el);
-          }
-          const advanceRn = self.returns?.find((ret) => !ret.typeAnnotation && el.left?.name === ret.name);
-          if (advanceRn && !advanceMap.get(advanceRn)) {
-            advanceMap.set(advanceRn, el);
-          }
-        } else if (asserts.isCallFunction(el)) {
-          // 需要被推导的集合
-          const expression = el.derivablecollection;
-          // 宽泛意义上的变量（变量+出参）
-          const advanceVar = [...(self.variables || []), ...(self.returns || [])].find((variable) => {
-            return !variable.typeAnnotation && expression?.name === variable.name;
-          });
-          if (advanceVar && !callFunctionAdvanceMap.get(advanceVar)) {
-            callFunctionAdvanceMap.set(advanceVar, el);
-          }
-        } else if (asserts.isBatchAssignment(el)) {
-          yield* wrapForEach(el.assignmentLines, function* warpForEachGenerator({ leftIndex }) {
-            const leftCode =
-              leftIndex.length === 1
-                ? yield* el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
-                : 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)) {
-              advanceMap.set(advanceVar, el);
-            }
-            const advanceRn = self.returns?.find((ret) => !ret.typeAnnotation && leftCode === ret.name);
-            if (advanceRn && !advanceMap.get(advanceRn)) {
-              advanceMap.set(advanceRn, el);
-            }
-          });
-        }
-      }
-    });
+    yield* reCollectTyInferCtx(advanceMap, callFunctionAdvanceMap, self);
 
     // 兼容 return 没有类型情况
     if (self.returns.length && self.returns[0].typeAnnotation) {
@@ -1508,7 +1455,10 @@ export class SubLogic extends LogicItem {
   subLogics: SubLogic[] = [];
 
   getSubLogics() {
-    const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
+    if (varScopeCtx.isFirstScreen) {
+      return;
+    }
+    const subLogics = this.findNaslNodeByBFS((node) => {
       if (asserts.isSubLogic(node)) {
         return true;
       }

package/src/concepts/View__.ts

@@ -46,6 +46,8 @@ const removedViewElementCache: {
   [key: string]: number | bigint;
 } = {};
 
+import { reCollectTyInferCtx, varScopeCtx } from '../../../nasl/src/server/semanticData';
+
 import { config } from '../config';
 
 //================================================================================
@@ -2182,7 +2184,12 @@ export class View extends Annotatable {
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
     // 获取所有子节点用于树上填充
+    // const time1 = Date.now();
     self.getSubLogics();
+    // const time2 = Date.now();
+    // if (time2 - time1 > 100) {
+    //   console.log('获取 getSubLogics 耗时', (time2 - time1) / 1000, 's');
+    // }
     function chineseTsName(name: string) {
       let tsName = name;
       // 匹配所有特殊字符都转为_
@@ -2209,57 +2216,7 @@ export class View extends Annotatable {
     // 需要类型推导的局部变量/返回值需要调整申明顺序
     const advanceMap: Map<Variable, Assignment | BatchAssignment> = new Map();
     const callFunctionAdvanceMap: Map<Variable, CallFunction> = new Map();
-    yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
-      if (
-        el &&
-        // 批量赋值
-        (asserts.isBatchAssignment(el) ||
-          // 赋值
-          (asserts.isAssignment(el) && el.left?.name) ||
-          // 内置函数对集合类型的推导
-          (asserts.isCallFunction(el) && el.derivablecollection?.name))
-      ) {
-        if (el?.getAncestor('SubLogic')) {
-          return;
-        }
-        // 子页面内部逻辑过滤
-        if (el.view !== self) return;
-        if (asserts.isAssignment(el)) {
-          // 需要被推导的赋值左侧
-          const expression = el.left;
-          const advanceVar = self.variables?.find((variable) => {
-            return !variable.typeAnnotation && expression?.name === variable.name;
-          });
-          if (advanceVar && !advanceMap.get(advanceVar)) {
-            advanceMap.set(advanceVar, el);
-          }
-        } else if (asserts.isCallFunction(el)) {
-          // 需要被推导的集合
-          const expression = el.derivablecollection;
-          const advanceVar = self.variables?.find((variable) => {
-            return !variable.typeAnnotation && expression?.name === variable.name;
-          });
-          if (advanceVar && !callFunctionAdvanceMap.get(advanceVar)) {
-            callFunctionAdvanceMap.set(advanceVar, el);
-          }
-        } else if (asserts.isBatchAssignment(el)) {
-          yield* wrapForEach(el.assignmentLines, function* warpForEachGenerator({ leftIndex }) {
-            const leftCode =
-              leftIndex.length === 1
-                ? 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)) {
-              advanceMap.set(advanceVar, el);
-            }
-          });
-        }
-      }
-    });
+    yield* reCollectTyInferCtx(advanceMap, callFunctionAdvanceMap, self);
 
     // 用来储存默认值翻译结构是__IDENTIFIER__或者__IDENTIFIER__()的节点
     const IDENTIFIERMAP = new Set<Variable>();
@@ -2789,8 +2746,8 @@ export class View extends Annotatable {
     this.elements.forEach((item) => {
       utils.traverse(
         (current) => {
-          current.node.bindEvents.forEach((bindEvent) => {
-            bindEvent.logics.forEach((logic) => {
+          current.node.bindEvents.forEach((bindEvent: BindEvent) => {
+            bindEvent.logics.forEach((logic: Logic) => {
               if (!logic?.name || logic?.name?.startsWith('__')) {
                 return;
               }
@@ -3186,7 +3143,10 @@ export class View extends Annotatable {
   subLogics: Array<SubLogic> = [];
 
   getSubLogics() {
-    const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
+    if (varScopeCtx.isFirstScreen) {
+      return;
+    }
+    const subLogics = this.findNaslNodeByBFS((node) => {
       // 仅仅是为了处理数据源中的子逻辑，Logic 下面的，交由Logic 自己处理
       if (node?.concept === 'Logic') {
         return true;

package/src/natural/transformTS2UI.ts

@@ -67,12 +67,12 @@ function transformParam(node: babelTypes.Identifier): naslTypes.Param {
 
 // 处理生命周期函数
 function transformLifecycle(node: babelTypes.ObjectExpression): Array<naslTypes.BindEvent> {
-  const bindEvents: Array<naslTypes.BindEvent> = []
+  const bindEvents: Array<naslTypes.BindEvent> = [];
   node.properties.forEach((property: any) => {
     const eventName = property?.key?.name?.replace(/^on/, '')?.toLowerCase();
     const bindEvent = new naslTypes.BindEvent({ name: eventName });
     property.value.elements.forEach((element: any) => {
-      let logicName =  element?.id?.name || '';
+      let logicName = element?.id?.name || '';
       logicName = bindEvent.getLogicUniqueName(logicName);
       const curLogic: any = transformNode2Logic(element, logicName, 'view_logic');
       bindEvent.addLogic(curLogic);
@@ -94,7 +94,7 @@ function transformVariableDeclaration(node: babelTypes.VariableDeclaration): nas
       typeAnnotation: varTypeAnnotation && transform2TypeAnnotation(varTypeAnnotation),
     });
     if (decl.init) {
-      if (decl.init.type !== 'ArrayExpression' && decl.init.type !== 'ObjectExpression') {
+      if (decl.init.type !== 'ArrayExpression') {
         // 变量值需要默认值还是赋值，在使用的地方处理
         newNode.defaultValue = new naslTypes.DefaultValue({
           expression: transformNode2Expression(decl.init),
@@ -690,10 +690,10 @@ function transformNode2Expression(node: babelTypes.Node, type?: string): any {
       }).filter((item) => !!item),
     }) as any;
     if (consequentIndex !== undefined) {
-      naslNode?.consequent?.splice(consequentIndex + 1, 0, new naslTypes.End());
+      naslNode.insertItemInConsequentAt(new naslTypes.End(), consequentIndex + 1,);
     }
     if (alternateIndex !== undefined) {
-      naslNode?.alternate?.splice(alternateIndex + 1, 0, new naslTypes.End());
+      naslNode.insertItemInAlternateAt(new naslTypes.End(), alternateIndex + 1);
     }
     return naslNode;
   } else if (node.type === 'WhileStatement') {
@@ -1202,7 +1202,7 @@ function transformNode2ViewConstruct(node: babelTypes.Node): naslTypes.ViewEleme
     const declList = node?.declarations || [];
     const declListFirstNodde = declList[0];
     const variableName = (declListFirstNodde as any)?.id?.name;
-    if(variableName === '$lifecycles' && declListFirstNodde.init) {
+    if (variableName === '$lifecycles' && declListFirstNodde.init) {
       return transformLifecycle(declListFirstNodde.init as any);
     }
     return transformVariableDeclaration(node);
@@ -1327,7 +1327,7 @@ function transformNode2View(node: babelTypes.FunctionDeclaration, root?: ParseRe
       if (viewItem.aiParams) json.push(viewItem.aiParams);
     }
     // 生命周期函数
-    if(item.type === 'VariableDeclaration' && Array.isArray(viewItem) && viewItem[0]?.concept === 'BindEvent') {
+    if (item.type === 'VariableDeclaration' && Array.isArray(viewItem) && viewItem[0]?.concept === 'BindEvent') {
       viewItem.forEach((bindEvent: any) => {
         view.addBindEvent(bindEvent);
       });

package/src/natural/transforms/transform2LogicItem.ts

@@ -378,7 +378,7 @@ function transform2VariableAndAddAssignment(node: babelTypes.VariableDeclaration
       }));
     }
     if (decl.init) {
-      if (decl.init.type !== 'ArrayExpression' && decl.init.type !== 'ObjectExpression') {
+      if (decl.init.type !== 'ArrayExpression') {
         const calleeName = generate((decl?.init as any)?.callee).code;
         const varTypeAnnotation = ((decl?.id as babelTypes.Identifier)?.typeAnnotation as babelTypes.TSTypeAnnotation)?.typeAnnotation;
         if (calleeName === 'nasl.oql.query' && varTypeAnnotation) {
@@ -428,10 +428,10 @@ function transform2IfStatement(node: babelTypes.IfStatement, options: TransformO
     }).filter((item) => !!item),
   }) as any;
   if (consequentIndex !== undefined) {
-    naslNode?.consequent?.splice(consequentIndex + 1, 0, new naslTypes.End());
+    naslNode.insertItemInConsequentAt(new naslTypes.End(), consequentIndex + 1,);
   }
   if (alternateIndex !== undefined) {
-    naslNode?.alternate?.splice(alternateIndex + 1, 0, new naslTypes.End());
+    naslNode.insertItemInAlternateAt(new naslTypes.End(), alternateIndex + 1);
   }
   return naslNode;
 }

package/src/server/naslServer.ts

@@ -124,6 +124,8 @@ import { withQueueExecute } from '../decorators';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
 import { isApp, isConnection, isConnector, isMsgTriggerEvent, isProcess, isProcessV2, isStrictLogic } from '../concepts/utils/asserts';
 
+import { collectAllSemanticCtx, clearSemanticData, printSemanticDataInfo } from './semanticData';
+
 const EmbeddedTSFileLineMap: { [name: string]: number } = {
   Entity: 3,
 };
@@ -649,6 +651,10 @@ class NaslServer {
 
   async openApp(app: App, performance = false, needRegisterCommand = true) {
     this.logger.time('生成 TS 文件');
+    this.logger.time('简单语义分析');
+    await utils.runGeneratorSync(collectAllSemanticCtx(app));
+    this.logger.timeEnd('简单语义分析');
+    // printSemanticDataInfo();
     invokeCommand('naslServer:startWork');
 
     app.naslServer = this;
@@ -677,6 +683,7 @@ class NaslServer {
         callback();
       });
     }
+    clearSemanticData();
     this.logger.timeEnd('生成 TS 文件');
 
     function* getAllTsFiles() {
@@ -1121,7 +1128,9 @@ class NaslServer {
         return;
       }
 
-      const { node } = record;
+      let { node } = record;
+      // @ts-ignore
+      node = node.__v_raw || node; // 暂时先这样提速
 
       // 先获取原来的节点先清除一下之前有异常的节点，下面重新赋值
       const oldRecord = self.diagnosticManager.getRecord?.(record.id);
@@ -1815,6 +1824,8 @@ class NaslServer {
    */
   private *_attachDiagnosticsWithGenerator(fileNode: BaseNode) {
     // 每次诊断前先清空这个Set
+    // @ts-ignore
+    fileNode = fileNode.__v_raw || fileNode; // 暂时先这样提速
     this.logicSetWithComponentLogic = new Set<string>();
 
     const self = this;
@@ -3197,11 +3208,15 @@ class NaslServer {
     fileNode: FileNode
   ): Generator<void, MinRange> {
     let minRange: MinRange;
+    // @ts-ignore
+    fileNode = fileNode.__v_raw || fileNode; // 暂时先这样提速
     const { sourceMap } = fileNode;
     // 是否找到了行内准确的，是的话，就不走多行的
     let haveLineNode = false;
 
-    for (const [node, item] of sourceMap.entries()) {
+    for (let [node, item] of sourceMap.entries()) {
+      // @ts-ignore
+      node = node.__v_raw || node;  // 暂时先这样提速
       /**
        * 当前内容的开始行 <= 诊断开始的行 &&
        * 当前内容的结束行 >= 诊断结束的行
@@ -4663,6 +4678,7 @@ class NaslServer {
       }
       if (
         ![
+
           'Identifier',
           'BinaryExpression',
           'CallLogic',
@@ -4775,8 +4791,10 @@ class NaslServer {
         }
       }
     });
+
     yield* utils.wrapIteratorToGenerator(types.entries(), ([node, value]) => {
       try {
+
         // 因为node可能是经过处理的TypeAnnotation
         node.__isCorrectTypeAnnotation = true;
         if (value) {
@@ -5492,6 +5510,7 @@ class NaslServer {
    */
   async handleRename(fileNode: BaseNode, targetNode: BaseNode, result: utils.EmbeddedTSFileResult, oldFilePath?: string) {
     // rename 场景
+
     const outputFiles = [{ file: result.filePath, fileContent: result.code }];
     // 如果是要修改顶级文件名
     // file节点和当前改得是同一节点
@@ -5798,6 +5817,7 @@ class NaslServer {
 
   changeFileNext() {
     if (!this.singleFileChangeIng) {
+      // SHIFT IS O(n) AND SLOW
       const item = this.changeStackList.shift();
       this.receiveHandleChange(item)
         .catch((err) => {