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

package/out/server/semanticData.d.ts

@@ -0,0 +1,32 @@
+import { App, Identifier, MemberExpression, View, ViewElement, Return, Variable, Assignment, BatchAssignment, CallFunction, AuthLogicForCallInterface, BusinessComponent, BusinessLogic, Logic, OverriddenLogic, SubLogic, Process, ProcessV2, ProcessElement, ProcessElementV2 } from '..';
+declare type VarScopeCtx = {
+    app: App;
+    isFirstScreen: boolean;
+    frontendGlobalVars: Set<string>;
+    varInViewOrComponent: Set<string>;
+    logicInViewOrComponent: Set<string>;
+    idToView: Map<Identifier, View>;
+    ctxViewElement: Array<ViewElement>;
+    ctxView: Array<View>;
+    isInViewOrComponent: boolean;
+    memExprToViewElem: Map<MemberExpression, ViewElement>;
+};
+declare type TyInferCtx = {
+    inferViaAsgnMap: Map<Return | Variable, Assignment | BatchAssignment | CallFunction>;
+    inferViaFnCallMap: Map<Return | Variable, CallFunction>;
+    scope: Array<AuthLogicForCallInterface | BusinessComponent | BusinessLogic | Logic | OverriddenLogic | SubLogic | View>;
+    capturedVars: Map<string, Variable | Return>;
+};
+declare type SubLogicCtx = {
+    ctx: Logic | Process | ProcessV2 | ProcessElement | ProcessElementV2 | null;
+    viewSubLogics: Set<SubLogic>;
+};
+export declare const varScopeCtx: VarScopeCtx;
+export declare const tyInferCtx: TyInferCtx;
+export declare const subLogicCtx: SubLogicCtx;
+export declare function collectAllSemanticCtx(app: App): Generator<never, void, unknown>;
+declare type LogicContainer = AuthLogicForCallInterface | BusinessComponent | BusinessLogic | Logic | OverriddenLogic | SubLogic | View;
+export declare function reCollectTyInferCtx(inferViaAsgn: Map<Return | Variable, Assignment | BatchAssignment | CallFunction>, inferViaFnCall: Map<Return | Variable, CallFunction>, self: LogicContainer): Generator<any, void, any>;
+export declare const clearSemanticData: () => void;
+export declare function printSemanticDataInfo(): void;
+export {};

package/out/server/semanticData.js

@@ -0,0 +1,371 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.printSemanticDataInfo = exports.clearSemanticData = exports.reCollectTyInferCtx = exports.collectAllSemanticCtx = exports.subLogicCtx = exports.tyInferCtx = exports.varScopeCtx = void 0;
+const translator_1 = require("../translator");
+const utils_1 = require("../utils");
+// 前端全局变量很少，一般就十个以内，所以 map 大小可以忽略不计
+exports.varScopeCtx = {
+    app: null,
+    isFirstScreen: false,
+    frontendGlobalVars: new Set(),
+    // Collect all params, (local) variables, and logic names under business component
+    // Note that within a business component, one can only refer to the above variables, and cannot refer to
+    // frontend global variables and any other variables under Views; therefore, checking the Name already suffices.
+    // 收集业务组件下的所有参数、（局部）变量和逻辑名称，请注意，在业务组件中，只能引用上述变量，
+    // 而不能引用前端全局变量和其他任何 “视图 ”下的变量；因此，检查 “Name” 已经足够了。
+    varInViewOrComponent: new Set(),
+    logicInViewOrComponent: new Set(),
+    // Collect all params, (local) variables, and logic names under views
+    // Actually, frontendGlobalVars U idInView U idInComponent should be the complete set of accessible variables
+    // 事实上，frontendGlobalVars 并上 idInView 并上 idInComponent 应该是前端所有能访问到的变量（名的集合）
+    // 赫基 27w 应用，前端 View 下有 2000 个变量名字；56176 个变量引用，内存占用约 1M。
+    idToView: new Map(),
+    // 路径上的 ViewElement 节点
+    ctxViewElement: [],
+    // 路径上的 View 节点
+    ctxView: [],
+    isInViewOrComponent: false,
+    memExprToViewElem: new Map(),
+};
+exports.tyInferCtx = {
+    inferViaAsgnMap: new Map(),
+    inferViaFnCallMap: new Map(),
+    scope: [],
+    capturedVars: new Map(),
+};
+exports.subLogicCtx = {
+    // naslNodesCount: 0,
+    ctx: null,
+    viewSubLogics: new Set(), // 隶属于 view 的 SubLogic，需要排除掉隶属于 Logic 的 SubLogic。
+};
+const last = (arr) => arr[arr.length - 1];
+function* collectAllSemanticCtx(app) {
+    exports.varScopeCtx.app = app;
+    exports.varScopeCtx.isFirstScreen = true;
+    const tasks = [
+        // collectFrontendVariablesTask, 这样不值得，能快一点还是快一点吧，
+        collectVarInViewOrComponentCtxTask,
+        collectLogicInViewOrComponentTask,
+        // collectMemExprToViewElemCtxTask, // 因为 $ce 的原因，暂时用不了
+        collectIdToViewCtxTask,
+        collectSubLogicCtxTask,
+        collectTyInferCtxTask
+    ];
+    const cleanups = [
+        collectVarInViewOrComponentCtxCleanup,
+        // collectLogicInViewOrComponentCleanup,
+        // collectMemExprToViewElemCtxCleanup, // 因为 $ce 的原因，暂时用不了
+        collectIdToViewCtxCleanup,
+        collectSubLogicCtxCleanup,
+        collectTyInferCtxCleanup
+    ];
+    (0, utils_1.runGeneratorSync)(collectFrontendVariablesTask(app));
+    (0, utils_1.runGeneratorSync)(app.traverseStrictChildrenDoMultiTasks(tasks, cleanups));
+}
+exports.collectAllSemanticCtx = collectAllSemanticCtx;
+function* collectFrontendVariablesTask(app) {
+    app.frontendTypes.forEach(ft => {
+        ft.frontends.forEach(f => {
+            f.variables.forEach(v => {
+                exports.varScopeCtx.frontendGlobalVars.add(v.name);
+            });
+        });
+    });
+}
+function* collectVarInViewOrComponentCtxTask(nd) {
+    switch (nd.concept) {
+        case 'Variable': /* FALL THROUGH */
+        case 'Param': /* FALL THROUGH */
+        case 'Return': {
+            if (exports.varScopeCtx.isInViewOrComponent) {
+                exports.varScopeCtx.varInViewOrComponent.add(nd.name);
+            }
+            break;
+        }
+        case 'View': /* FALL THROUGH */
+        case 'BusinessComponent':
+            exports.varScopeCtx.isInViewOrComponent = true;
+            break;
+        default: break;
+    }
+}
+function* collectVarInViewOrComponentCtxCleanup(nd) {
+    if (nd.concept === 'View' || nd.concept === 'BusinessComponent') {
+        exports.varScopeCtx.isInViewOrComponent = false;
+    }
+}
+// component-like：业务组件下的变量引用
+function* collectLogicInViewOrComponentTask(nd) {
+    if (nd.concept === 'Logic' || nd.concept === 'BusinessComponent') {
+        if (exports.varScopeCtx.isInViewOrComponent) {
+            exports.varScopeCtx.logicInViewOrComponent.add(nd.name);
+        }
+    }
+}
+// collectLogicInViewOrComponentCleanup 的事情被 collectVarInViewOrComponentCtxPost 做了
+function* collectMemExprToViewElemCtxTask(nd) {
+    // view 下的 identifier 的 getAncestor 必定有 view
+    switch (nd.concept) {
+        case 'ViewElement': {
+            exports.varScopeCtx.ctxViewElement.push(nd);
+            break;
+        }
+        case 'MemberExpression': {
+            if (exports.varScopeCtx.ctxViewElement) {
+                exports.varScopeCtx.memExprToViewElem.set(nd, last(exports.varScopeCtx.ctxViewElement));
+            }
+            break;
+        }
+        default: break;
+    }
+}
+function* collectMemExprToViewElemCtxCleanup(nd) {
+    if (nd.concept === 'ViewElement') {
+        exports.varScopeCtx.ctxViewElement.pop();
+    }
+}
+function* collectIdToViewCtxTask(nd) {
+    // view 下的 identifier 的 getAncestor 必定有 view
+    switch (nd.concept) {
+        case 'View':
+            exports.varScopeCtx.ctxView.push(nd);
+            break;
+        case 'Identifier': {
+            if (exports.varScopeCtx.ctxView.length > 0) {
+                exports.varScopeCtx.idToView.set(nd, last(exports.varScopeCtx.ctxView));
+            }
+            break;
+        }
+        default: break;
+    }
+}
+function* collectIdToViewCtxCleanup(nd) {
+    switch (nd.concept) {
+        case 'View':
+            exports.varScopeCtx.ctxView.pop();
+            break;
+        default: break;
+    }
+}
+function* collectSubLogicCtxTask(nd) {
+    switch (nd.concept) {
+        case 'Logic': /* FALL THROUGH */
+        /* 流程支持子逻辑 */
+        /* 流程变量不支持类型推导 */
+        case 'Process': /* FALL THROUGH */
+        case 'ProcessV2': /* FALL THROUGH */
+        case 'ProcessElement': /* FALL THROUGH */
+        case 'ProcessElementV2': /* FALL THROUGH */
+        case 'BusinessLogic':
+            exports.subLogicCtx.ctx = nd;
+            break;
+        case 'SubLogic': {
+            // 收集子逻辑
+            if (exports.subLogicCtx.ctx) {
+                exports.subLogicCtx.ctx.subLogics.push(nd);
+                // console.log('逻辑或流程的子逻辑：', subLogicCtx.ctx)
+            }
+            else {
+                exports.subLogicCtx.viewSubLogics.add(nd);
+            }
+            break;
+        }
+        default: break;
+    }
+}
+function* collectSubLogicCtxCleanup(nd) {
+    switch (nd.concept) {
+        /* 流程支持子逻辑 */
+        /* 流程变量不支持类型推导 */
+        case 'Logic': /* FALL THROUGH */
+        case 'Process': /* FALL THROUGH */
+        case 'ProcessV2': /* FALL THROUGH */
+        case 'ProcessElement': /* FALL THROUGH */
+        case 'ProcessElementV2':
+            exports.subLogicCtx.ctx = null;
+            break;
+        // 可能是有人忘了给业务组件加 subLogics？
+        case 'View': {
+            exports.subLogicCtx.viewSubLogics.forEach(sl => { nd.subLogics.push(sl); });
+            // console.log('View 的子逻辑：', nd.subLogics)
+            exports.subLogicCtx.viewSubLogics.clear();
+            break;
+        }
+        default: break;
+    }
+}
+const addVars = (nd, s) => {
+    nd.forEach(v => {
+        if (!v.typeAnnotation) {
+            s.set(v.name, v);
+        }
+    });
+};
+const removeVars = (nd, s) => {
+    nd.forEach(v => s.delete(v.name));
+};
+// OQL 批量优化优化完成前请勿移除
+// const oqlSet = new Set<string>();
+function* collectTyInferCtxTask(nd) {
+    // ++subLogicCtx.naslNodesCount;
+    // if (nd.concept === 'OqlQueryComponent') {
+    //   oqlSet.add(nd.code);
+    // }
+    switch (nd.concept) {
+        case 'Logic': /* FALL THROUGH */
+        case 'AuthLogicForCallInterface': /* FALL THROUGH */
+        case 'BusinessLogic': /* FALL THROUGH */
+        case 'OverriddenLogic': /* FALL THROUGH */
+        case 'SubLogic': {
+            // 全局变量不支持类型推导；逻辑的变量也不支持跨子逻辑推导
+            // addVars(nd.variables, tyInferCtx.capturedVars);
+            // addVars(nd.returns, tyInferCtx.capturedVars);
+            exports.tyInferCtx.scope.push(nd);
+            break;
+        }
+        case 'View': /* FALL THROUGH */
+        case 'BusinessComponent': {
+            addVars(nd.variables, exports.tyInferCtx.capturedVars);
+            exports.tyInferCtx.scope.push(nd);
+            break;
+        }
+        default: {
+            (0, utils_1.runGeneratorAsync)(collectAsgn(exports.tyInferCtx.inferViaAsgnMap, exports.tyInferCtx.inferViaFnCallMap, nd));
+            break;
+        }
+    }
+}
+function* collectTyInferCtxCleanup(nd) {
+    switch (nd.concept) {
+        case 'Logic': /* FALL THROUGH */
+        case 'AuthLogicForCallInterface': /* FALL THROUGH */
+        case 'BusinessLogic': /* FALL THROUGH */
+        case 'OverriddenLogic': /* FALL THROUGH */
+        case 'SubLogic': {
+            // removeVars(nd.variables, tyInferCtx.capturedVars);
+            // removeVars(nd.returns, tyInferCtx.capturedVars);
+            exports.tyInferCtx.scope.pop();
+            break;
+        }
+        case 'View': /* FALL THROUGH */
+        case 'BusinessComponent': {
+            removeVars(nd.variables, exports.tyInferCtx.capturedVars);
+            exports.tyInferCtx.scope.pop();
+            break;
+        }
+        default: break;
+    }
+}
+function* reCollectTyInferCtx(inferViaAsgn, inferViaFnCall, self) {
+    // No (types of) variables to be inferred
+    // @ts-ignore
+    const preTest = self.variables?.some((v) => !v.typeAnnotation) || self.returns?.some((v) => !v.typeAnnotation);
+    if (!preTest) {
+        return;
+    }
+    // 非首次则清空脏 map，重新收集所需上下文
+    if (!exports.varScopeCtx.isFirstScreen) {
+        exports.tyInferCtx.inferViaAsgnMap.clear();
+        exports.tyInferCtx.inferViaFnCallMap.clear();
+        yield* self.traverseChildrenGenerator(collectTyInferCtxTask);
+    }
+    self.variables.forEach((locVar) => {
+        if (exports.tyInferCtx.inferViaAsgnMap.has(locVar)) {
+            inferViaAsgn.set(locVar, exports.tyInferCtx.inferViaAsgnMap.get(locVar));
+        }
+        else if (exports.tyInferCtx.inferViaFnCallMap.has(locVar)) {
+            inferViaFnCall.set(locVar, exports.tyInferCtx.inferViaFnCallMap.get(locVar));
+        }
+    });
+    // @ts-ignore
+    self.returns?.forEach((locRet) => {
+        if (exports.tyInferCtx.inferViaAsgnMap.has(locRet)) {
+            inferViaAsgn.set(locRet, exports.tyInferCtx.inferViaAsgnMap.get(locRet));
+        }
+        else if (exports.tyInferCtx.inferViaFnCallMap.has(locRet)) {
+            inferViaFnCall.set(locRet, exports.tyInferCtx.inferViaFnCallMap.get(locRet));
+        }
+    });
+}
+exports.reCollectTyInferCtx = reCollectTyInferCtx;
+function* collectAsgn(inferViaAsgnMap, inferViaBuiltinFnMap, nd) {
+    const self = last(exports.tyInferCtx.scope); // 可能是 undefined
+    if (!nd || !self) {
+        return;
+    }
+    if (nd.concept === 'Assignment' && nd.left?.name) {
+        if (!self) {
+            console.log('nd', nd);
+        }
+        const hoistVar = self.variables?.find(v => nd.left?.name === v.name && !v.typeAnnotation)
+            // View 和 BusinessComponent 没有 returns
+            // @ts-ignore
+            ?? self.returns?.find(ret => nd.left?.name === ret.name && !ret.typeAnnotation)
+            ?? exports.tyInferCtx.capturedVars.get(nd.left.name);
+        if (hoistVar && !inferViaAsgnMap.has(hoistVar)) {
+            inferViaAsgnMap.set(hoistVar, nd);
+        }
+    }
+    else if (nd.concept === 'BatchAssignment') {
+        yield* (0, utils_1.wrapForEachToGenerator)(nd.assignmentLines, function* warpForEachGenerator({ leftIndex }) {
+            const leftCode = leftIndex.length === 1
+                ? yield* nd.left.expression.toEmbeddedTS((0, translator_1.shiftState)((0, translator_1.createCompilerState)(), '', { inline: true }))
+                : yield* nd.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)((0, translator_1.createCompilerState)(), '', { inline: true })) ??
+                    (0, utils_1.returnOrigin)('');
+            const hoistVar = self.variables?.find((v) => leftCode === v.name && !v.typeAnnotation)
+                // View 和 BusinessComponent 没有 returns
+                // @ts-ignore
+                ?? self.returns?.find(ret => leftCode === ret.name && !ret.typeAnnotation)
+                ?? exports.tyInferCtx.capturedVars.get(leftCode);
+            if (hoistVar && !inferViaAsgnMap.has(hoistVar)) {
+                inferViaAsgnMap.set(hoistVar, nd);
+            }
+        });
+    }
+    else if (nd.concept === 'CallFunction' && nd.derivableCollection?.name) {
+        // 需要被推导的集合
+        const expr = nd.derivableCollection;
+        // 宽泛意义上的变量（变量+出参），View 和 BusinessComponent 没有 returns
+        const hoistVar = self.variables.find((v) => expr?.name === v.name && !v.typeAnnotation)
+            // @ts-ignore
+            ?? self.returns?.find(ret => expr?.name === ret.name && !ret.typeAnnotation)
+            ?? exports.tyInferCtx.capturedVars.get(expr.name);
+        if (hoistVar && !inferViaBuiltinFnMap.has(hoistVar)) {
+            inferViaBuiltinFnMap.set(hoistVar, nd);
+        }
+    }
+}
+const clearSemanticData = () => {
+    exports.varScopeCtx.isFirstScreen = false;
+    exports.varScopeCtx.frontendGlobalVars.clear();
+    exports.varScopeCtx.varInViewOrComponent.clear();
+    exports.varScopeCtx.logicInViewOrComponent.clear();
+    exports.varScopeCtx.idToView.clear();
+    exports.varScopeCtx.ctxViewElement = [];
+    exports.varScopeCtx.memExprToViewElem.clear();
+    exports.tyInferCtx.inferViaAsgnMap.clear();
+    exports.tyInferCtx.inferViaFnCallMap.clear();
+    exports.tyInferCtx.scope = [];
+    exports.tyInferCtx.capturedVars.clear();
+    exports.subLogicCtx.viewSubLogics.clear();
+    exports.subLogicCtx.ctx = null;
+};
+exports.clearSemanticData = clearSemanticData;
+function printSemanticDataInfo() {
+    console.log('frontendGlobalVars', exports.varScopeCtx.frontendGlobalVars);
+    console.log('varInViewOrComponent', exports.varScopeCtx.varInViewOrComponent);
+    console.log('logicInViewOrComponent', exports.varScopeCtx.logicInViewOrComponent);
+    console.log('idToView', exports.varScopeCtx.idToView);
+    console.log('memExprToViewElem', exports.varScopeCtx.memExprToViewElem);
+    console.log('inferViaAsgnMap', exports.tyInferCtx.inferViaAsgnMap);
+    console.log('inferViaFnCallMap', exports.tyInferCtx.inferViaFnCallMap);
+    // console.log(oqlSet)
+    // console.log('capturedVars', tyInferCtx.capturedVars)
+    // console.log('viewSubLogics', subLogicCtx.viewSubLogics)
+    // console.log('naslNodesCount', subLogicCtx.naslNodesCount)
+    // console.log('ctx', subLogicCtx.ctx)
+    // console.log('scope', tyInferCtx.scope)
+    // console.log('isFirstScreen', varScopeCtx.isFirstScreen)
+}
+exports.printSemanticDataInfo = printSemanticDataInfo;
+//# sourceMappingURL=semanticData.js.map

package/out/server/semanticData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"semanticData.js","sourceRoot":"","sources":["../../src/server/semanticData.ts"],"names":[],"mappings":"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"}

package/out/templator/block2nasl/viewMergeBlock.js

@@ -25,7 +25,8 @@ function viewMergeBlock({ app, view, code, nodePath, position, cb, }) {
     const naslCode = (0, transformBlock2Nasl_1.tryTransformBlock2Nasl)(code);
     const blockView = naslCode.view;
     // vue2需要对tag进行转换 kebab-case
-    if (view?.parentNode?.parentNode?.frameworkKind === 'vue2') {
+    const frontendType = view?.getAncestor('FrontendType');
+    if (frontendType?.frameworkKind === 'vue2') {
         (0, utils_1.traverse)(({ node }) => {
             if (node.concept === 'ViewElement') {
                 node.tag = (0, string_1.Camel2kebab)(node.tag);

package/out/templator/block2nasl/viewMergeBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"viewMergeBlock.js","sourceRoot":"","sources":["../../../src/templator/block2nasl/viewMergeBlock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"viewMergeBlock.js","sourceRoot":"","sources":["../../../src/templator/block2nasl/viewMergeBlock.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "3.8.3-beta.1",
+  "version": "3.8.3-beta.2",
   "author": "Forrest <rainforest92@126.com>",
   "main": "./out",
   "license": "MIT",

package/src/common/BaseNode.ts

@@ -20,6 +20,8 @@ export function setActionable(value: boolean) {
   actionable = value;
 }
 
+import { subLogicCtx, varScopeCtx } from '../../../nasl/src/server/semanticData';
+
 const patchCompose = (node: BaseNode, type = 'add') => {
   if (node?.composedBy) {
     const app = (node as any)?.app;
@@ -942,7 +944,7 @@ export class BaseNode extends EventEmitter {
   }
 
   get app() {
-    return this.getAncestor('App') as App;
+    return varScopeCtx.isFirstScreen ? varScopeCtx.app : this.getAncestor('App') as App;
   }
 
   /**
@@ -1493,21 +1495,21 @@ export class BaseNode extends EventEmitter {
     }, whitelist);
   }
 
-   /**
+    /**
    * 迭代所有子节点
    *
-   * @description 严格迭代所有子节点！排除属性！条件满足时可提前终止！
+   * @description 严格迭代所有子节点！排除属性！条件满足时整个遍历全部终止！
    */
     traverseStrictChildrenStopWhen(cb: (el: types.SyntaxNode) => void, setStopFlag: (el: types.SyntaxNode) => boolean, whitelist?: string[]): void {
       let shouldStop = false;
 
-      // if ((node instanceof View || node instanceof ViewElement) && node.auth) flag = true;
-      function traverse(node: any) {
+      function __traverse(node: any) {
         if (asserts.isBaseNode(node)) {
           cb(node as types.SyntaxNode);
         }
 
         shouldStop = shouldStop || setStopFlag(node);
+
         if (shouldStop) {
           return;
         }
@@ -1522,14 +1524,54 @@ export class BaseNode extends EventEmitter {
         for (const property of propertyKeys) {
           const child = node[property as keyof BaseNode];
           if (!child) continue;
-          else if (Array.isArray(child)) child?.forEach?.((node: types.SyntaxNode) => traverse(node));
-          else traverse(child);
+          else if (Array.isArray(child)) child?.forEach?.((node: types.SyntaxNode) => __traverse(node));
+          else __traverse(child);
+        }
+      }
+
+      __traverse(this);
+    }
+
+    /**
+     * 迭代所有子节点
+     * @description 严格迭代所有子节点，排除属性；多函数特化版本，不做额外检查
+     */
+    *traverseStrictChildrenDoMultiTasks(
+      tasks: Array<(_: BaseNode) => Generator<any, any, any>>,
+      cleanups: Array<(_: BaseNode) => Generator<any, any, any>>): Generator<any, any, any> {
+
+      function __traverse(nd: BaseNode) {
+        if (!(nd instanceof BaseNode)) {
+          return;
+        }
+        tasks.forEach(task => utils.runGeneratorSync(task(nd)));
+
+        const props = getConceptPropertyMap(nd?.concept)?.keys();
+        if (!props) {
+          cleanups.forEach(task => utils.runGeneratorSync(task(nd)));
+          return;
+        }
+
+        for (const p of props) {
+          const child = nd[p as keyof BaseNode];
+          if (!child) {
+            continue;
+          } else if (Array.isArray(child)) {
+            child?.forEach?.((node: types.SyntaxNode) => {
+                __traverse(node);
+            });
+          } else {
+            __traverse(child);
+          }
         }
+
+        cleanups.forEach(task => utils.runGeneratorSync(task(nd)));
       }
 
-      traverse(this);
+      __traverse(this);
     }
 
+
   /**
    *  获取当前节点在nasl标注节点上的节点
    */

package/src/concepts/AuthLogicForCallInterface__.ts

@@ -42,6 +42,7 @@ import * as asserts from './utils/asserts';
 
 import Param from './Param__';
 import AuthLogic from './AuthLogic__';
+import { reCollectTyInferCtx } from '../../../nasl/src/server/semanticData';
 
 /**
  * 调用接口的鉴权逻辑
@@ -352,61 +353,7 @@ export class AuthLogicForCallInterface extends AuthLogic {
     // 需要类型推导的局部变量/返回值需要调整申明顺序
     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')) {
-          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);
     code += '{\n';
     // 用于虚拟节点的查找引用
     if (Array.isArray(self.virtualParams)) {
@@ -551,7 +498,7 @@ export class AuthLogicForCallInterface extends AuthLogic {
                 && itemNode.typeAnnotation?.typeKind === 'anonymousStructure'
               )
               || (
-                (asserts.isNewList(itemNode) || asserts.isNewMap(itemNode)) 
+                (asserts.isNewList(itemNode) || asserts.isNewMap(itemNode))
                 && !(itemNode?.typeAnnotation)
               )
             ) {