Merge pull request #310 from tdakkota/fix/variants-naming

fix(gen): null variant naming
ogen-go · Apr 25, 2022 · 5ea7b4a · 5ea7b4a
2 parents 3a42786 + 5318cb4
commit 5ea7b4a
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 68 deletions.
diff --git a/examples/ex_test_format/oas_client_gen.go b/examples/ex_test_format/oas_client_gen.go
diff --git a/examples/ex_test_format/oas_faker_gen.go b/examples/ex_test_format/oas_faker_gen.go
diff --git a/examples/ex_test_format/oas_json_gen.go b/examples/ex_test_format/oas_json_gen.go
diff --git a/examples/ex_test_format/oas_req_dec_gen.go b/examples/ex_test_format/oas_req_dec_gen.go
diff --git a/examples/ex_test_format/oas_req_enc_gen.go b/examples/ex_test_format/oas_req_enc_gen.go
diff --git a/examples/ex_test_format/oas_schemas_gen.go b/examples/ex_test_format/oas_schemas_gen.go
diff --git a/examples/ex_test_format/oas_server_gen.go b/examples/ex_test_format/oas_server_gen.go
diff --git a/examples/ex_test_format/oas_unimplemented_gen.go b/examples/ex_test_format/oas_unimplemented_gen.go
diff --git a/gen/ir/type.go b/gen/ir/type.go
@@ -157,6 +157,9 @@ func (t *Type) Go() string {
 func (t *Type) NamePostfix() string {
 	switch t.Kind {
 	case KindPrimitive:
+		if t.Primitive == Null {
+			return "Null"
+		}
 		switch t.Schema.Format {
 		case "uuid":
 			return "UUID"

diff --git a/gen/schema_gen_sum.go b/gen/schema_gen_sum.go
@@ -61,6 +61,8 @@ func (g *schemaGen) collectSumVariants(
 	parent *jsonschema.Schema,
 	schemas []*jsonschema.Schema,
 ) (sum []*ir.Type, _ error) {
+	// TODO(tdakkota): convert oneOf+null into generic
+
 	names := map[string]struct{}{}
 	for i, s := range schemas {
 		if ref := s.Ref; ref != "" && ref == parent.Ref {

diff --git a/gen/write.go b/gen/write.go
@@ -132,7 +132,7 @@ func (w *writer) Generate(templateName, fileName string, cfg TemplateConfig) err
 
 	b, err := imports.Process(fileName, w.buf.Bytes(), nil)
 	if err != nil {
-		_ = os.WriteFile(fileName+".dump", b, 0o600)
+		_ = os.WriteFile(fileName+".dump", w.buf.Bytes(), 0o600)
 		return errors.Wrap(err, "format imports")
 	}