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

package/src/concepts/BinaryExpression__.ts

@@ -1,4 +1,3 @@
-import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import {
   TranslatorState,
   shiftState,
@@ -9,6 +8,7 @@ import {
   TranslatorGenerator,
 } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
+import { getCallExpressionQuickInfo, Range, GetCode } from './utils/quick-info';
 
 const operatorMap = {
   '&&': 'and',
@@ -36,8 +36,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import LogicItem from './LogicItem__';
 
@@ -45,13 +45,12 @@ import LogicItem from './LogicItem__';
  * 二元表达式
  */
 @concept('二元表达式')
-// @ts-ignore
 export class BinaryExpression extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'BinaryExpression';
+  static readonly ConceptName: string = 'BinaryExpression';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -66,7 +65,6 @@ export class BinaryExpression extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   left!: LogicItem;
 
   /**
@@ -75,14 +73,12 @@ export class BinaryExpression extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   right!: LogicItem;
 
   /**
    * 运算符
    */
   @property()
-  // @ts-ignore
   operator!:
     | '+'
     | '-'
@@ -479,6 +475,10 @@ export class BinaryExpression extends LogicItem {
     return code;
   }
 
+  getQuickInfoOffset(range: Range, getCode: GetCode) {
+    return getCallExpressionQuickInfo(range, getCode);
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/BindAttribute__.ts

@@ -22,8 +22,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type LogicItem from './LogicItem__';
@@ -43,13 +43,12 @@ import type Process from './Process__';
  * 元素绑定属性
  */
 @concept('元素绑定属性')
-// @ts-ignore
 export class BindAttribute extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'BindAttribute';
+  static readonly ConceptName: string = 'BindAttribute';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -62,21 +61,18 @@ export class BindAttribute extends BaseNode {
    * 元素绑定属性名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * type
    */
   @property()
-  // @ts-ignore
   type!: 'string' | 'static' | 'dynamic';
 
   /**
    * 属性值
    */
   @property()
-  // @ts-ignore
   value!: string;
 
   /**
@@ -85,7 +81,6 @@ export class BindAttribute extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   expression!: LogicItem;
 
   /**
@@ -94,7 +89,6 @@ export class BindAttribute extends BaseNode {
   @property({
     objectRef: 'Destination',
   })
-  // @ts-ignore
   destination!: Destination;
 
   /**
@@ -103,7 +97,6 @@ export class BindAttribute extends BaseNode {
   @property({
     objectRef: 'ExternalDestination',
   })
-  // @ts-ignore
   externalDestination!: ExternalDestination;
 
   /**
@@ -122,21 +115,18 @@ export class BindAttribute extends BaseNode {
   @property({
     objectRef: 'Assignee',
   })
-  // @ts-ignore
   assignee!: Assignee;
 
   /**
    * 是否使用 v-model
    */
   @property()
-  // @ts-ignore
   model!: boolean;
 
   /**
    * 是否开启双向绑定
    */
   @property()
-  // @ts-ignore
   sync!: boolean;
 
   /**
@@ -153,7 +143,6 @@ export class BindAttribute extends BaseNode {
    * i18nKey
    */
   @property()
-  // @ts-ignore
   i18nKey!: string;
 
   /**
@@ -359,7 +348,7 @@ export class BindAttribute extends BaseNode {
         this,
         'rules',
       );
-    } else if (Assert.isValidationRule(options)) {
+    } else if (asserts.isValidationRule(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       validationRule = options;
       Object.assign(validationRule, relationOptions);
@@ -480,7 +469,7 @@ export class BindAttribute extends BaseNode {
     const relationOptions = { parentNode: this, parentKey: 'playground' };
     const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (Assert.isLogicItem(options)) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -824,7 +813,7 @@ export class BindAttribute extends BaseNode {
   // 获取表达式在页面中的名字
   get expressionNameInView() {
     const nameList: string[] = [];
-    let node: Type.SyntaxNode = this;
+    let node: types.SyntaxNode = this;
     while (node) {
       nameList.unshift(node.name);
       if (node.concept === 'ViewElement') {
@@ -1091,15 +1080,20 @@ export class BindAttribute extends BaseNode {
     return str;
   }
 
+
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
     const { name, type, value, rules, expression, playground } = self;
     let code = '';
-    if (self?.name === 'data-source' && self?.expression?.concept === 'CallLogic') {
-      code = `() => {`;
+    // 业务组件
+    const isBusinessComponent = self.viewElement?.isCorrespondingBusinessComponent;
+    if (isBusinessComponent) {
+      code += `${name}: `;
+    } else if (self?.name === 'data-source' && self?.expression?.concept === 'CallLogic') {
+      code += `() => {\n`;
     } else {
-      code = '() => {';
+      code += '() => {\n';
     }
     if (['destination', 'externalDestination'].includes(name) && type === 'dynamic') {
       code += yield* (self as any)[name].toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
@@ -1111,7 +1105,7 @@ export class BindAttribute extends BaseNode {
       });
     } else if (expression) {
       code += yield* expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-      code += ';\n';
+      code += '\n';
     } else if (name === 'url' && value) {
       /**
        * ls定制化处理
@@ -1137,13 +1131,15 @@ export class BindAttribute extends BaseNode {
         code += ';\n';
       }
     }
-    if (type === 'dynamic') {
+    if (type === 'dynamic' && !isBusinessComponent) {
       yield* wrapForEach(playground, function* warpForEachGenerator(item, index) {
         code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
         code += ';\n';
       });
     }
-    code += '}';
+    if (!isBusinessComponent) {
+      code += '\n}';
+    }
     return code;
   }
 
@@ -1179,6 +1175,8 @@ export class BindAttribute extends BaseNode {
         type = `${self.value}`.includes('.') ? 'nasl.core.Decimal' : 'nasl.core.Long';
       } else if (typeof self.value === 'boolean') {
         type = 'nasl.core.Boolean';
+      } else if (['page-size', 'page-number'].includes(self.name) && self.value === null) {
+        type = 'nasl.core.Long'
       }
       code += `${type}`;
     } else {
@@ -1220,7 +1218,7 @@ export class BindAttribute extends BaseNode {
   }
 
   findCurrentElementParent(node: any): ViewElement | undefined {
-    if (Assert.isViewElement(node.parentNode)) {
+    if (asserts.isViewElement(node.parentNode)) {
       if (
         [
           'u-table-view',

package/src/concepts/BindDirective__.ts

@@ -18,8 +18,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type LogicItem from './LogicItem__';
@@ -33,13 +33,12 @@ import type Frontend from './Frontend__';
  * 元素指令
  */
 @concept('元素指令')
-// @ts-ignore
 export class BindDirective extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'BindDirective';
+  static readonly ConceptName: string = 'BindDirective';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -52,28 +51,24 @@ export class BindDirective extends BaseNode {
    * 元素指令名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 原始名称
    */
   @property()
-  // @ts-ignore
   rawName!: string;
 
   /**
    * type
    */
   @property()
-  // @ts-ignore
   type!: 'string' | 'static' | 'dynamic';
 
   /**
    * 指令值
    */
   @property()
-  // @ts-ignore
   value!: string;
 
   /**
@@ -82,21 +77,18 @@ export class BindDirective extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   expression!: LogicItem;
 
   /**
    * 指令参数
    */
   @property()
-  // @ts-ignore
   arg!: string;
 
   /**
    * 指令修饰器
    */
   @property()
-  // @ts-ignore
   modifiers!: string;
 
   /**
@@ -113,7 +105,6 @@ export class BindDirective extends BaseNode {
    * i18nKey
    */
   @property()
-  // @ts-ignore
   i18nKey!: string;
 
   /**
@@ -205,7 +196,7 @@ export class BindDirective extends BaseNode {
     const relationOptions = { parentNode: this, parentKey: 'playground' };
     const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (Assert.isLogicItem(options)) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -638,21 +629,36 @@ export class BindDirective extends BaseNode {
     return str;
   }
 
+  get viewElement() {
+    return this.getAncestor('ViewElement') as ViewElement;
+  }
+
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
-    let code = '()=>{';
+    // 业务组件
+    const isBusinessComponent = self.viewElement?.correspondingBusinessComponent;
+    let code = '';
+    if (!isBusinessComponent) {
+      code += '()=>{';
+    }
     if (self.expression) {
       code += yield* self.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-      code += ';\n';
+      code += '\n';
     }
     if (self.type === 'dynamic') {
       yield* wrapForEach(self.playground, function* warpForEachGenerator(item, index) {
         code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-        if (index !== self.playground.length - 1) code += ';\n';
+        if (index !== self.playground.length - 1) code += '\n';
       });
     }
-    code += '}';
+    if (isBusinessComponent) {
+      if (code) {
+        code = `${self.name === 'if' ? '__NASLIF' : self.name}: ${code}`;
+      }
+    } else {
+      code += '}';
+    }
     return code;
   }
 

package/src/concepts/BindEvent__.ts

@@ -16,6 +16,7 @@ import { elementsEventsMap } from '../server/createUiTs';
 import type Param from './Param__';
 import type TypeAnnotation from './TypeAnnotation__';
 import type Process from './Process__';
+import type BusinessComponent from './BusinessComponent__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -25,8 +26,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type Logic from './Logic__';
@@ -42,13 +43,12 @@ import type LogicItem from './LogicItem__';
  * 元素绑定事件
  */
 @concept('元素绑定事件')
-// @ts-ignore
 export class BindEvent extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'BindEvent';
+  static readonly ConceptName: string = 'BindEvent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -61,7 +61,6 @@ export class BindEvent extends BaseNode {
    * 元素绑定事件名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -78,14 +77,12 @@ export class BindEvent extends BaseNode {
    * calleeNamespace
    */
   @property()
-  // @ts-ignore
   calleeNamespace!: string;
 
   /**
    * calleeName
    */
   @property()
-  // @ts-ignore
   calleeName!: string;
 
   /**
@@ -242,7 +239,7 @@ export class BindEvent extends BaseNode {
         this,
         'logics',
       );
-    } else if (Assert.isLogic(options)) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);
@@ -363,7 +360,7 @@ export class BindEvent extends BaseNode {
     const relationOptions = { parentNode: this, parentKey: 'arguments' };
     const Argument = getConceptConstructor('Argument');
     let argument: Argument;
-    if (Assert.isArgument(options)) {
+    if (asserts.isArgument(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       argument = options;
       Object.assign(argument, relationOptions);
@@ -610,7 +607,7 @@ export class BindEvent extends BaseNode {
     if (isPageCycle) {
       if (['keydown', 'keyup'].includes(self.name)) {
         code = `const ${self.toHump(self.name) || '__IDENTIFIER__'} = (event: `;
-        code += self.getEventTypeString();
+        code += yield* self.getEventTypeString(state);
         code += ') => [\n';
         yield* wrapForEach(self.logics, function* warpForEachGenerator(logic) {
           // 一些默认的逻辑不翻译 排除掉
@@ -649,7 +646,7 @@ export class BindEvent extends BaseNode {
       } else {
         yield* wrapForEach(self.logics, function* warpForEachGenerator(logic, index) {
           const logicName = logic.name;
-          logic.name = logic.view.name + logic.name + index;
+          logic.name = logic.likeComponent.name + logic.name + index;
           code += yield* logic.toEmbeddedTS(
             shiftState(state, code, {
               tabSize: (state?.tabSize || 0) + 2,
@@ -665,7 +662,7 @@ export class BindEvent extends BaseNode {
     }
     code = `${self.toHump(self.name) || '__IDENTIFIER__'}: (event: `;
     // event的类型
-    code += self.getEventTypeString();
+    code += yield* self.getEventTypeString(state);
     code += ') => [\n';
     yield* wrapForEach(self.logics, function* warpForEachGenerator(logic) {
       // 一些默认的逻辑不翻译 排除掉
@@ -700,7 +697,7 @@ export class BindEvent extends BaseNode {
       code += indent(state?.tabSize || 0);
       code += ',\n';
     });
-    if (self.view) code += '],\n';
+    if (self.view || self.getAncestor('BusinessComponent')) code += '],\n';
     else code += ']\n';
     return code;
   }
@@ -773,9 +770,11 @@ export class BindEvent extends BaseNode {
     return code;
   }
 
-  getEventTypeString() {
+  *getEventTypeString(state = createCompilerState()) {
     let code = '';
     if (!Object.keys(elementsEventsMap).length) return;
+    // 业务组件
+    const businessComponent = this.element.correspondingBusinessComponent;
     // 已有的点击事件，已知类型的，就直接取值
     if (
       [
@@ -796,6 +795,20 @@ export class BindEvent extends BaseNode {
       const ref = eventInfo.params[0].schema.$ref;
       const type = ref.replace('#/systemTypes/', 'nasl.ui.');
       code = `${type}`;
+    } else if (businessComponent) {
+      code = '{\n';
+      // 目标事件
+      const targetEvent = businessComponent.events?.find((event) => {
+        return event.name === this.name;
+      });
+      if (Array.isArray(targetEvent?.params)) {
+        yield* wrapForEach(targetEvent.params, function* warpForEachGenerator(param, index) {
+          code += `${param.name}?: `;
+          code += yield* param.typeAnnotation.toEmbeddedTS(shiftState(state, code));
+          code += ',\n';
+        });
+      }
+      code += '\n}';
     } else {
       code = 'nasl.ui.BaseEvent';
     }
@@ -840,7 +853,7 @@ export class BindEvent extends BaseNode {
    */
   setCallee(logic: Logic) {
     let calleeNamespace = logic.getNamespace();
-    if (Assert.isView(logic.parentNode)) {
+    if (asserts.isView(logic.parentNode)) {
       calleeNamespace = '';
     }
     const object = {
@@ -852,8 +865,13 @@ export class BindEvent extends BaseNode {
     });
   }
 
+  get likeComponent(): View | BusinessComponent {
+    return this.view || (this?.getAncestor('BusinessComponent') as BusinessComponent);
+  }
+
   getNamespace(ns: string) {
-    if (this.view) return `${this.view.getNamespace()}.${this.view.name}.bindEvents.${this.name}.logics`;
+    if (this.likeComponent)
+      return `${this.likeComponent.getNamespace()}.${this.likeComponent.name}.bindEvents.${this.name}.logics`;
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();
       const parentName = this.parentNode.name;
@@ -965,17 +983,22 @@ export class BindEvent extends BaseNode {
   getPageViewEventChineseName() {
     const parent = this.parentNode;
     const suffixRE = /时|前|后$/;
-    if (Assert.isView(parent)) {
+    if (asserts.isView(parent) || asserts.isBusinessComponent(parent)) {
+      const conceptTitleMap = {
+        View: '页面',
+        BusinessComponent: '业务组件',
+      };
+      const conceptTitle = conceptTitleMap[parent.concept];
       const event = elementsEventsMap[this.name];
 
       if (['keydown', 'keyup'].includes(event.name)) {
-        return `“${parent.title || parent.name}”页面${event.title}`;
+        return `“${parent.title || parent.name}”${conceptTitle}${event.title}`;
       }
 
       const cap = suffixRE.exec(event?.title);
-      if (cap) return `${event.title.replace(suffixRE, '')}“${parent.title || parent.name}”页面${cap[0]}`;
-      else return `${event.title}“${parent.title || parent.name}”页面`;
-    } else if (Assert.isViewElement(parent)) {
+      if (cap) return `${event.title.replace(suffixRE, '')}“${parent.title || parent.name}”${conceptTitle}${cap[0]}`;
+      else return `${event.title}“${parent.title || parent.name}”${conceptTitle}`;
+    } else if (asserts.isViewElement(parent)) {
       const eventName = `${parent.tag}-${this.name}`;
       if (elementsEventsMap[eventName]) {
         const event = elementsEventsMap[eventName];
@@ -1036,10 +1059,10 @@ export class BindEvent extends BaseNode {
 
   getViewEventChineseName() {
     const parent = this.parentNode;
-    if (Assert.isView(parent)) {
+    if (asserts.isView(parent)) {
       const event = elementsEventsMap[this.name];
       return `${event.title}`;
-    } else if (Assert.isViewElement(parent)) {
+    } else if (asserts.isViewElement(parent)) {
       const eventName = `${parent.tag}-${this.name}`;
       if (elementsEventsMap[eventName]) {
         const event = elementsEventsMap[eventName];
@@ -1067,10 +1090,10 @@ export class BindEvent extends BaseNode {
     // 名称规则：组件的名称 + 组件的事件 + 逻辑本身的事件 用下划线链接
     const parentNode = this.parentNode;
     const newName = this.name.replace(/-/g, '');
-    if (Assert.isViewElement(parentNode)) {
+    if (asserts.isViewElement(parentNode)) {
       return `${parentNode.name}_${newName}`;
-    } else if (Assert.isView(parentNode)) {
-      return `${this.view.name}_${newName}`;
+    } else if (asserts.isView(parentNode)) {
+      return `${this.likeComponent.name}_${newName}`;
     } else {
       // 这里编译成这个名字了 后续pctemplate 里也得按这个调用？
       // 或者说因为会编译在不同的端里  直接 name好了
@@ -1134,12 +1157,13 @@ export class BindEvent extends BaseNode {
     let pathName = name;
     let parent = this.parentNode;
     if (parent) {
-      while (parent && Assert.isView(parent)) {
+      while (parent && asserts.isView(parent)) {
         pathName = parent.name + '/' + pathName;
         parent = parent.parentNode;
       }
     }
-    return `/embedded/${this.app.name}/frontends/${this.frontend.name}/bindEvents/${pathName}.ts`;
+    return `/embedded/${this.getAncestor('App')?.name}/frontends/${this.getAncestor('FrontendType')?.name
+      }/bindEvents/${pathName}.ts`;
   }
 
   //================================================================================

package/src/concepts/BindStyle__.ts

@@ -18,8 +18,8 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
-import * as Type from './utils/types';
-import * as Assert from './utils/asserts';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import type LogicItem from './LogicItem__';
@@ -33,13 +33,12 @@ import type Frontend from './Frontend__';
  * 元素绑定样式
  */
 @concept('元素绑定样式')
-// @ts-ignore
 export class BindStyle extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'BindStyle';
+  static readonly ConceptName: string = 'BindStyle';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -52,7 +51,6 @@ export class BindStyle extends BaseNode {
    * 元素绑定样式名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
@@ -61,7 +59,6 @@ export class BindStyle extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   expression!: LogicItem;
 
   /**
@@ -163,7 +160,7 @@ export class BindStyle extends BaseNode {
     const relationOptions = { parentNode: this, parentKey: 'playground' };
     const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (Assert.isLogicItem(options)) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);