remote notion of HostDocument in favour of workspace

Author: VisualBean

src/LEGO.AsyncAPI.Readers/AsyncApiJsonDocumentReader.cs

@@ -197,7 +197,7 @@ private void ResolveInternalReferences(AsyncApiDiagnostic diagnostic, AsyncApiDo
         {
             var reader = new AsyncApiStringReader(this.settings);
 
-            var resolver = new AsyncApiReferenceHostDocumentResolver(document);
+            var resolver = new AsyncApiReferenceHostDocumentResolver(this.context.Workspace);
             var walker = new AsyncApiWalker(resolver);
             walker.Walk(document);
 
@@ -210,7 +210,7 @@ private void ResolveInternalReferences(AsyncApiDiagnostic diagnostic, AsyncApiDo
         private void ResolveExternalReferences(AsyncApiDiagnostic diagnostic, IAsyncApiSerializable serializable, AsyncApiDocument hostDocument)
         {
             var loader = this.settings.ExternalReferenceLoader ??= new DefaultStreamLoader(this.settings);
-            var collector = new AsyncApiRemoteReferenceCollector(hostDocument);
+            var collector = new AsyncApiRemoteReferenceCollector(this.context.Workspace);
             var walker = new AsyncApiWalker(collector);
             walker.Walk(serializable);
 

src/LEGO.AsyncAPI.Readers/AsyncApiReferenceHostDocumentResolver.cs

@@ -9,13 +9,13 @@ namespace LEGO.AsyncAPI.Readers
 
     internal class AsyncApiReferenceHostDocumentResolver : AsyncApiVisitorBase
     {
-        private AsyncApiDocument currentDocument;
+        private AsyncApiWorkspace workspace;
         private List<AsyncApiError> errors = new List<AsyncApiError>();
 
         public AsyncApiReferenceHostDocumentResolver(
-            AsyncApiDocument currentDocument)
+            AsyncApiWorkspace workspace)
         {
-            this.currentDocument = currentDocument;
+            this.workspace = workspace;
         }
 
         public IEnumerable<AsyncApiError> Errors
@@ -30,7 +30,7 @@ public override void Visit(IAsyncApiReferenceable referenceable)
         {
             if (referenceable.Reference != null)
             {
-                referenceable.Reference.HostDocument = this.currentDocument;
+                referenceable.Reference.Workspace = this.workspace;
             }
         }
     }

src/LEGO.AsyncAPI.Readers/Services/AsyncApiRemoteReferenceCollector.cs

@@ -10,12 +10,12 @@ namespace LEGO.AsyncAPI.Readers.Services
     internal class AsyncApiRemoteReferenceCollector : AsyncApiVisitorBase
     {
         private readonly List<IAsyncApiReferenceable> references = new();
-        private AsyncApiDocument currentDocument;
+        private AsyncApiWorkspace workspace;
 
         public AsyncApiRemoteReferenceCollector(
-            AsyncApiDocument currentDocument)
+            AsyncApiWorkspace workspace)
         {
-            this.currentDocument = currentDocument;
+            this.workspace = workspace;
         }
         /// <summary>
         /// List of all external references collected from AsyncApiDocument.
@@ -36,9 +36,9 @@ public override void Visit(IAsyncApiReferenceable referenceable)
         {
             if (referenceable.Reference != null && referenceable.Reference.IsExternal)
             {
-                if (referenceable.Reference.HostDocument == null)
+                if (referenceable.Reference.Workspace == null)
                 {
-                    referenceable.Reference.HostDocument = this.currentDocument;
+                    referenceable.Reference.Workspace = this.workspace;
                 }
 
                 this.references.Add(referenceable);

src/LEGO.AsyncAPI/AsyncApiWorkspace.cs

@@ -161,6 +161,12 @@ public bool Contains(string location)
             return this.resolvedReferenceRegistry.ContainsKey(key) || this.artifactsRegistry.ContainsKey(key);
         }
 
+        public T ResolveReference<T>(AsyncApiReference reference)
+            where T : class
+        {
+            return this.ResolveReference<T>(reference.Reference);
+        }
+
         public T ResolveReference<T>(string location)
             where T : class
         {

src/LEGO.AsyncAPI/Models/AsyncApiDocument.cs

@@ -74,8 +74,8 @@ public void SerializeV2(IAsyncApiWriter writer)
             }
 
             this.Workspace.RegisterComponents(this);
+            writer.Workspace = this.Workspace;
 
-            writer.RootDocument = this;
             writer.WriteStartObject();
 
             // asyncApi

src/LEGO.AsyncAPI/Models/AsyncApiReference.cs

@@ -105,7 +105,7 @@ public string ExternalResource
         /// <summary>
         /// Gets or sets the AsyncApiDocument that is hosting the AsyncApiReference instance. This is used to enable dereferencing the reference.
         /// </summary>
-        public AsyncApiDocument HostDocument { get; set; } = null;
+        public AsyncApiWorkspace Workspace { get; set; } = null;
 
         /// <summary>
         /// Gets a flag indicating whether a file is a valid OpenAPI document or a fragment.

src/LEGO.AsyncAPI/Models/References/AsyncApiChannelReference.cs

@@ -14,7 +14,7 @@ private AsyncApiChannel Target
         {
             get
             {
-                this.target ??= this.Reference.HostDocument?.ResolveReference<AsyncApiChannel>(this.Reference);
+                this.target ??= this.Reference.Workspace?.ResolveReference<AsyncApiChannel>(this.Reference.Reference);
                 return this.target;
             }
         }
@@ -51,7 +51,7 @@ public override void SerializeV2(IAsyncApiWriter writer)
             }
             else
             {
-                this.Reference.HostDocument = writer.RootDocument;
+                this.Reference.Workspace = writer.Workspace;
                 this.Target.SerializeV2(writer);
             }
         }

src/LEGO.AsyncAPI/Models/References/AsyncApiCorrelationIdReference.cs

@@ -17,7 +17,7 @@ private AsyncApiCorrelationId Target
         {
             get
             {
-                this.target ??= this.Reference.HostDocument?.ResolveReference<AsyncApiCorrelationId>(this.Reference);
+                this.target ??= this.Reference.Workspace?.ResolveReference<AsyncApiCorrelationId>(this.Reference.Reference);
                 return this.target;
             }
         }
@@ -46,7 +46,7 @@ public override void SerializeV2(IAsyncApiWriter writer)
             }
             else
             {
-                this.Reference.HostDocument = writer.RootDocument;
+                this.Reference.Workspace = writer.Workspace;
                 this.Target.SerializeV2(writer);
             }
         }

src/LEGO.AsyncAPI/Models/References/AsyncApiJsonSchemaReference.cs

@@ -15,7 +15,7 @@ private AsyncApiJsonSchema Target
         {
             get
             {
-                this.target ??= this.Reference.HostDocument?.ResolveReference<AsyncApiJsonSchema>(this.Reference);
+                this.target ??= this.Reference.Workspace?.ResolveReference<AsyncApiJsonSchema>(this.Reference);
                 return this.target;
             }
         }
@@ -304,7 +304,7 @@ public override void SerializeV2(IAsyncApiWriter writer)
                 return;
             }
 
-            this.Reference.HostDocument = writer.RootDocument;
+            this.Reference.Workspace = writer.Workspace;
             // If Loop is detected then just Serialize as a reference.
             if (!settings.LoopDetector.PushLoop(this))
             {

src/LEGO.AsyncAPI/Models/References/AsyncApiMessageReference.cs

@@ -17,7 +17,7 @@ private AsyncApiMessage Target
         {
             get
             {
-                this.target ??= this.Reference.HostDocument?.ResolveReference<AsyncApiMessage>(this.Reference);
+                this.target ??= this.Reference.Workspace?.ResolveReference<AsyncApiMessage>(this.Reference.Reference);
                 return this.target;
             }
         }
@@ -72,7 +72,7 @@ public override void SerializeV2(IAsyncApiWriter writer)
             }
             else
             {
-                this.Reference.HostDocument = writer.RootDocument;
+                this.Reference.Workspace = writer.Workspace;
                 this.Target.SerializeV2(writer);
             }
         }