UserToolchain: Unify handling of confg.json and provided-libraries.json

Author: xedin

Sources/PackageModel/UserToolchain.swift

@@ -533,40 +533,25 @@ public final class UserToolchain: Toolchain {
         if let customInstalledSwiftPMConfiguration {
             self.installedSwiftPMConfiguration = customInstalledSwiftPMConfiguration
         } else {
-            let path = self.swiftCompilerPath.parentDirectory.parentDirectory.appending(components: ["share", "pm", "config.json"])
-            if localFileSystem.exists(path) {
-                self.installedSwiftPMConfiguration = try JSONDecoder.makeWithDefaults().decode(path: path, fileSystem: localFileSystem, as: InstalledSwiftPMConfiguration.self)
-            } else {
-                // We *could* eventually make this an error, but not for a few releases.
-                self.installedSwiftPMConfiguration = InstalledSwiftPMConfiguration.default
-            }
+            let path = swiftCompilerPath.parentDirectory.parentDirectory.appending(components: [
+                "share", "pm", "config.json",
+            ])
+            self.installedSwiftPMConfiguration = try Self.loadJSONResource(
+                config: path,
+                type: InstalledSwiftPMConfiguration.self,
+                default: InstalledSwiftPMConfiguration.default)
         }
 
         if let customProvidedLibraries {
             self.providedLibraries = customProvidedLibraries
         } else {
-            // When building with CMake or `swift build --build-system xcode`, we need to skip resource support.
-            #if SKIP_RESOURCE_SUPPORT
-            let path = self.swiftCompilerPath.parentDirectory.parentDirectory.appending(components: ["share", "pm", "provided-libraries.json"])
-            #else
-            let path: AbsolutePath
-            if let developmentPath = Bundle.module.path(forResource: "provided-libraries", ofType: "json") {
-                // During development, we should be able to find the metadata file using `Bundle.module`.
-                path = try AbsolutePath(validating: developmentPath)
-            } else {
-                // When deployed, we can find the metadata file in the toolchain.
-                path = self.swiftCompilerPath.parentDirectory.parentDirectory.appending(components: ["share", "pm", "provided-libraries.json"])
-            }
-            #endif
-            if localFileSystem.exists(path) {
-                self.providedLibraries = try JSONDecoder.makeWithDefaults().decode(
-                    path: path,
-                    fileSystem: localFileSystem,
-                    as: [LibraryMetadata].self
-                )
-            } else {
-                self.providedLibraries = []
-            }
+            let path = swiftCompilerPath.parentDirectory.parentDirectory.appending(components: [
+                "share", "pm", "provided-libraries.json",
+            ])
+            self.providedLibraries = try Self.loadJSONResource(
+                config: path,
+                type: [LibraryMetadata].self,
+                default: [])
         }
 
         // Use the triple from Swift SDK or compute the host triple using swiftc.
@@ -895,4 +880,19 @@ public final class UserToolchain: Toolchain {
             }
         }
     }
+
+    private static func loadJSONResource<T: Decodable>(
+        config: AbsolutePath, type: T.Type, `default`: T
+    )
+        throws -> T
+    {
+        if localFileSystem.exists(config) {
+            return try JSONDecoder.makeWithDefaults().decode(
+                path: config,
+                fileSystem: localFileSystem,
+                as: type)
+        }
+
+        return `default`
+    }
 }