@hadss/turbo-trans-json-plugin 1.0.0-rc.0 → 1.0.0-rc.1

package/src/core/utils/GenericTypeSubstitutionUtil.ts

@@ -17,6 +17,7 @@ import { TypeNode } from 'ts-morph';
 import { PropertyAnalysis, TypeStructure, PropertyKind, TypeDependency } from '..';
 import { TypeHandlerRegistry } from '../handlers';
 import { DeepCopyUtil } from './DeepCopyUtil';
+import { Logger } from '../logger/Logger';
 
 export class GenericTypeSubstitutionUtil {
   /**
@@ -30,7 +31,9 @@ export class GenericTypeSubstitutionUtil {
 
     const length = Math.min(parentGenericParams.length, childTypeArguments.length);
 
+    Logger.debug(`[GenericMapping] Building mapping with ${length} parameters`);
     for (let i = 0; i < length; i++) {
+      Logger.debug(`[GenericMapping] ${parentGenericParams[i]} -> ${childTypeArguments[i].getText()}`);
       mapping.set(parentGenericParams[i], childTypeArguments[i]);
     }
 
@@ -71,12 +74,20 @@ export class GenericTypeSubstitutionUtil {
     if (typeStructure.kind === PropertyKind.GENERIC) {
       // 对于泛型类型，sourceText 就是泛型参数名（如 "T", "U", "TData"）
       const genericTypeName = typeStructure.sourceText;
+      Logger.debug(`[GenericSubstitution] Processing generic type: ${genericTypeName}`);
+      Logger.debug(`[GenericSubstitution] Available mappings: ${Array.from(mapping.keys()).join(', ')}`);
+      Logger.debug(`[GenericSubstitution] Current class generic params: ${currentClassGenericParams.join(', ')}`);
+
       if (mapping.has(genericTypeName)) {
         const substitutedTypeNode = mapping.get(genericTypeName)!;
+        Logger.debug(`[GenericSubstitution] Found mapping for ${genericTypeName} -> ${substitutedTypeNode.getText()}`);
 
-        return this.constructTypeStructureFromTypeName(substitutedTypeNode, currentClassGenericParams);
+        const result = this.constructTypeStructureFromTypeName(substitutedTypeNode, currentClassGenericParams);
+        Logger.debug(`[GenericSubstitution] Result kind: ${result.kind}, sourceText: ${result.sourceText}`);
+        return result;
       }
       // 如果没有找到对应的映射，保持原样
+      Logger.warn(`[GenericSubstitution] No mapping found for generic type: ${genericTypeName}, keeping as-is`);
       return typeStructure;
     }
 
@@ -95,8 +106,18 @@ export class GenericTypeSubstitutionUtil {
       newStructure.args = newStructure.args.map(
         arg => this.substituteTypeStructure(arg, mapping, currentClassGenericParams)
       );
+      // 重新生成 sourceText 以反映泛型参数替换
+      newStructure.sourceText = this.regenerateSourceText(newStructure);
     }
 
+
+
+
+
+
+
+
+
     // 重新计算依赖信息
     newStructure.dependencies = this.collectDependenciesFromChildren(newStructure);
 
@@ -113,6 +134,35 @@ export class GenericTypeSubstitutionUtil {
     })
   }
 
+  /**
+   * 根据替换后的 args 重新生成 sourceText
+   * 保持原始格式（数组字面量 T[] 或泛型形式 Container<T>）
+   * @param structure 类型结构
+   * @returns 重新生成的 sourceText
+   */
+  private static regenerateSourceText(structure: TypeStructure): string {
+    if (!structure.args || structure.args.length === 0) {
+      return structure.sourceText;
+    }
+
+    // 处理数组字面量形式: T[] -> NewT[]
+    if (structure.sourceText.endsWith('[]')) {
+      return `${structure.args[0].sourceText}[]`;
+    }
+
+    // 处理泛型形式: Container<T> 或 Container<K, V>
+    // 提取容器名称（在 < 之前的部分）
+    const genericStart = structure.sourceText.indexOf('<');
+    if (genericStart > 0) {
+      const containerName = structure.sourceText.substring(0, genericStart);
+      const argsText = structure.args.map(arg => arg.sourceText).join(', ');
+      return `${containerName}<${argsText}>`;
+    }
+
+    // 其他情况保持原样
+    return structure.sourceText;
+  }
+
   private static collectDependenciesFromChildren(children: TypeStructure): TypeDependency[] {
     const allDependencies: TypeDependency[] = [];
 

package/src/core/utils/TsMorphUtil.ts

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { Project, ProjectOptions, TypeChecker } from 'ts-morph';
+import { IndentationText, Project, ProjectOptions, QuoteKind, TypeChecker } from 'ts-morph';
 import { Logger } from '../logger/Logger';
 
 export class TsMorphUtil {
@@ -24,6 +24,10 @@ export class TsMorphUtil {
       Logger.info('创建ts-morph项目');
       this.project = new Project(
         options || {
+          manipulationSettings: {
+            indentationText: IndentationText.TwoSpaces,
+            quoteKind: QuoteKind.Single
+          },
           compilerOptions: {
             allowNonTsExtensions: true
           }

package/src/json-plugin/tasks/BaseTask.ts

@@ -16,7 +16,6 @@
 import { ITask, Logger, ImportRewriteServiceImpl, ConfigManager, CodeGenerationEngine } from '../../core';
 import { BuildProfileUpdaterImpl } from '../../core/import-rewrite/services/BuildProfileUpdater';
 import { ITargetContext } from '../interfaces/ITargetContext';
-import {logger} from 'handlebars';
 import {TaskConstants} from '../constants/TaskConstants';
 import SerializationPathUtil from '../../core/utils/SerializationPathUtil';
 

package/template/SerializerPerformanceTemplate.hbs

@@ -7,13 +7,13 @@ deserialize(decoder: Decoder, plain: ESObject): {{class.className}}{{#if class.g
     const result = new {{class.className}}{{#if class.generics.isGeneric}}<{{genericParametersString class.generics.parameters}}>{{/if}}(
     {{#each (getCtorProperties class.constructorParams properties)}}
       {{#unless analysis.decorators.isTransient}}
-        {{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}decoder.{{serializer.decodeMethod}}(plain[keys[{{getPropertyIndex this ../properties}}]]){{else}}this.{{analysis.name}}Serializer.deserialize(decoder, plain[keys[{{getPropertyIndex this ../properties}}]]){{/if}}{{#if serializer.needsTypeAssertion}} as {{analysis.type.sourceText}}{{/if}}{{#unless @last}},{{/unless}}
+        {{#if analysis.decorators.isPlainValue}}plain[keys[{{getPropertyIndex this ../properties}}]]{{else}}{{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}decoder.{{serializer.decodeMethod}}(plain[keys[{{getPropertyIndex this ../properties}}]]){{else}}this.{{analysis.name}}Serializer.deserialize(decoder, plain[keys[{{getPropertyIndex this ../properties}}]]){{/if}}{{#if serializer.needsTypeAssertion}} as {{analysis.type.sourceText}}{{/if}}{{/if}}{{#unless @last}},{{/unless}}
       {{/unless}}
     {{/each}});
   {{else}}
     const result: ESObject = {};
   {{/if}}
-  
+
 
   {{! 可选属性赋值（构造函数外的属性）}}
   {{#each (postConstructorAssignments class.constructorParams properties)}}
@@ -21,12 +21,22 @@ deserialize(decoder: Decoder, plain: ESObject): {{class.className}}{{#if class.g
       const {{analysis.name}}PlainValue: ESObject = plain[keys[{{getPropertyIndex this ../properties}}]];
       {{#if analysis.defaultValue}}
       {{! 有默认值的属性 }}
+      {{#if (eq analysis.visibility "private")}}
+      ObjectUtils.setProp(result, '{{analysis.name}}', {{analysis.name}}PlainValue === undefined ? {{analysis.defaultValue}} :
+        {{#if analysis.decorators.isPlainValue}}plain[keys[{{getPropertyIndex this ../properties}}]]{{else}}{{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}decoder.{{serializer.decodeMethod}}(plain[keys[{{getPropertyIndex this ../properties}}]]){{else}}this.{{analysis.name}}Serializer.deserialize(decoder, plain[keys[{{getPropertyIndex this ../properties}}]]){{/if}}{{#if serializer.needsTypeAssertion}} as {{analysis.type.sourceText}}{{/if}}{{/if}});
+      {{else}}
       result.{{analysis.name}} = {{analysis.name}}PlainValue === undefined ? {{analysis.defaultValue}} :
-        {{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}decoder.{{serializer.decodeMethod}}(plain[keys[{{getPropertyIndex this ../properties}}]]){{else}}this.{{analysis.name}}Serializer.deserialize(decoder, plain[keys[{{getPropertyIndex this ../properties}}]]){{/if}}{{#if serializer.needsTypeAssertion}} as {{analysis.type.sourceText}}{{/if}};
+        {{#if analysis.decorators.isPlainValue}}plain[keys[{{getPropertyIndex this ../properties}}]]{{else}}{{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}decoder.{{serializer.decodeMethod}}(plain[keys[{{getPropertyIndex this ../properties}}]]){{else}}this.{{analysis.name}}Serializer.deserialize(decoder, plain[keys[{{getPropertyIndex this ../properties}}]]){{/if}}{{#if serializer.needsTypeAssertion}} as {{analysis.type.sourceText}}{{/if}}{{/if}};
+      {{/if}}
       {{else}}
       {{! 无默认值的属性 }}
+      {{#if (eq analysis.visibility "private")}}
+      ObjectUtils.setProp(result, '{{analysis.name}}', {{analysis.name}}PlainValue === undefined ? undefined :
+        {{#if analysis.decorators.isPlainValue}}plain[keys[{{getPropertyIndex this ../properties}}]]{{else}}{{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}decoder.{{serializer.decodeMethod}}(plain[keys[{{getPropertyIndex this ../properties}}]]){{else}}this.{{analysis.name}}Serializer.deserialize(decoder, plain[keys[{{getPropertyIndex this ../properties}}]]){{/if}}{{#if serializer.needsTypeAssertion}} as {{analysis.type.sourceText}}{{/if}}{{/if}});
+      {{else}}
       result.{{analysis.name}} = {{analysis.name}}PlainValue === undefined ? undefined :
-        {{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}decoder.{{serializer.decodeMethod}}(plain[keys[{{getPropertyIndex this ../properties}}]]){{else}}this.{{analysis.name}}Serializer.deserialize(decoder, plain[keys[{{getPropertyIndex this ../properties}}]]){{/if}}{{#if serializer.needsTypeAssertion}} as {{analysis.type.sourceText}}{{/if}};
+        {{#if analysis.decorators.isPlainValue}}plain[keys[{{getPropertyIndex this ../properties}}]]{{else}}{{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}decoder.{{serializer.decodeMethod}}(plain[keys[{{getPropertyIndex this ../properties}}]]){{else}}this.{{analysis.name}}Serializer.deserialize(decoder, plain[keys[{{getPropertyIndex this ../properties}}]]){{/if}}{{#if serializer.needsTypeAssertion}} as {{analysis.type.sourceText}}{{/if}}{{/if}};
+      {{/if}}
       {{/if}}
     {{/unless}}
   {{/each}}

package/template/SerializerStrictTemplate.hbs

@@ -27,11 +27,15 @@ deserialize(decoder: Decoder, plain: ESObject): {{class.className}}{{#if class.g
       {{#each properties}}
       case {{@index}}:
         {{analysis.name}}Seen = true;
+        {{#if analysis.decorators.isPlainValue}}
+        {{analysis.name}}Value = value;
+        {{else}}
         {{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}
         {{analysis.name}}Value = decoder.{{serializer.decodeMethod}}(value);
         {{else}}
         {{analysis.name}}Value = this.{{analysis.name}}Serializer.deserialize(decoder, value){{#if serializer.needsTypeAssertion}} as {{analysis.type.sourceText}}{{/if}};
         {{/if}}
+        {{/if}}
         break;
       {{/each}}
       case DecodedElementIndex.UNKNOWN_NAME:
@@ -80,7 +84,11 @@ deserialize(decoder: Decoder, plain: ESObject): {{class.className}}{{#if class.g
   {{#each (postConstructorAssignments class.constructorParams properties)}}
   {{#unless analysis.decorators.isTransient}}
   if ({{analysis.name}}Seen) {
+    {{#if (eq analysis.visibility "private")}}
+    ObjectUtils.setProp(result, '{{analysis.name}}', {{analysis.name}}Value!{{#if serializer.needsTypeAssertion}} as {{analysis.type.sourceText}}{{/if}});
+    {{else}}
     result.{{analysis.name}} = {{analysis.name}}Value!{{#if serializer.needsTypeAssertion}} as {{analysis.type.sourceText}}{{/if}};
+    {{/if}}
   }
   {{/unless}}
   {{/each}}

package/template/SerializerTemplate.hbs

@@ -121,21 +121,29 @@ export class {{class.className}}Serializer extends Serializer<{{class.className}
     {{/if}}
   }
 
-  private innerSerialize(encoder: Encoder, value: {{#if class.generics.isGeneric}}{{class.className}}<{{genericParametersString class.generics.parameters}}>{{else}}{{class.className}}{{/if}}): ESObject { 
+  private innerSerialize(encoder: Encoder, value: {{#if class.generics.isGeneric}}{{class.className}}<{{genericParametersString class.generics.parameters}}>{{else}}{{class.className}}{{/if}}): ESObject {
     const keys = this.serialDescriptor.elementNames;
     const result = encoder.newObject();
     {{#each properties}}
-      {{! 根据类型选择编码方法 }}
-      {{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}
-      encoder.{{serializer.encodeMethod}}(result, keys[{{@index}}], value.{{analysis.name}});
+    {{! 根据类型选择编码方法 }}
+      {{#if (eq analysis.visibility "private")}}
+        {{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}
+          encoder.{{serializer.encodeMethod}}(result, keys[{{@index}}], ObjectUtils.getProp(value, '{{analysis.name}}'));
+        {{else}}
+          encoder.encodeSerializableElement(result, keys[{{@index}}], this.{{analysis.name}}Serializer, ObjectUtils.getProp(value, '{{analysis.name}}'));
+        {{/if}}
       {{else}}
-      encoder.encodeSerializableElement(result, keys[{{@index}}], this.{{analysis.name}}Serializer, value.{{analysis.name}});
+        {{#if (and (eqPrimitiveType analysis.type.kind) (not (hasDecoratorWith analysis.decorators)))}}
+          encoder.{{serializer.encodeMethod}}(result, keys[{{@index}}], value.{{analysis.name}});
+        {{else}}
+          encoder.encodeSerializableElement(result, keys[{{@index}}], this.{{analysis.name}}Serializer, value.{{analysis.name}});
+        {{/if}}
       {{/if}}
     {{/each}}
 
     return result;
   }
-  
+
   {{! 动态包含反序列化模板 - 使用从上下文传递的deserializeTemplate参数 }}
   {{> (lookup . "deserializeTemplate")}}
 }