Split lang config from generator config

8 files changed, 134 insertions, 88 deletions

diff --git a/examples/01-struct/hobgoblin.json5 b/examples/01-struct/hobgoblin.json5
index 4e7dfaa..19e0f93 100644
--- a/examples/01-struct/hobgoblin.json5
+++ b/examples/01-struct/hobgoblin.json5
@@ -1,19 +1,23 @@
 {
-  outputs: [
-    {
-      generator: "java-types",
-      path: "output/java/src/gen/java",
-      packageName: "org.zwobble.example.types"
+  outputs: {
+    langs: {
+      java: {
+        packageName: "org.zwobble.example.types",
+      },
     },
-    // TODO: remove duplication between configs
-    {
-      generator: "java-precisely-matchers",
-      path: "output/java/src/gen/java",
-      packageName: "org.zwobble.example.types",
-    },
-    {
-      generator: "rust-types",
-      path: "output/rust/src",
-    },
-  ],
+    generators: [
+      {
+        generator: "java-types",
+        path: "output/java/src/gen/java",
+      },
+      {
+        generator: "java-precisely-matchers",
+        path: "output/java/src/gen/java",
+      },
+      {
+        generator: "rust-types",
+        path: "output/rust/src",
+      },
+    ],
+  }
 }
diff --git a/examples/02-sum/hobgoblin.json5 b/examples/02-sum/hobgoblin.json5
index 2bf59c3..12713d4 100644
--- a/examples/02-sum/hobgoblin.json5
+++ b/examples/02-sum/hobgoblin.json5
@@ -1,13 +1,19 @@
 {
-  outputs: [
-    {
-      generator: "java-types",
-      path: "output/java/src/gen/java",
-      packageName: "org.zwobble.example.types"
+  outputs: {
+    langs: {
+      java: {
+        packageName: "org.zwobble.example.types",
+      },
     },
-    {
-      generator: "rust-types",
-      path: "output/rust/src",
-    },
-  ],
+    generators: [
+      {
+        generator: "java-types",
+        path: "output/java/src/gen/java",
+      },
+      {
+        generator: "rust-types",
+        path: "output/rust/src",
+      },
+    ],
+  },
 }
diff --git a/examples/03-list/hobgoblin.json5 b/examples/03-list/hobgoblin.json5
index 2bf59c3..12713d4 100644
--- a/examples/03-list/hobgoblin.json5
+++ b/examples/03-list/hobgoblin.json5
@@ -1,13 +1,19 @@
 {
-  outputs: [
-    {
-      generator: "java-types",
-      path: "output/java/src/gen/java",
-      packageName: "org.zwobble.example.types"
+  outputs: {
+    langs: {
+      java: {
+        packageName: "org.zwobble.example.types",
+      },
     },
-    {
-      generator: "rust-types",
-      path: "output/rust/src",
-    },
-  ],
+    generators: [
+      {
+        generator: "java-types",
+        path: "output/java/src/gen/java",
+      },
+      {
+        generator: "rust-types",
+        path: "output/rust/src",
+      },
+    ],
+  },
 }
diff --git a/examples/04-native-type/hobgoblin.json5 b/examples/04-native-type/hobgoblin.json5
index 8f92e51..a0f60c3 100644
--- a/examples/04-native-type/hobgoblin.json5
+++ b/examples/04-native-type/hobgoblin.json5
@@ -1,13 +1,19 @@
 {
-  outputs: [
-    {
-      generator: "java-types",
-      path: "output/java/src/gen/java",
-      packageName: "org.zwobble.example.types",
+  outputs: {
+    langs: {
+      java: {
+        packageName: "org.zwobble.example.types",
+      },
     },
-    {
-      generator: "rust-types",
-      path: "output/rust/src/gen",
-    },
-  ],
+    generators: [
+      {
+        generator: "java-types",
+        path: "output/java/src/gen/java",
+      },
+      {
+        generator: "rust-types",
+        path: "output/rust/src/gen",
+      },
+    ],
+  },
 }
diff --git a/examples/05-native-type-custom-config/hobgoblin.json5 b/examples/05-native-type-custom-config/hobgoblin.json5
index 89048ac..1c92a49 100644
--- a/examples/05-native-type-custom-config/hobgoblin.json5
+++ b/examples/05-native-type-custom-config/hobgoblin.json5
@@ -1,15 +1,21 @@
 {
-  outputs: [
-    {
-      generator: "java-types",
-      path: "output/java/src/gen/java",
-      packageName: "org.zwobble.example.types",
-      nativeTypes: [
-        {
-          hobgoblin: "point.Point",
-          java: "org.zwobble.example.Point",
-        }
-      ]
+  outputs: {
+    langs: {
+      java: {
+        packageName: "org.zwobble.example.types",
+        nativeTypes: [
+          {
+            hobgoblin: "point.Point",
+            java: "org.zwobble.example.Point",
+          },
+        ],
+      },
     },
-  ],
+    generators: [
+      {
+        generator: "java-types",
+        path: "output/java/src/gen/java",
+      },
+    ],
+  },
 }
diff --git a/examples/06-custom-code/hobgoblin.json5 b/examples/06-custom-code/hobgoblin.json5
index d599806..1d08a40 100644
--- a/examples/06-custom-code/hobgoblin.json5
+++ b/examples/06-custom-code/hobgoblin.json5
@@ -1,13 +1,19 @@
 {
-  outputs: [
-    {
-      generator: "java-types",
-      path: "output/java/src/main/java",
-      packageName: "org.zwobble.example.types"
+  outputs: {
+    langs: {
+      java: {
+        packageName: "org.zwobble.example.types",
+      },
     },
-    {
-      generator: "rust-types",
-      path: "output/rust/src/gen",
-    },
-  ],
+    generators: [
+      {
+        generator: "java-types",
+        path: "output/java/src/main/java",
+      },
+      {
+        generator: "rust-types",
+        path: "output/rust/src/gen",
+      },
+    ],
+  },
 }
diff --git a/examples/07-imports/hobgoblin.json5 b/examples/07-imports/hobgoblin.json5
index 2bf59c3..12713d4 100644
--- a/examples/07-imports/hobgoblin.json5
+++ b/examples/07-imports/hobgoblin.json5
@@ -1,13 +1,19 @@
 {
-  outputs: [
-    {
-      generator: "java-types",
-      path: "output/java/src/gen/java",
-      packageName: "org.zwobble.example.types"
+  outputs: {
+    langs: {
+      java: {
+        packageName: "org.zwobble.example.types",
+      },
     },
-    {
-      generator: "rust-types",
-      path: "output/rust/src",
-    },
-  ],
+    generators: [
+      {
+        generator: "java-types",
+        path: "output/java/src/gen/java",
+      },
+      {
+        generator: "rust-types",
+        path: "output/rust/src",
+      },
+    ],
+  },
 }
diff --git a/examples/08-enum/hobgoblin.json5 b/examples/08-enum/hobgoblin.json5
index 2bf59c3..12713d4 100644
--- a/examples/08-enum/hobgoblin.json5
+++ b/examples/08-enum/hobgoblin.json5
@@ -1,13 +1,19 @@
 {
-  outputs: [
-    {
-      generator: "java-types",
-      path: "output/java/src/gen/java",
-      packageName: "org.zwobble.example.types"
+  outputs: {
+    langs: {
+      java: {
+        packageName: "org.zwobble.example.types",
+      },
     },
-    {
-      generator: "rust-types",
-      path: "output/rust/src",
-    },
-  ],
+    generators: [
+      {
+        generator: "java-types",
+        path: "output/java/src/gen/java",
+      },
+      {
+        generator: "rust-types",
+        path: "output/rust/src",
+      },
+    ],
+  },
 }