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

package/src/concepts/CallLogic__.ts

@@ -10,13 +10,13 @@ import {
   TranslatorGenerator,
   transfromUnionTypeAnnotation,
 } from '../translator';
-import Logic from './Logic__';
+import type Logic from './Logic__';
 import type Param from './Param__';
-import View from './View__';
+import type View from './View__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import { findConceptKeyWordIndexFromNamespace } from '../utils';
 import { config } from '../config';
-import Identifier from './Identifier__';
+import type Identifier from './Identifier__';
 import type { ViewElement, ElementToVueOptions } from './ViewElement__';
 import type { MemberExpression } from './MemberExpression__';
 
@@ -25,28 +25,27 @@ import type { MemberExpression } from './MemberExpression__';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 TypeAnnotation from './TypeAnnotation__';
-import Argument from './Argument__';
-import BindAttribute from './BindAttribute__';
 import LogicItem from './LogicItem__';
+import type TypeAnnotation from './TypeAnnotation__';
+import type Argument from './Argument__';
+import type BindAttribute from './BindAttribute__';
 
 /**
  * 调用逻辑
  */
-@className
 @concept('调用逻辑')
-// @ts-ignore
 export class CallLogic extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'CallLogic';
+  static readonly ConceptName: string = 'CallLogic';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 唯一标识
@@ -71,28 +70,24 @@ export class CallLogic extends LogicItem {
    * calleeNamespace
    */
   @property()
-  // @ts-ignore
   calleeNamespace!: string;
 
   /**
    * calleeName
    */
   @property()
-  // @ts-ignore
   calleeName!: string;
 
   /**
    * shortcut
    */
   @property()
-  // @ts-ignore
   shortcut!: boolean;
 
   /**
    * handleError
    */
   @property()
-  // @ts-ignore
   handleError!: boolean;
 
   /**
@@ -121,14 +116,12 @@ export class CallLogic extends LogicItem {
   @property({
     objectRef: 'BindAttribute',
   })
-  // @ts-ignore
   validation!: BindAttribute;
 
   /**
    * 是否被折叠
    */
   @property()
-  // @ts-ignore
   isAdvancedSettingFolded!: boolean;
 
   /**
@@ -188,8 +181,9 @@ export class CallLogic extends LogicItem {
   _insertTypeAnnotationAt(options: Partial<TypeAnnotation> | TypeAnnotation, index: number) {
     const typeAnnotationOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
+    const TypeAnnotation = getConceptConstructor('TypeAnnotation');
     let typeAnnotation: TypeAnnotation;
-    if (options instanceof TypeAnnotation) {
+    if (asserts.isTypeAnnotation(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       typeAnnotation = options;
       Object.assign(typeAnnotation, relationOptions);
@@ -288,8 +282,9 @@ export class CallLogic extends LogicItem {
   _insertArgumentAt(options: Partial<Argument> | Argument, index: number) {
     const argumentOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'arguments' };
+    const Argument = getConceptConstructor('Argument');
     let argument: Argument;
-    if (options instanceof Argument) {
+    if (asserts.isArgument(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       argument = options;
       Object.assign(argument, relationOptions);
@@ -595,8 +590,9 @@ export class CallLogic extends LogicItem {
   }
 
   _setCallee(logic: Logic) {
+    const BaseNode = getBaseNode();
     this.calleeNamespace = logic.getNamespace();
-    if (logic.parentNode instanceof View) {
+    if (asserts.isView(logic.parentNode)) {
       this.calleeNamespace = '';
     }
     this.calleeName = logic.name;
@@ -620,10 +616,14 @@ export class CallLogic extends LogicItem {
 
   setCallee(logic: Logic) {
     let calleeNamespace = logic?.getNamespace() || '';
-    if (logic.parentNode instanceof View) {
+    if (asserts.isView(logic.parentNode)) {
       calleeNamespace = '';
     }
     const calleeName = logic.name;
+    const Logic = getConceptConstructor('Logic');
+    const Identifier = getConceptConstructor('Identifier');
+    const Argument = getConceptConstructor('Argument');
+    const TypeAnnotation = getConceptConstructor('TypeAnnotation');
     const params = logic?.params?.map((param) => {
       const relationOptions = { parentNode: this, parentKey: 'arguments' };
       const argument = Argument.from(
@@ -682,6 +682,7 @@ export class CallLogic extends LogicItem {
   }
 
   addCalleeArg(logic: Logic) {
+    const Argument = getConceptConstructor('Argument');
     const newArgs = this.arguments.map((argument) =>
       Argument.from(
         {
@@ -746,41 +747,85 @@ export class CallLogic extends LogicItem {
   }
 
   toVue(options?: ElementToVueOptions): string {
-    let code = '';
-    if (
-      this.calleeNamespace === 'nasl.browser' ||
-      this.calleeNamespace === 'nasl.auth' ||
-      this.calleeNamespace === 'nasl.configuration' ||
-      this.calleeNamespace === 'nasl.process'
-    ) {
-      code += '$global.';
-    }
-    const { completeArguments } = this;
-    if (this.concept === 'CallLogic' && this.getAncestor('BindAttribute')?.name === 'data-source') {
-      let code = '';
-      if (this.calleeNamespace) {
-        const currentElement = this.getAncestor('ViewElement') as ViewElement;
-        code += `__${currentElement.name}_dataSourceLoad`;
-        return code;
-      } else {
-        // 前端逻辑的calleeNamespace一直为空字符串
-        code += this.calleeName;
-        return code;
-      }
-    } else {
-      code += this.calleeName;
+    const { completeArguments, calleeNamespace, calleeName, concept } = this;
+
+    const setArguments = () => {
       code += '(';
       completeArguments.forEach((arg, index) => {
         code += arg?.toVue(options);
-        if (index !== completeArguments.length - 1) code += ', ';
+        if (index !== completeArguments.length - 1) {
+          code += ', ';
+        }
       });
+      code += ')';
+    };
+
+    let code = '';
+
+    if (concept === 'CallLogic') {
+      const bindAttr = this.getAncestor('BindAttribute');
+
+      if (bindAttr?.name === 'data-source') {
+        if (calleeNamespace) {
+          const currentElement = this.getAncestor('ViewElement') as ViewElement;
+          code += `__${currentElement.name}_dataSourceLoad`;
+        } else {
+          // 前端逻辑的calleeNamespace一直为空字符串
+          code += calleeName;
+        }
+        return code;
+      } else if (bindAttr?.name === 'text') {
+        if (calleeName === 'jsonSerialize') {
+          if (
+            this.arguments[0]?.expression?.__TypeAnnotation?.typeName === 'String' &&
+            this.arguments[0]?.expression?.__TypeAnnotation?.typeNamespace === 'nasl.core'
+          ) {
+            code += options?.finalCode === false ? 'JSON 序列化' : 'JSON.stringify';
+          } else {
+            code += options?.finalCode === false ? 'JSON 序列化' : `$utils['JsonSerialize']`;
+          }
+          setArguments();
+          return code;
+        } else if (calleeName === 'jsonDeserialize') {
+          code += options?.finalCode === false ? 'JSON 反序列化' : 'JSON.parse';
+          setArguments();
+          return code;
+        }
+      }
     }
-    code += ')';
+
+    if (
+      calleeNamespace === 'nasl.browser' ||
+      calleeNamespace === 'nasl.auth' ||
+      calleeNamespace === 'nasl.configuration' ||
+      calleeNamespace === 'nasl.process'
+    ) {
+      code += '$global.';
+    }
+
+    code += calleeName;
+    setArguments();
     return code;
   }
 
   toUI(state?: TranslatorState, hideDetails?: boolean): string {
-    let code = this.calleeName;
+    const { calleeName, concept } = this;
+
+    if (concept === 'CallLogic') {
+      const bindAttr = this.getAncestor('BindAttribute');
+
+      if (bindAttr?.name === 'data-source') {
+        return this.calleeName;
+      } else if (bindAttr?.name === 'text') {
+        if (calleeName === 'jsonSerialize') {
+          return 'JSON 序列化';
+        } else if (calleeName === 'jsonDeserialize') {
+          return 'JSON 反序列化';
+        }
+      }
+    }
+
+    let code = calleeName;
     code += '(';
 
     if (this.arguments?.length && !hideDetails) {
@@ -790,9 +835,6 @@ export class CallLogic extends LogicItem {
       });
     }
     code += ')';
-    if (this.concept === 'CallLogic' && this.getAncestor('BindAttribute')?.name === 'data-source') {
-      return this.calleeName;
-    }
 
     return code;
   }
@@ -884,7 +926,7 @@ export class CallLogic extends LogicItem {
             };
           })
           .filter((item) => isShowArgument(item.arg))
-          .map((obj: any) => `\n${obj?.keyword}: ${obj?.arg?.toJS(shiftState(state, code))}`)
+          .map((obj: any) => `\n${obj?.keyword}: ${obj?.arg?.toJS(state)}`)
           .join(', ');
         code += argsStr;
       }
@@ -910,7 +952,7 @@ export class CallLogic extends LogicItem {
                   arg: actualArg,
                 };
               })
-              .map((obj: any) => `\n${obj?.keyword}: ${obj?.arg?.toJS(shiftState(state, code))}`)
+              .map((obj: any) => `\n${obj?.keyword}: ${obj?.arg?.toJS(state)}`)
               .join(', ');
             code += argsStr;
             code += `},\n`;
@@ -924,7 +966,7 @@ export class CallLogic extends LogicItem {
               .map((arg) => {
                 const name =
                   arg.keyword === 'body' ? (this.calleeName === 'batchUpdate' ? 'entities' : 'entity') : arg.keyword;
-                return `${name}: ${arg.expression.toJS(shiftState(state, code))}`;
+                return `${name}: ${arg.expression.toJS(state)}`;
               })
               .join(',\n');
             code += argsStr;
@@ -950,7 +992,7 @@ export class CallLogic extends LogicItem {
                                         returnExpression: this.$resolveRequestData(${argsStr})
                                     }`;
                 }
-                return `${name}: ${arg.expression.toJS(shiftState(state, code))}`;
+                return `${name}: ${arg.expression.toJS(state)}`;
               })
               .join(',');
             code += argsStr;
@@ -981,7 +1023,7 @@ export class CallLogic extends LogicItem {
         const bodyArgument = logicArgs.find((arg) => arg.keyword === 'body');
         if (!breakBody) {
           if (bodyArgument) {
-            code += `\n${bodyArgument?.keyword}: ${bodyArgument?.toJS(shiftState(state, code))}`;
+            code += `\n${bodyArgument?.keyword}: ${bodyArgument?.toJS(state)}`;
           } else {
             code += `body: {}`;
           }
@@ -999,7 +1041,7 @@ export class CallLogic extends LogicItem {
               };
             })
             .filter((item) => isShowArgument(item.arg))
-            .map((obj) => `\n${obj?.keyword}: ${obj?.arg?.toJS(shiftState(state, code))}`)
+            .map((obj) => `\n${obj?.keyword}: ${obj?.arg?.toJS(state)}`)
             .join(', ');
           code += argsStr;
           if (Array.isArray(typeArguments) && typeArguments.length) {
@@ -1056,7 +1098,7 @@ export class CallLogic extends LogicItem {
         this.arguments
           ?.filter((arg) => arg?.expression)
           .forEach((arg, index) => {
-            code += `${arg.keyword}: ${arg?.toJS(shiftState(state, code))}`;
+            code += `${arg.keyword}: ${arg?.toJS(state)}`;
             if (index !== this.arguments?.length - 1) code += ', ';
           });
         code += '})';
@@ -1085,7 +1127,7 @@ export class CallLogic extends LogicItem {
           }
 
           completeArguments.forEach((arg, index) => {
-            code += arg?.toJS(shiftState(state, code));
+            code += arg?.toJS(state);
             if (index !== completeArguments?.length - 1) code += ', ';
           });
         }
@@ -1199,20 +1241,23 @@ export class CallLogic extends LogicItem {
       if (Array.isArray(typeArguments) && typeArguments.length) {
         // 如果有内容
         code += `<`;
-        yield *
-          wrapForEach(typeArguments, function* warpForEachGenerator(arg, i, arr) {
-            code += yield* arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
-            if (i !== arr.length - 1) {
-              code += ', ';
-            }
-          });
+        yield* wrapForEach(typeArguments, function* warpForEachGenerator(arg, i, arr) {
+          code += yield* arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
+          if (i !== arr.length - 1) {
+            code += ', ';
+          }
+        });
         code += `>`;
       }
     };
     /** 设置输入参数 */
     const setInputParam = function* setTypeArguments() {
       const paramRequired = ['showMessage', 'consoleLog', 'jsonDeserialize', 'jsonSerialize'].includes(calleeName);
-      if (['expression'].includes(parentKey) && self.getAncestor('BindAttribute')?.name === 'data-source' && (state as any)?.noNeedParams) {
+      if (
+        ['expression'].includes(parentKey) &&
+        self.getAncestor('BindAttribute')?.name === 'data-source' &&
+        (state as any)?.noNeedParams
+      ) {
         return;
       }
       if (
@@ -1220,12 +1265,11 @@ export class CallLogic extends LogicItem {
         tsCalleeNamespace.startsWith('nasl.')
       ) {
         code += '(';
-        yield *
-          wrapForEach(logicArgs, function* warpForEachGenerator(arg, index) {
-            // 页面逻辑先都非必填
-            code += yield* arg.toEmbeddedTS(shiftState(state, code), paramRequired);
-            if (index !== logicArgs.length - 1) code += ', ';
-          });
+        yield* wrapForEach(logicArgs, function* warpForEachGenerator(arg, index) {
+          // 页面逻辑先都非必填
+          code += yield* arg.toEmbeddedTS(shiftState(state, code), paramRequired);
+          if (index !== logicArgs.length - 1) code += ', ';
+        });
         code += ')';
       } else if (completeArguments.length) {
         if (
@@ -1236,12 +1280,11 @@ export class CallLogic extends LogicItem {
           return;
         }
         code += '(';
-        yield *
-          wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
-            // 取到是不是必填放入参数中
-            code += yield* arg.toEmbeddedTS(shiftState(state, code), arg?.paramRequired);
-            if (index !== logicArgs.length - 1) code += ', ';
-          });
+        yield* wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
+          // 取到是不是必填放入参数中
+          code += yield* arg.toEmbeddedTS(shiftState(state, code), arg?.paramRequired);
+          if (index !== logicArgs.length - 1) code += ', ';
+        });
         code += ')';
       } else {
         if (
@@ -1253,12 +1296,11 @@ export class CallLogic extends LogicItem {
         }
         if (completeArguments.length) {
           code += '(';
-          yield *
-            wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
-              // 取到是不是必填放入参数中
-              code += yield* arg.toEmbeddedTS(shiftState(state, code), arg?.paramRequired);
-              if (index !== logicArgs.length - 1) code += ', ';
-            });
+          yield* wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
+            // 取到是不是必填放入参数中
+            code += yield* arg.toEmbeddedTS(shiftState(state, code), arg?.paramRequired);
+            if (index !== logicArgs.length - 1) code += ', ';
+          });
           code += ')';
         } else {
           code += '()';

package/src/concepts/CallQueryComponent__.ts

@@ -9,44 +9,43 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import QueryJoinExpression from './QueryJoinExpression__';
-import Entity from './Entity__';
-import Structure from './Structure__';
-import StructureProperty from './StructureProperty__';
-import CompletionProperty from './CompletionProperty__';
-import QueryFieldExpression from './QueryFieldExpression__';
-import Identifier from './Identifier__';
-import MemberExpression from './MemberExpression__';
+import type QueryJoinExpression from './QueryJoinExpression__';
+import type Entity from './Entity__';
+import type Structure from './Structure__';
+import type StructureProperty from './StructureProperty__';
+import type CompletionProperty from './CompletionProperty__';
+import type QueryFieldExpression from './QueryFieldExpression__';
+import type Identifier from './Identifier__';
+import type MemberExpression from './MemberExpression__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 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 TypeAnnotation from './TypeAnnotation__';
-import QuerySelectExpression from './QuerySelectExpression__';
-import QueryFromExpression from './QueryFromExpression__';
 import LogicItem from './LogicItem__';
-import QueryGroupByExpression from './QueryGroupByExpression__';
-import QueryOrderByExpression from './QueryOrderByExpression__';
-import QueryLimitExpression from './QueryLimitExpression__';
+import type TypeAnnotation from './TypeAnnotation__';
+import type QuerySelectExpression from './QuerySelectExpression__';
+import type QueryFromExpression from './QueryFromExpression__';
+import type QueryGroupByExpression from './QueryGroupByExpression__';
+import type QueryOrderByExpression from './QueryOrderByExpression__';
+import type QueryLimitExpression from './QueryLimitExpression__';
 
 /**
  * 数据查询
  */
-@className
 @concept('数据查询')
-// @ts-ignore
 export class CallQueryComponent extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'CallQueryComponent';
+  static readonly ConceptName: string = 'CallQueryComponent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -61,7 +60,6 @@ export class CallQueryComponent extends LogicItem {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  // @ts-ignore
   typeAnnotation!: TypeAnnotation;
 
   /**
@@ -70,7 +68,6 @@ export class CallQueryComponent extends LogicItem {
   @property({
     objectRef: 'QuerySelectExpression',
   })
-  // @ts-ignore
   select!: QuerySelectExpression;
 
   /**
@@ -79,7 +76,6 @@ export class CallQueryComponent extends LogicItem {
   @property({
     objectRef: 'QueryFromExpression',
   })
-  // @ts-ignore
   from!: QueryFromExpression;
 
   /**
@@ -88,7 +84,6 @@ export class CallQueryComponent extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   where!: LogicItem;
 
   /**
@@ -117,7 +112,6 @@ export class CallQueryComponent extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  // @ts-ignore
   having!: LogicItem;
 
   /**
@@ -146,14 +140,12 @@ export class CallQueryComponent extends LogicItem {
   @property({
     objectRef: 'QueryLimitExpression',
   })
-  // @ts-ignore
   limit!: QueryLimitExpression;
 
   /**
    * 查询组件的局部版本
    */
   @property()
-  // @ts-ignore
   ideVersion!: string;
 
   /**
@@ -285,8 +277,9 @@ export class CallQueryComponent extends LogicItem {
   _insertItemInWherePlaygroundAt(options: Partial<LogicItem> | LogicItem, index: number) {
     const logicItemOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'wherePlayground' };
+    const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (options instanceof LogicItem) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -394,8 +387,9 @@ export class CallQueryComponent extends LogicItem {
   ) {
     const queryGroupByExpressionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'groupBy' };
+    const QueryGroupByExpression = getConceptConstructor('QueryGroupByExpression');
     let queryGroupByExpression: QueryGroupByExpression;
-    if (options instanceof QueryGroupByExpression) {
+    if (asserts.isQueryGroupByExpression(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       queryGroupByExpression = options;
       Object.assign(queryGroupByExpression, relationOptions);
@@ -507,8 +501,9 @@ export class CallQueryComponent extends LogicItem {
   _insertItemInHavingPlaygroundAt(options: Partial<LogicItem> | LogicItem, index: number) {
     const logicItemOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'havingPlayground' };
+    const LogicItem = getConceptConstructor('LogicItem');
     let logicItem: LogicItem;
-    if (options instanceof LogicItem) {
+    if (asserts.isLogicItem(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logicItem = options;
       Object.assign(logicItem, relationOptions);
@@ -616,8 +611,9 @@ export class CallQueryComponent extends LogicItem {
   ) {
     const queryOrderByExpressionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'orderBy' };
+    const QueryOrderByExpression = getConceptConstructor('QueryOrderByExpression');
     let queryOrderByExpression: QueryOrderByExpression;
-    if (options instanceof QueryOrderByExpression) {
+    if (asserts.isQueryOrderByExpression(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       queryOrderByExpression = options;
       Object.assign(queryOrderByExpression, relationOptions);
@@ -1022,7 +1018,7 @@ export class CallQueryComponent extends LogicItem {
     if (list.length === 0) return code;
 
     code += `${indent((state?.tabSize || 0) + 1)}.${key}(() => `;
-    yield* wrapForEach(list, function* wrapForEach(item, index ) {
+    yield* wrapForEach(list, function* wrapForEach(item, index) {
       if (index > 0) code += `,\n${indent((state?.tabSize || 0) + 2)}() => `;
       code += yield* item?.toEmbeddedTS?.(shiftState(state, code, { tabSize: 0 })) ?? returnOrigin('');
     });
@@ -1171,6 +1167,8 @@ export class CallQueryComponent extends LogicItem {
 
     const { entityName } = node;
     const { entityNamespace } = node;
+    const TypeAnnotation = getConceptConstructor('TypeAnnotation');
+    const StructureProperty = getConceptConstructor('StructureProperty');
     // 生成整个实体类型 { entity1: Entity1 }  在2.11属于默认情况；在2.22勾选实体节点(isDotStar=true)时
     if (
       !this.entityPropertySelectable ||
@@ -1304,6 +1302,7 @@ export class CallQueryComponent extends LogicItem {
 
   genStructure(structureName?: string, properties: any[] = []) {
     const logic = this.logic || this.AuthLogic || this.AuthLogicForCallInterface;
+    const Structure = getConceptConstructor('Structure');
     return Structure.from({
       concept: 'Structure',
       name: structureName || this.typeAnnotation?.typeName || `${utils.firstUpperCase(logic.name)}Structure`,
@@ -1326,6 +1325,8 @@ export class CallQueryComponent extends LogicItem {
 
     const { groupBy } = this;
     const selectElements = this.select.selectAggregateElements;
+    const TypeAnnotation = getConceptConstructor('TypeAnnotation');
+    const StructureProperty = getConceptConstructor('StructureProperty');
     let structureName;
     let typeAnnotation;
 
@@ -1556,6 +1557,8 @@ export class CallQueryComponent extends LogicItem {
   }
 
   saveStructureNoInfer(entities: any[] = []) {
+    const TypeAnnotation = getConceptConstructor('TypeAnnotation');
+    const StructureProperty = getConceptConstructor('StructureProperty');
     const source = this.genStructure(null, [
       ...this.genPropertyListOfFrom(this.from),
       ...this.genPropertyListOfAggregate(this, entities),
@@ -1641,6 +1644,8 @@ export class CallQueryComponent extends LogicItem {
 
   getCompletionPropertyOfEntities() {
     const firstEntityInfo: any = this.entityInfos[0];
+    const LogicItem = getConceptConstructor('LogicItem');
+    const CompletionProperty = getConceptConstructor('CompletionProperty');
     if (firstEntityInfo) {
       const { namespace } = firstEntityInfo;
       const entities: Entity[] = this.app.findNodeByCompleteName(namespace);
@@ -1684,6 +1689,8 @@ export class CallQueryComponent extends LogicItem {
   }
 
   getCompletionPropertyOfAggregateAsNames() {
+    const LogicItem = getConceptConstructor('LogicItem');
+    const CompletionProperty = getConceptConstructor('CompletionProperty');
     const children = this.select?.selectElements
       ?.filter((item) => item.concept === 'QueryAggregateExpression' && item.asName)
       .map(
@@ -1708,6 +1715,8 @@ export class CallQueryComponent extends LogicItem {
   }
 
   getCompletionPropertyOfGroupByAsNames() {
+    const LogicItem = getConceptConstructor('LogicItem');
+    const CompletionProperty = getConceptConstructor('CompletionProperty');
     const children = this.groupBy
       ?.filter(
         (item) => item.concept === 'QueryGroupByExpression' && (item.groupElement as QueryFieldExpression)?.asName,