@lcap/nasl 3.8.3-beta.3 → 3.8.3-beta.5

package/src/concepts/MemberExpression__.ts

@@ -125,7 +125,7 @@ export class MemberExpression extends LogicItem {
       let elementTag;
 
       if (this.object?.namespace?.startsWith('elements.$ce')) {
-        elementName = this.getAncestor('ViewElement')?.name;
+        elementName = this.getAncestor('ViewElement')?.name
       } else {
         elementName = this.object.name;
       }
@@ -173,7 +173,7 @@ export class MemberExpression extends LogicItem {
       this.object?.object?.name === 'elements' &&
       this.object?.property?.name === '$ce'
     ) {
-      return this.transfromAtrrLogic({ type: 'toVue' });
+      return this.transformAtrrLogic({ type: 'toVue' });
     }
 
     const object = String(this.object?.toVue(options)); // undefined 也让正常展示
@@ -302,7 +302,7 @@ export class MemberExpression extends LogicItem {
       this.object?.object?.name === 'elements' &&
       this.object?.property?.name === '$ce'
     ) {
-      return this.transfromAtrrLogic();
+      return this.transformAtrrLogic();
     }
 
     const object: string = this.object?.toJS(state);
@@ -409,10 +409,13 @@ export class MemberExpression extends LogicItem {
     return value;
   }
 
-  transfromAtrrLogic(options?: { type: 'toVue' | 'toJS' }) {
+  transformAtrrLogic(options?: { type: 'toVue' | 'toJS' }) {
     const { type = 'toJS' } = options || {};
 
-    const elementName = this.getAncestor('ViewElement')?.name;
+    const elementName = this.getAncestor('ViewElement')?.name
+    // varScopeCtx.isFirstScreen
+    //     ? varScopeCtx.memExprToViewElem.get(this)?.name
+    //     : this.getAncestor('ViewElement')?.name;
     let element;
     let elementTag;
 
@@ -490,6 +493,17 @@ export class MemberExpression extends LogicItem {
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
     let code = '';
+
+    // 变量提升且是调用逻辑取属性，此时需要翻译为立即执行函数规避 TS 的 BUG
+    if (asserts.isCallLogic(self.object) && state.isVariableHost) {
+      code += '(() => {\nconst __$1 = ';
+      code += `${yield* self.object.toEmbeddedTS(shiftState(state, code, { inline: true }))};\n`
+      code += `return __$1.`;
+      code += self.property ? yield* self.property.toEmbeddedTS(shiftState(state, code, { inline: true })) : '';
+      code += ';})()';
+      return code;
+    }
+
     const leftCode = self.object
       ? `${yield* self.object.toEmbeddedTS(shiftState(state, code, { inline: true }))}.`
       : '';
@@ -516,7 +530,7 @@ export class MemberExpression extends LogicItem {
     ) {
       let newCode = '';
       if (self.object?.namespace?.startsWith('elements.$ce')) {
-        const elementName = self.getAncestor('ViewElement')?.name;
+        const elementName = self.getAncestor('ViewElement')?.name
         newCode += `__elements['${elementName}']`;
         if (asserts.isIdentifier(self.property) && self.property?.name) {
           newCode += `['${self.property?.name}']`;
@@ -537,7 +551,7 @@ export class MemberExpression extends LogicItem {
       self.object?.property?.name === '$ce'
     ) {
       let newCode = '';
-      const elementName = self.getAncestor('ViewElement')?.name;
+      const elementName = self.getAncestor('ViewElement')?.name
       newCode += `__elements['${elementName}']`;
       newCode += `.${self.property?.name}`;
       return newCode;

package/src/concepts/OverriddenLogic__.ts

@@ -59,6 +59,7 @@ import Param from './Param__';
 import Return from './Return__';
 import Variable from './Variable__';
 import LogicItem from './LogicItem__';
+import { reCollectTyInferCtx } from '../server/semanticData';
 
 /**
  * 覆写逻辑
@@ -1584,61 +1585,8 @@ export class OverriddenLogic extends BaseNode {
     // 需要类型推导的局部变量/返回值需要调整申明顺序
     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);
+
     // 兼容 return 没有类型情况
     if (self.returns.length && self.returns[0].typeAnnotation) {
       code += ': ';
@@ -1778,7 +1726,7 @@ export class OverriddenLogic extends BaseNode {
                 && itemNode.typeAnnotation?.typeKind === 'anonymousStructure'
               )
               || (
-                (asserts.isNewList(itemNode) || asserts.isNewMap(itemNode)) 
+                (asserts.isNewList(itemNode) || asserts.isNewMap(itemNode))
                 && !(itemNode?.typeAnnotation)
               )
             ) {

package/src/concepts/ProcessElementV2__.ts

@@ -45,6 +45,7 @@ import FlowConditionV2 from './FlowConditionV2__';
 import Logic from './Logic__';
 import BindEvent from './BindEvent__';
 import ApprovalPolicyV2 from './ApprovalPolicyV2__';
+import { varScopeCtx } from '../server/semanticData';
 
 /**
  * 流程元素
@@ -1536,6 +1537,9 @@ export class ProcessElementV2 extends BaseNode {
   subLogics: Array<SubLogic> = [];
 
   getSubLogics() {
+    if (varScopeCtx.isFirstScreen) {
+      return;
+    }
     const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
       if (asserts.isSubLogic(node)) {
         return true;

package/src/concepts/ProcessElement__.ts

@@ -43,6 +43,7 @@ import Return from './Return__';
 import Constant from './Constant__';
 import BindAttribute from './BindAttribute__';
 import MultiApprovalPolicy from './MultiApprovalPolicy__';
+import { varScopeCtx } from '../server/semanticData';
 
 /**
  * 流程元素
@@ -1733,6 +1734,9 @@ export class ProcessElement extends BaseNode {
     // 只有 AutoTask 才需要在他的节点下找子逻辑
     // 其他直接在 BindEvent 下找
     if (this.type !== 'AutoTask') return [] as SubLogic[];
+    if (varScopeCtx.isFirstScreen) {
+      return;
+    }
     const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
       if (asserts.isSubLogic(node)) {
         return true;

package/src/concepts/ProcessV2__.ts

@@ -28,6 +28,8 @@ import ProcessElementV2 from './ProcessElementV2__';
 import HistoryProcessV2 from './HistoryProcessV2__';
 import ProcessBindV2 from './ProcessBindV2__';
 import BindEvent from './BindEvent__';
+import { varScopeCtx } from '../server/semanticData';
+
 /**
  * 流程
  */
@@ -1046,6 +1048,9 @@ export class ProcessV2 extends BaseNode {
   subLogics: Array<SubLogic> = [];
 
   getSubLogics() {
+    if (varScopeCtx.isFirstScreen) {
+      return;
+    }
     const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
       if (asserts.isSubLogic(node)) {
         return true;

package/src/concepts/Process__.ts

@@ -36,6 +36,7 @@ import Param from './Param__';
 import Return from './Return__';
 import Constant from './Constant__';
 import ProcessElement from './ProcessElement__';
+import { varScopeCtx } from '../server/semanticData';
 
 /**
  * 流程
@@ -1497,6 +1498,9 @@ export class Process extends BaseNode {
   subLogics: Array<SubLogic> = [];
 
   getSubLogics() {
+    if (varScopeCtx.isFirstScreen)  {
+      return;
+    }
     const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
       if (asserts.isSubLogic(node)) {
         return true;

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 '../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/TypeAnnotation__.ts

@@ -1253,7 +1253,7 @@ export class TypeAnnotation extends BaseNode {
       'inferred',
       'ruleMap',
       'properties',
-      'name',
+      // 'name',
       'label',
       'description',
       'typeAnnotation',

package/src/concepts/View__.ts

@@ -46,6 +46,8 @@ const removedViewElementCache: {
   [key: string]: number | bigint;
 } = {};
 
+import { reCollectTyInferCtx, varScopeCtx } from '../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/generator/genBundleFiles.ts

@@ -502,7 +502,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
   if (frontend.globalScaleEnabled) {
     content += `{
             // 如果是顶层页面，才使用iframe缩放，否则会死循环
-            if(window.parent === window){
+            if(!window.isScaledFrame){
                 // 顶层页面里有个iframe，用来缩放页面
                 document.body.innerHTML = '<iframe src="' + location.href + '"></iframe>';
                 const iframe = document.querySelector('iframe');
@@ -538,10 +538,10 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
                 document.documentElement.style.setProperty('--scrollbar-size', 0);
                 // 移除 iframe 边框
                 iframe.style.border = 'none';
-                // 标记全局缩放的顶层，原因：全局缩放页面可能在 iframe 中
-                window.isGlobalScaleTop = true;
+                // 标记全局缩放的iframe，原因：全局缩放页面可能在 iframe 中
+                iframe.contentWindow.isScaledFrame = true;
                 return;
-            } else if(window.parent.isGlobalScaleTop) {
+            } else {
                 // 点击跳转到外部页面时，通知顶层页面
                 document.body.addEventListener('click', (e) => {
                   if(!e.target.href) return;
@@ -681,7 +681,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
   if (frontend.globalScaleEnabled) {
     content += `
       // 同步逻辑仅在 iframe 内部执行
-      if(window.parent.isGlobalScaleTop) {
+      if(window.isScaledFrame) {
         /**
          * iframe 路由同步的几种情况：
          * 1. 跳转时，iframe 同步到顶层

package/src/generator/permission.ts

@@ -332,7 +332,7 @@ export async function genPermissionDataOld(app: App) {
   if (authVals?.length) {
     authVals.forEach((item) => {
       const { key, authValue } = item;
-      if (key.startsWith('/upload' || '/api/')) {
+      if (key.startsWith('/upload')  || key.startsWith('/api/')) {
         logicPageResourceDtoList[`${key}:POST`] = checkPageAndUploadAuth(uploaders, key) ? [[]] : convertArray(authValue);
       }
     });
@@ -365,6 +365,14 @@ function createArrayOnAdd<K, V>(k : K, v : V, m: Map<K, Array<V>>) {
   }
 }
 
+function createSetOnAdd<K, V>(k : K, v : V, m: Map<K, Set<V>>) {
+  if (m.get(k)) {
+    m.get(k).add(v);
+  } else {
+    m.set(k, new Set([v]));
+  }
+}
+
 // 需要区分：前端逻辑、后端逻辑、流程逻辑
 // 需要的信息：后端逻辑、流程逻辑的 service path；逻辑调用到其定义的映射；
 // 流程逻辑 call 的 getCallNode() 每次都不同
@@ -418,8 +426,12 @@ export function genPermissionData(app: App): { [key: string]: ResourceNode[][];
             const urlAttr = nd.bindAttrs.find((item : BindAttribute) => item.name === 'url');
             const url = urlAttr?.value;
             if (url) {
-              if (!uploaders.has(url)) uploaders.set(url, [nd]);
-              else uploaders.get(url).push(nd);
+              if (!uploaders.has(url)) {
+                uploaders.set(url, [nd]);
+              }
+              else {
+                uploaders.get(url).push(nd);
+              }
             }
           }
           break;
@@ -519,6 +531,7 @@ export function genPermissionData(app: App): { [key: string]: ResourceNode[][];
   });
 
   frontendLogicCallCtx.forEach(({ view, viewElements, thisLogic }) => {
+    const visitedCalls = new Map<Logic, Set<CallLogic>>(); // 防止 A 调用 A 自我调用或 A 调用 B，B 又调用 A 等循环调用
     const findCallBackendLogic = ([kind, l] : ['process' | 'server' | 'front', Logic]) => {
       if (!l) {
         return;
@@ -536,7 +549,12 @@ export function genPermissionData(app: App): { [key: string]: ResourceNode[][];
         }
         case 'front': {
           const lgcCalls : Array<CallLogic> = defToCalls.get(l);
-          lgcCalls?.forEach( call => findCallBackendLogic(call.getCallNodeUsingCache(frontNdCache, serverNdCache, processNdCache)));
+          lgcCalls?.forEach(call => {
+            if (!visitedCalls.get(l)?.has(call)) {
+              createSetOnAdd(l, call, visitedCalls);
+              findCallBackendLogic(call.getCallNodeUsingCache(frontNdCache, serverNdCache, processNdCache));
+            }
+          });
           break;
         }
         default: {
@@ -579,7 +597,7 @@ export function genPermissionData(app: App): { [key: string]: ResourceNode[][];
   if (authVals?.length) {
     authVals.forEach((item) => {
       const { key, authValue } = item;
-      if (key.startsWith('/upload' || '/api/')) {
+      if (key.startsWith('/upload') || (key.startsWith('/api/'))) {
         logicPageResourceDtoList[`${key}:POST`] =
             checkPageAndUploadAuth(uploaders, key) ? [[]] : convertArray(authValue);
       }

package/src/generator/release-body/body.ts

@@ -212,7 +212,6 @@ async function mergeBodyData(app: App, opt: InternalReleaseData) {
   const authReport: ReturnType<typeof getAuthReport> = getAuthReport(app, opt.frontends);
   await opt.logPublishFunc?.('权限', '分析权限数据成功！');
   const logicPageResourceDtoList = genPermissionData(app);
-
   // 与老板逻辑权限数据对比
   // await testWithOldPermissionResult(app, logicPageResourceDtoList);
   const allFrontends = getFrontendByTypes(app?.frontendTypes);

package/src/natural/transformTS2UI.ts

@@ -68,7 +68,7 @@ function transformParam(node: babelTypes.Identifier): naslTypes.Param {
 // 处理生命周期函数
 function transformLifecycle(node: babelTypes.ObjectExpression): Array<naslTypes.BindEvent> {
   const bindEvents: Array<naslTypes.BindEvent> = [];
-  node.properties.forEach((property: any) => {
+  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) => {
@@ -150,7 +150,7 @@ function handleNewExpression(calleeName: String, node: any, type?: string) {
   if (calleeName === 'NewMap') {
     const keys: any = [];
     const values: any = [];
-    node?.arguments?.[0]?.properties.forEach((arg: any) => {
+    node?.arguments?.[0]?.properties?.forEach((arg: any) => {
       keys.push(transformNode2Expression(arg.key));
       values.push(transformNode2Expression(arg.value));
     });
@@ -166,7 +166,7 @@ function handleNewExpression(calleeName: String, node: any, type?: string) {
     const properties: any = [];
     const rights: any = [];
     const assignmentLines: any = [];
-    node?.arguments?.[0]?.properties.forEach((arg: any, index: number) => {
+    node?.arguments?.[0]?.properties?.forEach((arg: any, index: number) => {
       properties.push(transformNode2Expression(arg.key));
       if (arg.value.type === 'MemberExpression') {
         const expression = flatMemberExpression(arg.value);
@@ -223,7 +223,7 @@ function handleNewExpression(calleeName: String, node: any, type?: string) {
     const properties: any = [];
     const rights: any = [];
     const assignmentLines: any = [];
-    node?.arguments?.[0]?.properties.forEach((arg: any, index: number) => {
+    node?.arguments?.[0]?.properties?.forEach((arg: any, index: number) => {
       properties.push(transformNode2Expression(arg.key));
       if (arg.value.type === 'MemberExpression') {
         const expression = flatMemberExpression(arg.value);
@@ -354,7 +354,7 @@ function transformNode2Expression(node: babelTypes.Node, type?: string): any {
       });
     }
     if (callee.length === 2 && callee[0].type === 'Identifier' && callee[0].name.endsWith('Entity')) {
-      const entityName = callee[0].name.replace(/Entity/, '');
+      const entityName = callee[0].name.replace(/Entity$/, '');
       return new naslTypes.CallLogic({
         calleeNamespace: `app.dataSources.defaultDS.entities.${entityName}.logics`,
         calleeName: (callee[1] as babelTypes.Identifier).name,
@@ -530,7 +530,7 @@ function transformNode2Expression(node: babelTypes.Node, type?: string): any {
     } else if (/^app.dataSources|app.logics/.test(calleeName)) {
       if (calleeName?.includes('.entities.')) {
         const calleeNamespace = generate((node?.callee as any)?.object?.object)?.code;
-        const entityName = (node?.callee as any)?.object?.property?.name?.replace(/Entity/, '');
+        const entityName = (node?.callee as any)?.object?.property?.name?.replace(/Entity$/, '');
         return new naslTypes.CallLogic({
           calleeNamespace: `${calleeNamespace}.${entityName}.logics`,
           calleeName: (node?.callee as any)?.property?.name,
@@ -1110,7 +1110,7 @@ function transformNode2ViewElement(node: babelTypes.NewExpression, componentName
       tag,
       name,
     });
-    viewNode.properties.forEach((prop: any, propIndex: number) => {
+    viewNode.properties?.forEach((prop: any, propIndex: number) => {
       if (prop?.value?.type === 'ArrayExpression' && ['FunctionExpression', 'ArrowFunctionExpression'].includes(prop?.value?.elements?.[0]?.type)) {
         // 事件逻辑
         const eventName = prop?.key?.name?.replace(/^on/, '')?.toLowerCase();