warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(codegen): Adds string intern, encoded int, enum and legacy version support (#613)

Browse source 
- [X] Adds Enum migration rule
- [X] Adds legacy version (writing full int for version field)
- [X] Adds encoded int attribute
- [X] Adds intern string attribute
- [X] Fixes missing base deserialize/serialize
This commit is contained in:
Kamron Batman 2021-05-24 01:01:56 -07:00 • committed by GitHub
parent 7084c6c24f
commit ca5a06e9a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 182 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.Class.cs
View file

@ -83,15 +83,13 @@ namespace SerializationGenerator
return null;
}
var version = classSymbol.GetAttributes()
var serializableAttribute = classSymbol.GetAttributes()
.FirstOrDefault(
attr => attr.AttributeClass?.Equals(serializableEntityAttribute, SymbolEqualityComparer.Default) ?? false
)?.ConstructorArguments.FirstOrDefault().Value?.ToString();
);
if (version == null)
{
return null; // We don't have the attribute
}
var version = (int)serializableAttribute?.ConstructorArguments[0].Value!;
var encodedVersion = (bool)serializableAttribute?.ConstructorArguments[1].Value!;
var namespaceName = classSymbol.ContainingNamespace.ToDisplayString();
var className = classSymbol.Name;
@ -112,7 +110,7 @@ namespace SerializationGenerator
InstanceModifier.Const,
"int",
"_version",
version,
version.ToString(),
true
);
source.AppendLine();
@ -200,22 +198,21 @@ namespace SerializationGenerator
source.GenerateSerialCtor(context, className, isOverride);
source.AppendLine();
var versionValue = int.Parse(version);
List<SerializableMetadata> migrations;
if (versionValue > 0)
if (version > 0)
{
migrations = SerializableMigration.GetMigrations(
migrationPath,
classSymbol,
versionValue,
version,
jsonSerializerOptions
);
for (var i = 0; i < migrations.Count; i++)
{
var migration = migrations[i];
if (migration.Version < versionValue)
if (migration.Version < version)
{
source.GenerateMigrationContentStruct(migration);
source.AppendLine();
@ -231,6 +228,7 @@ namespace SerializationGenerator
source.GenerateSerializeMethod(
compilation,
isOverride,
encodedVersion,
serializableProperties
);
source.AppendLine();
@ -239,7 +237,8 @@ namespace SerializationGenerator
source.GenerateDeserializeMethod(
compilation,
isOverride,
versionValue,
version,
encodedVersion,
migrations,
serializableProperties
);
@ -250,7 +249,7 @@ namespace SerializationGenerator
// Write the migration file
var newMigration = new SerializableMetadata
{
Version = versionValue,
Version = version,
Type = classSymbol.ToDisplayString(),
Properties = serializableProperties
};

8
Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.DeserializeMethod.cs
View file

@ -27,6 +27,7 @@ namespace SerializationGenerator
Compilation compilation,
bool isOverride,
int version,
bool encodedVersion,
List<SerializableMetadata> migrations,
List<SerializableProperty> properties
)
@ -43,8 +44,13 @@ namespace SerializationGenerator
const string indent = " ";
if (isOverride)
{
source.AppendLine($"{indent}base.Deserialize(reader);");
}
// Version
source.AppendLine($"{indent}var version = reader.ReadEncodedInt();");
source.AppendLine($"{indent}var version = reader.{(encodedVersion ? "ReadEncodedInt" : "ReadInt")}();");
if (version > 0)
{

8
Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.MetadataTypes.cs
View file

@ -33,6 +33,8 @@ namespace SerializationGenerator
public const string GENERIC_WRITER_INTERFACE = "Server.IGenericWriter";
public const string GENERIC_READER_INTERFACE = "Server.IGenericReader";
public const string DELTA_DATE_TIME_ATTRIBUTE = "Server.DeltaDateTimeAttribute";
public const string INTERN_STRING_ATTRIBUTE = "Server.InternStringAttribute";
public const string ENCODED_INT_ATTRIBUTE = "Server.EncodedIntAttribute";
public const string POINT2D_STRUCT = "Server.Point2D";
public const string POINT3D_STRUCT = "Server.Point3D";
public const string RECTANGLE2D_STRUCT = "Server.Rectangle2D";
@ -40,9 +42,15 @@ namespace SerializationGenerator
public const string RACE_CLASS = "Server.Race";
public const string MAP_CLASS = "Server.Map";
public static bool IsEncodedInt(this AttributeData attr, Compilation compilation) =>
attr?.IsAttribute(compilation.GetTypeByMetadataName(ENCODED_INT_ATTRIBUTE)) == true;
public static bool IsDeltaDateTime(this AttributeData attr, Compilation compilation) =>
attr?.IsAttribute(compilation.GetTypeByMetadataName(DELTA_DATE_TIME_ATTRIBUTE)) == true;
public static bool IsInternString(this AttributeData attr, Compilation compilation) =>
attr?.IsAttribute(compilation.GetTypeByMetadataName(INTERN_STRING_ATTRIBUTE)) == true;
public static bool IsAttribute(this AttributeData attr, ISymbol symbol) =>
attr?.AttributeClass?.Equals(symbol, SymbolEqualityComparer.Default) == true;

9
Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.SerializeMethod.cs
View file

@ -26,6 +26,7 @@ namespace SerializationGenerator
this StringBuilder source,
Compilation compilation,
bool isOverride,
bool encodedVersion,
List<SerializableProperty> properties
)
{
@ -48,9 +49,15 @@ namespace SerializationGenerator
{indent} return;
{indent}}}");
if (isOverride)
{
source.AppendLine();
source.AppendLine($"{indent}base.Serialize(writer);");
}
// Version
source.AppendLine();
source.AppendLine($"{indent}writer.WriteEncodedInt(_version);");
source.AppendLine($"{indent}writer.{(encodedVersion ? "WriteEncodedInt" : "Write")}(_version);");
foreach (var property in properties)
{