Merge pull request #174 from Dzalevski/fix/refactor-dependencies

moul · Apr 12, 2021 · 6ea84c1 · 6ea84c1
2 parents db1b4f6 + 1025d78
commit 6ea84c1
Show file tree

Hide file tree

Showing 17 changed files with 822 additions and 446 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,6 @@ gin-bin
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+
+# IDE settings
+.idea
diff --git a/examples/dummy/output/export.json b/examples/dummy/output/export.json
@@ -1,10 +1,10 @@
 {
-  "build-date": "2017-05-19T20:09:45.954357761+02:00",
-  "build-hostname": "manfred-spacegray.aircard",
+  "build-date": "2021-04-12T10:42:31.388860713Z",
+  "build-hostname": "fwrz",
   "build-user": "moul",
-  "pwd": "/Users/moul/Git/moul/protoc-gen-gotemplate/examples/dummy",
+  "pwd": "/home/moul/go/src/moul.io/protoc-gen-gotemplate/examples/dummy",
   "debug": false,
-  "destination-dir": ".",
+  "destination-dir": "",
   "file": {
     "name": "dummy.proto",
     "package": "dummy",
@@ -118,8 +118,8 @@
           ],
           "span": [
             2,
-            8,
-            13
+            0,
+            14
           ]
         },
         {
@@ -159,21 +159,6 @@
             16
           ]
         },
-        {
-          "path": [
-            4,
-            0,
-            2,
-            0,
-            4
-          ],
-          "span": [
-            5,
-            2,
-            4,
-            16
-          ]
-        },
         {
           "path": [
             4,
@@ -229,21 +214,6 @@
             17
           ]
         },
-        {
-          "path": [
-            4,
-            0,
-            2,
-            1,
-            4
-          ],
-          "span": [
-            6,
-            2,
-            5,
-            16
-          ]
-        },
         {
           "path": [
             4,
@@ -299,21 +269,6 @@
             16
           ]
         },
-        {
-          "path": [
-            4,
-            0,
-            2,
-            2,
-            4
-          ],
-          "span": [
-            7,
-            2,
-            6,
-            17
-          ]
-        },
         {
           "path": [
             4,
@@ -369,21 +324,6 @@
             16
           ]
         },
-        {
-          "path": [
-            4,
-            0,
-            2,
-            3,
-            4
-          ],
-          "span": [
-            8,
-            2,
-            7,
-            16
-          ]
-        },
         {
           "path": [
             4,
@@ -532,21 +472,6 @@
             16
           ]
         },
-        {
-          "path": [
-            4,
-            1,
-            2,
-            0,
-            4
-          ],
-          "span": [
-            13,
-            2,
-            12,
-            16
-          ]
-        },
         {
           "path": [
             4,
@@ -602,21 +527,6 @@
             17
           ]
         },
-        {
-          "path": [
-            4,
-            1,
-            2,
-            1,
-            4
-          ],
-          "span": [
-            14,
-            2,
-            13,
-            16
-          ]
-        },
         {
           "path": [
             4,

diff --git a/examples/flow/output/test/test_grpc_js.js b/examples/flow/output/test/test_grpc_js.js
@@ -261,7 +261,7 @@ export default {
 
   TestService: {
 
-    testNoStream: {
+    testnostream: {
       path: '/test.TestService/TestNoStream',
       requestStream: false,
       responseStream: false,
@@ -272,7 +272,7 @@ export default {
       responseSerialize: serialize_test_TestNoStreamReply,
       responseDeserialize: deserialize_test_TestNoStreamReply,
     },
-    testStreamRequest: {
+    teststreamrequest: {
       path: '/test.TestService/TestStreamRequest',
       requestStream: true,
       responseStream: false,
@@ -283,7 +283,7 @@ export default {
       responseSerialize: serialize_test_TestStreamRequestReply,
       responseDeserialize: deserialize_test_TestStreamRequestReply,
     },
-    testStreamReply: {
+    teststreamreply: {
       path: '/test.TestService/TestStreamReply',
       requestStream: false,
       responseStream: true,
@@ -294,7 +294,7 @@ export default {
       responseSerialize: serialize_test_TestStreamReplyReply,
       responseDeserialize: deserialize_test_TestStreamReplyReply,
     },
-    testStreamBoth: {
+    teststreamboth: {
       path: '/test.TestService/TestStreamBoth',
       requestStream: true,
       responseStream: true,

diff --git a/examples/go-generate/example.go b/examples/go-generate/example.go
@@ -1,4 +1,4 @@
 package example
 
 //go:generate protoc --go_out=./gen/         example.proto
-//go:generate protoc --gotemplate_out=./gen/ example.proto
+//go:generate protoc --gotemplate_out=template_dir=templates:./gen/ example.proto
diff --git a/examples/go-generate/example.proto b/examples/go-generate/example.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package example;
 
+option go_package = "./";
+
 service Sum {
   rpc Sum(SumRequest) returns (SumReply) {};
 }