Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "purview-value-objects",
"version": "1.0.0-prerelease.3",
"version": "1.0.0-prerelease.4",
"license": "MIT",
"author": {
"name": "Kieron Lanning",
Expand All @@ -14,4 +14,4 @@
"type": "git",
"url": "git+https://github.com/purview-dev/value-objects.git"
}
}
}
12 changes: 12 additions & 0 deletions src/src/SourceGenerator/Common/TypeLibrarySpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ namespace Purview.ValueObjects.SourceGenerator.Common;
[GenerateTypeLibrary(ClassName = "TypeLibrary", Namespace = "Purview.ValueObjects.SourceGenerator.Common")]
static partial class TypeLibrarySpec
{
[TypeRef("Purview.ValueObjects")]
static readonly TypeIdentity IValueObject = default;

[TypeRef("Purview.ValueObjects")]
static readonly TypeIdentity IScalarValueObject = default;

[TypeRef("Purview.ValueObjects.Serialization")]
static readonly TypeIdentity ScalarAttribute = default;

Expand All @@ -26,6 +32,12 @@ static partial class TypeLibrarySpec
[TypeRef("System")]
static readonly TypeIdentity Guid = default;

[TypeRef("System")]
static readonly TypeIdentity IEquatable = default;

[TypeRef("System")]
static readonly TypeIdentity IComparable = default;

[TypeRef("System.Text.Json")]
static readonly TypeIdentity JsonSerializer = default;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ static ImmutableArray<TypeReference> BuildInterfaces(ComplexValueObjectModel mod
var valueObjectType = ValueObjectType(model);

var builder = ImmutableArray.CreateBuilder<TypeReference>();
builder.Add(new TypeIdentity("IValueObject", "Purview.ValueObjects").MakeGeneric(valueObjectType));
builder.Add(TypeLibrary.Purview.ValueObjects.IValueObject.MakeGeneric(valueObjectType));

if (!model.IsReferenceType && !model.ImplementsSelfEquatable)
builder.Add(new TypeIdentity("IEquatable", "System").MakeGeneric(valueObjectType));
builder.Add(TypeLibrary.System.IEquatable.MakeGeneric(valueObjectType));

builder.Add(new TypeIdentity("IComparable", "System").MakeGeneric(valueObjectType));
builder.Add(new TypeIdentity("IComparable", "System"));
builder.Add(TypeLibrary.System.IComparable.MakeGeneric(valueObjectType));
builder.Add(TypeLibrary.System.IComparable);

return builder.ToImmutable();
}
Expand Down
13 changes: 5 additions & 8 deletions src/src/SourceGenerator/ValueObject/ScalarValueObjectEmitter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,15 @@ static ImmutableArray<TypeReference> BuildInterfaces(ScalarValueObjectModel mode

var builder = ImmutableArray.CreateBuilder<TypeReference>();
builder.Add(
new TypeIdentity("IScalarValueObject", "Purview.ValueObjects").MakeGeneric(
valueObjectType,
model.ScalarTypeReference
)
TypeLibrary.Purview.ValueObjects.IScalarValueObject.MakeGeneric(valueObjectType, model.ScalarTypeReference)
);

if (!model.IsReferenceType && !model.ImplementsSelfEquatable)
builder.Add(new TypeIdentity("IEquatable", "System").MakeGeneric(valueObjectType));
builder.Add(TypeLibrary.System.IEquatable.MakeGeneric(valueObjectType));

builder.Add(new TypeIdentity("IComparable", "System").MakeGeneric(valueObjectType));
builder.Add(new TypeIdentity("IComparable", "System").MakeGeneric(model.ScalarTypeReference));
builder.Add(new TypeIdentity("IComparable", "System"));
builder.Add(TypeLibrary.System.IComparable.MakeGeneric(valueObjectType));
builder.Add(TypeLibrary.System.IComparable.MakeGeneric(model.ScalarTypeReference));
builder.Add(TypeLibrary.System.IComparable);

return builder.ToImmutable();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ static void EmitBoolProperty(CodeWriter bodyWriter, string name, params string[]
.Property(
new(name, PurviewTypeLibrary.System.Boolean, TypeDeclarationAccessibility.Public)
{
IsInitOnly = true,
Initializer = "true",
}
);
Expand All @@ -119,7 +120,13 @@ params string[] summary
{
bodyWriter
.XmlSummary([.. summary, $"Default: {defaultValue.Split('.').Last()}"])
.Property(new(name, enumType, TypeDeclarationAccessibility.Public) { Initializer = defaultValue });
.Property(
new(name, enumType, TypeDeclarationAccessibility.Public)
{
IsInitOnly = true,
Initializer = defaultValue,
}
);
}

static CodeWriter GetCodeWriter()
Expand Down
1 change: 0 additions & 1 deletion src/src/ValueObjects/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("ValueObjects.UnitTests")]
[assembly: InternalsVisibleTo("SourceGenerator.UnitTests")]
4 changes: 2 additions & 2 deletions src/tests/SourceGenerator.UnitTests/Common/TypeRefs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ static class TypeRefs
public static TypeReference Named(string name, string @namespace) => new(new TypeIdentity(name, @namespace));

public static TypeReference EnumerableOf(TypeReference element) =>
new(new TypeIdentity("IEnumerable", "System.Collections.Generic").MakeGeneric(element));
new(TypeLibrary.System.Collections.Generic.IEnumerable.MakeGeneric(element));

public static TypeReference ICollectionOf(TypeReference element) =>
new(new TypeIdentity("ICollection", "System.Collections.Generic").MakeGeneric(element));
new(TypeLibrary.System.Collections.Generic.ICollection.MakeGeneric(element));
}
Loading