refactor: moduleName of Component should not be converted

LeoYuan · JackLian · commit 5b68b860acdc · 2023-05-08T08:42:19.000+08:00
diff --git a/modules/code-generator/src/parser/SchemaParser.ts b/modules/code-generator/src/parser/SchemaParser.ts
@@ -32,7 +32,7 @@ import {
 import { SUPPORT_SCHEMA_VERSION_LIST } from '../const';
 
 import { getErrorMessage } from '../utils/errors';
-import { handleSubNodes, isValidContainerType } from '../utils/schema';
+import { handleSubNodes, isValidContainerType, ContainerType } from '../utils/schema';
 import { uniqueArray } from '../utils/common';
 import { componentAnalyzer } from '../analyzer/componentAnalyzer';
 import { ensureValidClassName } from '../utils/validate';
@@ -161,7 +161,8 @@ export class SchemaParser implements ISchemaParser {
             ...subRoot,
             componentName: getRootComponentName(subRoot.componentName, compDeps),
             containerType: subRoot.componentName,
-            moduleName: ensureValidClassName(changeCase.pascalCase(subRoot.fileName)),
+            moduleName: ensureValidClassName(subRoot.componentName === ContainerType.Component ?
+              subRoot.fileName : changeCase.pascalCase(subRoot.fileName)),
           };
           return container;
         });
diff --git a/modules/code-generator/src/plugins/component/react/containerClass.ts b/modules/code-generator/src/plugins/component/react/containerClass.ts
@@ -48,7 +48,7 @@ const pluginFactory: BuilderComponentPluginFactory<unknown> = () => {
         type: ChunkType.STRING,
         fileType: FileType.JSX,
         name: CLASS_DEFINE_CHUNK_NAME.InsVar,
-        content: `static displayName = '${changeCase.pascalCase(ir.moduleName)}';`,
+        content: `static displayName = '${ir.moduleName}';`,
         linkAfter: [
           CLASS_DEFINE_CHUNK_NAME.Start,
         ],
diff --git a/modules/code-generator/src/utils/schema.ts b/modules/code-generator/src/utils/schema.ts
@@ -147,4 +147,10 @@ export function isValidContainerType(schema: IPublicTypeNodeSchema) {
     'Component',
     'Block',
   ].includes(schema.componentName);
+}
+
+export const enum ContainerType {
+  Page = 'Page',
+  Component = 'Component',
+  Block = 'Block',
 }
