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

package/out/utils/time-slicing/performance.js

@@ -25,14 +25,14 @@ class Performance {
         }
     }
     mark(name) {
-        return performance.mark(this.getPerformanceId(name));
+        return performance?.mark?.(this.getPerformanceId(name));
     }
     measure(name, startMark, endMark) {
-        return performance.measure(this.getPerformanceId(name), this.getPerformanceId(startMark), this.getPerformanceId(endMark));
+        return performance?.measure?.(this.getPerformanceId(name), this.getPerformanceId(startMark), this.getPerformanceId(endMark));
     }
     clearByNames(...names) {
         for (const name of names) {
-            const entry = performance.getEntriesByName(this.getPerformanceId(name))[0];
+            const entry = performance?.getEntriesByName?.(this.getPerformanceId(name))[0];
             if (entry) {
                 this.clearEntry(entry);
             }

package/out/utils/time-slicing/performance.js.map

@@ -1 +1 @@
-{"version":3,"file":"performance.js","sourceRoot":"","sources":["../../../src/utils/time-slicing/performance.ts"],"names":[],"mappings":";;;AAAA,IAAK,SAGJ;AAHD,WAAK,SAAS;IACZ,0BAAa,CAAA;IACb,gCAAmB,CAAA;AACrB,CAAC,EAHI,SAAS,KAAT,SAAS,QAGb;AAED,MAAa,WAAW;IAGtB,YAAY,EAAU;QACpB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAED,IAAI,MAAM;QACR,OAAO,kBAAkB,IAAI,CAAC,EAAE,EAAE,CAAC;IACrC,CAAC;IAEO,gBAAgB,CAAC,IAAY;QACnC,OAAO,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;IAClC,CAAC;IAEO,UAAU,CAAC,KAAuB;QACxC,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,EAAE;YACtC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACpC;aACI,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,OAAO,EAAE;YAC9C,WAAW,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACvC;IACH,CAAC;IAED,IAAI,CAAC,IAAY;QACf,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,CAAC,IAAY,EAAE,SAAiB,EAAE,OAAe;QACtD,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5H,CAAC;IAED,YAAY,CAAC,GAAG,KAAe;QAC7B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,KAAK,GAAG,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE3E,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;aACxB;SACF;IACH,CAAC;IAED,KAAK;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAExB,WAAW,CAAC,UAAU,EAAE;aACrB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,OAAO,CAAC;aAC3F,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aAC9C,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAChD,CAAC;CACF;AAlDD,kCAkDC"}
+{"version":3,"file":"performance.js","sourceRoot":"","sources":["../../../src/utils/time-slicing/performance.ts"],"names":[],"mappings":";;;AAAA,IAAK,SAGJ;AAHD,WAAK,SAAS;IACZ,0BAAa,CAAA;IACb,gCAAmB,CAAA;AACrB,CAAC,EAHI,SAAS,KAAT,SAAS,QAGb;AAED,MAAa,WAAW;IAGtB,YAAY,EAAU;QACpB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAED,IAAI,MAAM;QACR,OAAO,kBAAkB,IAAI,CAAC,EAAE,EAAE,CAAC;IACrC,CAAC;IAEO,gBAAgB,CAAC,IAAY;QACnC,OAAO,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;IAClC,CAAC;IAEO,UAAU,CAAC,KAAuB;QACxC,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,EAAE;YACtC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACpC;aACI,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,OAAO,EAAE;YAC9C,WAAW,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACvC;IACH,CAAC;IAED,IAAI,CAAC,IAAY;QACf,OAAO,WAAW,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,CAAC,IAAY,EAAE,SAAiB,EAAE,OAAe;QACtD,OAAO,WAAW,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/H,CAAC;IAED,YAAY,CAAC,GAAG,KAAe;QAC7B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,KAAK,GAAG,WAAW,EAAE,gBAAgB,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9E,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;aACxB;SACF;IACH,CAAC;IAED,KAAK;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAExB,WAAW,CAAC,UAAU,EAAE;aACrB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,OAAO,CAAC;aAC3F,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aAC9C,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAChD,CAAC;CACF;AAlDD,kCAkDC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "3.5.0-beta.3",
+  "version": "3.5.0-beta.5",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "clear": "rimraf ./out",
@@ -37,7 +37,7 @@
     "@babel/generator": "7.22.15",
     "@babel/parser": "7.22.15",
     "@babel/preset-typescript": "7.22.15",
-    "axios": "0.21.4",
+    "axios": "1.6.2",
     "compare-versions": "4.1.3",
     "date-fns": "2.6.0",
     "decimal.js": "10.4.3",

package/src/breakpoint/store/core.ts

@@ -138,7 +138,7 @@ const isFrontend = (node: BaseNode) => {
 
   const { getAncestor } = node;
 
-  return getAncestor && getAncestor.call(node, 'View');
+  return getAncestor && getAncestor.call(node, 'FrontendType');
 };
 
 const updateToBackend = (node: BaseNode) => {

package/src/common/BaseNode.ts

@@ -1,7 +1,7 @@
 import { at } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 
-import { SourceMap } from '../translator';
+import { SourceMap, createCompilerState, withSourceMap } from '../translator';
 import { getSourceFromMap } from '../service/storage/map';
 
 import * as utils from '../utils';
@@ -576,7 +576,9 @@ export class BaseNode extends EventEmitter {
     }
 
     // 更新实例上的属性
-    this.updateInstance(newObject);
+    // 有时候需要把实例对象挂载上去，如：
+    // 批量赋值-把这个变量往这个clone里边拖的时候报内部出错 http://projectmanage.netease-official.lcap.163yun.com/dashboard/BugDetail?id=2766199685126400
+    this.updateInstance(object);
 
     if (process.env.NODE_ENV === 'development') {
       console.log('[更新节点]', 'path:', path, 'oldObject:', oldObject, 'newObject:', newObject);
@@ -730,6 +732,7 @@ export class BaseNode extends EventEmitter {
     // 有一些继承的情况
     const Ctor = classMap.get(source?.concept) || this;
     if (Ctor && source instanceof Ctor) {
+      console.warn('传入的对象已经是一个实例，请确认逻辑是否存在问题！')
       if (parentNode) {
         source.parentNode = parentNode;
       }
@@ -1299,6 +1302,7 @@ export class BaseNode extends EventEmitter {
    * 迭代所有属性
    *
    * @description 是所有属性！！不是所有子节点！！
+   * @deprecated 请使用`traverseStrictChildren`方法
    */
   traverseChildren(cb: (el: any) => void): void {
     function traverse(node: any) {
@@ -1506,7 +1510,7 @@ export class BaseNode extends EventEmitter {
       nodes.push(self);
     }
 
-    this.traverseChildren((current) => {
+    this.traverseStrictChildren((current) => {
       if (pre(current)) {
         nodes.push(current);
       }
@@ -1519,6 +1523,16 @@ export class BaseNode extends EventEmitter {
     return '';
   }
 
+  /**
+   * 生成文本化代码
+   * @param state 编译状态
+   * @returns 生成的代码
+   */
+  // @withSourceMap()
+  toTextualNASL() {
+    return '[编译方法未实现]';
+  }
+
   /**
    * 调试用的 ToTS 接口
    */

package/src/concepts/AnonymousFunction__.ts

@@ -579,26 +579,41 @@ export class AnonymousFunction extends LogicItem {
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     let code = '';
-    if (this.body) {
       code += `(`;
       this.params.forEach((param, index) => {
         code += param.toNaturalTS(shiftState(state, code, { inline: true }));
         if (index !== this.params.length - 1) code += ', ';
       });
       code += `)`;
-      code += ` => (`;
-
+      code += ` => `;
       if (this.body) {
         code +=
           this.body.toNaturalTS &&
           this.body.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }));
+        // code += `${indent(state.tabSize)}}`;
+      } else {
+        code += '__IDENTIFIER__';
       }
-      code += ')';
-      code += ';';
-      code += `${indent(state.tabSize)}}`;
-    } else {
-      code += '__IDENTIFIER__';
-    }
+
+    return code;
+  }
+
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let code = `{ `;
+      this.params.forEach((param, index) => {
+        code += param.toTextualNASL(shiftState(state, code, { inline: true }));
+        if (index !== this.params.length - 1) code += ', ';
+      });
+      code += ` => `;
+      if (this.body) {
+        code +=
+          this.body.toTextualNASL &&
+          this.body.toTextualNASL(shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }));
+        } else {
+          code += '__IDENTIFIER__';
+        }
+      code += ` }`;
 
     return code;
   }

package/src/concepts/Argument__.ts

@@ -140,7 +140,7 @@ export class Argument extends LogicItem {
         params.index = index;
       } else {
         const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
+        if ((q?.__v_raw || q) === n) {
           params.index = 0;
           (this as any)[parentKey] = undefined;
         }
@@ -256,15 +256,37 @@ export class Argument extends LogicItem {
   @withSourceMap()
   toNaturalTS(state = createCompilerState(), isRequired: boolean = true, isHaveKeyWord?: boolean): string {
     let code = this.spread ? '...' : '';
+
+    if (isHaveKeyWord) {
+      code += `${this.tsKeyword || '__IDENTIFIER__'}: `;
+    }
+    if (this.expression) {
+      // if ((this.expression as StringLiteral).name === 'ListDistinctByTargetDefaultExpression') {
+      //   code += runSync((this.expression as NewList).toEmbeddedIgnoreTS(shiftState(state, code)));
+      // } else {
+      code += (this.expression as StringLiteral).toNaturalTS(shiftState(state, code), isRequired);
+      // }
+    } else {
+      code += isRequired ? '__IDENTIFIER__' : 'undefined';
+    }
+
+    // if ((this.parentNode as any)?.tsCalleeKey === 'apis.up_mod_api_prod.interfaces.commentPage')
+    //   console.log('CallInterface:', (this.parentNode as any)?.tsCalleeKey, this.tsKeyword, code);
+    return code;
+  }
+
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState(), isRequired: boolean = true, isHaveKeyWord?: boolean): string {
+    let code = this.spread ? '...' : '';
     if (isHaveKeyWord) {
       code += `${this.tsKeyword}:`;
     }
     if (this.expression) {
-      if ((this.expression as StringLiteral).name === 'ListDistinctByTargetDefaultExpression') {
-        code += runSync((this.expression as NewList).toEmbeddedIgnoreTS(shiftState(state, code)));
-      } else {
-        code += (this.expression as StringLiteral).toNaturalTS(shiftState(state, code), isRequired);
-      }
+      // if ((this.expression as StringLiteral).name === 'ListDistinctByTargetDefaultExpression') {
+      //   code += runSync((this.expression as NewList).toEmbeddedIgnoreTS(shiftState(state, code)));
+      // } else {
+      code += this.expression.toTextualNASL(shiftState(state, code));
+      // }
     } else {
       code += isRequired ? '__IDENTIFIER__' : 'undefined';
     }

package/src/concepts/Assignment__.ts

@@ -177,12 +177,12 @@ export class Assignment extends LogicItem {
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
         // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
+        const index = (t as any)[parentKey]?.findIndex?.((el) => (el?.__v_raw || el) === n);
+        ~index && (this as any)[parentKey]?.splice?.(index, 1);
         params.index = index;
       } else {
         const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
+        if ((q?.__v_raw || q) === n) {
           params.index = 0;
           (this as any)[parentKey] = undefined;
         }
@@ -346,7 +346,7 @@ export class Assignment extends LogicItem {
   toNaturalTS(state = createCompilerState()): string {
     let code = '';
 
-    code += this.left ? this.left.toNaturalTS(shiftState(state, code, { inline: true })) : '__LEFT__';
+    code += this.left?.toNaturalTS(shiftState(state, code, { inline: true })) || '__LEFT__';
     code += ' = ';
     // 因为右侧枚举要赋值就得new 一下；
     if (
@@ -358,9 +358,7 @@ export class Assignment extends LogicItem {
       code += 'new ';
     }
     code +=
-      this.right && this.right.toNaturalTS
-        ? this.right.toNaturalTS(shiftState(state, code, { inline: true }))
-        : '__RIGHT__';
+      this.right && this.right?.toNaturalTS(shiftState(state, code, { inline: true })) || '__RIGHT__';
 
     return code;
   }

package/src/concepts/BatchAssignment__.ts

@@ -7,6 +7,7 @@ import {
   withSourceMapGenerator,
   withGenerator,
   TranslatorGenerator,
+  indent,
 } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import type MemberExpression from './MemberExpression__';
@@ -1091,18 +1092,20 @@ export class BatchAssignment extends LogicItem {
   toNaturalTS(state = createCompilerState()): string {
     let code = '';
     // 根据连线状态，拆分成多个单赋值
-    this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+    this.assignmentLines.forEach(({ leftIndex, rightIndex }, index) => {
+      if (index > 0)
+        code += indent(state.tabSize);
       const leftValue =
         leftIndex.length === 1
           ? this.left.expression.toNaturalTS(shiftState(state, code, { inline: true }))
           : this.left.members[leftIndex[1]]?.toNaturalTS(shiftState(state, code, { inline: true }));
-      code += `${leftValue}`;
+      code += `${leftValue.trim() || '__LEFT__'}`;
       code += ' = ';
       const rightValue =
         rightIndex.length === 1
           ? this.rights[rightIndex[0]]?.expression?.toNaturalTS(shiftState(state, code, { inline: true }))
           : this.rights[rightIndex[0]]?.members[rightIndex[1]]?.toNaturalTS(shiftState(state, code, { inline: true }));
-      code += `${rightValue}`;
+      code += `${rightValue.trim() || '__RIGHT__'}`;
       code += ';';
       code += '\n';
     });

package/src/concepts/BinaryExpression__.ts

@@ -239,12 +239,12 @@ export class BinaryExpression extends LogicItem {
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
         // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
+        const index = (t as any)[parentKey]?.findIndex((el) => ((el.__v_raw || el) === n));
+        ~index && (this as any)[parentKey]?.splice(index, 1);
         params.index = index;
       } else {
         const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
+        if ((q?.__v_raw || q) === n) {
           params.index = 0;
           (this as any)[parentKey] = undefined;
         }
@@ -396,7 +396,7 @@ export class BinaryExpression extends LogicItem {
   }
 
   toBrief(): string {
-    return `(${this.left.toBrief()} ${this.operator} ${this.right.toBrief()})`;
+    return `(${this.left?.toBrief?.()} ${this.operator} ${this.right?.toBrief?.()})`;
   }
 
   @withSourceMapGenerator
@@ -445,33 +445,50 @@ export class BinaryExpression extends LogicItem {
     if (['startwith', 'endwith', 'like', 'in'].includes(this.operator)) {
       const fnName = this.operator.toUpperCase();
       let code = '';
-      code += `nasl.langUtil.${fnName}(`;
-      code += this.left ? this.left.toNaturalTS(shiftState(state, code, { inline: true })) : '__LEFT__';
+      code += `${fnName}(`;
+      code += this.left?.toNaturalTS(shiftState(state, code, { inline: true })) || '__LEFT__';
       code += ', ';
-      code += this.right ? this.right.toNaturalTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
+      code += this.right?.toNaturalTS(shiftState(state, code, { inline: true })) || '__RIGHT__';
       code += ')';
       return code;
     }
     if (['&&', '||', '+', '-', '*', '/', '%', '==', '!=', '>', '<', '>=', '<='].includes(this.operator)) {
       let code = '';
       if (this.left && this.left.concept === 'BinaryExpression') {
-        code += this.left ? `(${this.left.toNaturalTS(shiftState(state, code, { inline: true }))})` : '__LEFT__';
+        code += this.left ? `(${this.left?.toNaturalTS(shiftState(state, code, { inline: true })) || '__LEFT__'})` : '__LEFT__';
       } else {
-        code += this.left ? this.left.toNaturalTS(shiftState(state, code, { inline: true })) : '__LEFT__';
+        code += this.left?.toNaturalTS(shiftState(state, code, { inline: true })) || '__LEFT__';
       }
       code += ` ${this.operator} `;
       if (this.right && this.right.concept === 'BinaryExpression') {
-        code += this.right ? `(${this.right.toNaturalTS(shiftState(state, code, { inline: true }))})` : '__RIGHT__';
+        code += this.right ? `(${this.right.toNaturalTS(shiftState(state, code, { inline: true })) || '__RIGHT__'})` : '__RIGHT__';
       } else {
-        code += this.right ? this.right.toNaturalTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
+        code += this.right?.toNaturalTS(shiftState(state, code, { inline: true })) || '__RIGHT__';
       }
       return code;
     }
 
     let code = '';
-    code += this.left ? this.left.toNaturalTS(shiftState(state, code, { inline: true })) : '__LEFT__';
+    code += this.left?.toNaturalTS(shiftState(state, code, { inline: true })) || '__LEFT__';
     code += ` ${this.operator} `;
-    code += this.right ? this.right.toNaturalTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
+    code += this.right?.toNaturalTS(shiftState(state, code, { inline: true })) || '__RIGHT__';
+    return code;
+  }
+
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    const isDataQuery = false; // !!this.getAncestor('CallQueryComponent');
+    const operatorMap = {
+      '==': '=',
+      '&&': 'and',
+      '||': 'or',
+    }
+    const operator = isDataQuery ? operatorMap[this.operator as keyof typeof operatorMap] || this.operator : this.operator;
+
+    let code = '';
+    code += this.left ? this.left.toTextualNASL(shiftState(state, code, { inline: true })) : '__LEFT__';
+    code += ` ${operator} `;
+    code += this.right ? this.right.toTextualNASL(shiftState(state, code, { inline: true })) : '__RIGHT__';
     return code;
   }
 

package/src/concepts/BindAttribute__.ts

@@ -1089,7 +1089,10 @@ export class BindAttribute extends BaseNode {
     // 业务组件
     const isBusinessComponent = self.viewElement?.isCorrespondingBusinessComponent;
     if (isBusinessComponent) {
-      code += `${name}: `;
+      if (type === 'dynamic') {
+        code += `${name}: (() => {
+          return `;
+      }
     } else if (self?.name === 'data-source' && self?.expression?.concept === 'CallLogic') {
       code += `() => {\n`;
     } else {
@@ -1131,13 +1134,17 @@ export class BindAttribute extends BaseNode {
         code += ';\n';
       }
     }
-    if (type === 'dynamic' && !isBusinessComponent) {
+    if (type === 'dynamic') {
       yield* wrapForEach(playground, function* warpForEachGenerator(item, index) {
         code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
         code += ';\n';
       });
     }
-    if (!isBusinessComponent) {
+    if (isBusinessComponent) {
+      if (type === 'dynamic') {
+        code += '\n})()';
+      }
+    } else {
       code += '\n}';
     }
     return code;

package/src/concepts/BindDirective__.ts

@@ -331,12 +331,12 @@ export class BindDirective extends BaseNode {
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
         // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
+        const index = (t as any)[parentKey]?.findIndex((el) => (el.__v_raw || el) === n);
+        ~index && (this as any)[parentKey]?.splice(index, 1);
         params.index = index;
       } else {
         const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
+        if ((q?.__v_raw || q) === n) {
           params.index = 0;
           (this as any)[parentKey] = undefined;
         }

package/src/concepts/BindEvent__.ts

@@ -774,7 +774,7 @@ export class BindEvent extends BaseNode {
     let code = '';
     if (!Object.keys(elementsEventsMap).length) return;
     // 业务组件
-    const businessComponent = this.element.correspondingBusinessComponent;
+    const businessComponent = this.element?.correspondingBusinessComponent;
     // 已有的点击事件，已知类型的，就直接取值
     if (
       [
@@ -1092,7 +1092,7 @@ export class BindEvent extends BaseNode {
     const newName = this.name.replace(/-/g, '');
     if (asserts.isViewElement(parentNode)) {
       return `${parentNode.name}_${newName}`;
-    } else if (asserts.isView(parentNode)) {
+    } else if (asserts.isView(parentNode) || asserts.isBusinessComponent(parentNode)) {
       return `${this.likeComponent.name}_${newName}`;
     } else {
       // 这里编译成这个名字了 后续pctemplate 里也得按这个调用？

package/src/concepts/BooleanLiteral__.ts

@@ -88,6 +88,11 @@ export class BooleanLiteral extends LogicItem {
     return this.value;
   }
 
+  @withSourceMap()
+  toTextualNASL(): string {
+    return this.value;
+  }
+
   /**
    * 设置布尔值内容
    */