Added HOCON and XML (broken in Scala.js, see scala/scala-xml#198) support.

Author: darkfrog26

README.md

@@ -24,15 +24,23 @@ developer and let them get their job done. To this end we support a unified conf
 environment variables, system properties, and configuration files to provide maximum flexibility of defining, defaulting,
 and overriding configuration in your application.
 
+# File Formats
+
+* JSON (automatically picked up from config.json, configuration.json, app.json, application.json, and defaults.json)
+* Properties (automatically picked up from config.properties, configuration.properties, app.properties, application.properties, and defaults.properties)
+* YAML (automatically picked up from config.yml, config.yaml, configuration.yml, configuration.yaml, app.yml, app.yaml, application.yml, application.yaml, defaults.yml, defaults.yaml)
+* HOCON (automatically picked up from config.hocon, configuration.hocon, app.hocon, application.hocon, and defaults.hocon)
+* XML (automatically picked up from config.xml, configuration.xml, app.xml, application.xml, and defaults.xml)
+
 # Setup
 
 ## SBT Configuration
 
 Profig is published to Sonatype OSS and synchronized to Maven Central supporting JVM and Scala.js on 2.11 and 2.12:
 
 ```
-libraryDependencies += "com.outr" %% "profig" % "2.1.1"   // Scala
-libraryDependencies += "com.outr" %%% "profig" % "2.1.1"  // Scala.js / Cross-Build
+libraryDependencies += "com.outr" %% "profig" % "2.2.0"   // Scala
+libraryDependencies += "com.outr" %%% "profig" % "2.2.0"  // Scala.js / Cross-Build
 ```
 
 ## Getting Started
@@ -105,7 +113,9 @@ ScalaDocs and the specs: https://github.com/outr/profig/blob/master/core/shared/
 ## 2.2.0 (In-Progress)
 
 * [ ] Better README documentation
-* [ ] HOCON support (integrate https://github.com/unicredit/shocon)
+* [X] HOCON support (integrate https://github.com/akka-js/shocon)
+* [ ] XML support
+* [X] Resolve explicit work-arounds for use in Macros
 
 ## 2.1.0 (Released 03.08.2018)
 

build.sbt

@@ -1,7 +1,7 @@
 import sbtcrossproject.{CrossType, crossProject}
 
 organization in ThisBuild := "com.outr"
-version in ThisBuild := "2.1.2-SNAPSHOT"
+version in ThisBuild := "2.2.0-SNAPSHOT"
 scalaVersion in ThisBuild := "2.12.4"
 crossScalaVersions in ThisBuild := List("2.12.4", "2.11.12")
 scalacOptions in ThisBuild ++= Seq("-unchecked", "-deprecation")
@@ -24,6 +24,8 @@ developers in ThisBuild := List(
 
 val circeVersion = "0.9.1"
 val circeYamlVersion = "0.7.0"
+val shoconVersion = "0.2.0"
+val scalaXMLVersion = "1.1.0"
 val scalatestVersion = "3.0.4"
 
 lazy val root = project.in(file("."))
@@ -52,13 +54,15 @@ lazy val macros = crossProject(JSPlatform, JVMPlatform)
       "io.circe" %%% "circe-generic-extras"
     ).map(_ % circeVersion),
     libraryDependencies ++= Seq(
+      "org.akka-js" %%% "shocon" % shoconVersion,
+      "org.scala-lang.modules" %%% "scala-xml" % scalaXMLVersion,
       "io.circe" %% "circe-jawn" % circeVersion,
       "io.circe" %% "circe-yaml" % circeYamlVersion,
       "org.scala-lang" % "scala-reflect" % scalaVersion.value
     )
   )
   .jsSettings(
-    manipulateBytecode in Compile := {
+    manipulateBytecode in Compile := {    // Allows access to Json parsing at compile-time (for use with Macros)
       val result = (manipulateBytecode in Compile).value
 
       val classDir = (classDirectory in Compile).value

config.hocon

@@ -0,0 +1 @@
+test.hocon = "yes"

config.xml

@@ -0,0 +1,3 @@
+<test>
+    <xml>yes</xml>
+</test>

core/shared/src/test/scala/spec/ProfigSpec.scala

@@ -90,6 +90,12 @@ class ProfigSpec extends WordSpec with Matchers {
     "verify YAML support works" in {
       Profig("test.yaml").as[Option[String]] should be(Some("yes"))
     }
+    "verify HOCON support works" in {
+      Profig("test.hocon").as[Option[String]] should be(Some("yes"))
+    }
+    "verify XML support works" in {
+      Profig("test.xml").as[Option[String]] should be(Some("yes"))
+    }
     "compile-time Json parsing" in {
       val parsed = MacroTest.format("""{"name": "John Doe", "age": 1234}""")
       parsed should be("""{

macros/shared/src/main/scala/profig/ConfigurationFileType.scala

@@ -7,4 +7,6 @@ object ConfigurationFileType {
   case object Json extends ConfigurationFileType
   case object Properties extends ConfigurationFileType
   case object Yaml extends ConfigurationFileType
+  case object Hocon extends ConfigurationFileType
+  case object XML extends ConfigurationFileType
 }

macros/shared/src/main/scala/profig/ConfigurationPath.scala

@@ -18,24 +18,40 @@ object ConfigurationPath {
     ConfigurationPath("config.properties", ConfigurationFileType.Properties, LoadType.Merge),
     ConfigurationPath("config.yml", ConfigurationFileType.Yaml, LoadType.Merge),
     ConfigurationPath("config.yaml", ConfigurationFileType.Yaml, LoadType.Merge),
+    ConfigurationPath("config.hocon", ConfigurationFileType.Hocon, LoadType.Merge),
+    ConfigurationPath("config.xml", ConfigurationFileType.XML, LoadType.Merge),
 
     ConfigurationPath("configuration.json", ConfigurationFileType.Json, LoadType.Merge),
     ConfigurationPath("configuration.conf", ConfigurationFileType.Auto, LoadType.Merge),
     ConfigurationPath("configuration.properties", ConfigurationFileType.Properties, LoadType.Merge),
     ConfigurationPath("configuration.yml", ConfigurationFileType.Yaml, LoadType.Merge),
     ConfigurationPath("configuration.yaml", ConfigurationFileType.Yaml, LoadType.Merge),
+    ConfigurationPath("configuration.hocon", ConfigurationFileType.Hocon, LoadType.Merge),
+    ConfigurationPath("configuration.xml", ConfigurationFileType.XML, LoadType.Merge),
+
+    ConfigurationPath("app.json", ConfigurationFileType.Json, LoadType.Merge),
+    ConfigurationPath("app.conf", ConfigurationFileType.Auto, LoadType.Merge),
+    ConfigurationPath("app.properties", ConfigurationFileType.Properties, LoadType.Merge),
+    ConfigurationPath("app.yml", ConfigurationFileType.Yaml, LoadType.Merge),
+    ConfigurationPath("app.yaml", ConfigurationFileType.Yaml, LoadType.Merge),
+    ConfigurationPath("app.hocon", ConfigurationFileType.Hocon, LoadType.Merge),
+    ConfigurationPath("app.xml", ConfigurationFileType.XML, LoadType.Merge),
 
     ConfigurationPath("application.json", ConfigurationFileType.Json, LoadType.Merge),
     ConfigurationPath("application.conf", ConfigurationFileType.Auto, LoadType.Merge),
     ConfigurationPath("application.properties", ConfigurationFileType.Properties, LoadType.Merge),
     ConfigurationPath("application.yml", ConfigurationFileType.Yaml, LoadType.Merge),
     ConfigurationPath("application.yaml", ConfigurationFileType.Yaml, LoadType.Merge),
+    ConfigurationPath("application.hocon", ConfigurationFileType.Hocon, LoadType.Merge),
+    ConfigurationPath("application.xml", ConfigurationFileType.XML, LoadType.Merge),
 
     ConfigurationPath("defaults.json", ConfigurationFileType.Json, LoadType.Defaults),
     ConfigurationPath("defaults.conf", ConfigurationFileType.Auto, LoadType.Defaults),
     ConfigurationPath("defaults.properties", ConfigurationFileType.Properties, LoadType.Defaults),
     ConfigurationPath("defaults.yml", ConfigurationFileType.Yaml, LoadType.Defaults),
-    ConfigurationPath("defaults.yaml", ConfigurationFileType.Yaml, LoadType.Defaults)
+    ConfigurationPath("defaults.yaml", ConfigurationFileType.Yaml, LoadType.Defaults),
+    ConfigurationPath("defaults.hocon", ConfigurationFileType.Hocon, LoadType.Defaults),
+    ConfigurationPath("defaults.xml", ConfigurationFileType.XML, LoadType.Defaults)
   )
 
   def toStrings(entries: List[ConfigurationPath] = defaults): List[(ConfigurationPath, String)] = if (entries.isEmpty) {
@@ -128,10 +144,57 @@ object ConfigurationPath {
     case Right(value) => value
   }
 
+  def hoconString2Json(string: String): Json = {
+    import eu.unicredit.shocon._
+
+    def toJson(value: Config.Value): Json = value match {
+      case Config.Array(elements) => Json.arr(elements.map(toJson): _*)
+      case Config.Object(fields) => Json.obj(fields.map {
+        case (k, v) => k -> toJson(v)
+      }.toSeq: _*)
+      case Config.NumberLiteral(v) => Json.fromDouble(v.toDouble).getOrElse(throw new RuntimeException(s"Unable to convert $v to JsonNumber"))
+      case Config.StringLiteral(v) => Json.fromString(v)
+      case Config.BooleanLiteral(v) => Json.fromBoolean(v)
+      case Config.NullLiteral => Json.Null
+      case _ => throw new UnsupportedOperationException(s"Unsupported HOCON value: $value")
+    }
+
+    toJson(Config(string))
+  }
+
+  def xmlString2Json(string: String): Json = {
+    import scala.xml._
+
+    def toJson(node: Node): Option[Json] = node match {
+      case elem: Elem => {
+        val attributes: List[(String, Json)] = elem.attributes.map(md => toJson(md.value.head).map(md.key -> _)).toList.flatten
+        val children = elem.child.toList.collect {
+          case child: Elem => toJson(child).map(child.label -> _)
+        }.flatten
+        val text = elem.text.trim
+        if (attributes.isEmpty && children.isEmpty) {
+          if (text.isEmpty) {
+            None
+          } else {
+            Some(Json.fromString(text))
+          }
+        } else {
+          Some(Json.obj(attributes ::: children: _*))
+        }
+      }
+      case _ => None
+    }
+
+    val root = XML.loadString(string)
+    Json.obj(root.label -> toJson(root).getOrElse(Json.Null))
+  }
+
   def toJson(string: String, `type`: ConfigurationFileType): Json = `type` match {
     case ConfigurationFileType.Json => jsonString2Json(string)
     case ConfigurationFileType.Properties => propertiesString2Json(string)
     case ConfigurationFileType.Yaml => yamlConversion.map(c => c(string)).getOrElse(throw new RuntimeException(s"YAML conversion not supported."))
+    case ConfigurationFileType.Hocon => hoconString2Json(string)
+    case ConfigurationFileType.XML => xmlString2Json(string)
     case ConfigurationFileType.Auto => if (string.trim.startsWith("{")) {
       jsonString2Json(string)
     } else {