feat: support json5 config format

I love comments in json, this is going to be awesome
iloveitaly · May 19, 2023 · 7add980 · 7add980
1 parent 3dd5a4b
commit 7add980
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Package.swift b/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "hyper-focus",
     platforms: [
-        .macOS(.v10_15),
+        .macOS(.v12),
     ],
     dependencies: [
         .package(url: "https://github.com/envoy/Ambassador", from: "4.0.0"),

diff --git a/Sources/hyper-focus/configuration_loader.swift b/Sources/hyper-focus/configuration_loader.swift
@@ -21,7 +21,13 @@ enum ConfigurationLoader {
         debug("Loading configuration from \(configPath!.absoluteString)")
 
         let configData = try! Data(contentsOf: configPath!)
-        let config = try! JSONDecoder().decode(Configuration.self, from: configData)
+
+        // neat! Apple supports JSON5, which allows for comments
+        // https://developer.apple.com/documentation/foundation/jsondecoder/3766916-allowsjson5
+        let decoder = JSONDecoder()
+        decoder.allowsJSON5 = true
+
+        let config = try! decoder.decode(Configuration.self, from: configData)
 
         return config
     }