move options to its own package

marwan-at-work · Jun 20, 2019 · 2ae9411 · 2ae9411
1 parent 3329b78
commit 2ae9411
Show file tree

Hide file tree

Showing 29 changed files with 244 additions and 210 deletions.
diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -131,7 +131,7 @@ func TestBread(t *testing.T) {
  require.Equal(t, s.breadReq.GetCount(), int64(3))
 }
 
-func TestChangeMe(t *testing.T) {
+func TestMutations(t *testing.T) {
  s := &service{changeResp: &e2e.ChangeMeResp{
  Name: "james",
  Previous: map[string]*e2e.ChangeMeResp{

diff --git a/e2e/gen.go b/e2e/gen.go
@@ -1,4 +1,4 @@
 package e2e
 
-//go:generate protoc -I . -I /usr/local/include -I ../twirpql --go_out=. --twirp_out=. service.proto
-//go:generate protoc -I . -I /usr/local/include -I ../twirpql --twirpql_out=. service.proto
+//go:generate protoc -I . -I /usr/local/include -I ../options --go_out=. --twirp_out=. service.proto
+//go:generate protoc -I . -I /usr/local/include -I ../options --twirpql_out=. service.proto
diff --git a/e2e/service.pb.go b/e2e/service.pb.go
diff --git a/e2e/service.proto b/e2e/service.proto
@@ -3,7 +3,7 @@ package e2e;
 option go_package = "e2e";
 
 import "painters/painters.proto";
-import "twirpql.proto";
+import "options.proto";
 
 service Service {
  rpc Hello(HelloReq) returns (HelloResp);
@@ -12,7 +12,7 @@ service Service {
  rpc Translate(TranslateReq) returns (TranslateResp);
  rpc Bread(BreadReq) returns (BreadResp);
  rpc ChangeMe(ChangeMeReq) returns (ChangeMeResp) {
- option (twirpql.modifiers) = {
+ option (twirpql.options.rpc) = {
  mutation: true;
  };
  };

diff --git a/e2e/service.twirp.go b/e2e/service.twirp.go
diff --git a/e2e/twirpql/generated.go b/e2e/twirpql/generated.go
diff --git a/e2e/twirpql/gqlgen.yml b/e2e/twirpql/gqlgen.yml
@@ -1,3 +1,5 @@
+# Code was generated by marwan.io/protoc-gen-twirpql. DO NOT EDIT.
+
 schema:
 - twirpql/schema.graphql
 exec:

diff --git a/e2e/twirpql/schema.graphql b/e2e/twirpql/schema.graphql
@@ -1,3 +1,5 @@
+# Code was generated by marwan.io/protoc-gen-twirpql. DO NOT EDIT.
+
 schema {
  query: Query
  mutation: Mutation

diff --git a/e2e/twirpql/server.go b/e2e/twirpql/server.go
diff --git a/options/gen.go b/options/gen.go
@@ -0,0 +1,3 @@
+package options
+
+//go:generate protoc -I . -I /usr/local/include --go_out=paths=source_relative:. options.proto