@lcap/nasl 3.8.2-beta.8 → 3.8.3-beta.1

package/src/concepts/CallLogic__.ts

@@ -437,7 +437,7 @@ export class CallLogic extends LogicItem {
   /**
    * 设置argment 触发别的地方的更新
    */
-  setArgumentName({ argument }: { argument: Argument[] }) {
+  setArgumentName({ argument }: { argument: Argument[]; }) {
     // argument.setKeyword(newKeyword);
     // this.arguments = argument;
   }
@@ -513,9 +513,14 @@ export class CallLogic extends LogicItem {
     const Identifier = getConceptConstructor('Identifier');
     const Argument = getConceptConstructor('Argument');
     const TypeAnnotation = getConceptConstructor('TypeAnnotation');
+
+    // 拖拽实体更新逻辑，默认全部更新，不带 properties
+    const isEntityUpdate = /entities\.([^.]+)\.logics\.(update|updateBy|createOrUpdate|batchUpdate)/.test(logic.calleewholeKey);
+    const logicParams = isEntityUpdate ? logic.params.filter((item) => item.name !== 'properties') : logic.params;
+
     const params =
       argument ??
-      logic?.params?.map((param) => {
+      logicParams?.map((param) => {
         const relationOptions = { parentNode: this, parentKey: 'arguments' };
         let expression = param.defaultExpression;
         if (param.isFunction) {
@@ -689,7 +694,7 @@ export class CallLogic extends LogicItem {
         for (let i = 0; i < currentIndex; i++) {
           currentParamList.push(`,current${i === 0 ? '' : i}`);
         }
-        code += `$global.useDatabaseCallback()(__${currentElement.name}_handleDataSourceLoad${currentParamList.join('')})`
+        code += `$global.useDatabaseCallback()(__${currentElement.name}_handleDataSourceLoad${currentParamList.join('')})`;
         return code;
       }
       if (calleeName === 'jsonSerialize') {
@@ -817,7 +822,7 @@ export class CallLogic extends LogicItem {
     let extensionName = '';
 
     const { calleeName, calleeNamespace, isComponentLogic, completeArguments, isViewLogic, typeArguments } = this;
-    const completeTypeArguments = this.__TypeArguments?.length ? this.__TypeArguments :  typeArguments;
+    const completeTypeArguments = this.__TypeArguments?.length ? this.__TypeArguments : typeArguments;
 
     const isShowArgument = (arg?: Argument) => {
       return arg?.expression;
@@ -845,8 +850,8 @@ export class CallLogic extends LogicItem {
         body: {
       `;
       const argsStr = (this?.arguments || []).filter((obj) => obj?.expression)
-      .map((obj) => `\n${obj.keyword}: ${obj.expression?.toJS(state)}`)
-      .join(', ');
+        .map((obj) => `\n${obj.keyword}: ${obj.expression?.toJS(state)}`)
+        .join(', ');
       code += argsStr;
 
       code += `}
@@ -857,9 +862,8 @@ export class CallLogic extends LogicItem {
       const isSpreadFunc = args.some((arg) => arg.spread);
       const keywordEntitiesIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'entities');
 
-      code += `this.$logics['${
-        this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName
-      }']`;
+      code += `this.$logics['${this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName
+        }']`;
       code += `({
                 config: {
                     download: false,
@@ -1511,7 +1515,8 @@ export class CallLogic extends LogicItem {
         code += '()';
       }
     };
-
+    // 调用实体逻辑特殊处理
+    if (tsCalleeNamespace.startsWith('app.dataSources.') && tsCalleeNamespace.endsWith('.logics')) calleeKey = calleeKey.replace('.logics', 'Entity');
     code += calleeKey;
     setTypeArguments();
     setInputParam();
@@ -1613,11 +1618,13 @@ export class CallLogic extends LogicItem {
     } else if (this.calleeNamespace?.startsWith('elements.')) {
       // 查找组件的逻辑，用于展示默认值
       const elementsLogic = (this.app as any)?.naslServer?.elementsLogic || {};
-      let elementName: string = this.calleeNamespace.split('.')[1];
-      // eslint-disable-next-line prefer-destructuring
-      elementName = elementName.split('_')[0];
-      elementName = elementName[0].toUpperCase() + elementName.slice(1);
-      const logics = elementsLogic[`U${elementName}`] || elementsLogic[`Van${elementName}`] || [];
+
+      let tag = this.getElementTagByLogic();
+      // tag转换为首字母大写，驼峰
+      tag = tag.replace(/^\S/, (s) => s.toUpperCase())
+        .replace(/-(\w)/g, (all, letter) => letter.toUpperCase());
+
+      const logics = elementsLogic[`${tag}`] || [];
       node = logics.find((l: any) => l.name === this.calleeName);
     } else {
       // 如果是其余app下自定义逻辑
@@ -1636,12 +1643,31 @@ export class CallLogic extends LogicItem {
             state: Array.isArray(t) ? 2 : 1,
           };
         });
-      } catch (err) {}
+      } catch (err) { }
     }
     return node;
   }
 
-  getCallNodeUsingCache(frontNdCache : Map<string, Logic>, serverNdCache : Map<string, Logic>, processNdCache : Map<string, Logic>): ['front' | 'server' | 'process', Logic | undefined] {
+  private getElementTagByLogic(): string {
+    const elementName: string = this.calleeNamespace.split('.')[1];
+    let tag = '';
+    this.likeComponent.elements.forEach((element) => {
+      utils.traverse(
+        ({ node }) => {
+          if (node.name === elementName) {
+            tag = node.tag;
+          }
+        },
+        {
+          node: element,
+        },
+      );
+    });
+
+    return tag;
+  }
+
+  getCallNodeUsingCache(frontNdCache: Map<string, Logic>, serverNdCache: Map<string, Logic>, processNdCache: Map<string, Logic>): ['front' | 'server' | 'process', Logic | undefined] {
     const cwKey = this.calleewholeKey;
     if (serverNdCache.get(cwKey)) {
       return ['server', serverNdCache.get(cwKey)];
@@ -1663,11 +1689,11 @@ export class CallLogic extends LogicItem {
     } else if (this.calleeNamespace?.startsWith('elements.')) {
       // 查找组件的逻辑，用于展示默认值
       const elementsLogic = (this.app as any)?.naslServer?.elementsLogic || {};
-      let elementName: string = this.calleeNamespace.split('.')[1];
-      // eslint-disable-next-line prefer-destructuring
-      elementName = elementName.split('_')[0];
-      elementName = elementName[0].toUpperCase() + elementName.slice(1);
-      const logics = elementsLogic[`U${elementName}`] || elementsLogic[`Van${elementName}`] || [];
+      let tag = this.getElementTagByLogic();
+      // tag转换为首字母大写，驼峰
+      tag = tag.replace(/^\S/, (s) => s.toUpperCase())
+        .replace(/-(\w)/g, (all, letter) => letter.toUpperCase());
+      const logics = elementsLogic[`${tag}`] || [];
       node = logics.find((l: any) => l.name === this.calleeName);
     } else {
       // 如果是其余app下自定义逻辑
@@ -1686,7 +1712,7 @@ export class CallLogic extends LogicItem {
             state: Array.isArray(t) ? 2 : 1,
           };
         });
-      } catch (err) {}
+      } catch (err) { }
     }
     frontNdCache.set(cwKey, node);
     return ['front', node];
@@ -1726,7 +1752,7 @@ export class CallLogic extends LogicItem {
     } else {
       const result = getCallExpressionQuickInfo(range, getCode);
       let code = getCode();
-      if(code.includes('__elements.')){
+      if (code.includes('__elements.')) {
         const prefixOffset = code.indexOf('__elements.');
         code = code.slice(prefixOffset);
         let indexOf = code.indexOf('(');

package/src/concepts/CallQueryComponent__.ts

@@ -743,10 +743,8 @@ export class CallQueryComponent extends LogicItem {
     return {
       kind: 'Statement',
       concept: 'CallQueryComponent',
-      label: '数据查询',
       select: {
         concept: 'QuerySelectExpression',
-        label: '查询组件Select子句',
         distinct: false,
         star: true,
         selectElements: [],
@@ -852,10 +850,14 @@ export class CallQueryComponent extends LogicItem {
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
-    if (!self.typeAnnotation)
-      return `(function () {
-                return;
-            })()`;
+    if (!self.typeAnnotation) {
+      if (!self.isAutoInfer()) {
+        return `(function () {
+                  return;
+              })()`;
+      }
+      self.typeAnnotation = self.computeStructure();
+    }
     let code = `(function(): `;
     if (self.isAutoInfer()) {
       code += `${yield* self.typeAnnotation.toEmbeddedTS(shiftState(state, code))} {\n`;
@@ -1093,17 +1095,13 @@ export class CallQueryComponent extends LogicItem {
     });
   }
 
-  saveStructure() {
+  computeStructure(): TypeAnnotation {
     // 没有数据源时不初始化数据结构
     if (!this.entityInfos.length) {
       return;
     }
     const entityNamespace = this.from?.entityNamespace;
     const entities = this.app.findNodeByCompleteName(entityNamespace);
-    if (!this.isAutoInfer()) {
-      // 存量应用走之前的逻辑
-      return this.saveStructureNoInfer(entities);
-    }
 
     const { groupBy } = this;
     const selectElements = this.select.selectAggregateElements;
@@ -1249,7 +1247,23 @@ export class CallQueryComponent extends LogicItem {
       }
     }
 
-    this.update({ typeAnnotation });
+    return typeAnnotation;
+  }
+
+  saveStructure() {
+    // 没有数据源时不初始化数据结构
+    if (!this.entityInfos.length) {
+      return;
+    }
+    const entityNamespace = this.from?.entityNamespace;
+    const entities = this.app.findNodeByCompleteName(entityNamespace);
+
+    if (!this.isAutoInfer()) {
+      // 存量应用走之前的逻辑
+      return this.saveStructureNoInfer(entities);
+    }
+
+    this.update({ typeAnnotation: this.computeStructure() });
   }
 
   saveStructureNoInfer(entities: any[] = []) {

package/src/concepts/Destination__.ts

@@ -312,9 +312,8 @@ export class Destination extends LogicItem {
     let code = '';
     const viewArr = this.genViewArr();
     if (Array.isArray(viewArr) && viewArr.length) {
-      code += `let url = '${
-        this.viewNode?.frontend?.prefixPath ? this.viewNode.frontend.prefixPath : ''
-      }/${viewArr.join('/')}';\n`;
+      code += `let url = '${this.viewNode?.frontend?.prefixPath ? this.viewNode.frontend.prefixPath : ''
+        }/${viewArr.join('/')}';\n`;
       const { completeArguments } = this;
       if (Array.isArray(completeArguments) && completeArguments.length) {
         const node = this.viewNode;
@@ -596,7 +595,7 @@ export class Destination extends LogicItem {
   /**
    * 设置Arguments的KeyWord
    */
-  setArgumentsKeyWord(options: { findArgument: Argument; newKeyword: string }) {
+  setArgumentsKeyWord(options: { findArgument: Argument; newKeyword: string; }) {
     const { findArgument, newKeyword } = options;
     findArgument.setKeyword(newKeyword);
   }
@@ -729,18 +728,21 @@ export class Destination extends LogicItem {
 
     if (this.tsCalleeNamespace && this.tsName) {
       const viewPath =
-        `${this.tsCalleeNamespace}.${this.tsName}`.replace(/^app\..+?.views\./, '').replace(/\.views\./g, '_view.') +
-        '_view';
-      code += `nasl.ui.destination('${viewPath}'`;
+        `${`${this.tsCalleeNamespace}.${this.tsName}`.replace(/^app\..+?.views\./, '').replace(/\.views\./g, '_view.')}_view`;
+      code += `nasl.ui.destination('${this?.frontend?.name}.${viewPath}'`;
+      if (logicParamLength > 0) {
+        code += `, `;
+        code += '{';
+      }
       this.arguments.slice(0, logicParamLength).forEach((argument: Argument, index) => {
-        if (!argument) {
-          code += `, __IDENTIFIER__`;
-        } else {
+        code += argument?.toNaturalTS(shiftState(state, code, { inline: true }), false, true);
+        if (index < logicParamLength - 1) {
           code += `, `;
-          code += argument.toNaturalTS(shiftState(state, code, { inline: true }), false, false);
         }
       });
-
+      if (logicParamLength > 0) {
+        code += '}';
+      }
       // code += this.anchor?.toNaturalTS(shiftState(state, code, { inline: true }), true) || '';
       // code += `, '${this.target}'`;
 

package/src/concepts/EntityProperty__.ts

@@ -361,7 +361,7 @@ export class EntityProperty extends BaseNode {
     this.app?.emit('collect:end');
   }
 
-  async _effect(options: { action?: 'delete' } = {}) {
+  async _effect(options: { action?: 'delete'; } = {}) {
     // 处理选中的此字段的 CallQueryComponent
     const callQueryComponents: Set<CallQueryComponent> = new Set();
     const refs = await this.findUsage();
@@ -408,7 +408,7 @@ export class EntityProperty extends BaseNode {
   /**
    * 设置是否必填
    */
-  setDisplay(display: { [name: string]: boolean }) {
+  setDisplay(display: { [name: string]: boolean; }) {
     const object = {
       display,
     };
@@ -478,10 +478,10 @@ export class EntityProperty extends BaseNode {
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     let code = '';
+    const excludeList = ['createdTime', 'updatedTime', 'createdBy', 'updatedBy'];
+    if (state.descriptionComment && !excludeList.includes(this.name))
+      code += createDescriptionComment(state, this, ['label']);
 
-    if (state.descriptionComment)
-      code += createDescriptionComment(state, this, ['label', 'description']);
-    
     if (this.relationNamespace && this.relationEntity && this.relationProperty) {
       code += `@EntityRelation(() => new ${this.relationEntity}().${this.relationProperty})\n`;
       code += indent(state.tabSize);

package/src/concepts/Entity__.ts

@@ -844,7 +844,7 @@ export class Entity extends Annotatable {
     let code = '';
     if (state.descriptionComment)
       code += createDescriptionComment(state, this, ['description']);
-    code = `class ${this?.name} {\n`;
+    code += `class ${this?.name} {\n`;
 
     this.properties.forEach((property) => {
       code += `${property.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }))};\n`;

package/src/concepts/Interface__.ts

@@ -985,7 +985,7 @@ export class Interface extends ImportedInterface {
     let code = '';
     if (state.descriptionComment)
       code += createDescriptionComment(state, this, ['description']);
-    code = `declare function ${state?.rename || name}(`;
+    code += `declare function ${state?.rename || name}(`;
     if (params?.length) {
       code += '{ ';
       params?.forEach((param, index) => {

package/src/concepts/Logic__.ts

@@ -1276,7 +1276,7 @@ export class Logic extends Annotatable {
   }
 
   get __isVirtual() {
-    const isDisabled = !!this.getAncestor('HistoryProcessV2') || ['enabled', 'history'].includes(this.processV2?.status)
+    const isDisabled = !!this.getAncestor('HistoryProcessV2') || ['enabled', 'history'].includes(this.processV2?.status);
     return isDisabled || this.process?.__isVirtual || false;
   }
 
@@ -1551,7 +1551,7 @@ export class Logic extends Annotatable {
     const self = this;
 
     // 获取所有子节点用于树上填充
-    self.getSubLogics()
+    self.getSubLogics();
 
     yield waitOqlQueryComponentChildrenFinish(self);
     let code = '';
@@ -1610,7 +1610,7 @@ export class Logic extends Annotatable {
               leftIndex.length === 1
                 ? yield* el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
                 : yield* el.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
-                    returnOrigin('');
+                returnOrigin('');
             const advanceVar = self.variables?.find(
               (variable) => !variable.typeAnnotation && leftCode === variable.name,
             );
@@ -1663,7 +1663,7 @@ export class Logic extends Annotatable {
             leftIndex.length === 1
               ? yield* assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
               : yield* assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
-                  returnOrigin('');
+              returnOrigin('');
           if (leftCode === node.name) {
             const rightNode: any =
               rightIndex.length === 1
@@ -1934,7 +1934,7 @@ export class Logic extends Annotatable {
               leftIndex.length === 1
                 ? yield* el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
                 : yield* el.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
-                    returnOrigin('');
+                returnOrigin('');
             const advanceVar = self.variables?.find(
               (variable) => !variable.typeAnnotation && leftCode === variable.name,
             );
@@ -2049,7 +2049,7 @@ export class Logic extends Annotatable {
             leftIndex.length === 1
               ? yield* assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
               : yield* assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
-                  returnOrigin('');
+              returnOrigin('');
           if (leftCode === node.name) {
             const rightNode: any =
               rightIndex.length === 1
@@ -2151,22 +2151,39 @@ export class Logic extends Annotatable {
         ],
         function* warpForEachGenerator({ key, node: itemNode }) {
           if (itemNode) {
-            code += `const __${key}_${node?.name} = `;
+            code += `let __${key}_${node?.name}`;
             let itemCode = '';
+            // 匿名数据结构 / 未设置类型的List/map 才进getInitCode
             if (
-              asserts.isNewComposite(itemNode)
-              || asserts.isNewList(itemNode)
-              || asserts.isNewMap(itemNode)
+              (
+                asserts.isNewComposite(itemNode)
+                && itemNode.typeAnnotation?.typeKind === 'anonymousStructure'
+              )
+              || (
+                (asserts.isNewList(itemNode) || asserts.isNewMap(itemNode))
+                && !(itemNode?.typeAnnotation)
+              )
             ) {
-              itemCode += yield* itemNode?.getInitCode(shiftState(state, code, {
+              code += ' = ';
+              itemCode += yield* itemNode?.getInitCode?.(shiftState(state, code, {
                 inline: true
               })) ??
-              returnOrigin('');
+                returnOrigin('');
+            } else if (asserts.isNewComposite(itemNode) && itemNode.typeAnnotation?.typeKind === 'generic') { // new 带泛型的数据结构/实体 进这里
+              code += ' = ';
+              itemCode += (yield* itemNode?.getNewCompositeCode?.(shiftState(state, code, { inline: true }))) || 'null';
+            } else if ((itemNode as any)?.typeAnnotation && !(asserts.isCallQueryComponent(itemNode) && !itemNode.isAutoInfer())) {
+              code += ': ';
+              code += yield* (itemNode as any)?.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
+                returnOrigin('');
             } else {
+              code += ' = ';
               itemCode = yield* itemNode?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
                 returnOrigin('');
             }
-            code += yield* self.getRightCode(itemCode, assignment, itemNode);
+            if (itemCode) {
+              code += yield* self.getRightCode(itemCode, assignment, itemNode);
+            }
             code += ';\n';
           }
         },
@@ -2277,19 +2294,32 @@ export class Logic extends Annotatable {
     }
 
     code += `(`;
-    if (this.parentNode?.concept === 'BindEvent') {
-      code += `event`;
+    if (state?.typeMap?.[this.nodePath]) {
+      code += state?.typeMap?.[this.nodePath];
+    } else {
+      if (this.parentNode?.concept === 'BindEvent') {
+        // code += `event`;
+      }
+      this.params.forEach((param, index) => {
+        let curCode = '';
+        if (param.name === 'event') curCode += '';
+        else curCode += param.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (curCode && index !== this.params.length - 1) curCode += ', ';
+        code += curCode;
+      });
     }
-    this.params.forEach((param, index) => {
-      code += param.toNaturalTS(shiftState(state, code, { inline: true }));
-      if (index !== this.params.length - 1) code += ', ';
-    });
     code += ')';
 
     // 兼容 return 没有类型情况
-    if (this.returns.length && (this.returns[0].typeAnnotation || this.returns[0].__TypeAnnotation)) {
-      code += ': ';
-      code += this.returns[0].typeAnnotation?.toNaturalTS(shiftState(state, code, { inline: true })) || this.returns[0].__TypeAnnotation?.toNaturalTS(shiftState(state, code, { inline: true }));
+    if (this.returns.length) {
+      if (state?.typeMap?.[this.returns[0]?.nodePath]) {
+        code += ': ';
+        code += state?.typeMap?.[this.returns[0]?.nodePath];
+      } else if (this.returns[0].typeAnnotation || this.returns[0].__TypeAnnotation) {
+        code += ': ';
+        const typeAnnotation = this.returns[0].typeAnnotation || this.returns[0].__TypeAnnotation;
+        code += typeAnnotation?.toNaturalTS(shiftState(state, code, { inline: true }));
+      }
     }
 
     if (state.declaration) {
@@ -2372,17 +2402,17 @@ export class Logic extends Annotatable {
       code += ';';
     } else {
       code += ' {\n';
-  
+
       this.variables.forEach((variable) => {
         code += `${indent(state.tabSize + 1)}let `;
         code += variable.toTextualNASL(shiftState(state, code, { inline: true }));
         code += ';\n';
       });
       if (this.variables.length) code += '\n';
-  
+
       this.body.forEach((item) => {
         let partialCode = '';
-  
+
         // if (!state.focusedNodePath && item.concept === 'End') code += `${indent(state.tabSize + 1)}/* 当前位置 */\n`;
         if (item.toTextualNASL) {
           partialCode = item.toTextualNASL(shiftState(state, code, { tabSize: state.tabSize + 1 }));
@@ -2515,8 +2545,8 @@ export class Logic extends Annotatable {
           collectionTSCode === '__IDENTIFIER__'
             ? collectionTSCode
             : callFunction.isLoopMap && index === 0
-            ? `${collectionTSCode}.__getKey(0)`
-            : `${collectionTSCode}.__get(0)`,
+              ? `${collectionTSCode}.__getKey(0)`
+              : `${collectionTSCode}.__get(0)`,
         );
       }
     });
@@ -2658,9 +2688,8 @@ export class Logic extends Annotatable {
     if (asserts.isFrontendLibrary(this.parentNode)) {
       _path += `/frontends/${this.parentNode.type}`;
     } else if (this.parentNode.concept === 'BindEvent' && this.getAncestor('Frontend')) {
-      _path += `/frontendTypes/${this.getAncestor('FrontendType')?.name}/frontends/${
-        this.getAncestor('Frontend')?.name
-      }/bindEvents/${name}.ts`;
+      _path += `/frontendTypes/${this.getAncestor('FrontendType')?.name}/frontends/${this.getAncestor('Frontend')?.name
+        }/bindEvents/${name}.ts`;
     }
     return `/embedded/${this.getAncestor('App')?.name}${_path}/logics/${name}.ts`;
   }
@@ -2750,9 +2779,9 @@ export class Logic extends Annotatable {
     super.delete();
     this.body.forEach((el) => {
       if (asserts.isCallInterface(el)) {
-        el.deleteCallNode()
+        el.deleteCallNode();
       }
-    })
+    });
     this.traverseChildren(async (el) => {
       if (el?.concept === 'CallQueryComponent') (el as CallQueryComponent).removeStructure();
       // 仅仅针对 自定义连接器下的 Loigc，其他需要界定边界
@@ -2886,7 +2915,7 @@ export class Logic extends Annotatable {
 
   getSubLogics() {
     const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
-      if (asserts.isSubLogic(node)) {
+      if (node?.concept === 'SubLogic') {
         return true;
       }
     });

package/src/concepts/MemberExpression__.ts

@@ -8,13 +8,14 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
-import { ComponentCompletionPropertyMap, Enum, TypeAnnotation, BusinessComponent, View } from '..';
+import { Enum, TypeAnnotation, BusinessComponent, View } from '..';
 import { ElementToVueOptions } from './ViewElement__';
 import type Identifier from './Identifier__';
 import BindAttribute, { attrConvertCamelCase } from './BindAttribute__';
 import type Assignment from './Assignment__';
 import type BatchAssignment from './BatchAssignment__';
 import DefaultValue from './DefaultValue__';
+import { config } from '../config';
 
 const Identifier_RE = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 
@@ -138,11 +139,13 @@ export class MemberExpression extends LogicItem {
       }
 
       if (
-        ComponentCompletionPropertyMap[elementTag] &&
-        ComponentCompletionPropertyMap[elementTag][this.property.name] &&
-        ComponentCompletionPropertyMap[elementTag][this.property.name].state
+        config?.allNodesAPI &&
+        config?.allNodesAPI[elementTag] &&
+        config?.allNodesAPI[elementTag].readablePropsMap &&
+        config?.allNodesAPI[elementTag].readablePropsMap[this.property.name] &&
+        config?.allNodesAPI[elementTag].readablePropsMap[this.property.name].state
       ) {
-        const { prop } = ComponentCompletionPropertyMap[elementTag][this.property.name];
+        const { prop } = config?.allNodesAPI[elementTag].readablePropsMap[this.property.name];
         if (!['data'].includes(this.property.name)) {
           return `this && this.__${elementName}_params && this.__${elementName}_params.${this.property.name}`;
         }
@@ -263,11 +266,13 @@ export class MemberExpression extends LogicItem {
       }
 
       if (
-        ComponentCompletionPropertyMap[elementTag] &&
-        ComponentCompletionPropertyMap[elementTag][this.property.name] &&
-        ComponentCompletionPropertyMap[elementTag][this.property.name].state
+        config?.allNodesAPI &&
+        config?.allNodesAPI[elementTag] &&
+        config?.allNodesAPI[elementTag].readablePropsMap &&
+        config?.allNodesAPI[elementTag].readablePropsMap[this.property.name] &&
+        config?.allNodesAPI[elementTag].readablePropsMap[this.property.name].state
       ) {
-        const { prop } = ComponentCompletionPropertyMap[elementTag][this.property.name];
+        const { prop } = config?.allNodesAPI[elementTag].readablePropsMap[this.property.name];
 
         if (!['data'].includes(this.property.name)) {
           return `this['__${elementName}_params'] && this['__${elementName}_params'].${this.property.name}`;
@@ -422,11 +427,13 @@ export class MemberExpression extends LogicItem {
     const prefix = type === 'toVue' ? '' : 'this.';
 
     if (
-      ComponentCompletionPropertyMap[elementTag] &&
-      ComponentCompletionPropertyMap[elementTag][this.property.name] &&
-      ComponentCompletionPropertyMap[elementTag][this.property.name].state
+      config?.allNodesAPI &&
+      config?.allNodesAPI[elementTag] &&
+      config?.allNodesAPI[elementTag].readablePropsMap &&
+      config?.allNodesAPI[elementTag].readablePropsMap[this.property.name] &&
+      config?.allNodesAPI[elementTag].readablePropsMap[this.property.name].state
     ) {
-      const { prop } = ComponentCompletionPropertyMap[elementTag][this.property.name];
+      const { prop } = config?.allNodesAPI[elementTag].readablePropsMap[this.property.name];
 
       if (!['data'].includes(this.property.name)) {
         return `${prefix}__${elementName}_params && ${prefix}__${elementName}_params.${this.property.name}`;