Clear oneofs correctly (#6)

.github/workflows/ci.yaml

@@ -27,6 +27,7 @@ jobs:
       - name: Generate
         run: |
           make clean
+          make format
           make generate
           make generate-check
       - name: Test

Makefile

@@ -40,6 +40,10 @@ check: test lint
 test: $(codegen)
 	$(GO) test $(GO_TEST_FLAGS) ./...
 
+.PHONY: format
+format: $(BUF)
+	$(BUF) format -w
+
 .PHONY: lint
 lint: $(codegen) $(GOLANGCI_LINT)
 	$(GOLANGCI_LINT) run

proto/gofakeit/example/user.proto

@@ -1,20 +1,28 @@
-syntax="proto3";
+syntax = "proto3";
 package gofakeit.example;
-option go_package = "github.com/rodaine/protogofakeit/gen/gofakeit/example";
+
 import "gofakeit/gofakeit.proto";
 
+option go_package = "github.com/rodaine/protogofakeit/gen/gofakeit/example";
+
 message User {
   fixed64 user_id = 1;
   string first_name = 2 [(gofakeit.generate).tag = "{firstname}"];
   string last_name = 3 [(gofakeit.generate).tag = "{lastname}"];
   string email = 4 [(gofakeit.generate).tag = "{email}"];
   Location location = 5;
   repeated string hobbies = 6 [
-    (gofakeit.generate).repeated.range = { min: 1, max: 3},
+    (gofakeit.generate).repeated.range = {
+      min: 1,
+      max: 3
+    },
     (gofakeit.generate).repeated.element.tag = "{hobby}"
   ];
   map<string, PetType> pets = 7 [
-    (gofakeit.generate).map.range = { min: 1, max: 3},
+    (gofakeit.generate).map.range = {
+      min: 1,
+      max: 3
+    },
     (gofakeit.generate).map.key.tag = "{petname}"
   ];
 }

proto/gofakeit/gofakeit.proto

@@ -1,9 +1,11 @@
-syntax="proto3";
+syntax = "proto3";
 
 package gofakeit;
-option go_package = "github.com/rodaine/protogofakeit/gen/gofakeit";
+
 import "google/protobuf/descriptor.proto";
 
+option go_package = "github.com/rodaine/protogofakeit/gen/gofakeit";
+
 extend google.protobuf.FieldOptions {
   Generator generate = 112233;
 }

proto/gofakeit/test/map.proto

@@ -1,8 +1,10 @@
 syntax = "proto3";
 package gofakeit.test;
-option go_package = "github.com/rodaine/protogofakeit/gen/gofakeit/test";
+
 import "gofakeit/gofakeit.proto";
 
+option go_package = "github.com/rodaine/protogofakeit/gen/gofakeit/test";
+
 enum MapEnum {
   MAP_ENUM_UNSPECIFIED = 0;
   MAP_ENUM_ONE = 1;
@@ -13,7 +15,7 @@ message MapMsg {
   string foo = 1;
 }
 
-message MapDefaults{
+message MapDefaults {
   map<string, bool> scalars = 1;
   map<int32, MapEnum> enums = 2;
   map<string, MapMsg> messages = 3;
@@ -28,23 +30,20 @@ message MapTags {
 }
 
 message MapLength {
-  map<string, string> values = 1 [
-    (gofakeit.generate).map.len = 3
-  ];
+  map<string, string> values = 1 [(gofakeit.generate).map.len = 3];
 }
 
 message MapRange {
-  map<string, string> values = 1 [
-    (gofakeit.generate).map.range = { min: 1, max: 2 }
-  ];
+  map<string, string> values = 1 [(gofakeit.generate).map.range = {
+    min: 1,
+    max: 2
+  }];
 }
 
 message MapSkip {
   map<string, string> values = 1 [
     (gofakeit.generate).map.key.skip = true,
     (gofakeit.generate).map.value.skip = true
   ];
-  map<string, string> skipped = 2 [
-    (gofakeit.generate).skip = true
-  ];
+  map<string, string> skipped = 2 [(gofakeit.generate).skip = true];
 }

proto/gofakeit/test/message.proto

@@ -1,18 +1,24 @@
 syntax = "proto3";
 package gofakeit.test;
-option go_package = "github.com/rodaine/protogofakeit/gen/gofakeit/test";
+
 import "gofakeit/gofakeit.proto";
 
+option go_package = "github.com/rodaine/protogofakeit/gen/gofakeit/test";
+
 message SelfRecursive {
   string foo = 1 [(gofakeit.generate).tag = "{phone}"];
   SelfRecursive recurse = 2;
 }
 
 message PairRecursive {
-  message A { B b = 1; }
-  message B { A a = 2; }
+  message A {
+    B b = 1;
+  }
+  message B {
+    A a = 2;
+  }
 }
 
 message MessageSkipped {
   MessageSkipped skipped = 1 [(gofakeit.generate).skip = true];
-}
+}

proto/gofakeit/test/oneofs.proto

@@ -1,18 +1,28 @@
 syntax = "proto3";
 package gofakeit.test;
-option go_package = "github.com/rodaine/protogofakeit/gen/gofakeit/test";
+
 import "gofakeit/gofakeit.proto";
 
+option go_package = "github.com/rodaine/protogofakeit/gen/gofakeit/test";
+
 enum OneOfEnum {
   ONE_OF_ENUM_UNSPECIFIED = 0;
   ONE_OF_ENUM_ONE = 1;
   ONE_OF_ENUM_TWO = 2;
 }
 
-message OneOf{
+message OneOf {
   oneof fields {
     string scalar = 1;
     OneOfEnum enum = 2;
     OneOf message = 3;
   }
-}
+}
+
+// see https://github.com/rodaine/protogofakeit/issues/5
+message OneOfMessages {
+  oneof kind {
+    OneOfMessages foo = 1;
+    OneOfMessages bar = 2;
+  }
+}