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

package/src/concepts/CallLogic__.ts

@@ -1335,7 +1335,7 @@ export class CallLogic extends LogicItem {
         code += ';';
       }
     };
-    if (useIife) {
+    if (!state.callLogicNoIife && useIife) {
       code += '(() =>{\nconst wrapper = ';
       if (handleError) {
         code += 'nasl.util.autoHandleError(';
@@ -1362,7 +1362,7 @@ export class CallLogic extends LogicItem {
       // 属于业务组件
       const belongBusinessComponent = !!this.businessComponent;
       if (belongBusinessComponent && !self.calleeNamespace) {
-        code += 'this.';
+        code += `(this as ${this.businessComponent.name}).`;
       }
       code += calleeKey;
       yield* setTypeArguments();
@@ -1390,8 +1390,8 @@ export class CallLogic extends LogicItem {
 
     let code = '';
     let calleeKey = this.calleeKey.replace('__elements', '$refs');
-    if (/^app.+?\.entities\..+?logics/.test(code))
-      calleeKey = calleeKey.replace(/^app.+?\.entities\.(.+?)\.logics/, '$1');
+    if (/^app.+?\.entities\..+?logics/.test(calleeKey))
+      calleeKey = calleeKey.replace(/^app.+?\.entities\.(.+?)\.logics/, '$1Entity');
     /** 设置函数范型参数 */
     const setTypeArguments = () => {
       if (Array.isArray(typeArguments) && typeArguments.length) {
@@ -1415,16 +1415,24 @@ export class CallLogic extends LogicItem {
       ) {
         code += '(';
         logicArgs.forEach((arg, index) => {
-          // 页面逻辑先都非必填
-          code += arg.toNaturalTS(shiftState(state, code, { tabSize: 0 }), paramRequired);
+          if (!arg) {
+            code += '__IDENTIFIER__';
+          } else {
+            // 页面逻辑先都非必填
+            code += arg.toNaturalTS(shiftState(state, code, { tabSize: 0 }), paramRequired);
+          }
           if (index !== logicArgs.length - 1) code += ', ';
         });
         code += ')';
       } else if (completeArguments.length) {
         code += '(';
         completeArguments.forEach((arg, index) => {
-          // 取到是不是必填放入参数中
-          code += arg.toNaturalTS(shiftState(state, code, { tabSize: 0 }), arg?.paramRequired);
+          if (!arg) {
+            code += '__IDENTIFIER__';
+          } else {
+            // 取到是不是必填放入参数中
+            code += arg.toNaturalTS(shiftState(state, code, { tabSize: 0 }), arg?.paramRequired);
+          }
           if (index !== logicArgs.length - 1) code += ', ';
         });
         code += ')';
@@ -1455,42 +1463,42 @@ export class CallLogic extends LogicItem {
       }
     };
 
-    if (useIife) {
-      code += '(() =>{\nconst wrapper = ';
+    // if (useIife) {
+    //   code += '(() =>{\nconst wrapper = ';
 
-      if (handleError) {
-        code += 'nasl.util.autoHandleError(';
-      }
+    //   if (handleError) {
+    //     code += 'nasl.util.autoHandleError(';
+    //   }
 
-      if (useValidation) {
-        code += 'nasl.util.callLogicWithChecker(';
-      }
+    //   if (useValidation) {
+    //     code += 'nasl.util.callLogicWithChecker(';
+    //   }
 
-      code += calleeKey;
-      setTypeArguments();
+    //   code += calleeKey;
+    //   setTypeArguments();
 
-      if (useValidation) {
-        code += ', (';
-        code += completeArguments.map((item) => item.keyword).join(', ');
-        code += ') => {\n';
-        code += validation.toNaturalTS(shiftState(state, code));
-        code += ';\n})';
-      }
+    //   if (useValidation) {
+    //     code += ', (';
+    //     code += completeArguments.map((item) => item.keyword).join(', ');
+    //     code += ') => {\n';
+    //     code += validation.toNaturalTS(shiftState(state, code));
+    //     code += ';\n})';
+    //   }
 
-      if (handleError) {
-        code += ')';
-      }
+    //   if (handleError) {
+    //     code += ')';
+    //   }
 
-      code += ';\nreturn wrapper';
-      setInputParam();
-      code += ';\n})()';
-    } else {
-      code += calleeKey;
-      setTypeArguments();
-      setInputParam();
-    }
+    //   code += ';\nreturn wrapper';
+    //   setInputParam();
+    //   code += ';\n})()';
+    // } else {
+    code += calleeKey;
+    setTypeArguments();
+    setInputParam();
+    // }
 
-    setEndSemi();
+    // setEndSemi();
 
     return code;
   }
@@ -1562,6 +1570,9 @@ export class CallLogic extends LogicItem {
     const logicParams = node?.params ?? [];
 
     callArguments.forEach((arg, index) => {
+      if (!arg)
+        return;
+
       const param = logicParams[index] || ({} as Param);
       arg.paramRequired = Boolean(!param?.defaultValue?.expression);
       arg.paramTypeAnnotation = undefined;

package/src/concepts/CallQueryComponent__.ts

@@ -950,14 +950,14 @@ export class CallQueryComponent extends LogicItem {
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
         // @ts-ignore
-        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-        ~index && (this as any)[parentKey].splice(index, 1);
+        const index = (t as any)[parentKey]?.findIndex((el) => ((el.__v_raw || el) === n));
+        ~index && (this as any)[parentKey]?.splice(index, 1);
         params.index = index;
       } else {
         const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
+        if ((q?.__v_raw || q) === n) {
           params.index = 0;
-          (this as any)[parentKey] = undefined;
+          this && ((this as any)[parentKey] = undefined);
         }
       }
     }
@@ -1317,7 +1317,7 @@ export class CallQueryComponent extends LogicItem {
       return;
     }
     const entityNamespace = this.from?.entityNamespace;
-    const entities = this.app.findNodeByCompleteName(entityNamespace);
+    const entities = this.app?.findNodeByCompleteName?.(entityNamespace);
     if (!this.isAutoInfer()) {
       // 存量应用走之前的逻辑
       return this.saveStructureNoInfer(entities);
@@ -1361,8 +1361,8 @@ export class CallQueryComponent extends LogicItem {
         // 1.1 单分组无聚合：`{ list: List<列的类型>, total: Long }`
         const { entityAsName, propertyName } = groupBy[0].groupElement as QueryFieldExpression;
         const entity = entities.find((item: Entity) => item.name === entityAsName);
-        const property = entity?.properties.find((item: any) => item.name === propertyName);
-        const propertyTypeAnnotation = property.typeAnnotation;
+        const property = entity?.properties?.find((item: any) => item.name === propertyName);
+        const propertyTypeAnnotation = property?.typeAnnotation;
 
         typeAnnotation = TypeAnnotation.from(
           {
@@ -1673,7 +1673,7 @@ export class CallQueryComponent extends LogicItem {
               });
               completionProperty.icon = 'property';
               // 标记实体属性是否是符合类型
-              Object.assign(completionProperty, { isComplexType: property.typeAnnotation.isComplexType() });
+              Object.assign(completionProperty, { isComplexType: property.typeAnnotation.isComplexType?.() });
               return completionProperty;
             }),
           }));
@@ -1779,6 +1779,99 @@ export class CallQueryComponent extends LogicItem {
     };
     loop(node.from);
   }
+
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = '';
+    // return '__IDENTIFIER__';
+
+    code += this.from ? this.from.toNaturalTS(shiftState(state, code)) : '$';
+
+    const re = /FROM\(|JOIN\(/g;
+    let count = 0;
+    while(re.exec(code)) count++;
+
+    if (this.where) {
+      code += `\n${indent(state.tabSize)}.WHERE(() => `;
+      code += this.where.toNaturalTS(shiftState(state, code, { inline: true }));
+      code += ')';
+    }
+
+    if (this.groupBy.length) {
+      code +=  `\n${indent(state.tabSize)}.GROUP_BY(() => `;
+      this.groupBy.forEach((groupExpression, index) => {
+        code += groupExpression.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (index !== this.groupBy.length - 1) code += ', ';
+      });
+      code += ')';
+    }
+    
+    if (this.having) {
+      code += `\n${indent(state.tabSize)}.HAVING(() => `;
+      code += this.having.toNaturalTS(shiftState(state, code, { inline: true }));
+      code += ')';
+    }
+
+    if (this.orderBy.length) {
+      code += `\n${indent(state.tabSize)}.ORDER_BY(() => `;
+      this.orderBy.forEach((orderExpression, index) => {
+        code += orderExpression.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (index !== this.orderBy.length - 1) code += ', ';
+      });
+      code += ')';
+    }
+
+    code += this.select.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize }));
+
+    if (this.limit) {
+      code += `\n${indent(state.tabSize)}.PAGINATE(() => `;
+      code += this.limit.toNaturalTS(shiftState(state, code, { inline: true }));
+      code += `)\n`;
+    }
+
+    code += indent(state.tabSize) + ')'.repeat(count);
+
+    return code;
+  }
+
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let code = '';
+    
+    code += this.select.toTextualNASL(shiftState(state, code, { inline: true }));
+    if (this.groupBy.length) {
+      this.groupBy.forEach((groupElement, index) => {
+        code += ', ';
+        code += (groupElement.groupElement as QueryFieldExpression).toTextualNASL(state);
+      });
+    }
+
+    code += ' ';
+    code += this.from.toTextualNASL(shiftState(state, code, { inline: true }));
+
+    if (this.where)
+      code += '\nWHERE ' + this.where.toTextualNASL(shiftState(state, code, { inline: true }));
+    if (this.groupBy.length) {
+      code += '\nGROUP BY ';
+      this.groupBy.forEach((groupExpression, index) => {
+        code += groupExpression.toTextualNASL(shiftState(state, code, { inline: true }));
+        if (index !== this.groupBy.length - 1) code += ', ';
+      });
+    }
+    if (this.having)
+      code += '\nHAVING ' + this.having.toTextualNASL(shiftState(state, code, { inline: true }));
+    if (this.orderBy.length) {
+      code += '\nORDER BY ';
+      this.orderBy.forEach((orderExpression, index) => {
+        code += orderExpression.toTextualNASL(shiftState(state, code, { inline: true }));
+        if (index !== this.orderBy.length - 1) code += ', ';
+      });
+    }
+    if (this.limit)
+      code += '\nLIMIT ' + this.limit.toTextualNASL(shiftState(state, code, { inline: true }));
+
+    return code;
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/DefaultValue__.ts

@@ -248,7 +248,7 @@ export class DefaultValue extends BaseNode {
         params.index = index;
       } else {
         const q = (t as any)[parentKey];
-        if ((q.__v_raw || q) === n) {
+        if ((q?.__v_raw || q) === n) {
           params.index = 0;
           (this as any)[parentKey] = undefined;
         }
@@ -300,6 +300,11 @@ export class DefaultValue extends BaseNode {
     code += yield* this.expression?.toEmbeddedTS?.(shiftState(state, code)) ?? returnOrigin('undefined');
     return code;
   }
+
+  @withSourceMap()
+  toNaturalTS(state?: TranslatorState): string {
+    return this.expression.toNaturalTS(state);
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Destination__.ts

@@ -358,7 +358,8 @@ export class Destination extends LogicItem {
     if (this.viewName) {
       viewArr.push(this.viewName);
     }
-    // 第一个是端名，需要去掉
+    // 端名和端类型名都需要去掉
+    viewArr.shift();
     viewArr.shift();
     return viewArr;
   }
@@ -690,6 +691,7 @@ export class Destination extends LogicItem {
         }
       });
     }
+    console.log(viewNameAttr);
     if (this.viewNode) {
       return `${this.viewNode?.frontend?.prefixPath}/${viewNameAttr.join('/')}`;
     }
@@ -697,13 +699,13 @@ export class Destination extends LogicItem {
   }
 
   @withSourceMapGenerator
-  *toEmbeddedTSInProcess(state = createCompilerState(), prependCode: string): TranslatorGenerator {
+  *toEmbeddedTSInProcess(state = createCompilerState(), prevCode: string): TranslatorGenerator {
     const self = this;
     // const tab = indent((state?.tabSize || 0));
     if (self.tsCalleeNamespace && self.tsName) {
       const destinationName = self.parentNode.name.replace('-', '_');
       let code = `${destinationName}: function() {\n`;
-      code += prependCode;
+      code += prevCode;
       code += '\n';
       if (self.tsCalleeNamespace && self.viewName) {
         code += `${self.tsCalleeNamespace}.${self.viewName}.$destination({`;
@@ -787,12 +789,16 @@ export class Destination extends LogicItem {
         code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
         if (Array.isArray(this.arguments)) {
           this.arguments.slice(0, logicParamLength).forEach((argument: Argument, index) => {
-            const oldName = argument.keyword;
-            if (index >= logicParamLength) {
-              argument.keyword = '__unknown__';
+            if (!argument) {
+              code += `__unknown__: __IDENTIFIER__, `;
+            } else {
+              const oldName = argument.keyword;
+              if (index >= logicParamLength) {
+                argument.keyword = '__unknown__';
+              }
+              code += `${argument.toNaturalTS(shiftState(state, code), false, true)}, `;
+              argument.keyword = oldName;
             }
-            code += `${argument.toNaturalTS(shiftState(state, code), false, true)}, `;
-            argument.keyword = oldName;
           });
         }
 
@@ -803,22 +809,26 @@ export class Destination extends LogicItem {
       return code;
     }
     if (this.tsCalleeNamespace && this.tsName) {
-      code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
-      if (Array.isArray(this.arguments)) {
-        this.arguments.slice(0, logicParamLength).forEach((argument: Argument, index) => {
-          const oldName = argument.keyword;
-          if (index >= logicParamLength) {
-            argument.keyword = '__unknown__';
-          }
-          code += `${argument.toNaturalTS(shiftState(state, code, { inline: true }), false, true)}, `;
-          argument.keyword = oldName;
-        });
-      }
+      const viewPath = `${this.tsCalleeNamespace}.${this.tsName}`.replace(/^app\..+?.views\./, '').replace(/\.views\./g, '_view.') + '_view';
+      code += `nasl.ui.destination('${viewPath}'`;
+      this.arguments.slice(0, logicParamLength).forEach((argument: Argument, index) => {
+        if (!argument) {
+          code += `, __IDENTIFIER__`;
+        } else {
+          // const oldName = argument.keyword;
+          // if (index >= logicParamLength) {
+          //   argument.keyword = '__unknown__';
+          // }
+          code += `, `;
+          code += argument.toNaturalTS(shiftState(state, code, { inline: true }), false, false);
+          // argument.keyword = oldName;
+        }
+      });
 
-      code += this.anchor?.toNaturalTS(shiftState(state, code, { inline: true }), true) || '';
-      code += `, target: '${this.target}'`;
+      // code += this.anchor?.toNaturalTS(shiftState(state, code, { inline: true }), true) || '';
+      // code += `, '${this.target}'`;
 
-      code += `});\n`;
+      code += `);\n`;
     } else {
       code += '__IDENTIFIER__';
     }

package/src/concepts/EntityProperty__.ts

@@ -9,6 +9,7 @@ import {
   withSourceMapGenerator,
   withGenerator,
   TranslatorGenerator,
+  createDecoratorCode,
 } from '../translator';
 import type CallQueryComponent from './CallQueryComponent__';
 
@@ -546,10 +547,10 @@ export class EntityProperty extends BaseNode {
     // 处理选中的此字段的 CallQueryComponent
     const callQueryComponents: Set<CallQueryComponent> = new Set();
     const refs = await this.findUsage();
-    refs.forEach((val: any) => {
+    refs?.forEach((val: any) => {
       const loopFindNode = (item: any) => {
         if (item.children) {
-          item.children.forEach((i: any) => loopFindNode(i));
+          item.children?.forEach((i: any) => loopFindNode(i));
         } else {
           const target = item.node?.getAncestor('CallQueryComponent');
           if (target) {
@@ -672,6 +673,33 @@ export class EntityProperty extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let code = '';
+
+    const index = (this.parentNode as Entity)?.properties.indexOf(this);
+    if (index > 0) code += `\n${indent(state.tabSize)}`;
+
+    code += createDecoratorCode(state, this, ['label', 'description', 'uuid', 'columnName', 'required', 'primaryKey', 'generationRule', 'sequence']);
+
+    // , 'display'
+
+    // if (this.relationNamespace && this.relationEntity && this.relationProperty) {
+    //   code += `@EntityRelation(() => new ${this.relationEntity}().${this.relationProperty})\n`;
+    //   code += indent(state.tabSize);
+    // }
+
+    code += this.name;
+    if (this.typeAnnotation) {
+      code += ': ';
+      code += this.typeAnnotation.toTextualNASL(shiftState(state, code, { inline: true }));
+    }
+    if (this.defaultValue) {
+      code += ` = ${this.defaultValue}`;
+    }
+    return code;
+  }
+
   /**
    * 设置数据类型
    * @param typeAnnotation 类型标注对象

package/src/concepts/Entity__.ts

@@ -10,6 +10,7 @@ import {
   withSourceMapGenerator,
   withGenerator,
   TranslatorGenerator,
+  createDecoratorCode,
 } from '../translator';
 import { entity2LogicNamespace } from '../server/entity2LogicNamespace';
 import type CallQueryComponent from './CallQueryComponent__';
@@ -931,6 +932,34 @@ export class Entity extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let code = '';
+    
+    code += createDecoratorCode(state, this, ['description', 'uuid', 'tableName', 'origin']);
+
+    code += `entity ${this.name} {\n`;
+    // code += `${indent(state.tabSize + 1)}__name: '${this.getNamespace()}.${this.name}';\n`;
+    this.properties.forEach((property) => {
+      code += `${property.toTextualNASL(shiftState(state, code, { tabSize: state.tabSize + 1 }))};\n`;
+    });
+    // if (this.indexes && this.indexes.length) {
+    //   code += indent(state.tabSize + 1);
+    //   code += `__IndexList() {\n`;
+    //   code += `            return [`;
+    //   this.indexes.forEach((entityIndex) => {
+    //     code += indent(state.tabSize + 1);
+    //     code += '\n                ';
+    //     code += runSync(entityIndex.toEmbeddedTS(shiftState(state, code, { inline: true })));
+    //   });
+    //   code += `${indent(state.tabSize)}\n            ];\n        }\n`;
+    // }
+
+    code += `${indent(state.tabSize)}}\n`;
+
+    return code;
+  }
+
   getNamespace() {
     if (this.parentNode && (this.parentNode as DataSource).getNamespace)
       return `${(this.parentNode as DataSource).getNamespace()}.${this.parentNode.name}.entities`;

package/src/concepts/EnumItem__.ts

@@ -6,6 +6,9 @@ import {
   withSourceMapGenerator,
   withGenerator,
   TranslatorGenerator,
+  indent,
+  createDecoratorCode,
+  shiftState,
 } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -141,6 +144,20 @@ export class EnumItem extends BaseNode {
     return `'${this.value}' = '${this.label}'`;
   }
 
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let code = '';
+
+    const index = (this.parentNode as Enum)?.enumItems.indexOf(this);
+    if (index > 0) code += `\n${indent(state.tabSize)}`;
+
+    code += createDecoratorCode(state, this, ['label']);
+    
+    code += `${this.value}`;
+
+    return code;
+  }
+
   setName(value: string) {
     this.setValue(value);
   }

package/src/concepts/Enum__.ts

@@ -9,6 +9,7 @@ import {
   withSourceMapGenerator,
   withGenerator,
   TranslatorGenerator,
+  createDecoratorCode,
 } from '../translator';
 import type Namespace from './Namespace__';
 import type Identifier from './Identifier__';
@@ -343,9 +344,9 @@ export class Enum extends BaseNode {
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     let code = `enum ${this.name} {\n`;
-    this.enumItems.forEach((property) => {
+    this.enumItems.forEach((item) => {
       code += indent(state.tabSize + 1);
-      code += property.toNaturalTS(shiftState(state, code, { tabSize: 0 }));
+      code += item.toNaturalTS(shiftState(state, code, { tabSize: 0 }));
       code += ',\n';
     });
     code += `${indent(state?.tabSize || 0)}}\n`;
@@ -353,6 +354,22 @@ export class Enum extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let code = '';
+    
+    code += createDecoratorCode(state, this, ['label', 'description']);
+    
+    code += `enum ${this.name} {\n`;
+    this.enumItems.forEach((item) => {
+      code += item.toTextualNASL(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+      code += '\n';
+    });
+    code += `${indent(state?.tabSize || 0)}}\n`;
+
+    return code;
+  }
+
   getNamespace() {
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();

package/src/concepts/Event__.ts

@@ -133,6 +133,19 @@ export class Event extends BaseNode {
     }
     return params;
   }
+  /**
+   * 设置组件事件名称
+   */
+  setName(name: string) {
+    const object = {
+      name,
+    };
+    this.update({
+      ...object,
+      field: 'name',
+    });
+  }
+
   /**
    * 设置组件事件描述
    */

package/src/concepts/ForEachStatement__.ts

@@ -595,47 +595,37 @@ export class ForEachStatement extends LogicItem {
       yield* wrapForEach(self.body, function* warpForEachGenerator(logicItem) {
         code += `${yield* logicItem.toEmbeddedTS(
           shiftState(state, code, {
-            tabSize: (state?.tabSize || 0) + 1,
+            tabSize: state.tabSize + 1,
           }),
         )};\n`;
       });
     }
-    code += `${indent(state?.tabSize || 0)}})\n`;
+    code += `${indent(state.tabSize)}})\n`;
     return code;
   }
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     let code = 'ForEach(';
-    code += this.each
-      ? this.each?.toNaturalTS(
-          shiftState(state, code, {
-            tabSize: 0,
-          }),
-        )
-      : '__IDENTIFIER__';
+    code += this.each?.toNaturalTS(shiftState(state, code, { tabSize: 0 })) || '__IDENTIFIER__';
     code += ', ';
-    code += this.start ? this.start?.toNaturalTS(shiftState(state, code, { tabSize: 0 })) : '__IDENTIFIER__';
+    code += this.start?.toNaturalTS(shiftState(state, code, { tabSize: 0 })) || '__IDENTIFIER__';
     code += ', ';
-    code += this.end ? this.end?.toNaturalTS(shiftState(state, code, { tabSize: 0 })) : '__IDENTIFIER__';
+    code += this.end?.toNaturalTS(shiftState(state, code, { tabSize: 0 })) || '__IDENTIFIER__';
     code += ', (';
-    code += this.item ? this.item?.toNaturalTS(shiftState(state, code, { tabSize: 0 }), true) : '__IDENTIFIER__';
+    code += this.item?.toNaturalTS(shiftState(state, code, { tabSize: 0 }), true) || '__IDENTIFIER__';
     code += ', ';
-    code += this.index ? this.index?.toNaturalTS(shiftState(state, code, { tabSize: 0 }), true) : '__IDENTIFIER__';
-    code += ') => {\n ';
+    code += this.index?.toNaturalTS(shiftState(state, code, { tabSize: 0 }), true) || '__IDENTIFIER__';
+    code += ') => {\n';
 
     if (Array.isArray(this.body)) {
       this.body.forEach((logicItem) => {
-        code += `${logicItem?.toNaturalTS(
-          shiftState(state, code, {
-            tabSize: (state?.tabSize || 0) + 1,
-          }),
-        )};\n`;
+        code += `${logicItem?.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }))};\n`;
       });
       if (state?.focusedNodePath === `${this?.nodePath}.body[${this.body?.length}]`)
         code += `${indent((state?.tabSize || 0) + 1)}// 当前位置\n`;
     }
-    code += `${indent(state?.tabSize || 0)}})\n`;
+    code += `${indent(state.tabSize)}})\n`;
 
     return code;
   }

package/src/concepts/FrontendType__.ts

@@ -769,6 +769,7 @@ export class FrontendType extends BaseNode {
     let code = `export namespace ${self.name} {\n`;
     code += 'const name = ';
     code += `"${self.name}";\n`;
+    code += 'export namespace businessComponents { }\n';
     code += '}\n';
     return code;
   }