Make the json mode toggleable

hocon-compiler/src/Compiler.scala

@@ -24,6 +24,7 @@ object Compiler {
     val allowMissing = opt[Boolean](default = Some(false))
     val includeComments = toggle("comments", default = Some(true), noshort = true)
     val doResolve = toggle("resolve", default = Some(true), noshort = true)
+    val json = toggle("json", default = Some(false), noshort = true)
     val src = trailArg[File]()
 
     verify()
@@ -50,6 +51,7 @@ object Compiler {
       val renderOptions = ConfigRenderOptions
         .defaults()
         .setOriginComments(false)
+        .setJson(opts.json())
         .setComments(opts.includeComments())
 
       writeConfig(finalConfig, renderOptions, opts.output(), opts.header())

rules/hocon.bzl

@@ -41,6 +41,9 @@ def _hocon_library_impl(ctx):
     if not ctx.attr.resolve:
         args.add("--noresolve")
 
+    if ctx.attr.json:
+        args.add("--json")
+
     args.add_all("-D", ctx.attr.optional_includes, omit_if_empty = True, uniquify = True)
 
     if ctx.attr.warnings:
@@ -113,6 +116,11 @@ hocon_library = rule(
             doc = "If true, the output will resolve any references where possible, so that the only remaining references are to values that will be supplied at runtime.",
             default = True,
         ),
+        "json": attr.bool(
+            doc = """If true, then output in  a json-like format.
+            Note that it may include comments and references that aren't actually valid JSON""",
+            default = False,
+        ),
         "_hocon_compiler": attr.label(
             executable = True,
             cfg = "host",

tests/general/expected.conf

@@ -1,46 +1,44 @@
 # Resolved configuration
 
-{
-    "base-conf" : {
-        "overwrite" : "Overwrote the base config here",
-        "strings" : {
-            "a" : "a",
-            "b" : "b"
-        },
-        "up-ref" : {
-            "foobar" : "foobar",
-            "n" : null
+base-conf {
+    overwrite="Overwrote the base config here"
+    strings {
+        a=a
+        b=b
+    }
+    up-ref {
+        foobar=foobar
+        n=null
+    }
+}
+test-conf {
+    bool=true
+    env-ref=something-from-${env.key}
+    from-env=${env.key}
+    num=500
+    obj {
+        bar=bar
+        foo=foo
+        num=10
+        obj2 {
+            foobar=foobar
+            n=null
+        }
+    }
+    overwrite="overwritten!"
+    ref=a
+    strings {
+        one {
+            a=a
+            b=b
+            c=c
+        }
+        two {
+            x=x
+            y=y
+            z=z
         }
-    },
-    "test-conf" : {
-        "bool" : true,
-        "env-ref" : "something-from-"${env.key},
-        "from-env" : ${env.key},
-        "num" : 500,
-        "obj" : {
-            "bar" : "bar",
-            "foo" : "foo",
-            "num" : 10,
-            "obj2" : {
-                "foobar" : "foobar",
-                "n" : null
-            }
-        },
-        "overwrite" : "overwritten!",
-        "ref" : "a",
-        "strings" : {
-            "one" : {
-                "a" : "a",
-                "b" : "b",
-                "c" : "c"
-            },
-            "two" : {
-                "x" : "x",
-                "y" : "y",
-                "z" : "z"
-            }
-        },
-        "subref" : "prefix-b",
-        "undef" : null
     }
+    subref=prefix-b
+    undef=null
 }

tests/optional_includes/test.sh

@@ -9,7 +9,7 @@ if [[ $? -ne 0 ]]; then echo "$out"; exit 1; fi
 
 # Verify 3.conf was included
 config_path="bazel-bin/tests/optional_includes/good.conf"
-cat "$config_path" | grep -oq '"some-config" *: *"hello"'
+cat "$config_path" | grep -oq 'some-config=hello'
 if [[ $? -ne 0 ]]; then echo "Malformed config: "; cat "$config_path"; exit 1; fi
 
 out=$(! bazel build //tests/optional_includes:bad 2>&1)