diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java index 9ca17b80..7c2749ca 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/CodeGenerateTypeScript.java @@ -293,8 +293,8 @@ public class CodeGenerateTypeScript implements ICodeGenerate { for (var fieldNote : fieldNotes) { tsBuilder.append(fieldNote).append(LS); } - var triple = tsSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); - tsBuilder.append(StringUtils.format("{}{} = {};", triple.getMiddle(), triple.getLeft(), triple.getRight())).append(LS); + var pair = tsSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); + tsBuilder.append(StringUtils.format("{}: {} = {};", fieldName, pair.getKey(), pair.getValue())).append(LS); } return tsBuilder.toString(); } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/ITsSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/ITsSerializer.java index 0c52c6f9..ca0297e5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/ITsSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/ITsSerializer.java @@ -13,7 +13,7 @@ package com.zfoo.protocol.serializer.typescript; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import java.lang.reflect.Field; @@ -26,7 +26,7 @@ public interface ITsSerializer { /** * 获取属性的类型,名称,默认值 */ - Triple field(Field field, IFieldRegistration fieldRegistration); + Pair field(Field field, IFieldRegistration fieldRegistration); void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsArraySerializer.java index 6892459e..d7b1b2c5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsArraySerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.ArrayField; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.serializer.CodeLanguage; @@ -31,9 +31,9 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsArraySerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - var type = StringUtils.format(": Array<{}>", CodeGenerateTypeScript.toTsClassName(field.getType().getComponentType().getSimpleName())); - return new Triple<>(type, field.getName(), "[]"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + var type = StringUtils.format("Array<{}>", CodeGenerateTypeScript.toTsClassName(field.getType().getComponentType().getSimpleName())); + return new Pair<>(type, "[]"); } @Override @@ -75,7 +75,7 @@ public class TsArraySerializer implements ITsSerializer { ArrayField arrayField = (ArrayField) fieldRegistration; String result = "result" + GenerateProtocolFile.localVariableId++; - var typeName = StringUtils.format("Array<{}>", CodeGenerateTypeScript.toTsClassName(arrayField.getType().getSimpleName())); + var typeName = StringUtils.format("Array<{}>", CodeGenerateTypeScript.toTsClassName(arrayField.getType().getSimpleName())); builder.append(StringUtils.format("const {} = new {};", result, typeName)).append(LS); String i = "index" + GenerateProtocolFile.localVariableId++; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsBoolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsBoolSerializer.java index 048ab483..a24c4c90 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsBoolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsBoolSerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsBoolSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>(": boolean", field.getName(), "false"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("boolean", "false"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsByteSerializer.java index 6916c406..7ec38000 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsByteSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsByteSerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsByteSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>(": number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsDoubleSerializer.java index 786dd398..f9e85a0a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsDoubleSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsDoubleSerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsDoubleSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>(": number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsFloatSerializer.java index 57e57d42..d5806974 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsFloatSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsFloatSerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsFloatSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>(": number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsIntSerializer.java index 62e9485a..1303eee9 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsIntSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsIntSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.model.Triple; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -28,8 +29,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsIntSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>(": number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsListSerializer.java index 72fd7509..66970054 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsListSerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.ListField; import com.zfoo.protocol.serializer.CodeLanguage; @@ -31,9 +31,9 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsListSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - var type = StringUtils.format(": {}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString())); - return new Triple<>(type, field.getName(), "[]"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + var type = StringUtils.format("{}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString())); + return new Pair<>(type, "[]"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsLongSerializer.java index 1b452bdb..c94bb2ea 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsLongSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsLongSerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsLongSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>(": number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsMapSerializer.java index d7568475..4fe9a418 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsMapSerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.MapField; import com.zfoo.protocol.serializer.CodeLanguage; @@ -31,9 +31,9 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsMapSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - var type = StringUtils.format(": {}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString())); - return new Triple<>(type, field.getName(), "new Map()"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + var type = StringUtils.format("{}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString())); + return new Pair<>(type, "new Map()"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsObjectProtocolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsObjectProtocolSerializer.java index 0561912d..f0a6ae1a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsObjectProtocolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsObjectProtocolSerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.ObjectProtocolField; import com.zfoo.protocol.serializer.enhance.EnhanceObjectProtocolSerializer; @@ -30,11 +30,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsObjectProtocolSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { + public Pair field(Field field, IFieldRegistration fieldRegistration) { ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; var protocolSimpleName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(objectProtocolField.getProtocolId()); - var type = StringUtils.format(": {} | null", protocolSimpleName); - return new Triple<>(type, field.getName(), "null"); + var type = StringUtils.format("{} | null", protocolSimpleName); + return new Pair<>(type, "null"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsSetSerializer.java index 8050679f..560e6534 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsSetSerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.SetField; import com.zfoo.protocol.serializer.CodeLanguage; @@ -31,9 +31,9 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsSetSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - var type = StringUtils.format(": {}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString())); - return new Triple<>(type, field.getName(), "new Set()"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + var type = StringUtils.format("{}", CodeGenerateTypeScript.toTsClassName(field.getGenericType().toString())); + return new Pair<>(type, "new Set()"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsShortSerializer.java index 5c699826..c72f79c9 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsShortSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsShortSerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsShortSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>(": number", field.getName(), "0"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", "0"); } @Override diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsStringSerializer.java index 385ae6d1..ccd400f3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/TsStringSerializer.java @@ -14,7 +14,7 @@ package com.zfoo.protocol.serializer.typescript; import com.zfoo.protocol.generate.GenerateProtocolFile; -import com.zfoo.protocol.model.Triple; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -28,8 +28,8 @@ import static com.zfoo.protocol.util.FileUtils.LS; public class TsStringSerializer implements ITsSerializer { @Override - public Triple field(Field field, IFieldRegistration fieldRegistration) { - return new Triple<>(": string", field.getName(), "''"); + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("string", "''"); } @Override