Lazily resolve contract property types and default values to make use of the new symbol name resolver (This tempoarily disables unused contract validation)

C0nquistadore · C0nquistadore · commit c199c618192c · 2022-09-23T13:30:57.000+02:00
diff --git a/src/Dibix.Sdk/CodeGeneration/Model/CodeGenerationModelLoader.cs b/src/Dibix.Sdk/CodeGeneration/Model/CodeGenerationModelLoader.cs
@@ -77,7 +77,7 @@ string projectName
             IDictionary<string, SecurityScheme> securitySchemeMap = new Dictionary<string, SecurityScheme>();
 
             ISchemaProvider builtInSchemaProvider = new BuiltInSchemaProvider();
-            IContractDefinitionProvider contractDefinitionProvider = new ContractDefinitionProvider(fileSystemProvider, logger, normalizedContracts, productName, areaName);
+            IContractDefinitionProvider contractDefinitionProvider = new ContractDefinitionProvider(fileSystemProvider, typeResolver, logger, normalizedContracts, productName, areaName);
             IUserDefinedTypeProvider userDefinedTypeProvider = new UserDefinedTypeProvider(rootNamespace, productName, areaName, normalizedSources, typeResolver, logger);
             //ISchemaProvider externalSchemaProvider = new ExternalSchemaProvider(assemblyResolver);
             schemaRegistry.ImportSchemas(builtInSchemaProvider, contractDefinitionProvider, userDefinedTypeProvider/*, externalSchemaProvider*/);
diff --git a/src/Dibix.Sdk/CodeGeneration/Model/ContractDefinition.cs b/src/Dibix.Sdk/CodeGeneration/Model/ContractDefinition.cs
@@ -6,7 +6,6 @@ public sealed class ContractDefinition
         public string FilePath { get; }
         public int Line { get; }
         public int Column { get; }
-        public bool HasReferences { get; internal set; }
 
         public ContractDefinition(SchemaDefinition schema, string filePath, int line, int column)
         {
diff --git a/src/Dibix.Sdk/CodeGeneration/Model/ContractDefinitionProvider.cs b/src/Dibix.Sdk/CodeGeneration/Model/ContractDefinitionProvider.cs
@@ -13,10 +13,10 @@ internal sealed class ContractDefinitionProvider : JsonSchemaDefinitionReader, I
     {
         #region Fields
         private const string RootFolderName = "Contracts";
+        private readonly ITypeResolverFacade _typeResolver;
         private readonly string _productName;
         private readonly string _areaName;
         private readonly IDictionary<string, ContractDefinition> _contracts;
-        private readonly ICollection<string> _referencedContracts;
         #endregion
 
         #region Properties
@@ -26,13 +26,13 @@ internal sealed class ContractDefinitionProvider : JsonSchemaDefinitionReader, I
         #endregion
 
         #region Constructor
-        public ContractDefinitionProvider(IFileSystemProvider fileSystemProvider, ILogger logger, IEnumerable<string> contracts, string productName, string areaName) : base(fileSystemProvider, logger)
+        public ContractDefinitionProvider(IFileSystemProvider fileSystemProvider, ITypeResolverFacade typeResolver, ILogger logger, IEnumerable<string> contracts, string productName, string areaName) : base(fileSystemProvider, logger)
         {
+            this._typeResolver = typeResolver;
             this._productName = productName;
             this._areaName = areaName;
             this._contracts = new Dictionary<string, ContractDefinition>();
-            this._referencedContracts = new HashSet<string>();
-            this.CollectCore(contracts);
+            base.Collect(contracts);
         }
         #endregion
 
@@ -44,8 +44,6 @@ public bool TryGetSchema(string fullName, out SchemaDefinition schema)
                 schema = null;
                 return false;
             }
-
-            contract.HasReferences = true;
             schema = contract.Schema;
             return true;
         }
@@ -67,34 +65,25 @@ protected override void Read(string filePath, JObject json)
             string relativeNamespace = String.Join(".", parts.Skip(1));
             NamespacePath currentNamespace = PathUtility.BuildAbsoluteNamespace(this._productName, this._areaName, LayerName.DomainModel, relativeNamespace);
 
-            string root = multipleAreas ? parts[1] : null;
-            NamespacePath rootNamespace = PathUtility.BuildAbsoluteNamespace(this._productName, this._areaName, LayerName.DomainModel, relativeNamespace: root);
-
-            this.ReadContracts(rootNamespace, currentNamespace, json, filePath);
+            this.ReadContracts(currentNamespace, relativeNamespace, json, filePath);
         }
         #endregion
 
         #region Private Methods
-        private void CollectCore(IEnumerable<string> contracts)
-        {
-            base.Collect(contracts);
-            this.CollectReferenceCounts();
-        }
-
-        private void ReadContracts(NamespacePath rootNamespace, NamespacePath currentNamespace, JObject contracts, string filePath)
+        private void ReadContracts(NamespacePath currentNamespace, string relativeNamespace, JObject contracts, string filePath)
         {
             foreach (JProperty definitionProperty in contracts.Properties())
             {
-                this.ReadContract(rootNamespace, currentNamespace, definitionProperty.Name, definitionProperty.Value, filePath, definitionProperty.GetLineInfo());
+                this.ReadContract(currentNamespace, relativeNamespace, definitionProperty.Name, definitionProperty.Value, filePath, definitionProperty.GetLineInfo());
             }
         }
 
-        private void ReadContract(NamespacePath rootNamespace, NamespacePath currentNamespace, string definitionName, JToken value, string filePath, IJsonLineInfo lineInfo)
+        private void ReadContract(NamespacePath currentNamespace, string relativeNamespace, string definitionName, JToken value, string filePath, IJsonLineInfo lineInfo)
         {
             switch (value.Type)
             {
                 case JTokenType.Object:
-                    this.ReadObjectContract(rootNamespace, currentNamespace, definitionName, value, filePath, lineInfo);
+                    this.ReadObjectContract(currentNamespace, relativeNamespace, definitionName, value, filePath, lineInfo);
                     break;
 
                 case JTokenType.Array:
@@ -106,7 +95,7 @@ private void ReadContract(NamespacePath rootNamespace, NamespacePath currentName
             }
         }
 
-        private void ReadObjectContract(NamespacePath rootNamespace, NamespacePath currentNamespace, string definitionName, JToken value, string filePath, IJsonLineInfo lineInfo)
+        private void ReadObjectContract(NamespacePath currentNamespace, string relativeNamespace, string definitionName, JToken value, string filePath, IJsonLineInfo lineInfo)
         {
             ObjectSchema contract = new ObjectSchema(currentNamespace.Path, definitionName, SchemaDefinitionSource.Defined);
             foreach (JProperty property in ((JObject)value).Properties())
@@ -150,17 +139,34 @@ private void ReadObjectContract(NamespacePath rootNamespace, NamespacePath curre
                             throw new ArgumentOutOfRangeException(nameof(property.Type), property.Type, null);
                     }
 
-                    TypeReference type = this.ParsePropertyType(typeName, rootNamespace, filePath, typeNameValue);
-                    ValueReference defaultValue = null;
-                    if (defaultValueJson != null)
+                    IJsonLineInfo propertyLineInfo = property.GetLineInfo();
+                    Token<string> propertyName = new Token<string>(property.Name, filePath, propertyLineInfo.LineNumber, propertyLineInfo.LinePosition);
+
+                    TypeReference ResolveType()
                     {
-                        IJsonLineInfo defaultValueLocation = defaultValueJson.GetLineInfo();
-                        defaultValue = JsonValueReferenceParser.Parse(type, defaultValueJson, filePath, defaultValueLocation, Logger);
+                        bool isEnumerable = typeName.EndsWith("*", StringComparison.Ordinal);
+                        typeName = typeName.TrimEnd('*');
+
+                        // TODO: Remove support
+                        typeName = typeName.TrimStart('#');
+
+                        IJsonLineInfo location = value.GetLineInfo();
+                        TypeReference type = this._typeResolver.ResolveType(typeName, relativeNamespace, filePath, location.LineNumber, location.LinePosition, isEnumerable);
+                        return type;
                     }
 
-                    IJsonLineInfo propertyLineInfo = property.GetLineInfo();
-                    Token<string> propertyName = new Token<string>(property.Name, filePath, propertyLineInfo.LineNumber, propertyLineInfo.LinePosition);
-                    ObjectSchemaProperty objectSchemaProperty = new ObjectSchemaProperty(propertyName, type, defaultValue, serializationBehavior, dateTimeKind, isPartOfKey, isOptional, isDiscriminator, isObfuscated, isRelativeHttpsUrl);
+                    ValueReference ResolveDefaultValue(TypeReference typeReference)
+                    {
+                        ValueReference defaultValue = null;
+                        if (defaultValueJson != null)
+                        {
+                            IJsonLineInfo defaultValueLocation = defaultValueJson.GetLineInfo();
+                            defaultValue = JsonValueReferenceParser.Parse(typeReference, defaultValueJson, filePath, defaultValueLocation, Logger);
+                        }
+                        return defaultValue;
+                    }
+
+                    ObjectSchemaProperty objectSchemaProperty = new ObjectSchemaProperty(propertyName, ResolveType, ResolveDefaultValue, serializationBehavior, dateTimeKind, isPartOfKey, isOptional, isDiscriminator, isObfuscated, isRelativeHttpsUrl);
                     contract.Properties.Add(objectSchemaProperty);
                 }
             }
@@ -241,47 +247,6 @@ private static EnumValue ReadEnumValue(string name, JValue value, JTokenType typ
                 default: throw new ArgumentOutOfRangeException(nameof(type), type, null);
             }
         }
-
-        private TypeReference ParsePropertyType(string typeName, NamespacePath rootNamespace, string filePath, JToken value)
-        {
-            bool isEnumerable = typeName.EndsWith("*", StringComparison.Ordinal);
-            typeName = typeName.TrimEnd('*');
-            
-            bool isNullable = typeName.EndsWith("?", StringComparison.Ordinal);
-            typeName = typeName.TrimEnd('?');
-
-            bool isTypeReference = typeName.StartsWith("#", StringComparison.Ordinal);
-            typeName = typeName.TrimStart('#');
-
-            IJsonLineInfo location = value.GetLineInfo();
-            if (isTypeReference)
-            {
-                // TODO: Actually the contracts should have a namespace group, just like the procedures.
-                // The folder itself should not indicate a namespace (just like in C#).
-                // Therefore a namespace property should be added to the contract schema.
-                // This would however introduce a breaking change, since in C#, when you are within a namespace group,
-                // and you want to reference a type from outside of the namespace, an absolute namespace must be used.
-                string key = $"{rootNamespace}.{typeName}";
-                this._referencedContracts.Add(key);
-                return new SchemaTypeReference(key, isNullable, isEnumerable, filePath, location.LineNumber, location.LinePosition);
-            }
-
-            PrimitiveType dataType = (PrimitiveType)Enum.Parse(typeof(PrimitiveType), typeName, ignoreCase: true /* JSON is camelCase while C# is PascalCase */);
-            return new PrimitiveTypeReference(dataType, isNullable, isEnumerable, filePath, location.LineNumber, location.LinePosition);
-        }
-
-        private void CollectReferenceCounts()
-        {
-            foreach (string name in this._referencedContracts)
-            {
-                if (!this._contracts.TryGetValue(name, out ContractDefinition contractDefinition))
-                {
-                    // The contract is quite possibly not defined in this project
-                    continue;
-                }
-                contractDefinition.HasReferences = true;
-            }
-        }
         #endregion
 
         #region Nested types
diff --git a/src/Dibix.Sdk/CodeGeneration/Model/ObjectSchemaProperty.cs b/src/Dibix.Sdk/CodeGeneration/Model/ObjectSchemaProperty.cs
@@ -4,9 +4,12 @@ namespace Dibix.Sdk.CodeGeneration
 {
     public sealed class ObjectSchemaProperty
     {
+        private readonly Lazy<TypeReference> _typeResolver;
+        private readonly Lazy<ValueReference> _defaultValueResolver;
+
         public Token<string> Name { get; }
-        public TypeReference Type { get; }
-        public ValueReference DefaultValue { get; }
+        public TypeReference Type => this._typeResolver.Value;
+        public ValueReference DefaultValue => this._defaultValueResolver.Value;
         public DateTimeKind DateTimeKind { get; }
         public SerializationBehavior SerializationBehavior { get; }
         public bool IsPartOfKey { get; }
@@ -15,11 +18,12 @@ public sealed class ObjectSchemaProperty
         public bool IsObfuscated { get; }
         public bool IsRelativeHttpsUrl { get; }
 
-        public ObjectSchemaProperty(Token<string> name, TypeReference type, ValueReference defaultValue = default, SerializationBehavior serializationBehavior = default, DateTimeKind dateTimeKind = default, bool isPartOfKey = default, bool isOptional = default, bool isDiscriminator = default, bool isObfuscated = default, bool isRelativeHttpsUrl = default)
+        public ObjectSchemaProperty(Token<string> name, TypeReference type, ValueReference defaultValue = default, SerializationBehavior serializationBehavior = default, DateTimeKind dateTimeKind = default, bool isPartOfKey = default, bool isOptional = default, bool isDiscriminator = default, bool isObfuscated = default, bool isRelativeHttpsUrl = default) : this(name, () => type, _ => defaultValue, serializationBehavior, dateTimeKind, isPartOfKey, isOptional, isDiscriminator, isObfuscated, isRelativeHttpsUrl) { }
+        internal ObjectSchemaProperty(Token<string> name, Func<TypeReference> typeResolver, Func<TypeReference, ValueReference> defaultValueResolver, SerializationBehavior serializationBehavior, DateTimeKind dateTimeKind, bool isPartOfKey, bool isOptional, bool isDiscriminator, bool isObfuscated, bool isRelativeHttpsUrl)
         {
+            this._typeResolver = new Lazy<TypeReference>(typeResolver);
+            this._defaultValueResolver = new Lazy<ValueReference>(() => defaultValueResolver(this.Type));
             this.Name = name;
-            this.Type = type;
-            this.DefaultValue = defaultValue;
             this.DateTimeKind = dateTimeKind;
             this.SerializationBehavior = !isDiscriminator ? serializationBehavior : SerializationBehavior.Never;
             this.IsPartOfKey = isPartOfKey;
diff --git a/src/Dibix.Sdk/CodeGeneration/Validation/ContractArtifactModelValidator.cs b/src/Dibix.Sdk/CodeGeneration/Validation/ContractArtifactModelValidator.cs
diff --git a/tests/Dibix.Sdk.Tests/CodeGeneration/CodeGenerationTaskTests.cs b/tests/Dibix.Sdk.Tests/CodeGeneration/CodeGenerationTaskTests.cs

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ public sealed class ContractDefinition`
`6`	`6`	`public string FilePath { get; }`
`7`	`7`	`public int Line { get; }`
`8`	`8`	`public int Column { get; }`
`9`		`- public bool HasReferences { get; internal set; }`
`10`	`9`
`11`	`10`	`public ContractDefinition(SchemaDefinition schema, string filePath, int line, int column)`
`12`	`11`	`{`