@lcap/nasl 3.4.0-beta.6 → 3.5.0-alpha.1

package/src/concepts/App__.ts

@@ -5,6 +5,8 @@ import TypeAnnotation from './TypeAnnotation__';
 import View from './View__';
 import AuthInterface from './AuthInterface__';
 import Interface from './Interface__';
+import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
+
 // import CallLogic from './CallLogic__';
 
 export interface AssetsInfo {
@@ -37,49 +39,48 @@ interface compilerInfoMapProps {
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import DataSource from './DataSource__';
-import Structure from './Structure__';
-import Enum from './Enum__';
-import Logic from './Logic__';
-import OverriddenLogic from './OverriddenLogic__';
-import AbstractInterface from './AbstractInterface__';
-import Frontend from './Frontend__';
+import type DataSource from './DataSource__';
+import type Structure from './Structure__';
+import type Enum from './Enum__';
+import type Logic from './Logic__';
+import type OverriddenLogic from './OverriddenLogic__';
+import type AbstractInterface from './AbstractInterface__';
+import type Frontend from './Frontend__';
 import Backend from './Backend__';
-import Process from './Process__';
-import Role from './Role__';
+import type Process from './Process__';
+import type Role from './Role__';
 import Configuration from './Configuration__';
-import Module from './Module__';
-import Connector from './Connector__';
-import Integration from './Integration__';
-import AuthLogic from './AuthLogic__';
-import AuthLogicForCallInterface from './AuthLogicForCallInterface__';
-import Connection from './Connection__';
-import TriggerLauncher from './TriggerLauncher__';
-import MetadataType from './MetadataType__';
+import type Module from './Module__';
+import type Connector from './Connector__';
+import type Integration from './Integration__';
+import type AuthLogic from './AuthLogic__';
+import type AuthLogicForCallInterface from './AuthLogicForCallInterface__';
+import type Connection from './Connection__';
+import type TriggerLauncher from './TriggerLauncher__';
+import type MetadataType from './MetadataType__';
 
 /**
  * 应用
  */
-@className
 @concept('应用')
-// @ts-ignore
 export class App extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'App';
+  static readonly ConceptName: string = 'App';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 应用 Id
    */
   @property()
-  // @ts-ignore
   id!: string;
 
   /**
@@ -93,56 +94,48 @@ export class App extends BaseNode {
    * IDE 版本
    */
   @property()
-  // @ts-ignore
   ideVersion!: string;
 
   /**
    * 应用标识
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 应用标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 应用图标
    */
   @property()
-  // @ts-ignore
   icon!: string;
 
   /**
    * 应用描述
    */
   @property()
-  // @ts-ignore
   desc!: string;
 
   /**
    * 域名
    */
   @property()
-  // @ts-ignore
   dnsAddr!: string;
 
   /**
    * 是否有用户中心
    */
   @property()
-  // @ts-ignore
   hasUserCenter!: boolean;
 
   /**
    * 是否有权限
    */
   @property()
-  // @ts-ignore
   hasAuth!: boolean;
 
   /**
@@ -277,7 +270,6 @@ export class App extends BaseNode {
   @property({
     objectRef: 'Integration',
   })
-  // @ts-ignore
   integration!: Integration;
 
   /**
@@ -397,6 +389,7 @@ export class App extends BaseNode {
   _insertDataSourceAt(options: string | Partial<DataSource> | DataSource, index: number) {
     const dataSourceOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'dataSources' };
+    const DataSource = getConceptConstructor('DataSource');
     let dataSource: DataSource;
     if (!options) {
       dataSource = DataSource.from(
@@ -416,7 +409,7 @@ export class App extends BaseNode {
         this,
         'dataSources',
       );
-    } else if (options instanceof DataSource) {
+    } else if (asserts.isDataSource(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       dataSource = options;
       Object.assign(dataSource, relationOptions);
@@ -550,6 +543,7 @@ export class App extends BaseNode {
   _insertStructureAt(options: string | Partial<Structure> | Structure, index: number) {
     const structureOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'structures' };
+    const Structure = getConceptConstructor('Structure');
     let structure: Structure;
     if (!options) {
       structure = Structure.from(
@@ -569,7 +563,7 @@ export class App extends BaseNode {
         this,
         'structures',
       );
-    } else if (options instanceof Structure) {
+    } else if (asserts.isStructure(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       structure = options;
       Object.assign(structure, relationOptions);
@@ -703,6 +697,7 @@ export class App extends BaseNode {
   _insertEnumAt(options: string | Partial<Enum> | Enum, index: number) {
     const enumerationOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'enums' };
+    const Enum = getConceptConstructor('Enum');
     let enumeration: Enum;
     if (!options) {
       enumeration = Enum.from(
@@ -722,7 +717,7 @@ export class App extends BaseNode {
         this,
         'enums',
       );
-    } else if (options instanceof Enum) {
+    } else if (asserts.isEnum(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       enumeration = options;
       Object.assign(enumeration, relationOptions);
@@ -856,6 +851,7 @@ export class App extends BaseNode {
   _insertLogicAt(options: string | Partial<Logic> | Logic, index: number) {
     const logicOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'logics' };
+    const Logic = getConceptConstructor('Logic');
     let logic: Logic;
     if (!options) {
       logic = Logic.from(
@@ -875,7 +871,7 @@ export class App extends BaseNode {
         this,
         'logics',
       );
-    } else if (options instanceof Logic) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);
@@ -1001,6 +997,7 @@ export class App extends BaseNode {
   _insertAuthLogicInAuthLogicsAt(options: string | Partial<AuthLogic> | AuthLogic, index: number) {
     const authLogicOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'authLogics' };
+    const AuthLogic = getConceptConstructor('AuthLogic');
     let authLogic: AuthLogic;
     if (!options) {
       authLogic = AuthLogic.from(
@@ -1020,7 +1017,7 @@ export class App extends BaseNode {
         this,
         'authLogics',
       );
-    } else if (options instanceof AuthLogic) {
+    } else if (asserts.isAuthLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       authLogic = options;
       Object.assign(authLogic, relationOptions);
@@ -1158,6 +1155,7 @@ export class App extends BaseNode {
   ) {
     const authLogicForCallInterfaceOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'authLogicsForCallInterface' };
+    const AuthLogicForCallInterface = getConceptConstructor('AuthLogicForCallInterface');
     let authLogicForCallInterface: AuthLogicForCallInterface;
     if (!options) {
       authLogicForCallInterface = AuthLogicForCallInterface.from(
@@ -1177,7 +1175,7 @@ export class App extends BaseNode {
         this,
         'authLogicsForCallInterface',
       );
-    } else if (options instanceof AuthLogicForCallInterface) {
+    } else if (asserts.isAuthLogicForCallInterface(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       authLogicForCallInterface = options;
       Object.assign(authLogicForCallInterface, relationOptions);
@@ -1334,6 +1332,7 @@ export class App extends BaseNode {
   _insertOverriddenLogicAt(options: string | Partial<OverriddenLogic> | OverriddenLogic, index: number) {
     const overriddenLogicOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'overriddenLogics' };
+    const OverriddenLogic = getConceptConstructor('OverriddenLogic');
     let overriddenLogic: OverriddenLogic;
     if (!options) {
       overriddenLogic = OverriddenLogic.from(
@@ -1353,7 +1352,7 @@ export class App extends BaseNode {
         this,
         'overriddenLogics',
       );
-    } else if (options instanceof OverriddenLogic) {
+    } else if (asserts.isOverriddenLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       overriddenLogic = options;
       Object.assign(overriddenLogic, relationOptions);
@@ -1497,6 +1496,7 @@ export class App extends BaseNode {
   _insertFrontendAt(options: string | Partial<Frontend> | Frontend, index: number) {
     const frontendOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'frontends' };
+    const Frontend = getConceptConstructor('Frontend');
     let frontend: Frontend;
     if (!options) {
       frontend = Frontend.from(
@@ -1516,7 +1516,7 @@ export class App extends BaseNode {
         this,
         'frontends',
       );
-    } else if (options instanceof Frontend) {
+    } else if (asserts.isFrontend(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       frontend = options;
       Object.assign(frontend, relationOptions);
@@ -1650,6 +1650,7 @@ export class App extends BaseNode {
   _insertProcessAt(options: string | Partial<Process> | Process, index: number) {
     const processOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'processes' };
+    const Process = getConceptConstructor('Process');
     let process: Process;
     if (!options) {
       process = Process.from(
@@ -1669,7 +1670,7 @@ export class App extends BaseNode {
         this,
         'processes',
       );
-    } else if (options instanceof Process) {
+    } else if (asserts.isProcess(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       process = options;
       Object.assign(process, relationOptions);
@@ -1803,6 +1804,7 @@ export class App extends BaseNode {
   _insertRoleAt(options: string | Partial<Role> | Role, index: number) {
     const roleOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'roles' };
+    const Role = getConceptConstructor('Role');
     let role: Role;
     if (!options) {
       role = Role.from(
@@ -1822,7 +1824,7 @@ export class App extends BaseNode {
         this,
         'roles',
       );
-    } else if (options instanceof Role) {
+    } else if (asserts.isRole(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       role = options;
       Object.assign(role, relationOptions);
@@ -1956,6 +1958,7 @@ export class App extends BaseNode {
   _insertModuleInDependenciesAt(options: string | Partial<Module> | Module, index: number) {
     const moduleOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'dependencies' };
+    const Module = getConceptConstructor('Module');
     let module: Module;
     if (!options) {
       module = Module.from(
@@ -1975,7 +1978,7 @@ export class App extends BaseNode {
         this,
         'dependencies',
       );
-    } else if (options instanceof Module) {
+    } else if (asserts.isModule(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       module = options;
       Object.assign(module, relationOptions);
@@ -2101,6 +2104,7 @@ export class App extends BaseNode {
   _insertConnectorInDependenciesAt(options: string | Partial<Connector> | Connector, index: number) {
     const connectorOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'dependencies' };
+    const Connector = getConceptConstructor('Connector');
     let connector: Connector;
     if (!options) {
       connector = Connector.from(
@@ -2120,7 +2124,7 @@ export class App extends BaseNode {
         this,
         'dependencies',
       );
-    } else if (options instanceof Connector) {
+    } else if (asserts.isConnector(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       connector = options;
       Object.assign(connector, relationOptions);
@@ -2246,6 +2250,7 @@ export class App extends BaseNode {
   _insertModuleInInterfaceDependenciesAt(options: string | Partial<Module> | Module, index: number) {
     const moduleOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'interfaceDependencies' };
+    const Module = getConceptConstructor('Module');
     let module: Module;
     if (!options) {
       module = Module.from(
@@ -2265,7 +2270,7 @@ export class App extends BaseNode {
         this,
         'interfaceDependencies',
       );
-    } else if (options instanceof Module) {
+    } else if (asserts.isModule(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       module = options;
       Object.assign(module, relationOptions);
@@ -2401,6 +2406,7 @@ export class App extends BaseNode {
   _insertConnectionAt(options: string | Partial<Connection> | Connection, index: number) {
     const connectionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'connections' };
+    const Connection = getConceptConstructor('Connection');
     let connection: Connection;
     if (!options) {
       connection = Connection.from(
@@ -2420,7 +2426,7 @@ export class App extends BaseNode {
         this,
         'connections',
       );
-    } else if (options instanceof Connection) {
+    } else if (asserts.isConnection(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       connection = options;
       Object.assign(connection, relationOptions);
@@ -2556,6 +2562,7 @@ export class App extends BaseNode {
   _insertTriggerLauncherAt(options: string | Partial<TriggerLauncher> | TriggerLauncher, index: number) {
     const triggerLauncherOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'triggerLaunchers' };
+    const TriggerLauncher = getConceptConstructor('TriggerLauncher');
     let triggerLauncher: TriggerLauncher;
     if (!options) {
       triggerLauncher = TriggerLauncher.from(
@@ -2575,7 +2582,7 @@ export class App extends BaseNode {
         this,
         'triggerLaunchers',
       );
-    } else if (options instanceof TriggerLauncher) {
+    } else if (asserts.isTriggerLauncher(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       triggerLauncher = options;
       Object.assign(triggerLauncher, relationOptions);
@@ -2711,6 +2718,7 @@ export class App extends BaseNode {
   _insertMetadataTypeAt(options: string | Partial<MetadataType> | MetadataType, index: number) {
     const metadataTypeOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'metadataTypes' };
+    const MetadataType = getConceptConstructor('MetadataType');
     let metadataType: MetadataType;
     if (!options) {
       metadataType = MetadataType.from(
@@ -2730,7 +2738,7 @@ export class App extends BaseNode {
         this,
         'metadataTypes',
       );
-    } else if (options instanceof MetadataType) {
+    } else if (asserts.isMetadataType(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       metadataType = options;
       Object.assign(metadataType, relationOptions);
@@ -3932,7 +3940,14 @@ export class App extends BaseNode {
     return queryNodeByPath(this, nodePath);
   }
 
-  findNodeByCompleteName(completeName: string) {
+  findNodeByCompleteName(originCompleteName: string) {
+    let completeName = originCompleteName;
+    // 是否是来自编辑态的自定义连接器
+    const isFromEditableConnector = completeName.endsWith(CUSTOM_CONNECTOR_EDITABLE_SUFFIX);
+    if (isFromEditableConnector) {
+      // 为了查找到真实的结构，需要去掉编辑态的后缀
+      completeName = completeName.replace(CUSTOM_CONNECTOR_EDITABLE_SUFFIX, '');
+    }
     const nameArr = completeName?.split('.') || [];
     let node: any = this;
     // 先处理平台的
@@ -3951,7 +3966,11 @@ export class App extends BaseNode {
     const modules = modulesMap[start];
     if (Array.isArray(modules)) {
       const moduleName = nameArr.shift();
-      node = modules.find((moduleItem) => moduleItem.name === moduleName);
+      if(isFromEditableConnector) {
+        node = modules.find((moduleItem) => moduleItem.name === moduleName && moduleItem?.parentNode?.concept === 'Integration');
+      } else {
+        node = modules.find((moduleItem) => moduleItem.name === moduleName);
+      }    
     }
     for (let index = 0; index < nameArr.length; index++) {
       if (!node) {
@@ -3978,21 +3997,23 @@ export class App extends BaseNode {
   }
 
   loadPackageInfo(scope: string) {
-    const dependencyMap = (window as any).globalData.ideVersionDetail.dependencies;
+    const materialConfig = (window as any).globalData.materialConfig || {};
+    const { framework, ui } = materialConfig;
+
     const packageInfo = {
       template: { name: '', version: '', scope },
       ui: { name: '', version: '', scope },
       scope,
     };
 
-    packageInfo.template.name = scope === 'h5' ? '@lcap/mobile-template' : 'lcap-pc-template';
-    packageInfo.template.version =
-      scope === 'h5' ? dependencyMap.FrontendArchH5.version : dependencyMap.FrontendArchPC.version;
-    packageInfo.ui.name = scope === 'h5' ? '@lcap/mobile-ui' : 'cloud-ui.vusion';
-    packageInfo.ui.version =
-      scope === 'h5'
-        ? dependencyMap.FrontendComponentLibraryH5.version
-        : dependencyMap.FrontendComponentLibraryPC.version;
+    packageInfo.template.name = scope === 'h5' ? framework.h5 : framework.pc;
+    packageInfo.template.version = framework.version;
+
+    packageInfo.ui.name = scope === 'h5' ? ui.h5.name : ui.pc.name;
+    packageInfo.ui.version = scope === 'h5'
+        ? ui.h5.version
+        : ui.pc.version;
+
     return packageInfo;
   }
 
@@ -4027,21 +4048,13 @@ export class App extends BaseNode {
           `${prefix}/packages/vue@2/dist/vue.min.js`,
           // `${prefix}/packages/vue-router@3/dist/vue-router.min.js`,
 
-          scope === 'h5'
-            ? `${prefix}/packages/@lcap/mobile-ui@${packageInfo.ui.version}/dist-theme/index.js`
-            : `${prefix}/packages/cloud-ui.vusion@${packageInfo.ui.version}/dist-theme/index.js`,
+          `${prefix}/packages/${packageInfo.ui.name}@${packageInfo.ui.version}/dist-theme/index.js`,
 
-          scope === 'h5'
-            ? `${prefix}/packages/@lcap/mobile-template@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js`
-            : `${prefix}/packages/lcap-pc-template@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js`,
+          `${prefix}/packages/${packageInfo.template.name}@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js`,
         ],
         css: [
-          scope === 'h5'
-            ? `${prefix}/packages/@lcap/mobile-ui@${packageInfo.ui.version}/dist-theme/index.css`
-            : `${prefix}/packages/cloud-ui.vusion@${packageInfo.ui.version}/dist-theme/index.css`,
-          scope === 'h5'
-            ? `${prefix}/packages/@lcap/mobile-template@${packageInfo.template.version}/cloudAdminDesigner.css`
-            : `${prefix}/packages/lcap-pc-template@${packageInfo.template.version}/cloudAdminDesigner.css`,
+          `${prefix}/packages/${packageInfo.ui.name}@${packageInfo.ui.version}/dist-theme/index.css`,
+          `${prefix}/packages/${packageInfo.template.name}@${packageInfo.template.version}/cloudAdminDesigner.css`,
         ],
       },
       custom: {
@@ -4132,6 +4145,7 @@ export class App extends BaseNode {
     // if (node.enable && node.dataSources) {
     if (node.dataSources) {
       const dataSourceGroup = this.configuration?.getGroup('dataSource');
+      const ConfigProperty = getConceptConstructor('ConfigProperty');
       if (dataSourceGroup) {
         node.dataSources.forEach((datasource) => {
           const body: ConfigProperty = ConfigProperty.from({
@@ -4503,6 +4517,7 @@ export class App extends BaseNode {
   _insertInterfaceInInterfacesAt(options: string | Partial<Interface> | Interface, index: number) {
     const itfaceOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'interfaces' };
+    const Interface = getConceptConstructor('Interface');
     let itface: Interface;
     if (!options) {
       itface = Interface.from(
@@ -4522,7 +4537,7 @@ export class App extends BaseNode {
         this,
         'interfaces',
       );
-    } else if (options instanceof Interface) {
+    } else if (asserts.isInterface(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       itface = options;
       Object.assign(itface, relationOptions);
@@ -4648,6 +4663,7 @@ export class App extends BaseNode {
   _insertAuthInterfaceInInterfacesAt(options: string | Partial<AuthInterface> | AuthInterface, index: number) {
     const itfaceOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'interfaces' };
+    const AuthInterface = getConceptConstructor('AuthInterface');
     let itface: AuthInterface;
     if (!options) {
       itface = AuthInterface.from(
@@ -4667,7 +4683,7 @@ export class App extends BaseNode {
         this,
         'interfaces',
       );
-    } else if (options instanceof AuthInterface) {
+    } else if (asserts.isAuthInterface(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       itface = options;
       Object.assign(itface, relationOptions);

package/src/concepts/Argument__.ts

@@ -9,35 +9,34 @@ import {
   TranslatorGenerator,
 } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
-import StringLiteral from './StringLiteral__';
-import TypeAnnotation from './TypeAnnotation__';
-import NewList from './NewList__';
-import DefaultValue from './DefaultValue__';
-import CallFunction from './CallFunction__';
+import type StringLiteral from './StringLiteral__';
+import type TypeAnnotation from './TypeAnnotation__';
+import type NewList from './NewList__';
+import type DefaultValue from './DefaultValue__';
+import type CallFunction from './CallFunction__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
-import BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
 
 /**
  * 实际参数
  */
-@className
 @concept('实际参数')
-// @ts-ignore
 export class Argument extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'Argument';
+  static readonly ConceptName: string = 'Argument';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -50,14 +49,12 @@ export class Argument extends LogicItem {
    * 参数名
    */
   @property()
-  // @ts-ignore
   keyword!: string;
 
   /**
    * 是否为展开参数
    */
   @property()
-  // @ts-ignore
   spread!: boolean;
 
   /**
@@ -66,7 +63,6 @@ export class Argument extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   expression!: LogicItem;
 
   /**
@@ -204,7 +200,7 @@ export class Argument extends LogicItem {
   toJS(state?: TranslatorState): string {
     let code = this.spread ? '...' : '';
     if (this.expression) {
-      const resultCode = this.expression.toJS(shiftState(state, code));
+      const resultCode = this.expression.toJS(state);
       const { typeName, typeNamespace } = (this.expression as any)?.__nodeType || {};
       code += resultCode;
     } else {