Disable omitempty

pkg/generator/config.go

@@ -16,6 +16,11 @@ type Config struct {
 	OnlyModels          bool
 	MinSizedInts        bool
 	Loader              schemas.Loader
+	// When DisableOmitempty is set to true,
+	// an "omitempty" tag will never be present in generated struct fields.
+	// When DisableOmitempty is set to false,
+	// an "omitempty" tag will be present for ann fields that are not required.
+	DisableOmitempty bool
 }
 
 type SchemaMapping struct {

pkg/generator/generate.go

@@ -218,3 +218,7 @@ func (g *Generator) makeEnumConstantName(typeName, value string) string {
 
 	return typeName + g.caser.Identifierize(value)
 }
+
+func (g *Generator) DisableOmitempty() bool {
+	return g.config.DisableOmitempty
+}

pkg/generator/schema_generator.go

@@ -535,7 +535,7 @@ func (g *schemaGenerator) generateStructType(
 
 		tags := ""
 
-		if isRequired {
+		if isRequired || g.DisableOmitempty() {
 			for _, tag := range g.config.Tags {
 				tags += fmt.Sprintf(`%s:"%s" `, tag, name)
 			}

tests/data/disableOmitempty/omitempty.json

@@ -0,0 +1,10 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "id": "https://example.com/imported",
+    "type": "object",
+    "properties": {
+        "importedString": {
+            "type": "string"
+        }
+    }
+}

tests/generation_test.go

@@ -36,6 +36,15 @@ func TestCore(t *testing.T) {
 	testExamples(t, basicConfig, "./data/core")
 }
 
+func TestOmitempty(t *testing.T) {
+	t.Parallel()
+
+	cfg := basicConfig
+	cfg.DisableOmitempty = true
+
+	testExamples(t, cfg, "./data/disableOmitempty")
+}
+
 func TestValidation(t *testing.T) {
 	t.Parallel()
 
@@ -243,7 +252,9 @@ func testExampleFile(t *testing.T, cfg generator.Config, fileName string) {
 			}
 
 			if diff, ok := diffStrings(t, string(goldenData), string(source)); !ok {
-				t.Fatalf("Contents different (left is expected, right is actual):\n%s", *diff)
+				// TODO: Revert this later
+				// t.Fatalf("Contents different (left is expected, right is actual):\n%s", *diff)
+				t.Fatalf("Contents different. Actual:\n%s\nDiff:\n%s", string(source), *diff)
 			}
 		}
 	})