[Fusion] ComposeCommand: Store source schema configurations in package (#8613)

Author: tobias-tengler

src/HotChocolate/Fusion-vnext/src/Fusion.CommandLine/Commands/ComposeCommand.cs

@@ -438,44 +438,33 @@ public static async Task<CompositionResult<MutableSchemaDefinition>> ComposeAsyn
     {
         environment ??= Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Development";
 
-        var sourceSchemas = await ReadSourceSchemasAsync(sourceSchemaFiles, cancellationToken);
-        var schemaNames = new SortedSet<string>(StringComparer.Ordinal);
-
-        await UpdateArchiveMetadata(archive, schemaNames, cancellationToken);
+        var sourceSchemas = await ReadSourceSchemasAsync(
+            sourceSchemaFiles,
+            cancellationToken);
 
-        using var bufferWriter = new PooledArrayWriter();
+        var sourceSchemaNamesInPackage = new SortedSet<string>(
+            await archive.GetSourceSchemaNamesAsync(cancellationToken),
+            StringComparer.Ordinal);
 
-        foreach (var schemaName in schemaNames)
+        foreach (var schemaName in sourceSchemaNamesInPackage)
         {
-            if (!sourceSchemas.ContainsKey(schemaName))
+            if (sourceSchemas.ContainsKey(schemaName))
             {
-                var sourceSchemaConfiguration =
-                    await archive.TryGetSourceSchemaConfigurationAsync(
-                        schemaName,
-                        cancellationToken);
+                // We have a new configuration for the schema, so we'll take that
+                // instead of the one in the gateway package.
+                continue;
+            }
 
-                if (sourceSchemaConfiguration is null)
-                {
-                    continue;
-                }
+            var configuration = await archive.TryGetSourceSchemaConfigurationAsync(schemaName, cancellationToken);
 
-                bufferWriter.Reset();
+            if (configuration is null)
+            {
+                continue;
+            }
 
-                await using (var stream = await sourceSchemaConfiguration.OpenReadSchemaAsync(cancellationToken))
-                {
-                    int read;
+            var sourceText = await ReadSchemaSourceTextAsync(configuration, cancellationToken);
 
-                    do
-                    {
-                        var memory = bufferWriter.GetMemory(4096);
-                        read = await stream.ReadAsync(memory, cancellationToken);
-                        bufferWriter.Advance(read);
-                    } while (read > 0);
-                }
-
-                var sourceText = new SourceSchemaText(schemaName, Encoding.UTF8.GetString(bufferWriter.WrittenSpan));
-                sourceSchemas[schemaName] = (sourceText, sourceSchemaConfiguration.Settings);
-            }
+            sourceSchemas[schemaName] = (new SourceSchemaText(schemaName, sourceText), configuration.Settings);
         }
 
         var schemaComposerOptions = new SchemaComposerOptions
@@ -495,12 +484,29 @@ await archive.TryGetSourceSchemaConfigurationAsync(
             return result;
         }
 
-        bufferWriter.Reset();
+        using var bufferWriter = new PooledArrayWriter();
         new SettingsComposer().Compose(
             bufferWriter,
             sourceSchemas.Values.Select(t => t.Item2.RootElement).ToArray(),
             environment);
 
+        var metadata = new ArchiveMetadata
+        {
+            SupportedGatewayFormats = [new Version(2, 0, 0)],
+            SourceSchemas = [..sourceSchemas.Keys]
+        };
+
+        await archive.SetArchiveMetadataAsync(metadata, cancellationToken);
+
+        foreach (var (schemaName, (schema, settings)) in sourceSchemas)
+        {
+            await archive.SetSourceSchemaConfigurationAsync(
+                schemaName,
+                Encoding.UTF8.GetBytes(schema.SourceText),
+                settings,
+                cancellationToken);
+        }
+
         await archive.SetGatewayConfigurationAsync(
             result.Value + Environment.NewLine,
             JsonDocument.Parse(bufferWriter.WrittenMemory),
@@ -512,30 +518,6 @@ await archive.SetGatewayConfigurationAsync(
         return result;
     }
 
-    private static async Task UpdateArchiveMetadata(
-        FusionArchive archive,
-        SortedSet<string> sourceSchemaNames,
-        CancellationToken cancellationToken)
-    {
-        var metadata = await archive.GetArchiveMetadataAsync(cancellationToken);
-
-        if (metadata is not null)
-        {
-            foreach (var schemaName in metadata.SourceSchemas)
-            {
-                sourceSchemaNames.Add(schemaName);
-            }
-        }
-
-        metadata = new ArchiveMetadata
-        {
-            SupportedGatewayFormats = [new Version(2, 0, 0)],
-            SourceSchemas = [.. sourceSchemaNames]
-        };
-
-        await archive.SetArchiveMetadataAsync(metadata, cancellationToken);
-    }
-
     public static void WriteCompositionLog(
         CompositionLog compositionLog,
         IStandardStreamWriter writer,
@@ -640,6 +622,15 @@ static async Task ReadSourceSchemaAsync(
         }
     }
 
+    private static async Task<string> ReadSchemaSourceTextAsync(
+        SourceSchemaConfiguration configuration,
+        CancellationToken cancellationToken)
+    {
+        await using var stream = await configuration.OpenReadSchemaAsync(cancellationToken);
+        using var reader = new StreamReader(stream, Encoding.UTF8);
+        return await reader.ReadToEndAsync(cancellationToken);
+    }
+
     /// <summary>
     /// Since we're prefixing the message with an emoji and space before printing,
     /// we need to also indent each line of a multiline message by three spaces to fix the alignment.