Refactor JSON value type checks to use GetValueKind for consistency

Author: Carael

src/Confix.Tool/src/Confix.Library/Entities/Component/Configuration/ComponentReferenceConfiguration.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using Confix.Utilities.Json;
 using Confix.Utilities.Parsing;
@@ -48,7 +49,7 @@ public static ComponentReferenceConfiguration Parse(string key, JsonNode node)
                 "The component key must be in the format '@provider/componentName'.");
         }
 
-        if (node.GetSchemaValueType() is SchemaValueType.String)
+        if (node.GetValueKind() is JsonValueKind.String)
         {
             return new ComponentReferenceConfiguration(
                 provider,
@@ -58,7 +59,7 @@ public static ComponentReferenceConfiguration Parse(string key, JsonNode node)
                 null);
         }
 
-        if (node.GetSchemaValueType() is SchemaValueType.Boolean)
+        if (node.GetValueKind() is JsonValueKind.True)
         {
             return new ComponentReferenceConfiguration(
                 provider,
@@ -76,7 +77,7 @@ public static ComponentReferenceConfiguration Parse(string key, JsonNode node)
 
         var mountingPoints =
             obj.TryGetNonNullPropertyValue(FieldNames.MountingPoint, out var mountingPointNode)
-                ? mountingPointNode.GetSchemaValueType() is SchemaValueType.Array
+                ? mountingPointNode.GetValueKind() is JsonValueKind.Array
                     ? mountingPointNode
                         .ExpectArray()
                         .WhereNotNull()

src/Confix.Tool/src/Confix.Library/Entities/Environment/Configuration/EnvironmentConfiguration.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using Confix.Utilities.Json;
 using Json.Schema;
@@ -25,7 +26,7 @@ public EnvironmentConfiguration(
 
     public static EnvironmentConfiguration Parse(JsonNode node)
     {
-        if (node.GetSchemaValueType() is SchemaValueType.String)
+        if (node.GetValueKind() is JsonValueKind.String)
         {
             return new EnvironmentConfiguration(node.ExpectValue<string>(), null);
         }

src/Confix.Tool/src/Confix.Library/Entities/Project/Configuration/ConfigurationFileConfiguration.cs

@@ -24,7 +24,7 @@ public ConfigurationFileConfiguration(string? type, JsonNode value)
 
     public static ConfigurationFileConfiguration Parse(JsonNode node)
     {
-        if (node.GetSchemaValueType() is SchemaValueType.String)
+        if (node.GetValueKind() is JsonValueKind.String)
         {
             // TODO const?
             return new ConfigurationFileConfiguration("inline", node);

src/Confix.Tool/src/Confix.Library/Middlewares/LoadConfiguration/MagicPathRewriter.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using Confix.Tool.Commands.Logging;
 using Confix.Tool.Schema;
@@ -18,9 +19,9 @@ public sealed class MagicPathRewriter : JsonDocumentRewriter<MagicPathContext>
 {
     protected override JsonNode Rewrite(JsonValue value, MagicPathContext context)
     {
-        switch (value.GetSchemaValueType())
+        switch (value.GetValueKind())
         {
-            case SchemaValueType.String when MagicPath.From(value) is { } magicPath:
+            case JsonValueKind.String when MagicPath.From(value) is { } magicPath:
                 var replacedValue = magicPath.Replace(context);
 
                 App.Log.ReplacedMagicPath((string?) value, replacedValue);

src/Confix.Tool/src/Confix.Library/Pipelines/Reporting/Dependency/Regex/RegexDependencyProvider.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.RegularExpressions;
 using Json.More;
@@ -30,7 +31,7 @@ public RegexDependencyProvider(RegexDependencyProviderDefinition definition)
 
     public void Analyze(DependencyAnalyzerContext context, JsonNode node)
     {
-        if (node.GetSchemaValueType() is not SchemaValueType.String)
+        if (node.GetValueKind() is not JsonValueKind.String)
         {
             return;
         }

src/Confix.Tool/src/Confix.Library/Pipelines/Reporting/Dependency/ReportingDependencyConfiguration.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using Confix.Utilities.Json;
 using Json.Schema;
@@ -60,7 +61,7 @@ file static class Extensions
 
         if (!configuration.Configuration.TryGetPropertyValue("Kind", out var kind) ||
             kind is not JsonValue value ||
-            value.GetSchemaValueType() is not SchemaValueType.String)
+            value.GetValueKind() is not JsonValueKind.String)
         {
             return null;
         }

src/Confix.Tool/src/Confix.Library/Utilities/Json/JsonNodeExtensions.cs

@@ -43,8 +43,8 @@ public static bool TryGetNonNullPropertyValue(
             (_, JsonValue nodeValue) => nodeValue,
             _ => throw new InvalidOperationException($"""
                     Cannot merge nodes of different types:
-                    Source: {source.GetSchemaValueType()}
-                    Node: {node.GetSchemaValueType()}
+                    Source: {source.GetValueKind()}
+                    Node: {node.GetValueKind()}
                 """)
         };
 

src/Confix.Tool/src/Confix.Library/Utilities/Json/PrefixJsonNamesRewriter.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using Json.More;
 using Json.Schema;
@@ -28,7 +29,7 @@ protected override JsonNode Rewrite(JsonObject obj, PrefixJsonNamesContext conte
 
             if (field is RefKeyword.Name &&
                 value is JsonValue refValue &&
-                refValue.GetSchemaValueType() is SchemaValueType.String)
+                refValue.GetValueKind() is JsonValueKind.String)
             {
                 var parts = refValue.GetValue<object>().ToString()!.Split("/");
                 parts[^1] = $"{prefix}{parts[^1]}";

src/Confix.Tool/src/Confix.Library/Variables/JsonVariableRewriter.cs

@@ -10,9 +10,9 @@ namespace Confix.Variables;
 public sealed class JsonVariableRewriter : JsonDocumentRewriter<JsonVariableRewriterContext>
 {
     protected override JsonNode Rewrite(JsonValue value, JsonVariableRewriterContext context)
-        => value.GetSchemaValueType() switch
+        => value.GetValueKind() switch
         {
-            SchemaValueType.String => RewriteVariable((string) value!, context),
+            JsonValueKind.String => RewriteVariable((string) value!, context),
             _ => value.Deserialize<JsonNode>()!
         };
 

src/Confix.Tool/src/Confix.Library/Variables/Providers/AzureKeyVault/AzureKeyVaultProvider.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using Azure.Identity;
 using Azure.Security.KeyVault.Secrets;
@@ -64,7 +65,7 @@ public Task<IReadOnlyDictionary<string, JsonNode>> ResolveManyAsync(
     public Task<string> SetAsync(string path, JsonNode value, IVariableProviderContext context)
         => KeyVaultExtension.HandleKeyVaultException(async () =>
         {
-            if (value.GetSchemaValueType() != SchemaValueType.String)
+            if (value.GetValueKind() != JsonValueKind.String)
             {
                 throw new NotSupportedException("KeyVault only supports String secrets");
             }