merged in master

coltonmorris · Aug 12, 2018 · 175f5f3 · 175f5f3
2 parents c4e3a2b + 50bb30c
commit 175f5f3
Show file tree

Hide file tree

Showing 73 changed files with 204 additions and 184 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,8 +23,8 @@ deploy:
   email:
     secure: WRWu/LodEL9DQO/p65MwFzOOAmfezOOVB7N7Wh56NImUSX0/Ves4Uuzm1yWhqb/OuonW3Ofm3wxmLiwjpJpiNf45OivI1N2Z/noKn+ZiAC/beuHUYXDR5FlHZvf0VmXXhjFnJPu1cRGHdTD2RIloL4z5TUajNta4FZdIo37lLfNodafaiTd+F/OQR3LsC7R7oyMKH3MLDbEEAZkfCv7Vfk+kxLhSezWJuy24APGG856oOEj49sy6s27hWsX89SruOQggbZFnw8yxWC0rkEp4ACNhdWx3FxhoQ5XR5AT4OB2Ydfgr8+YHQReBqZnHBn0RAQ5qLc+hJUhLGZZlw0WCbuAc8W+zd2IH5ufLUzTn3RfMCeDb50cfX9Dz7Zi9wPJDxCE8DMFJfHuCEV6GEuso5bu9vB175lGrwuOrkpvLlen/5HykLKSobAZ7gixnsg7F6oVV+CgM1xA7eN6oA2KPWzudMtydJ7aRDkHMyyHN7LsTMUmE5iTWTBZV0+o3x6dskc3xfSfXHjUuD3qefdraW0cV4gFrpq7r+dB3x6jUfKlwPeQkPb0RMsOw+v179kYmbS5M+ejvNI3Ta9ffrOvTZyEOq3b6WXJZU2TGa1hIazP8BXzZ6AEh6Oq7tRczlyNT9DM0bpocwPyPUF1+dduBxa10PJGkoRbBYT4abk2e7MI=
   api_key:
-    secure: lSqMHFgvNO9ABjx4dqBYLkbiD8oCoZPRISQZMamg9A+jZdSbH7UYDaGpckbM552w5Oi3jJOKdt82xGoii/IAhIaLFIhf9tzpKQjW5UlYzSmRVL6FB2KpNPa6iondpPeXYdpA5As4N8Peee2EfEsCsA82e54X++Dv/HyovnXUp4dQ0BqZOBihPcWeuTBcD25UaPCClKdX3XSTP8pN5uSfYPpBSQ15JYaLD2EUtpqZ//a0o0wtS1vFjKUz71SnqiHktCz4vKSxmPRpe2bksYfa0kecq41TXG3foAmeVbsXXWpJCvUyEuiRI/mtS4/X9ALWMKGO1ob2VXOz+iUhcwcqQnJs6UvIHlAOR7+d2bzFb4VAIhdvfJuMy7fwIufuIvE0v8fHcIyp1vqbelYj43dBgTyCBwUiNzGe6O3+Kan6OaXqoO9342JUCD1V6NzAHRri/362oTvq02OLUwSUjSBho7a4MIdmy0Yinyd4/pvWOPXR0Kdi/6oZ4k9m1hrrFDYEXz5FQaFGzdiunmYzaoZ8UEszH8WIhqITS79VIM2DXlO0Oa4N0g+uH9/3TN0KvYuUf0j+qhBLh5Lr7BabYPhs2QHxX7pqJQQg8+XuimX0E/MDEuKmGcDClpsFOzSNB/YUfJ4ImaloWAowuzGoE6DCvjwXbpFOh3M+EgcGfqolyZw=
-  tag: $NPM_TAG
+    secure: V5ha4R/5SByBygSa5V9Tm9gpxY3RhmPJueboD8gRIJ952IddUPwCL0wd3yp1Sln0/Ppeh9T6mAl3zCVCqGc4GTwpgh7CwhjXDQZ9kdjixqD464Giv2cxyQ2ZFDO7HDHbQyk+yLIFCQZr1CVMoMkkPxLx72zcJRVuISEITckeYozs32Fn3QciefJqzXr1l2BIQFtCV23StVx4QykPVyY/0l50xAoY3AJudh0MJYQ9gQBfCLgm8SCD0kVf5uAx1mowUDk+AjEbaYuxevZ6ovjuMt/CPzOoYSSOSgh+4///VtBxHcsk+8pGeamgZ0x6CDS9CVQ7tqydXWLrteB6qbkLsegJCcLZYGDHeaIaV+WQbyCzOD41G9hrFUFp49x0zb5XFvdZn7YKViRdeMrdS2yZdyj7gYLo/Cmkn86dvlSpoUx5ic0L5cEMhBHWIntRgyrSwR8zrxwOD+70Fq/nmAzRzN1qsgOIo5aqoVQakEMEFa5SQznE6Zw4skAxW8RtLQQfBbPWegwGVm/Ph9ERbcN1ZGCtQANW1gNPh0LmquiITGO5TH00uAOBoUoQ8X5LTFxmK5tihJX7gtAzWEg1N+JziLiJEEU6dJZqYa/HB5PQe/+uy89Tk2y4nk+S5U3iZuC0y7dbmfyNAmdDOEu38GL9wMSLrDDO3Uq/97QdQnaofVk=
+  tag: "$NPM_TAG"
   on:
     branch: master
 cache:
@@ -36,4 +36,4 @@ before_install:
 install:
 - npm install
 script:
-- ./travis-ci-build.sh
+- "./travis-ci-build.sh"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,22 @@
-## 0.7.4-pre
+## 0.7.7-pre
+
+## 0.7.6
+
+### Fixes
+* Broken integration tests on master 
+
+## 0.7.5
+
+### Fixes
+* Fixed NPM publish.
+
+## 0.7.4
+
+### Changes
+* Download protoc when generating protos to ensure a consistent version is being used. [@easyCZ](https://github.com/easyCZ) in [#80](https://github.com/improbable-eng/ts-protoc-gen/pull/80) 
+* Always generate Service Definitions (`pb_service.d.js` and `pb_service.d.ts`) even if the proto does not define any services. [@lx223 ](https://github.com/lx223) in [#83](https://github.com/improbable-eng/ts-protoc-gen/pull/83) 
+* Add custom Bazel rule which uses ts-protoc-gen for generation. [@coltonmorris](https://github.com/coltonmorris) in [#84](https://github.com/improbable-eng/ts-protoc-gen/pull/84)
+* Add `debug` to `ServiceClientOptions`. [@bianbian-org](https://github.com/bianbian-org) in [#90](https://github.com/improbable-eng/ts-protoc-gen/pull/90)
 
 ## 0.7.3
 

diff --git a/README.md b/README.md
@@ -36,8 +36,8 @@ git_repository(
     commit = "6bee898391a42971289a7989c0f459ab5a4a84dd",  # master as of May 10th, 2018
     remote = "https://github.com/bazelbuild/rules_go.git",
     )
-  load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
-  go_rules_dependencies()
+load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
+go_rules_dependencies()
 go_register_toolchains()
 
 http_archive(
@@ -86,11 +86,6 @@ proto_library(
   ],
 )
 
-typescript_proto_library(
-  name = "generate",
-  proto = ":proto",
-)
-
 typescript_proto_library(
   name = "generate",
   proto = ":proto",

diff --git a/examples/generated/examplecom/empty_message_no_service_pb_service.d.ts b/examples/generated/examplecom/empty_message_no_service_pb_service.d.ts
diff --git a/examples/generated/examplecom/empty_message_no_service_pb_service.js b/examples/generated/examplecom/empty_message_no_service_pb_service.js
diff --git a/examples/generated/examplecom/enum_message_pb_service.d.ts b/examples/generated/examplecom/enum_message_pb_service.d.ts
diff --git a/examples/generated/examplecom/enum_message_pb_service.js b/examples/generated/examplecom/enum_message_pb_service.js
diff --git a/examples/generated/examplecom/map_message_pb_service.d.ts b/examples/generated/examplecom/map_message_pb_service.d.ts
diff --git a/examples/generated/examplecom/map_message_pb_service.js b/examples/generated/examplecom/map_message_pb_service.js
diff --git a/examples/generated/examplecom/oneof_message_pb_service.d.ts b/examples/generated/examplecom/oneof_message_pb_service.d.ts
diff --git a/examples/generated/examplecom/oneof_message_pb_service.js b/examples/generated/examplecom/oneof_message_pb_service.js
diff --git a/examples/generated/examplecom/parent_message_v2_pb_service.d.ts b/examples/generated/examplecom/parent_message_v2_pb_service.d.ts
diff --git a/examples/generated/examplecom/parent_message_v2_pb_service.js b/examples/generated/examplecom/parent_message_v2_pb_service.js
diff --git a/examples/generated/examplecom/parent_message_v3_pb_service.d.ts b/examples/generated/examplecom/parent_message_v3_pb_service.d.ts
diff --git a/examples/generated/examplecom/parent_message_v3_pb_service.js b/examples/generated/examplecom/parent_message_v3_pb_service.js
diff --git a/examples/generated/examplecom/primitive_message_v2_pb_service.d.ts b/examples/generated/examplecom/primitive_message_v2_pb_service.d.ts
diff --git a/examples/generated/examplecom/primitive_message_v2_pb_service.js b/examples/generated/examplecom/primitive_message_v2_pb_service.js
diff --git a/examples/generated/examplecom/primitive_message_v3_pb_service.d.ts b/examples/generated/examplecom/primitive_message_v3_pb_service.d.ts
diff --git a/examples/generated/examplecom/primitive_message_v3_pb_service.js b/examples/generated/examplecom/primitive_message_v3_pb_service.js
diff --git a/examples/generated/examplecom/repeated_primitive_message_pb_service.d.ts b/examples/generated/examplecom/repeated_primitive_message_pb_service.d.ts
diff --git a/examples/generated/examplecom/repeated_primitive_message_pb_service.js b/examples/generated/examplecom/repeated_primitive_message_pb_service.js
diff --git a/examples/generated/examplecom/reserved_words_pb_service.d.ts b/examples/generated/examplecom/reserved_words_pb_service.d.ts
diff --git a/examples/generated/examplecom/reserved_words_pb_service.js b/examples/generated/examplecom/reserved_words_pb_service.js
diff --git a/examples/generated/examplecom/simple_pb_service.d.ts b/examples/generated/examplecom/simple_pb_service.d.ts
diff --git a/examples/generated/examplecom/simple_pb_service.js b/examples/generated/examplecom/simple_pb_service.js
diff --git a/examples/generated/examplecom/simplevalue_pb_service.d.ts b/examples/generated/examplecom/simplevalue_pb_service.d.ts
diff --git a/examples/generated/examplecom/simplevalue_pb_service.js b/examples/generated/examplecom/simplevalue_pb_service.js
diff --git a/examples/generated/examplecom/well_known_message_pb_service.d.ts b/examples/generated/examplecom/well_known_message_pb_service.d.ts
diff --git a/examples/generated/examplecom/well_known_message_pb_service.js b/examples/generated/examplecom/well_known_message_pb_service.js
diff --git a/examples/generated/othercom/external_child_message_pb_service.d.ts b/examples/generated/othercom/external_child_message_pb_service.d.ts
diff --git a/examples/generated/othercom/external_child_message_pb_service.js b/examples/generated/othercom/external_child_message_pb_service.js
diff --git a/examples/generated/othercom/external_enum_pb_service.d.ts b/examples/generated/othercom/external_enum_pb_service.d.ts
diff --git a/examples/generated/othercom/external_enum_pb_service.js b/examples/generated/othercom/external_enum_pb_service.js
diff --git a/...amplecom/empty_message_no_service_pb.d.ts → ...amplecom/empty_message_no_service_pb.d.ts b/...amplecom/empty_message_no_service_pb.d.ts → ...amplecom/empty_message_no_service_pb.d.ts
diff --git a/...examplecom/empty_message_no_service_pb.js → ...examplecom/empty_message_no_service_pb.js b/...examplecom/empty_message_no_service_pb.js → ...examplecom/empty_message_no_service_pb.js
diff --git a/examples/generated/proto/examplecom/empty_message_no_service_pb_service.d.ts b/examples/generated/proto/examplecom/empty_message_no_service_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/empty_message_no_service_pb_service.js b/examples/generated/proto/examplecom/empty_message_no_service_pb_service.js
diff --git a/examples/generated/proto/examplecom/enum_message_pb_service.d.ts b/examples/generated/proto/examplecom/enum_message_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/enum_message_pb_service.js b/examples/generated/proto/examplecom/enum_message_pb_service.js
diff --git a/examples/generated/proto/examplecom/map_message_pb_service.d.ts b/examples/generated/proto/examplecom/map_message_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/map_message_pb_service.js b/examples/generated/proto/examplecom/map_message_pb_service.js
diff --git a/examples/generated/proto/examplecom/oneof_message_pb_service.d.ts b/examples/generated/proto/examplecom/oneof_message_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/oneof_message_pb_service.js b/examples/generated/proto/examplecom/oneof_message_pb_service.js
diff --git a/examples/generated/proto/examplecom/parent_message_v2_pb_service.d.ts b/examples/generated/proto/examplecom/parent_message_v2_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/parent_message_v2_pb_service.js b/examples/generated/proto/examplecom/parent_message_v2_pb_service.js
diff --git a/examples/generated/proto/examplecom/parent_message_v3_pb_service.d.ts b/examples/generated/proto/examplecom/parent_message_v3_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/parent_message_v3_pb_service.js b/examples/generated/proto/examplecom/parent_message_v3_pb_service.js
diff --git a/examples/generated/proto/examplecom/primitive_message_v2_pb_service.d.ts b/examples/generated/proto/examplecom/primitive_message_v2_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/primitive_message_v2_pb_service.js b/examples/generated/proto/examplecom/primitive_message_v2_pb_service.js
diff --git a/examples/generated/proto/examplecom/primitive_message_v3_pb_service.d.ts b/examples/generated/proto/examplecom/primitive_message_v3_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/primitive_message_v3_pb_service.js b/examples/generated/proto/examplecom/primitive_message_v3_pb_service.js
diff --git a/examples/generated/proto/examplecom/repeated_primitive_message_pb_service.d.ts b/examples/generated/proto/examplecom/repeated_primitive_message_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/repeated_primitive_message_pb_service.js b/examples/generated/proto/examplecom/repeated_primitive_message_pb_service.js
diff --git a/examples/generated/proto/examplecom/reserved_words_pb_service.d.ts b/examples/generated/proto/examplecom/reserved_words_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/reserved_words_pb_service.js b/examples/generated/proto/examplecom/reserved_words_pb_service.js
diff --git a/examples/generated/proto/examplecom/simple_pb_service.d.ts b/examples/generated/proto/examplecom/simple_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/simple_pb_service.js b/examples/generated/proto/examplecom/simple_pb_service.js
diff --git a/examples/generated/proto/examplecom/simple_service_pb_service.d.ts b/examples/generated/proto/examplecom/simple_service_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/simple_service_pb_service.js b/examples/generated/proto/examplecom/simple_service_pb_service.js
diff --git a/examples/generated/proto/examplecom/simplevalue_pb_service.d.ts b/examples/generated/proto/examplecom/simplevalue_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/simplevalue_pb_service.js b/examples/generated/proto/examplecom/simplevalue_pb_service.js
diff --git a/examples/generated/proto/examplecom/well_known_message_pb_service.d.ts b/examples/generated/proto/examplecom/well_known_message_pb_service.d.ts
diff --git a/examples/generated/proto/examplecom/well_known_message_pb_service.js b/examples/generated/proto/examplecom/well_known_message_pb_service.js
diff --git a/examples/generated/proto/orphan_pb_service.d.ts b/examples/generated/proto/orphan_pb_service.d.ts
diff --git a/examples/generated/proto/orphan_pb_service.js b/examples/generated/proto/orphan_pb_service.js
diff --git a/examples/generated/proto/othercom/external_child_message_pb_service.d.ts b/examples/generated/proto/othercom/external_child_message_pb_service.d.ts
diff --git a/examples/generated/proto/othercom/external_child_message_pb_service.js b/examples/generated/proto/othercom/external_child_message_pb_service.js
diff --git a/examples/generated/proto/othercom/external_enum_pb_service.d.ts b/examples/generated/proto/othercom/external_enum_pb_service.d.ts
diff --git a/examples/generated/proto/othercom/external_enum_pb_service.js b/examples/generated/proto/othercom/external_enum_pb_service.js