From 05c52b843edf9420be3a9549d01352dfeff76a5e Mon Sep 17 00:00:00 2001 From: Colton Morris Date: Sun, 10 Jun 2018 11:29:05 -0600 Subject: [PATCH 01/14] Add Custom Bazel rule (#84) * Added custom bazel rule. Also needed to change around import paths to better align with bazel's ideology. * Cleaned up * Added readme * rerun pipeline :) * Removed services flag because of pull request #83 --- BUILD.bazel | 11 ++ README.md | 70 ++++++++++ WORKSPACE | 18 +-- defs.bzl | 121 ++++++++++++++++++ .../examplecom/simple_service_pb_service.d.ts | 77 ----------- .../examplecom/enum_message_pb.d.ts | 18 +-- .../{ => proto}/examplecom/enum_message_pb.js | 2 +- .../examplecom/map_message_pb.d.ts | 14 +- .../{ => proto}/examplecom/map_message_pb.js | 4 +- .../examplecom/oneof_message_pb.d.ts | 10 +- .../examplecom/oneof_message_pb.js | 12 +- .../examplecom/parent_message_v2_pb.d.ts | 24 ++-- .../examplecom/parent_message_v2_pb.js | 32 ++--- .../examplecom/parent_message_v3_pb.d.ts | 18 +-- .../examplecom/parent_message_v3_pb.js | 22 ++-- .../examplecom/primitive_message_v2_pb.d.ts | 2 +- .../examplecom/primitive_message_v2_pb.js | 0 .../examplecom/primitive_message_v3_pb.d.ts | 2 +- .../examplecom/primitive_message_v3_pb.js | 0 .../repeated_primitive_message_pb.d.ts | 2 +- .../repeated_primitive_message_pb.js | 0 .../examplecom/reserved_words_pb.d.ts | 2 +- .../examplecom/reserved_words_pb.js | 0 .../{ => proto}/examplecom/simple_pb.d.ts | 2 +- .../{ => proto}/examplecom/simple_pb.js | 0 .../examplecom/simple_service_pb.d.ts | 4 +- .../examplecom/simple_service_pb.js | 2 +- .../examplecom/simple_service_pb_service.d.ts | 77 +++++++++++ .../examplecom/simple_service_pb_service.js | 18 +-- .../examplecom/simplevalue_pb.d.ts | 2 +- .../{ => proto}/examplecom/simplevalue_pb.js | 0 .../examplecom/well_known_message_pb.d.ts | 2 +- .../examplecom/well_known_message_pb.js | 0 examples/generated/{ => proto}/orphan_pb.d.ts | 2 +- examples/generated/{ => proto}/orphan_pb.js | 0 .../{ => proto}/orphan_pb_service.d.ts | 22 ++-- .../{ => proto}/orphan_pb_service.js | 12 +- .../othercom/external_child_message_pb.d.ts | 2 +- .../othercom/external_child_message_pb.js | 0 .../othercom/external_enum_pb.d.ts | 2 +- .../{ => proto}/othercom/external_enum_pb.js | 0 generate.sh | 5 +- proto/BUILD | 19 +++ proto/examplecom/BUILD | 34 +++++ proto/examplecom/enum_message.proto | 2 +- proto/examplecom/map_message.proto | 4 +- proto/examplecom/oneof_message.proto | 2 +- proto/examplecom/parent_message_v2.proto | 2 +- proto/examplecom/parent_message_v3.proto | 2 +- proto/examplecom/simple_service.proto | 2 +- proto/othercom/BUILD | 19 +++ test/integration/enums.ts | 6 +- test/integration/maps.ts | 8 +- test/integration/nestedMessagesV2.ts | 4 +- test/integration/nestedMessagesV3.ts | 4 +- test/integration/oneof.ts | 4 +- test/integration/orphan.ts | 4 +- test/integration/primitivesV2.ts | 2 +- test/integration/primitivesV3.ts | 2 +- test/integration/repeatedPrimitives.ts | 2 +- test/integration/reservedWords.ts | 2 +- test/integration/service/grpcweb.ts | 12 +- test/integration/wellKnownTypes.ts | 2 +- test/unit/util.ts | 2 +- 64 files changed, 511 insertions(+), 242 deletions(-) create mode 100644 defs.bzl delete mode 100644 examples/generated/examplecom/simple_service_pb_service.d.ts rename examples/generated/{ => proto}/examplecom/enum_message_pb.d.ts (65%) rename examples/generated/{ => proto}/examplecom/enum_message_pb.js (98%) rename examples/generated/{ => proto}/examplecom/map_message_pb.d.ts (78%) rename examples/generated/{ => proto}/examplecom/map_message_pb.js (98%) rename examples/generated/{ => proto}/examplecom/oneof_message_pb.d.ts (89%) rename examples/generated/{ => proto}/examplecom/oneof_message_pb.js (97%) rename examples/generated/{ => proto}/examplecom/parent_message_v2_pb.d.ts (70%) rename examples/generated/{ => proto}/examplecom/parent_message_v2_pb.js (91%) rename examples/generated/{ => proto}/examplecom/parent_message_v3_pb.d.ts (72%) rename examples/generated/{ => proto}/examplecom/parent_message_v3_pb.js (93%) rename examples/generated/{ => proto}/examplecom/primitive_message_v2_pb.d.ts (99%) rename examples/generated/{ => proto}/examplecom/primitive_message_v2_pb.js (100%) rename examples/generated/{ => proto}/examplecom/primitive_message_v3_pb.d.ts (97%) rename examples/generated/{ => proto}/examplecom/primitive_message_v3_pb.js (100%) rename examples/generated/{ => proto}/examplecom/repeated_primitive_message_pb.d.ts (98%) rename examples/generated/{ => proto}/examplecom/repeated_primitive_message_pb.js (100%) rename examples/generated/{ => proto}/examplecom/reserved_words_pb.d.ts (99%) rename examples/generated/{ => proto}/examplecom/reserved_words_pb.js (100%) rename examples/generated/{ => proto}/examplecom/simple_pb.d.ts (99%) rename examples/generated/{ => proto}/examplecom/simple_pb.js (100%) rename examples/generated/{ => proto}/examplecom/simple_service_pb.d.ts (94%) rename examples/generated/{ => proto}/examplecom/simple_service_pb.js (99%) create mode 100644 examples/generated/proto/examplecom/simple_service_pb_service.d.ts rename examples/generated/{ => proto}/examplecom/simple_service_pb_service.js (82%) rename examples/generated/{ => proto}/examplecom/simplevalue_pb.d.ts (98%) rename examples/generated/{ => proto}/examplecom/simplevalue_pb.js (100%) rename examples/generated/{ => proto}/examplecom/well_known_message_pb.d.ts (99%) rename examples/generated/{ => proto}/examplecom/well_known_message_pb.js (100%) rename examples/generated/{ => proto}/orphan_pb.d.ts (99%) rename examples/generated/{ => proto}/orphan_pb.js (100%) rename examples/generated/{ => proto}/orphan_pb_service.d.ts (61%) rename examples/generated/{ => proto}/orphan_pb_service.js (89%) rename examples/generated/{ => proto}/othercom/external_child_message_pb.d.ts (94%) rename examples/generated/{ => proto}/othercom/external_child_message_pb.js (100%) rename examples/generated/{ => proto}/othercom/external_enum_pb.d.ts (75%) rename examples/generated/{ => proto}/othercom/external_enum_pb.js (100%) create mode 100644 proto/BUILD create mode 100644 proto/examplecom/BUILD create mode 100644 proto/othercom/BUILD diff --git a/BUILD.bazel b/BUILD.bazel index 7fef3c0f..ef5d1227 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,2 +1,13 @@ package(default_visibility = ["//visibility:public"]) + + exports_files(["tsconfig.json"]) + +filegroup( + name = "generate_ts", + srcs = [ + "//proto:generate", + "//proto/examplecom:generate", + "//proto/othercom:generate", + ], +) diff --git a/README.md b/README.md index e3c97306..c8cf5457 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ also output service definitions as both `.js` and `.d.ts` files in the structure This plugin is tested and written using TypeScript 2.7. ## Installation + +### npm As a prerequisite, download or install `protoc` (the protocol buffer compiler) for your platform from the [github releases page](https://github.com/google/protobuf/releases) or via a package manager (ie: [brew](http://brewformulas.org/Protobuf), [apt](https://www.ubuntuupdates.org/pm/protobuf-compiler)). For the latest stable version of the ts-protoc-gen plugin: @@ -26,6 +28,74 @@ For our latest build straight from master: ```bash npm install ts-protoc-gen@next ``` +### bazel +Include the following in your `WORKSPACE`: +```python +git_repository( + name = "io_bazel_rules_go", + 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() +go_register_toolchains() + +http_archive( + name = "io_bazel_rules_webtesting", + strip_prefix = "rules_webtesting-master", + urls = [ + "https://github.com/bazelbuild/rules_webtesting/archive/master.tar.gz", + ], +) +load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories") +web_test_repositories() + +git_repository( + name = "build_bazel_rules_nodejs", + remote = "https://github.com/bazelbuild/rules_nodejs.git", + commit = "d334fd8e2274fb939cf447106dced97472534e80", +) +load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories") +node_repositories(package_json = ["//:package.json"]) + +load("@ts_protoc_gen//:defs.bzl", "typescript_proto_dependencies") +typescript_proto_dependencies() + +git_repository( + name = "build_bazel_rules_typescript", + remote = "https://github.com/bazelbuild/rules_typescript.git", + commit = "3488d4fb89c6a02d79875d217d1029182fbcd797", +) +load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace") +ts_setup_workspace() +``` + +Now in your `BUILD.bazel`: +```python +load("@ts_protoc_gen//:defs.bzl", "typescript_proto_library") + +filegroup( + name = "proto_files", + srcs = glob(["*.proto"]), +) + +proto_library( + name = "proto", + srcs = [ + ":proto_files", + ], +) + +typescript_proto_library( + name = "generate", + proto = ":proto", +) + +typescript_proto_library( + name = "generate", + proto = ":proto", +) +``` ## Contributing Contributions are welcome! Please refer to [CONTRIBUTING.md](https://github.com/improbable-eng/ts-protoc-gen/blob/master/CONTRIBUTING.md) for more information. diff --git a/WORKSPACE b/WORKSPACE index a9969f9b..2b1ed42f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -16,29 +16,25 @@ http_archive( urls = [ "https://github.com/bazelbuild/rules_webtesting/archive/master.tar.gz", ], -) + ) load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories") web_test_repositories() git_repository( name = "build_bazel_rules_nodejs", remote = "https://github.com/bazelbuild/rules_nodejs.git", - tag = "0.9.1", + commit = "d334fd8e2274fb939cf447106dced97472534e80", ) -load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "npm_install") +load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories") node_repositories(package_json = ["//:package.json"]) -# installs our node_modules -npm_install( - name = "deps", - package_json = "//:package.json", - package_lock_json = "//:package-lock.json", -) +load("@ts_protoc_gen//:defs.bzl", "typescript_proto_dependencies") +typescript_proto_dependencies() git_repository( name = "build_bazel_rules_typescript", remote = "https://github.com/bazelbuild/rules_typescript.git", - tag = "0.14.0", -) + commit = "3488d4fb89c6a02d79875d217d1029182fbcd797", + ) load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace") ts_setup_workspace() diff --git a/defs.bzl b/defs.bzl new file mode 100644 index 00000000..c9be280d --- /dev/null +++ b/defs.bzl @@ -0,0 +1,121 @@ +load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") +load("@build_bazel_rules_nodejs//:defs.bzl", "npm_install") + + +def declare_file(ctx, filename, file_modifications): + f = ctx.actions.declare_file(filename) + + # Removes an import that protoc-gen-ts adds that is not needed + for removal in ctx.attr.remove_dependencies: + file_modifications.append("echo \"$(grep -v \"%s\" %s)\" > %s" % (removal, f.path, f.path)) + + return f + +def proto_path(proto): + """ + The proto path is not really a file path + It's the path to the proto that was seen when the descriptor file was generated. + """ + path = proto.path + root = proto.root.path + ws = proto.owner.workspace_root + if path.startswith(root): path = path[len(root):] + if path.startswith("/"): path = path[1:] + if path.startswith(ws): path = path[len(ws):] + if path.startswith("/"): path = path[1:] + return path + +def append_to_outputs(ctx, file_name, outputs, file_modifications): + generated_filenames = ["_pb.d.ts", "_pb.js", "_pb_service.js", "_pb_service.d.ts"] + + for f in generated_filenames: + outputs.append(declare_file(ctx, file_name + f, file_modifications)) + +def _typescript_proto_library_impl(ctx): + outputs = [] + proto_inputs = [] + file_modifications = [] + + for src in ctx.attr.proto.proto.direct_sources: + if src.extension != "proto": + fail("Input must be a proto file") + + file_name = src.basename[:-len(src.extension) - 1] + normalized_file = proto_path(src) + proto_inputs.append(normalized_file) + append_to_outputs(ctx, file_name, outputs, file_modifications) + + if not file_modifications: + file_modifications.append("echo \"No services generated\"") + + inputs = depset([ctx.file._protoc]) + inputs += ctx.files._ts_protoc_gen + inputs += ctx.attr.proto.proto.transitive_descriptor_sets + + descriptor_sets = [desc.path for desc in ctx.attr.proto.proto.transitive_descriptor_sets] + + ts_out = "service=true:" + + protoc_command = "%s --plugin=protoc-gen-ts=%s --ts_out=%s%s --js_out=import_style=commonjs,binary:%s --descriptor_set_in=%s %s" % (ctx.file._protoc.path, ctx.files._ts_protoc_gen[1].path, ts_out, ctx.var["BINDIR"], ctx.var["BINDIR"], ":".join(descriptor_sets), " ".join(proto_inputs)) + + ctx.actions.run_shell( + inputs = inputs, + outputs = outputs, + progress_message = "Creating Typescript pb files %s" % ctx.label, + command = "%s && %s" % (protoc_command, " && ".join(file_modifications)), + ) + + if ctx.attr.debug: + print("protoc command: ", protoc_command) + print("service file modification: ", file_modifications) + print("ctx.var['BINDIR']: ", ctx.var["BINDIR"]) + print("normalized_file: ", normalized_file) + + return DefaultInfo( + files = depset(outputs), + ) + +typescript_proto_library = rule( + attrs = { + "proto": attr.label( + mandatory = True, + allow_files = True, + single_file = True, + providers = ["proto"], + ), + "remove_dependencies": attr.string_list( + doc = "Each string given will be grepped and removed from the generated files. This can be useful if your proto files are importing a dependency that the generated Typescript does not use.", + default = [], + allow_empty = True, + ), + "debug": attr.bool( + doc="Set for additional logging", + mandatory = False, + default = False, + ), + "_ts_protoc_gen": attr.label( + allow_files = True, + executable = True, + cfg = "host", + default = Label("@ts_protoc_gen//bin:protoc-gen-ts"), + ), + "_protoc": attr.label( + allow_files = True, + single_file = True, + executable = True, + cfg = "host", + default = Label("@com_google_protobuf//:protoc"), + ), + }, + implementation = _typescript_proto_library_impl, +) + +def typescript_proto_dependencies(): + """To be run in user's WORKSPACE to install ts-protoc-gen dependencies. +""" + + npm_install( + name = "deps", + package_json = "@ts_protoc_gen//:package.json", + package_lock_json = "@ts_protoc_gen//:package-lock.json", + ) diff --git a/examples/generated/examplecom/simple_service_pb_service.d.ts b/examples/generated/examplecom/simple_service_pb_service.d.ts deleted file mode 100644 index baae01fc..00000000 --- a/examples/generated/examplecom/simple_service_pb_service.d.ts +++ /dev/null @@ -1,77 +0,0 @@ -// package: examplecom -// file: examplecom/simple_service.proto - -import * as examplecom_simple_service_pb from "../examplecom/simple_service_pb"; -import * as othercom_external_child_message_pb from "../othercom/external_child_message_pb"; -import {grpc} from "grpc-web-client"; - -type SimpleServiceDoUnary = { - readonly methodName: string; - readonly service: typeof SimpleService; - readonly requestStream: false; - readonly responseStream: false; - readonly requestType: typeof examplecom_simple_service_pb.UnaryRequest; - readonly responseType: typeof othercom_external_child_message_pb.ExternalChildMessage; -}; - -type SimpleServiceDoStream = { - readonly methodName: string; - readonly service: typeof SimpleService; - readonly requestStream: false; - readonly responseStream: true; - readonly requestType: typeof examplecom_simple_service_pb.StreamRequest; - readonly responseType: typeof othercom_external_child_message_pb.ExternalChildMessage; -}; - -type SimpleServiceDelete = { - readonly methodName: string; - readonly service: typeof SimpleService; - readonly requestStream: false; - readonly responseStream: false; - readonly requestType: typeof examplecom_simple_service_pb.UnaryRequest; - readonly responseType: typeof examplecom_simple_service_pb.UnaryResponse; -}; - -export class SimpleService { - static readonly serviceName: string; - static readonly DoUnary: SimpleServiceDoUnary; - static readonly DoStream: SimpleServiceDoStream; - static readonly Delete: SimpleServiceDelete; -} - -export type ServiceError = { message: string, code: number; metadata: grpc.Metadata } -export type Status = { details: string, code: number; metadata: grpc.Metadata } -export type ServiceClientOptions = { transport: grpc.TransportConstructor } - -interface ResponseStream { - cancel(): void; - on(type: 'data', handler: (message: T) => void): ResponseStream; - on(type: 'end', handler: () => void): ResponseStream; - on(type: 'status', handler: (status: Status) => void): ResponseStream; -} - -export class SimpleServiceClient { - readonly serviceHost: string; - - constructor(serviceHost: string, options?: ServiceClientOptions); - doUnary( - requestMessage: examplecom_simple_service_pb.UnaryRequest, - metadata: grpc.Metadata, - callback: (error: ServiceError, responseMessage: othercom_external_child_message_pb.ExternalChildMessage|null) => void - ): void; - doUnary( - requestMessage: examplecom_simple_service_pb.UnaryRequest, - callback: (error: ServiceError, responseMessage: othercom_external_child_message_pb.ExternalChildMessage|null) => void - ): void; - doStream(requestMessage: examplecom_simple_service_pb.StreamRequest, metadata?: grpc.Metadata): ResponseStream; - delete( - requestMessage: examplecom_simple_service_pb.UnaryRequest, - metadata: grpc.Metadata, - callback: (error: ServiceError, responseMessage: examplecom_simple_service_pb.UnaryResponse|null) => void - ): void; - delete( - requestMessage: examplecom_simple_service_pb.UnaryRequest, - callback: (error: ServiceError, responseMessage: examplecom_simple_service_pb.UnaryResponse|null) => void - ): void; -} - diff --git a/examples/generated/examplecom/enum_message_pb.d.ts b/examples/generated/proto/examplecom/enum_message_pb.d.ts similarity index 65% rename from examples/generated/examplecom/enum_message_pb.d.ts rename to examples/generated/proto/examplecom/enum_message_pb.d.ts index f7685a16..c1bc93cc 100644 --- a/examples/generated/examplecom/enum_message_pb.d.ts +++ b/examples/generated/proto/examplecom/enum_message_pb.d.ts @@ -1,8 +1,8 @@ // package: examplecom -// file: examplecom/enum_message.proto +// file: proto/examplecom/enum_message.proto import * as jspb from "google-protobuf"; -import * as othercom_external_enum_pb from "../othercom/external_enum_pb"; +import * as proto_othercom_external_enum_pb from "../../proto/othercom/external_enum_pb"; export class EnumMessage extends jspb.Message { getInternalEnum(): EnumMessage.InternalEnum; @@ -13,13 +13,13 @@ export class EnumMessage extends jspb.Message { setInternalEnumsList(value: Array): void; addInternalEnums(value: EnumMessage.InternalEnum, index?: number): EnumMessage.InternalEnum; - getExternalEnum(): othercom_external_enum_pb.ExternalEnum; - setExternalEnum(value: othercom_external_enum_pb.ExternalEnum): void; + getExternalEnum(): proto_othercom_external_enum_pb.ExternalEnum; + setExternalEnum(value: proto_othercom_external_enum_pb.ExternalEnum): void; clearExternalEnumsList(): void; - getExternalEnumsList(): Array; - setExternalEnumsList(value: Array): void; - addExternalEnums(value: othercom_external_enum_pb.ExternalEnum, index?: number): othercom_external_enum_pb.ExternalEnum; + getExternalEnumsList(): Array; + setExternalEnumsList(value: Array): void; + addExternalEnums(value: proto_othercom_external_enum_pb.ExternalEnum, index?: number): proto_othercom_external_enum_pb.ExternalEnum; serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): EnumMessage.AsObject; @@ -35,8 +35,8 @@ export namespace EnumMessage { export type AsObject = { internalEnum: EnumMessage.InternalEnum, internalEnumsList: Array, - externalEnum: othercom_external_enum_pb.ExternalEnum, - externalEnumsList: Array, + externalEnum: proto_othercom_external_enum_pb.ExternalEnum, + externalEnumsList: Array, } export enum InternalEnum { diff --git a/examples/generated/examplecom/enum_message_pb.js b/examples/generated/proto/examplecom/enum_message_pb.js similarity index 98% rename from examples/generated/examplecom/enum_message_pb.js rename to examples/generated/proto/examplecom/enum_message_pb.js index 1581cae1..a84b3503 100644 --- a/examples/generated/examplecom/enum_message_pb.js +++ b/examples/generated/proto/examplecom/enum_message_pb.js @@ -11,7 +11,7 @@ var jspb = require('google-protobuf'); var goog = jspb; var global = Function('return this')(); -var othercom_external_enum_pb = require('../othercom/external_enum_pb.js'); +var proto_othercom_external_enum_pb = require('../../proto/othercom/external_enum_pb.js'); goog.exportSymbol('proto.examplecom.EnumMessage', null, global); goog.exportSymbol('proto.examplecom.EnumMessage.InternalEnum', null, global); diff --git a/examples/generated/examplecom/map_message_pb.d.ts b/examples/generated/proto/examplecom/map_message_pb.d.ts similarity index 78% rename from examples/generated/examplecom/map_message_pb.d.ts rename to examples/generated/proto/examplecom/map_message_pb.d.ts index 253138ec..5e74ee8b 100644 --- a/examples/generated/examplecom/map_message_pb.d.ts +++ b/examples/generated/proto/examplecom/map_message_pb.d.ts @@ -1,18 +1,18 @@ // package: examplecom -// file: examplecom/map_message.proto +// file: proto/examplecom/map_message.proto import * as jspb from "google-protobuf"; -import * as othercom_external_enum_pb from "../othercom/external_enum_pb"; -import * as othercom_external_child_message_pb from "../othercom/external_child_message_pb"; +import * as proto_othercom_external_enum_pb from "../../proto/othercom/external_enum_pb"; +import * as proto_othercom_external_child_message_pb from "../../proto/othercom/external_child_message_pb"; export class MapMessage extends jspb.Message { getInternalEnumsMap(): jspb.Map; clearInternalEnumsMap(): void; getInternalChildrenMap(): jspb.Map; clearInternalChildrenMap(): void; - getExternalEnumsMap(): jspb.Map; + getExternalEnumsMap(): jspb.Map; clearExternalEnumsMap(): void; - getExternalChildrenMap(): jspb.Map; + getExternalChildrenMap(): jspb.Map; clearExternalChildrenMap(): void; getPrimitiveIntsMap(): jspb.Map; clearPrimitiveIntsMap(): void; @@ -30,8 +30,8 @@ export namespace MapMessage { export type AsObject = { internalEnumsMap: Array<[number, MapMessage.InternalEnum]>, internalChildrenMap: Array<[string, MapMessage.InternalChildMessage.AsObject]>, - externalEnumsMap: Array<[number, othercom_external_enum_pb.ExternalEnum]>, - externalChildrenMap: Array<[string, othercom_external_child_message_pb.ExternalChildMessage.AsObject]>, + externalEnumsMap: Array<[number, proto_othercom_external_enum_pb.ExternalEnum]>, + externalChildrenMap: Array<[string, proto_othercom_external_child_message_pb.ExternalChildMessage.AsObject]>, primitiveIntsMap: Array<[string, number]>, } diff --git a/examples/generated/examplecom/map_message_pb.js b/examples/generated/proto/examplecom/map_message_pb.js similarity index 98% rename from examples/generated/examplecom/map_message_pb.js rename to examples/generated/proto/examplecom/map_message_pb.js index a6224ff4..f9ae62cb 100644 --- a/examples/generated/examplecom/map_message_pb.js +++ b/examples/generated/proto/examplecom/map_message_pb.js @@ -11,8 +11,8 @@ var jspb = require('google-protobuf'); var goog = jspb; var global = Function('return this')(); -var othercom_external_enum_pb = require('../othercom/external_enum_pb.js'); -var othercom_external_child_message_pb = require('../othercom/external_child_message_pb.js'); +var proto_othercom_external_enum_pb = require('../../proto/othercom/external_enum_pb.js'); +var proto_othercom_external_child_message_pb = require('../../proto/othercom/external_child_message_pb.js'); goog.exportSymbol('proto.examplecom.MapMessage', null, global); goog.exportSymbol('proto.examplecom.MapMessage.InternalChildMessage', null, global); goog.exportSymbol('proto.examplecom.MapMessage.InternalEnum', null, global); diff --git a/examples/generated/examplecom/oneof_message_pb.d.ts b/examples/generated/proto/examplecom/oneof_message_pb.d.ts similarity index 89% rename from examples/generated/examplecom/oneof_message_pb.d.ts rename to examples/generated/proto/examplecom/oneof_message_pb.d.ts index 989bb2e0..c641ba6a 100644 --- a/examples/generated/examplecom/oneof_message_pb.d.ts +++ b/examples/generated/proto/examplecom/oneof_message_pb.d.ts @@ -1,8 +1,8 @@ // package: examplecom -// file: examplecom/oneof_message.proto +// file: proto/examplecom/oneof_message.proto import * as jspb from "google-protobuf"; -import * as othercom_external_child_message_pb from "../othercom/external_child_message_pb"; +import * as proto_othercom_external_child_message_pb from "../../proto/othercom/external_child_message_pb"; export class OneOfMessage extends jspb.Message { hasInternalChildMessage(): boolean; @@ -12,8 +12,8 @@ export class OneOfMessage extends jspb.Message { hasExternalChildMessage(): boolean; clearExternalChildMessage(): void; - getExternalChildMessage(): othercom_external_child_message_pb.ExternalChildMessage | undefined; - setExternalChildMessage(value?: othercom_external_child_message_pb.ExternalChildMessage): void; + getExternalChildMessage(): proto_othercom_external_child_message_pb.ExternalChildMessage | undefined; + setExternalChildMessage(value?: proto_othercom_external_child_message_pb.ExternalChildMessage): void; hasMyString(): boolean; clearMyString(): void; @@ -39,7 +39,7 @@ export class OneOfMessage extends jspb.Message { export namespace OneOfMessage { export type AsObject = { internalChildMessage?: OneOfMessage.InternalChildMessage.AsObject, - externalChildMessage?: othercom_external_child_message_pb.ExternalChildMessage.AsObject, + externalChildMessage?: proto_othercom_external_child_message_pb.ExternalChildMessage.AsObject, myString: string, myInt64: number, } diff --git a/examples/generated/examplecom/oneof_message_pb.js b/examples/generated/proto/examplecom/oneof_message_pb.js similarity index 97% rename from examples/generated/examplecom/oneof_message_pb.js rename to examples/generated/proto/examplecom/oneof_message_pb.js index cf70a39e..56b080bf 100644 --- a/examples/generated/examplecom/oneof_message_pb.js +++ b/examples/generated/proto/examplecom/oneof_message_pb.js @@ -11,7 +11,7 @@ var jspb = require('google-protobuf'); var goog = jspb; var global = Function('return this')(); -var othercom_external_child_message_pb = require('../othercom/external_child_message_pb.js'); +var proto_othercom_external_child_message_pb = require('../../proto/othercom/external_child_message_pb.js'); goog.exportSymbol('proto.examplecom.CamelCasedOneOfMessage', null, global); goog.exportSymbol('proto.examplecom.OneOfMessage', null, global); goog.exportSymbol('proto.examplecom.OneOfMessage.InternalChildMessage', null, global); @@ -91,7 +91,7 @@ proto.examplecom.OneOfMessage.prototype.toObject = function(opt_includeInstance) proto.examplecom.OneOfMessage.toObject = function(includeInstance, msg) { var f, obj = { internalChildMessage: (f = msg.getInternalChildMessage()) && proto.examplecom.OneOfMessage.InternalChildMessage.toObject(includeInstance, f), - externalChildMessage: (f = msg.getExternalChildMessage()) && othercom_external_child_message_pb.ExternalChildMessage.toObject(includeInstance, f), + externalChildMessage: (f = msg.getExternalChildMessage()) && proto_othercom_external_child_message_pb.ExternalChildMessage.toObject(includeInstance, f), myString: jspb.Message.getFieldWithDefault(msg, 3, ""), myInt64: jspb.Message.getFieldWithDefault(msg, 4, 0) }; @@ -136,8 +136,8 @@ proto.examplecom.OneOfMessage.deserializeBinaryFromReader = function(msg, reader msg.setInternalChildMessage(value); break; case 2: - var value = new othercom_external_child_message_pb.ExternalChildMessage; - reader.readMessage(value,othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); + var value = new proto_othercom_external_child_message_pb.ExternalChildMessage; + reader.readMessage(value,proto_othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); msg.setExternalChildMessage(value); break; case 3: @@ -190,7 +190,7 @@ proto.examplecom.OneOfMessage.serializeBinaryToWriter = function(message, writer writer.writeMessage( 2, f, - othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter + proto_othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter ); } f = /** @type {string} */ (jspb.Message.getField(message, 3)); @@ -388,7 +388,7 @@ proto.examplecom.OneOfMessage.prototype.hasInternalChildMessage = function() { */ proto.examplecom.OneOfMessage.prototype.getExternalChildMessage = function() { return /** @type{?proto.othercom.ExternalChildMessage} */ ( - jspb.Message.getWrapperField(this, othercom_external_child_message_pb.ExternalChildMessage, 2)); + jspb.Message.getWrapperField(this, proto_othercom_external_child_message_pb.ExternalChildMessage, 2)); }; diff --git a/examples/generated/examplecom/parent_message_v2_pb.d.ts b/examples/generated/proto/examplecom/parent_message_v2_pb.d.ts similarity index 70% rename from examples/generated/examplecom/parent_message_v2_pb.d.ts rename to examples/generated/proto/examplecom/parent_message_v2_pb.d.ts index 1c11e6b9..809372f5 100644 --- a/examples/generated/examplecom/parent_message_v2_pb.d.ts +++ b/examples/generated/proto/examplecom/parent_message_v2_pb.d.ts @@ -1,8 +1,8 @@ // package: examplecom -// file: examplecom/parent_message_v2.proto +// file: proto/examplecom/parent_message_v2.proto import * as jspb from "google-protobuf"; -import * as othercom_external_child_message_pb from "../othercom/external_child_message_pb"; +import * as proto_othercom_external_child_message_pb from "../../proto/othercom/external_child_message_pb"; export class ParentMessageV2 extends jspb.Message { hasInternalChildMessage(): boolean; @@ -22,18 +22,18 @@ export class ParentMessageV2 extends jspb.Message { hasExternalChildMessage(): boolean; clearExternalChildMessage(): void; - getExternalChildMessage(): othercom_external_child_message_pb.ExternalChildMessage; - setExternalChildMessage(value?: othercom_external_child_message_pb.ExternalChildMessage): void; + getExternalChildMessage(): proto_othercom_external_child_message_pb.ExternalChildMessage; + setExternalChildMessage(value?: proto_othercom_external_child_message_pb.ExternalChildMessage): void; hasOptExternalChildMessage(): boolean; clearOptExternalChildMessage(): void; - getOptExternalChildMessage(): othercom_external_child_message_pb.ExternalChildMessage | undefined; - setOptExternalChildMessage(value?: othercom_external_child_message_pb.ExternalChildMessage): void; + getOptExternalChildMessage(): proto_othercom_external_child_message_pb.ExternalChildMessage | undefined; + setOptExternalChildMessage(value?: proto_othercom_external_child_message_pb.ExternalChildMessage): void; clearExternalChildrenList(): void; - getExternalChildrenList(): Array; - setExternalChildrenList(value: Array): void; - addExternalChildren(value?: othercom_external_child_message_pb.ExternalChildMessage, index?: number): othercom_external_child_message_pb.ExternalChildMessage; + getExternalChildrenList(): Array; + setExternalChildrenList(value: Array): void; + addExternalChildren(value?: proto_othercom_external_child_message_pb.ExternalChildMessage, index?: number): proto_othercom_external_child_message_pb.ExternalChildMessage; serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): ParentMessageV2.AsObject; @@ -50,9 +50,9 @@ export namespace ParentMessageV2 { internalChildMessage: ParentMessageV2.InternalChildMessage.AsObject, optInternalChildMessage?: ParentMessageV2.InternalChildMessage.AsObject, internalChildrenList: Array, - externalChildMessage: othercom_external_child_message_pb.ExternalChildMessage.AsObject, - optExternalChildMessage?: othercom_external_child_message_pb.ExternalChildMessage.AsObject, - externalChildrenList: Array, + externalChildMessage: proto_othercom_external_child_message_pb.ExternalChildMessage.AsObject, + optExternalChildMessage?: proto_othercom_external_child_message_pb.ExternalChildMessage.AsObject, + externalChildrenList: Array, } export class InternalChildMessage extends jspb.Message { diff --git a/examples/generated/examplecom/parent_message_v2_pb.js b/examples/generated/proto/examplecom/parent_message_v2_pb.js similarity index 91% rename from examples/generated/examplecom/parent_message_v2_pb.js rename to examples/generated/proto/examplecom/parent_message_v2_pb.js index 7f6f1256..c343dfc2 100644 --- a/examples/generated/examplecom/parent_message_v2_pb.js +++ b/examples/generated/proto/examplecom/parent_message_v2_pb.js @@ -11,7 +11,7 @@ var jspb = require('google-protobuf'); var goog = jspb; var global = Function('return this')(); -var othercom_external_child_message_pb = require('../othercom/external_child_message_pb.js'); +var proto_othercom_external_child_message_pb = require('../../proto/othercom/external_child_message_pb.js'); goog.exportSymbol('proto.examplecom.ParentMessageV2', null, global); goog.exportSymbol('proto.examplecom.ParentMessageV2.InternalChildMessage', null, global); @@ -72,10 +72,10 @@ proto.examplecom.ParentMessageV2.toObject = function(includeInstance, msg) { optInternalChildMessage: (f = msg.getOptInternalChildMessage()) && proto.examplecom.ParentMessageV2.InternalChildMessage.toObject(includeInstance, f), internalChildrenList: jspb.Message.toObjectList(msg.getInternalChildrenList(), proto.examplecom.ParentMessageV2.InternalChildMessage.toObject, includeInstance), - externalChildMessage: (f = msg.getExternalChildMessage()) && othercom_external_child_message_pb.ExternalChildMessage.toObject(includeInstance, f), - optExternalChildMessage: (f = msg.getOptExternalChildMessage()) && othercom_external_child_message_pb.ExternalChildMessage.toObject(includeInstance, f), + externalChildMessage: (f = msg.getExternalChildMessage()) && proto_othercom_external_child_message_pb.ExternalChildMessage.toObject(includeInstance, f), + optExternalChildMessage: (f = msg.getOptExternalChildMessage()) && proto_othercom_external_child_message_pb.ExternalChildMessage.toObject(includeInstance, f), externalChildrenList: jspb.Message.toObjectList(msg.getExternalChildrenList(), - othercom_external_child_message_pb.ExternalChildMessage.toObject, includeInstance) + proto_othercom_external_child_message_pb.ExternalChildMessage.toObject, includeInstance) }; if (includeInstance) { @@ -128,18 +128,18 @@ proto.examplecom.ParentMessageV2.deserializeBinaryFromReader = function(msg, rea msg.addInternalChildren(value); break; case 4: - var value = new othercom_external_child_message_pb.ExternalChildMessage; - reader.readMessage(value,othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); + var value = new proto_othercom_external_child_message_pb.ExternalChildMessage; + reader.readMessage(value,proto_othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); msg.setExternalChildMessage(value); break; case 5: - var value = new othercom_external_child_message_pb.ExternalChildMessage; - reader.readMessage(value,othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); + var value = new proto_othercom_external_child_message_pb.ExternalChildMessage; + reader.readMessage(value,proto_othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); msg.setOptExternalChildMessage(value); break; case 6: - var value = new othercom_external_child_message_pb.ExternalChildMessage; - reader.readMessage(value,othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); + var value = new proto_othercom_external_child_message_pb.ExternalChildMessage; + reader.readMessage(value,proto_othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); msg.addExternalChildren(value); break; default: @@ -200,7 +200,7 @@ proto.examplecom.ParentMessageV2.serializeBinaryToWriter = function(message, wri writer.writeMessage( 4, f, - othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter + proto_othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter ); } f = message.getOptExternalChildMessage(); @@ -208,7 +208,7 @@ proto.examplecom.ParentMessageV2.serializeBinaryToWriter = function(message, wri writer.writeMessage( 5, f, - othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter + proto_othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter ); } f = message.getExternalChildrenList(); @@ -216,7 +216,7 @@ proto.examplecom.ParentMessageV2.serializeBinaryToWriter = function(message, wri writer.writeRepeatedMessage( 6, f, - othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter + proto_othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter ); } }; @@ -475,7 +475,7 @@ proto.examplecom.ParentMessageV2.prototype.clearInternalChildrenList = function( */ proto.examplecom.ParentMessageV2.prototype.getExternalChildMessage = function() { return /** @type{!proto.othercom.ExternalChildMessage} */ ( - jspb.Message.getWrapperField(this, othercom_external_child_message_pb.ExternalChildMessage, 4, 1)); + jspb.Message.getWrapperField(this, proto_othercom_external_child_message_pb.ExternalChildMessage, 4, 1)); }; @@ -505,7 +505,7 @@ proto.examplecom.ParentMessageV2.prototype.hasExternalChildMessage = function() */ proto.examplecom.ParentMessageV2.prototype.getOptExternalChildMessage = function() { return /** @type{?proto.othercom.ExternalChildMessage} */ ( - jspb.Message.getWrapperField(this, othercom_external_child_message_pb.ExternalChildMessage, 5)); + jspb.Message.getWrapperField(this, proto_othercom_external_child_message_pb.ExternalChildMessage, 5)); }; @@ -535,7 +535,7 @@ proto.examplecom.ParentMessageV2.prototype.hasOptExternalChildMessage = function */ proto.examplecom.ParentMessageV2.prototype.getExternalChildrenList = function() { return /** @type{!Array.} */ ( - jspb.Message.getRepeatedWrapperField(this, othercom_external_child_message_pb.ExternalChildMessage, 6)); + jspb.Message.getRepeatedWrapperField(this, proto_othercom_external_child_message_pb.ExternalChildMessage, 6)); }; diff --git a/examples/generated/examplecom/parent_message_v3_pb.d.ts b/examples/generated/proto/examplecom/parent_message_v3_pb.d.ts similarity index 72% rename from examples/generated/examplecom/parent_message_v3_pb.d.ts rename to examples/generated/proto/examplecom/parent_message_v3_pb.d.ts index 2e237397..8aa18ea7 100644 --- a/examples/generated/examplecom/parent_message_v3_pb.d.ts +++ b/examples/generated/proto/examplecom/parent_message_v3_pb.d.ts @@ -1,8 +1,8 @@ // package: examplecom -// file: examplecom/parent_message_v3.proto +// file: proto/examplecom/parent_message_v3.proto import * as jspb from "google-protobuf"; -import * as othercom_external_child_message_pb from "../othercom/external_child_message_pb"; +import * as proto_othercom_external_child_message_pb from "../../proto/othercom/external_child_message_pb"; export class ParentMessageV3 extends jspb.Message { hasInternalChildMessage(): boolean; @@ -17,13 +17,13 @@ export class ParentMessageV3 extends jspb.Message { hasExternalChildMessage(): boolean; clearExternalChildMessage(): void; - getExternalChildMessage(): othercom_external_child_message_pb.ExternalChildMessage | undefined; - setExternalChildMessage(value?: othercom_external_child_message_pb.ExternalChildMessage): void; + getExternalChildMessage(): proto_othercom_external_child_message_pb.ExternalChildMessage | undefined; + setExternalChildMessage(value?: proto_othercom_external_child_message_pb.ExternalChildMessage): void; clearExternalChildrenList(): void; - getExternalChildrenList(): Array; - setExternalChildrenList(value: Array): void; - addExternalChildren(value?: othercom_external_child_message_pb.ExternalChildMessage, index?: number): othercom_external_child_message_pb.ExternalChildMessage; + getExternalChildrenList(): Array; + setExternalChildrenList(value: Array): void; + addExternalChildren(value?: proto_othercom_external_child_message_pb.ExternalChildMessage, index?: number): proto_othercom_external_child_message_pb.ExternalChildMessage; serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): ParentMessageV3.AsObject; @@ -39,8 +39,8 @@ export namespace ParentMessageV3 { export type AsObject = { internalChildMessage?: ParentMessageV3.InternalChildMessage.AsObject, internalChildrenList: Array, - externalChildMessage?: othercom_external_child_message_pb.ExternalChildMessage.AsObject, - externalChildrenList: Array, + externalChildMessage?: proto_othercom_external_child_message_pb.ExternalChildMessage.AsObject, + externalChildrenList: Array, } export class InternalChildMessage extends jspb.Message { diff --git a/examples/generated/examplecom/parent_message_v3_pb.js b/examples/generated/proto/examplecom/parent_message_v3_pb.js similarity index 93% rename from examples/generated/examplecom/parent_message_v3_pb.js rename to examples/generated/proto/examplecom/parent_message_v3_pb.js index df5f000d..f194fc79 100644 --- a/examples/generated/examplecom/parent_message_v3_pb.js +++ b/examples/generated/proto/examplecom/parent_message_v3_pb.js @@ -11,7 +11,7 @@ var jspb = require('google-protobuf'); var goog = jspb; var global = Function('return this')(); -var othercom_external_child_message_pb = require('../othercom/external_child_message_pb.js'); +var proto_othercom_external_child_message_pb = require('../../proto/othercom/external_child_message_pb.js'); goog.exportSymbol('proto.examplecom.ParentMessageV3', null, global); goog.exportSymbol('proto.examplecom.ParentMessageV3.InternalChildMessage', null, global); @@ -71,9 +71,9 @@ proto.examplecom.ParentMessageV3.toObject = function(includeInstance, msg) { internalChildMessage: (f = msg.getInternalChildMessage()) && proto.examplecom.ParentMessageV3.InternalChildMessage.toObject(includeInstance, f), internalChildrenList: jspb.Message.toObjectList(msg.getInternalChildrenList(), proto.examplecom.ParentMessageV3.InternalChildMessage.toObject, includeInstance), - externalChildMessage: (f = msg.getExternalChildMessage()) && othercom_external_child_message_pb.ExternalChildMessage.toObject(includeInstance, f), + externalChildMessage: (f = msg.getExternalChildMessage()) && proto_othercom_external_child_message_pb.ExternalChildMessage.toObject(includeInstance, f), externalChildrenList: jspb.Message.toObjectList(msg.getExternalChildrenList(), - othercom_external_child_message_pb.ExternalChildMessage.toObject, includeInstance) + proto_othercom_external_child_message_pb.ExternalChildMessage.toObject, includeInstance) }; if (includeInstance) { @@ -121,13 +121,13 @@ proto.examplecom.ParentMessageV3.deserializeBinaryFromReader = function(msg, rea msg.addInternalChildren(value); break; case 3: - var value = new othercom_external_child_message_pb.ExternalChildMessage; - reader.readMessage(value,othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); + var value = new proto_othercom_external_child_message_pb.ExternalChildMessage; + reader.readMessage(value,proto_othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); msg.setExternalChildMessage(value); break; case 4: - var value = new othercom_external_child_message_pb.ExternalChildMessage; - reader.readMessage(value,othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); + var value = new proto_othercom_external_child_message_pb.ExternalChildMessage; + reader.readMessage(value,proto_othercom_external_child_message_pb.ExternalChildMessage.deserializeBinaryFromReader); msg.addExternalChildren(value); break; default: @@ -180,7 +180,7 @@ proto.examplecom.ParentMessageV3.serializeBinaryToWriter = function(message, wri writer.writeMessage( 3, f, - othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter + proto_othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter ); } f = message.getExternalChildrenList(); @@ -188,7 +188,7 @@ proto.examplecom.ParentMessageV3.serializeBinaryToWriter = function(message, wri writer.writeRepeatedMessage( 4, f, - othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter + proto_othercom_external_child_message_pb.ExternalChildMessage.serializeBinaryToWriter ); } }; @@ -403,7 +403,7 @@ proto.examplecom.ParentMessageV3.prototype.clearInternalChildrenList = function( */ proto.examplecom.ParentMessageV3.prototype.getExternalChildMessage = function() { return /** @type{?proto.othercom.ExternalChildMessage} */ ( - jspb.Message.getWrapperField(this, othercom_external_child_message_pb.ExternalChildMessage, 3)); + jspb.Message.getWrapperField(this, proto_othercom_external_child_message_pb.ExternalChildMessage, 3)); }; @@ -433,7 +433,7 @@ proto.examplecom.ParentMessageV3.prototype.hasExternalChildMessage = function() */ proto.examplecom.ParentMessageV3.prototype.getExternalChildrenList = function() { return /** @type{!Array.} */ ( - jspb.Message.getRepeatedWrapperField(this, othercom_external_child_message_pb.ExternalChildMessage, 4)); + jspb.Message.getRepeatedWrapperField(this, proto_othercom_external_child_message_pb.ExternalChildMessage, 4)); }; diff --git a/examples/generated/examplecom/primitive_message_v2_pb.d.ts b/examples/generated/proto/examplecom/primitive_message_v2_pb.d.ts similarity index 99% rename from examples/generated/examplecom/primitive_message_v2_pb.d.ts rename to examples/generated/proto/examplecom/primitive_message_v2_pb.d.ts index fb999013..8cd1dfe1 100644 --- a/examples/generated/examplecom/primitive_message_v2_pb.d.ts +++ b/examples/generated/proto/examplecom/primitive_message_v2_pb.d.ts @@ -1,5 +1,5 @@ // package: examplecom -// file: examplecom/primitive_message_v2.proto +// file: proto/examplecom/primitive_message_v2.proto import * as jspb from "google-protobuf"; diff --git a/examples/generated/examplecom/primitive_message_v2_pb.js b/examples/generated/proto/examplecom/primitive_message_v2_pb.js similarity index 100% rename from examples/generated/examplecom/primitive_message_v2_pb.js rename to examples/generated/proto/examplecom/primitive_message_v2_pb.js diff --git a/examples/generated/examplecom/primitive_message_v3_pb.d.ts b/examples/generated/proto/examplecom/primitive_message_v3_pb.d.ts similarity index 97% rename from examples/generated/examplecom/primitive_message_v3_pb.d.ts rename to examples/generated/proto/examplecom/primitive_message_v3_pb.d.ts index 3595ad9a..2f8b1f49 100644 --- a/examples/generated/examplecom/primitive_message_v3_pb.d.ts +++ b/examples/generated/proto/examplecom/primitive_message_v3_pb.d.ts @@ -1,5 +1,5 @@ // package: examplecom -// file: examplecom/primitive_message_v3.proto +// file: proto/examplecom/primitive_message_v3.proto import * as jspb from "google-protobuf"; diff --git a/examples/generated/examplecom/primitive_message_v3_pb.js b/examples/generated/proto/examplecom/primitive_message_v3_pb.js similarity index 100% rename from examples/generated/examplecom/primitive_message_v3_pb.js rename to examples/generated/proto/examplecom/primitive_message_v3_pb.js diff --git a/examples/generated/examplecom/repeated_primitive_message_pb.d.ts b/examples/generated/proto/examplecom/repeated_primitive_message_pb.d.ts similarity index 98% rename from examples/generated/examplecom/repeated_primitive_message_pb.d.ts rename to examples/generated/proto/examplecom/repeated_primitive_message_pb.d.ts index b7cab6e6..2492a87c 100644 --- a/examples/generated/examplecom/repeated_primitive_message_pb.d.ts +++ b/examples/generated/proto/examplecom/repeated_primitive_message_pb.d.ts @@ -1,5 +1,5 @@ // package: examplecom -// file: examplecom/repeated_primitive_message.proto +// file: proto/examplecom/repeated_primitive_message.proto import * as jspb from "google-protobuf"; diff --git a/examples/generated/examplecom/repeated_primitive_message_pb.js b/examples/generated/proto/examplecom/repeated_primitive_message_pb.js similarity index 100% rename from examples/generated/examplecom/repeated_primitive_message_pb.js rename to examples/generated/proto/examplecom/repeated_primitive_message_pb.js diff --git a/examples/generated/examplecom/reserved_words_pb.d.ts b/examples/generated/proto/examplecom/reserved_words_pb.d.ts similarity index 99% rename from examples/generated/examplecom/reserved_words_pb.d.ts rename to examples/generated/proto/examplecom/reserved_words_pb.d.ts index 99547c63..b6b11613 100644 --- a/examples/generated/examplecom/reserved_words_pb.d.ts +++ b/examples/generated/proto/examplecom/reserved_words_pb.d.ts @@ -1,5 +1,5 @@ // package: examplecom -// file: examplecom/reserved_words.proto +// file: proto/examplecom/reserved_words.proto import * as jspb from "google-protobuf"; diff --git a/examples/generated/examplecom/reserved_words_pb.js b/examples/generated/proto/examplecom/reserved_words_pb.js similarity index 100% rename from examples/generated/examplecom/reserved_words_pb.js rename to examples/generated/proto/examplecom/reserved_words_pb.js diff --git a/examples/generated/examplecom/simple_pb.d.ts b/examples/generated/proto/examplecom/simple_pb.d.ts similarity index 99% rename from examples/generated/examplecom/simple_pb.d.ts rename to examples/generated/proto/examplecom/simple_pb.d.ts index debb2dd4..9384ef61 100644 --- a/examples/generated/examplecom/simple_pb.d.ts +++ b/examples/generated/proto/examplecom/simple_pb.d.ts @@ -1,5 +1,5 @@ // package: examplecom -// file: examplecom/simple.proto +// file: proto/examplecom/simple.proto import * as jspb from "google-protobuf"; import * as google_protobuf_compiler_plugin_pb from "google-protobuf/google/protobuf/compiler/plugin_pb"; diff --git a/examples/generated/examplecom/simple_pb.js b/examples/generated/proto/examplecom/simple_pb.js similarity index 100% rename from examples/generated/examplecom/simple_pb.js rename to examples/generated/proto/examplecom/simple_pb.js diff --git a/examples/generated/examplecom/simple_service_pb.d.ts b/examples/generated/proto/examplecom/simple_service_pb.d.ts similarity index 94% rename from examples/generated/examplecom/simple_service_pb.d.ts rename to examples/generated/proto/examplecom/simple_service_pb.d.ts index eaf21250..f8c9f620 100644 --- a/examples/generated/examplecom/simple_service_pb.d.ts +++ b/examples/generated/proto/examplecom/simple_service_pb.d.ts @@ -1,8 +1,8 @@ // package: examplecom -// file: examplecom/simple_service.proto +// file: proto/examplecom/simple_service.proto import * as jspb from "google-protobuf"; -import * as othercom_external_child_message_pb from "../othercom/external_child_message_pb"; +import * as proto_othercom_external_child_message_pb from "../../proto/othercom/external_child_message_pb"; import * as google_protobuf_timestamp_pb from "google-protobuf/google/protobuf/timestamp_pb"; export class UnaryRequest extends jspb.Message { diff --git a/examples/generated/examplecom/simple_service_pb.js b/examples/generated/proto/examplecom/simple_service_pb.js similarity index 99% rename from examples/generated/examplecom/simple_service_pb.js rename to examples/generated/proto/examplecom/simple_service_pb.js index 2ad02d30..1b4b5107 100644 --- a/examples/generated/examplecom/simple_service_pb.js +++ b/examples/generated/proto/examplecom/simple_service_pb.js @@ -11,7 +11,7 @@ var jspb = require('google-protobuf'); var goog = jspb; var global = Function('return this')(); -var othercom_external_child_message_pb = require('../othercom/external_child_message_pb.js'); +var proto_othercom_external_child_message_pb = require('../../proto/othercom/external_child_message_pb.js'); var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js'); goog.exportSymbol('proto.examplecom.StreamRequest', null, global); goog.exportSymbol('proto.examplecom.UnaryRequest', null, global); diff --git a/examples/generated/proto/examplecom/simple_service_pb_service.d.ts b/examples/generated/proto/examplecom/simple_service_pb_service.d.ts new file mode 100644 index 00000000..ddafbea9 --- /dev/null +++ b/examples/generated/proto/examplecom/simple_service_pb_service.d.ts @@ -0,0 +1,77 @@ +// package: examplecom +// file: proto/examplecom/simple_service.proto + +import * as proto_examplecom_simple_service_pb from "../../proto/examplecom/simple_service_pb"; +import * as proto_othercom_external_child_message_pb from "../../proto/othercom/external_child_message_pb"; +import {grpc} from "grpc-web-client"; + +type SimpleServiceDoUnary = { + readonly methodName: string; + readonly service: typeof SimpleService; + readonly requestStream: false; + readonly responseStream: false; + readonly requestType: typeof proto_examplecom_simple_service_pb.UnaryRequest; + readonly responseType: typeof proto_othercom_external_child_message_pb.ExternalChildMessage; +}; + +type SimpleServiceDoStream = { + readonly methodName: string; + readonly service: typeof SimpleService; + readonly requestStream: false; + readonly responseStream: true; + readonly requestType: typeof proto_examplecom_simple_service_pb.StreamRequest; + readonly responseType: typeof proto_othercom_external_child_message_pb.ExternalChildMessage; +}; + +type SimpleServiceDelete = { + readonly methodName: string; + readonly service: typeof SimpleService; + readonly requestStream: false; + readonly responseStream: false; + readonly requestType: typeof proto_examplecom_simple_service_pb.UnaryRequest; + readonly responseType: typeof proto_examplecom_simple_service_pb.UnaryResponse; +}; + +export class SimpleService { + static readonly serviceName: string; + static readonly DoUnary: SimpleServiceDoUnary; + static readonly DoStream: SimpleServiceDoStream; + static readonly Delete: SimpleServiceDelete; +} + +export type ServiceError = { message: string, code: number; metadata: grpc.Metadata } +export type Status = { details: string, code: number; metadata: grpc.Metadata } +export type ServiceClientOptions = { transport: grpc.TransportConstructor } + +interface ResponseStream { + cancel(): void; + on(type: 'data', handler: (message: T) => void): ResponseStream; + on(type: 'end', handler: () => void): ResponseStream; + on(type: 'status', handler: (status: Status) => void): ResponseStream; +} + +export class SimpleServiceClient { + readonly serviceHost: string; + + constructor(serviceHost: string, options?: ServiceClientOptions); + doUnary( + requestMessage: proto_examplecom_simple_service_pb.UnaryRequest, + metadata: grpc.Metadata, + callback: (error: ServiceError, responseMessage: proto_othercom_external_child_message_pb.ExternalChildMessage|null) => void + ): void; + doUnary( + requestMessage: proto_examplecom_simple_service_pb.UnaryRequest, + callback: (error: ServiceError, responseMessage: proto_othercom_external_child_message_pb.ExternalChildMessage|null) => void + ): void; + doStream(requestMessage: proto_examplecom_simple_service_pb.StreamRequest, metadata?: grpc.Metadata): ResponseStream; + delete( + requestMessage: proto_examplecom_simple_service_pb.UnaryRequest, + metadata: grpc.Metadata, + callback: (error: ServiceError, responseMessage: proto_examplecom_simple_service_pb.UnaryResponse|null) => void + ): void; + delete( + requestMessage: proto_examplecom_simple_service_pb.UnaryRequest, + callback: (error: ServiceError, responseMessage: proto_examplecom_simple_service_pb.UnaryResponse|null) => void + ): void; +} + diff --git a/examples/generated/examplecom/simple_service_pb_service.js b/examples/generated/proto/examplecom/simple_service_pb_service.js similarity index 82% rename from examples/generated/examplecom/simple_service_pb_service.js rename to examples/generated/proto/examplecom/simple_service_pb_service.js index 999d0079..0fa10b35 100644 --- a/examples/generated/examplecom/simple_service_pb_service.js +++ b/examples/generated/proto/examplecom/simple_service_pb_service.js @@ -1,8 +1,8 @@ // package: examplecom -// file: examplecom/simple_service.proto +// file: proto/examplecom/simple_service.proto -var examplecom_simple_service_pb = require("../examplecom/simple_service_pb"); -var othercom_external_child_message_pb = require("../othercom/external_child_message_pb"); +var proto_examplecom_simple_service_pb = require("../../proto/examplecom/simple_service_pb"); +var proto_othercom_external_child_message_pb = require("../../proto/othercom/external_child_message_pb"); var grpc = require("grpc-web-client").grpc; var SimpleService = (function () { @@ -16,8 +16,8 @@ SimpleService.DoUnary = { service: SimpleService, requestStream: false, responseStream: false, - requestType: examplecom_simple_service_pb.UnaryRequest, - responseType: othercom_external_child_message_pb.ExternalChildMessage + requestType: proto_examplecom_simple_service_pb.UnaryRequest, + responseType: proto_othercom_external_child_message_pb.ExternalChildMessage }; SimpleService.DoStream = { @@ -25,8 +25,8 @@ SimpleService.DoStream = { service: SimpleService, requestStream: false, responseStream: true, - requestType: examplecom_simple_service_pb.StreamRequest, - responseType: othercom_external_child_message_pb.ExternalChildMessage + requestType: proto_examplecom_simple_service_pb.StreamRequest, + responseType: proto_othercom_external_child_message_pb.ExternalChildMessage }; SimpleService.Delete = { @@ -34,8 +34,8 @@ SimpleService.Delete = { service: SimpleService, requestStream: false, responseStream: false, - requestType: examplecom_simple_service_pb.UnaryRequest, - responseType: examplecom_simple_service_pb.UnaryResponse + requestType: proto_examplecom_simple_service_pb.UnaryRequest, + responseType: proto_examplecom_simple_service_pb.UnaryResponse }; exports.SimpleService = SimpleService; diff --git a/examples/generated/examplecom/simplevalue_pb.d.ts b/examples/generated/proto/examplecom/simplevalue_pb.d.ts similarity index 98% rename from examples/generated/examplecom/simplevalue_pb.d.ts rename to examples/generated/proto/examplecom/simplevalue_pb.d.ts index 14ef2f49..79da301f 100644 --- a/examples/generated/examplecom/simplevalue_pb.d.ts +++ b/examples/generated/proto/examplecom/simplevalue_pb.d.ts @@ -1,5 +1,5 @@ // package: examplecom -// file: examplecom/simplevalue.proto +// file: proto/examplecom/simplevalue.proto import * as jspb from "google-protobuf"; diff --git a/examples/generated/examplecom/simplevalue_pb.js b/examples/generated/proto/examplecom/simplevalue_pb.js similarity index 100% rename from examples/generated/examplecom/simplevalue_pb.js rename to examples/generated/proto/examplecom/simplevalue_pb.js diff --git a/examples/generated/examplecom/well_known_message_pb.d.ts b/examples/generated/proto/examplecom/well_known_message_pb.d.ts similarity index 99% rename from examples/generated/examplecom/well_known_message_pb.d.ts rename to examples/generated/proto/examplecom/well_known_message_pb.d.ts index 32d5639d..a970a7e1 100644 --- a/examples/generated/examplecom/well_known_message_pb.d.ts +++ b/examples/generated/proto/examplecom/well_known_message_pb.d.ts @@ -1,5 +1,5 @@ // package: examplecom -// file: examplecom/well_known_message.proto +// file: proto/examplecom/well_known_message.proto import * as jspb from "google-protobuf"; import * as google_protobuf_any_pb from "google-protobuf/google/protobuf/any_pb"; diff --git a/examples/generated/examplecom/well_known_message_pb.js b/examples/generated/proto/examplecom/well_known_message_pb.js similarity index 100% rename from examples/generated/examplecom/well_known_message_pb.js rename to examples/generated/proto/examplecom/well_known_message_pb.js diff --git a/examples/generated/orphan_pb.d.ts b/examples/generated/proto/orphan_pb.d.ts similarity index 99% rename from examples/generated/orphan_pb.d.ts rename to examples/generated/proto/orphan_pb.d.ts index e918cec7..24026c84 100644 --- a/examples/generated/orphan_pb.d.ts +++ b/examples/generated/proto/orphan_pb.d.ts @@ -1,5 +1,5 @@ // package: -// file: orphan.proto +// file: proto/orphan.proto import * as jspb from "google-protobuf"; diff --git a/examples/generated/orphan_pb.js b/examples/generated/proto/orphan_pb.js similarity index 100% rename from examples/generated/orphan_pb.js rename to examples/generated/proto/orphan_pb.js diff --git a/examples/generated/orphan_pb_service.d.ts b/examples/generated/proto/orphan_pb_service.d.ts similarity index 61% rename from examples/generated/orphan_pb_service.d.ts rename to examples/generated/proto/orphan_pb_service.d.ts index 1cfd54c2..ede90559 100644 --- a/examples/generated/orphan_pb_service.d.ts +++ b/examples/generated/proto/orphan_pb_service.d.ts @@ -1,7 +1,7 @@ // package: -// file: orphan.proto +// file: proto/orphan.proto -import * as orphan_pb from "./orphan_pb"; +import * as proto_orphan_pb from "../proto/orphan_pb"; import {grpc} from "grpc-web-client"; type OrphanServiceDoUnary = { @@ -9,8 +9,8 @@ type OrphanServiceDoUnary = { readonly service: typeof OrphanService; readonly requestStream: false; readonly responseStream: false; - readonly requestType: typeof orphan_pb.OrphanUnaryRequest; - readonly responseType: typeof orphan_pb.OrphanMessage; + readonly requestType: typeof proto_orphan_pb.OrphanUnaryRequest; + readonly responseType: typeof proto_orphan_pb.OrphanMessage; }; type OrphanServiceDoStream = { @@ -18,8 +18,8 @@ type OrphanServiceDoStream = { readonly service: typeof OrphanService; readonly requestStream: false; readonly responseStream: true; - readonly requestType: typeof orphan_pb.OrphanStreamRequest; - readonly responseType: typeof orphan_pb.OrphanMessage; + readonly requestType: typeof proto_orphan_pb.OrphanStreamRequest; + readonly responseType: typeof proto_orphan_pb.OrphanMessage; }; export class OrphanService { @@ -44,14 +44,14 @@ export class OrphanServiceClient { constructor(serviceHost: string, options?: ServiceClientOptions); doUnary( - requestMessage: orphan_pb.OrphanUnaryRequest, + requestMessage: proto_orphan_pb.OrphanUnaryRequest, metadata: grpc.Metadata, - callback: (error: ServiceError, responseMessage: orphan_pb.OrphanMessage|null) => void + callback: (error: ServiceError, responseMessage: proto_orphan_pb.OrphanMessage|null) => void ): void; doUnary( - requestMessage: orphan_pb.OrphanUnaryRequest, - callback: (error: ServiceError, responseMessage: orphan_pb.OrphanMessage|null) => void + requestMessage: proto_orphan_pb.OrphanUnaryRequest, + callback: (error: ServiceError, responseMessage: proto_orphan_pb.OrphanMessage|null) => void ): void; - doStream(requestMessage: orphan_pb.OrphanStreamRequest, metadata?: grpc.Metadata): ResponseStream; + doStream(requestMessage: proto_orphan_pb.OrphanStreamRequest, metadata?: grpc.Metadata): ResponseStream; } diff --git a/examples/generated/orphan_pb_service.js b/examples/generated/proto/orphan_pb_service.js similarity index 89% rename from examples/generated/orphan_pb_service.js rename to examples/generated/proto/orphan_pb_service.js index fad256d4..c8c4583c 100644 --- a/examples/generated/orphan_pb_service.js +++ b/examples/generated/proto/orphan_pb_service.js @@ -1,7 +1,7 @@ // package: -// file: orphan.proto +// file: proto/orphan.proto -var orphan_pb = require("./orphan_pb"); +var proto_orphan_pb = require("../proto/orphan_pb"); var grpc = require("grpc-web-client").grpc; var OrphanService = (function () { @@ -15,8 +15,8 @@ OrphanService.DoUnary = { service: OrphanService, requestStream: false, responseStream: false, - requestType: orphan_pb.OrphanUnaryRequest, - responseType: orphan_pb.OrphanMessage + requestType: proto_orphan_pb.OrphanUnaryRequest, + responseType: proto_orphan_pb.OrphanMessage }; OrphanService.DoStream = { @@ -24,8 +24,8 @@ OrphanService.DoStream = { service: OrphanService, requestStream: false, responseStream: true, - requestType: orphan_pb.OrphanStreamRequest, - responseType: orphan_pb.OrphanMessage + requestType: proto_orphan_pb.OrphanStreamRequest, + responseType: proto_orphan_pb.OrphanMessage }; exports.OrphanService = OrphanService; diff --git a/examples/generated/othercom/external_child_message_pb.d.ts b/examples/generated/proto/othercom/external_child_message_pb.d.ts similarity index 94% rename from examples/generated/othercom/external_child_message_pb.d.ts rename to examples/generated/proto/othercom/external_child_message_pb.d.ts index 01adaec8..569e5857 100644 --- a/examples/generated/othercom/external_child_message_pb.d.ts +++ b/examples/generated/proto/othercom/external_child_message_pb.d.ts @@ -1,5 +1,5 @@ // package: othercom -// file: othercom/external_child_message.proto +// file: proto/othercom/external_child_message.proto import * as jspb from "google-protobuf"; diff --git a/examples/generated/othercom/external_child_message_pb.js b/examples/generated/proto/othercom/external_child_message_pb.js similarity index 100% rename from examples/generated/othercom/external_child_message_pb.js rename to examples/generated/proto/othercom/external_child_message_pb.js diff --git a/examples/generated/othercom/external_enum_pb.d.ts b/examples/generated/proto/othercom/external_enum_pb.d.ts similarity index 75% rename from examples/generated/othercom/external_enum_pb.d.ts rename to examples/generated/proto/othercom/external_enum_pb.d.ts index d28ec159..e9e8b3af 100644 --- a/examples/generated/othercom/external_enum_pb.d.ts +++ b/examples/generated/proto/othercom/external_enum_pb.d.ts @@ -1,5 +1,5 @@ // package: othercom -// file: othercom/external_enum.proto +// file: proto/othercom/external_enum.proto import * as jspb from "google-protobuf"; diff --git a/examples/generated/othercom/external_enum_pb.js b/examples/generated/proto/othercom/external_enum_pb.js similarity index 100% rename from examples/generated/othercom/external_enum_pb.js rename to examples/generated/proto/othercom/external_enum_pb.js diff --git a/generate.sh b/generate.sh index 4714a03c..0e22382a 100755 --- a/generate.sh +++ b/generate.sh @@ -40,16 +40,15 @@ if [ -d "$EXAMPLES_GENERATED_DIR" ] then rm -rf "$EXAMPLES_GENERATED_DIR" fi -mkdir "$EXAMPLES_GENERATED_DIR" +mkdir -p "$EXAMPLES_GENERATED_DIR" $PROTOC \ --plugin=protoc-gen-ts=./bin/protoc-gen-ts \ --js_out=import_style=commonjs,binary:$EXAMPLES_GENERATED_DIR \ --ts_out=service=true:$EXAMPLES_GENERATED_DIR \ - -I ./proto \ ./proto/othercom/*.proto \ ./proto/examplecom/*.proto \ ./proto/*.proto # Cleanup downloaded proto directory -rm -r protoc \ No newline at end of file +rm -r protoc diff --git a/proto/BUILD b/proto/BUILD new file mode 100644 index 00000000..d78d550f --- /dev/null +++ b/proto/BUILD @@ -0,0 +1,19 @@ +load("@ts_protoc_gen//:defs.bzl", "typescript_proto_library") +package(default_visibility = ["//visibility:public"]) + +filegroup( + name = "proto_files", + srcs = glob(["*.proto"]), +) + +proto_library( + name = "proto", + srcs = [ + ":proto_files", + ], +) + +typescript_proto_library( + name = "generate", + proto = ":proto", +) diff --git a/proto/examplecom/BUILD b/proto/examplecom/BUILD new file mode 100644 index 00000000..92980828 --- /dev/null +++ b/proto/examplecom/BUILD @@ -0,0 +1,34 @@ +load("@ts_protoc_gen//:defs.bzl", "typescript_proto_library") +package(default_visibility = ["//visibility:public"]) + +filegroup( + name = "proto_files", + srcs = glob(["*.proto"]), +) + +proto_library( + name = "proto", + srcs = [ + ":proto_files", + ], + deps = [ + "//proto/othercom:proto", + "@com_google_protobuf//:compiler_plugin_proto", + "@com_google_protobuf//:any_proto", + "@com_google_protobuf//:api_proto", + "@com_google_protobuf//:descriptor_proto", + "@com_google_protobuf//:duration_proto", + "@com_google_protobuf//:empty_proto", + "@com_google_protobuf//:field_mask_proto", + "@com_google_protobuf//:source_context_proto", + "@com_google_protobuf//:struct_proto", + "@com_google_protobuf//:timestamp_proto", + "@com_google_protobuf//:type_proto", + "@com_google_protobuf//:wrappers_proto", + ], +) + +typescript_proto_library( + name = "generate", + proto = ":proto", +) diff --git a/proto/examplecom/enum_message.proto b/proto/examplecom/enum_message.proto index db11f682..d5486d04 100644 --- a/proto/examplecom/enum_message.proto +++ b/proto/examplecom/enum_message.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package examplecom; -import "othercom/external_enum.proto"; +import "proto/othercom/external_enum.proto"; message EnumMessage { enum InternalEnum { diff --git a/proto/examplecom/map_message.proto b/proto/examplecom/map_message.proto index fb33e8fb..99ffbbec 100644 --- a/proto/examplecom/map_message.proto +++ b/proto/examplecom/map_message.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package examplecom; -import "othercom/external_enum.proto"; -import "othercom/external_child_message.proto"; +import "proto/othercom/external_enum.proto"; +import "proto/othercom/external_child_message.proto"; message MapMessage { enum InternalEnum { diff --git a/proto/examplecom/oneof_message.proto b/proto/examplecom/oneof_message.proto index ec037406..ba23d676 100644 --- a/proto/examplecom/oneof_message.proto +++ b/proto/examplecom/oneof_message.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package examplecom; -import "othercom/external_child_message.proto"; +import "proto/othercom/external_child_message.proto"; message OneOfMessage { message InternalChildMessage { diff --git a/proto/examplecom/parent_message_v2.proto b/proto/examplecom/parent_message_v2.proto index 3c57d202..d9268424 100644 --- a/proto/examplecom/parent_message_v2.proto +++ b/proto/examplecom/parent_message_v2.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package examplecom; -import "othercom/external_child_message.proto"; +import "proto/othercom/external_child_message.proto"; message ParentMessageV2 { message InternalChildMessage { diff --git a/proto/examplecom/parent_message_v3.proto b/proto/examplecom/parent_message_v3.proto index 4a733800..bafa6e05 100644 --- a/proto/examplecom/parent_message_v3.proto +++ b/proto/examplecom/parent_message_v3.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package examplecom; -import "othercom/external_child_message.proto"; +import "proto/othercom/external_child_message.proto"; message ParentMessageV3 { message InternalChildMessage { diff --git a/proto/examplecom/simple_service.proto b/proto/examplecom/simple_service.proto index c50cdddb..dcd5feb2 100644 --- a/proto/examplecom/simple_service.proto +++ b/proto/examplecom/simple_service.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package examplecom; -import "othercom/external_child_message.proto"; +import "proto/othercom/external_child_message.proto"; // this import should not be output in the generated typescript service import "google/protobuf/timestamp.proto"; diff --git a/proto/othercom/BUILD b/proto/othercom/BUILD new file mode 100644 index 00000000..d78d550f --- /dev/null +++ b/proto/othercom/BUILD @@ -0,0 +1,19 @@ +load("@ts_protoc_gen//:defs.bzl", "typescript_proto_library") +package(default_visibility = ["//visibility:public"]) + +filegroup( + name = "proto_files", + srcs = glob(["*.proto"]), +) + +proto_library( + name = "proto", + srcs = [ + ":proto_files", + ], +) + +typescript_proto_library( + name = "generate", + proto = ":proto", +) diff --git a/test/integration/enums.ts b/test/integration/enums.ts index 5aa21563..9b4231ac 100644 --- a/test/integration/enums.ts +++ b/test/integration/enums.ts @@ -1,6 +1,6 @@ import {assert} from "chai"; -import {EnumMessage} from "../../examples/generated/examplecom/enum_message_pb"; -import {ExternalEnum} from "../../examples/generated/othercom/external_enum_pb"; +import {EnumMessage} from "../../examples/generated/proto/examplecom/enum_message_pb"; +import {ExternalEnum} from "../../examples/generated/proto/othercom/external_enum_pb"; import InternalEnum = EnumMessage.InternalEnum; describe("internal enums", () => { @@ -49,4 +49,4 @@ describe("enum casing", () => { parentMsg.setInternalEnum(InternalEnum.THIRD); // should compile. assert.ok(true, ".d.ts file should export the enum definition in ALL_CAPS"); }); -}); \ No newline at end of file +}); diff --git a/test/integration/maps.ts b/test/integration/maps.ts index 16bca99a..c635f3c8 100644 --- a/test/integration/maps.ts +++ b/test/integration/maps.ts @@ -1,10 +1,10 @@ import {assert} from "chai"; -import {MapMessage} from "../../examples/generated/examplecom/map_message_pb"; -import {ExternalEnum} from "../../examples/generated/othercom/external_enum_pb"; -import {ExternalChildMessage} from "../../examples/generated/othercom/external_child_message_pb"; +import {MapMessage} from "../../examples/generated/proto/examplecom/map_message_pb"; +import {ExternalEnum} from "../../examples/generated/proto/othercom/external_enum_pb"; +import {ExternalChildMessage} from "../../examples/generated/proto/othercom/external_child_message_pb"; import InternalEnum = MapMessage.InternalEnum; import InternalChildMessage = MapMessage.InternalChildMessage; -import {OrphanMapMessage} from "../../examples/generated/orphan_pb"; +import {OrphanMapMessage} from "../../examples/generated/proto/orphan_pb"; describe("maps", () => { describe("message maps", () => { diff --git a/test/integration/nestedMessagesV2.ts b/test/integration/nestedMessagesV2.ts index c667fe76..80bdd20e 100644 --- a/test/integration/nestedMessagesV2.ts +++ b/test/integration/nestedMessagesV2.ts @@ -1,7 +1,7 @@ import {assert} from "chai"; -import {ParentMessageV2} from "../../examples/generated/examplecom/parent_message_v2_pb"; +import {ParentMessageV2} from "../../examples/generated/proto/examplecom/parent_message_v2_pb"; import InternalChildMessage = ParentMessageV2.InternalChildMessage; -import {ExternalChildMessage} from "../../examples/generated/othercom/external_child_message_pb"; +import {ExternalChildMessage} from "../../examples/generated/proto/othercom/external_child_message_pb"; describe("proto2 - internal nested messages", () => { it("should allow getting internal message fields on an empty message", () => { diff --git a/test/integration/nestedMessagesV3.ts b/test/integration/nestedMessagesV3.ts index d5b8bfe6..1509f1a7 100644 --- a/test/integration/nestedMessagesV3.ts +++ b/test/integration/nestedMessagesV3.ts @@ -1,6 +1,6 @@ import {assert} from "chai"; -import {ParentMessageV3} from "../../examples/generated/examplecom/parent_message_v3_pb"; -import {ExternalChildMessage} from "../../examples/generated/othercom/external_child_message_pb"; +import {ParentMessageV3} from "../../examples/generated/proto/examplecom/parent_message_v3_pb"; +import {ExternalChildMessage} from "../../examples/generated/proto/othercom/external_child_message_pb"; import InternalChildMessage = ParentMessageV3.InternalChildMessage; describe("proto3 - internal nested messages", () => { diff --git a/test/integration/oneof.ts b/test/integration/oneof.ts index 904b48b9..d720f503 100644 --- a/test/integration/oneof.ts +++ b/test/integration/oneof.ts @@ -1,6 +1,6 @@ import {assert} from "chai"; -import {OneOfMessage, CamelCasedOneOfMessage} from "../../examples/generated/examplecom/oneof_message_pb"; -import {ExternalChildMessage} from "../../examples/generated/othercom/external_child_message_pb"; +import {OneOfMessage, CamelCasedOneOfMessage} from "../../examples/generated/proto/examplecom/oneof_message_pb"; +import {ExternalChildMessage} from "../../examples/generated/proto/othercom/external_child_message_pb"; import InternalChildMessage = OneOfMessage.InternalChildMessage; describe("oneofs", () => { diff --git a/test/integration/orphan.ts b/test/integration/orphan.ts index 584086f1..fe761855 100644 --- a/test/integration/orphan.ts +++ b/test/integration/orphan.ts @@ -1,6 +1,6 @@ import {assert} from "chai"; -import * as orphan_pb_service from "../../examples/generated/orphan_pb_service"; -import * as orphan_pb from "../../examples/generated/orphan_pb"; +import * as orphan_pb_service from "../../examples/generated/proto/orphan_pb_service"; +import * as orphan_pb from "../../examples/generated/proto/orphan_pb"; describe("ts orphan service", () => { it("should generate a service definition that does not have a package", () => { diff --git a/test/integration/primitivesV2.ts b/test/integration/primitivesV2.ts index a082c0b3..9288ce53 100644 --- a/test/integration/primitivesV2.ts +++ b/test/integration/primitivesV2.ts @@ -1,5 +1,5 @@ import {assert} from "chai"; -import {PrimitiveMessageV2} from "../../examples/generated/examplecom/primitive_message_v2_pb"; +import {PrimitiveMessageV2} from "../../examples/generated/proto/examplecom/primitive_message_v2_pb"; describe("proto2 - primitive", () => { it("should allow getting required primitive fields", () => { diff --git a/test/integration/primitivesV3.ts b/test/integration/primitivesV3.ts index 6c6862e6..abc369df 100644 --- a/test/integration/primitivesV3.ts +++ b/test/integration/primitivesV3.ts @@ -1,5 +1,5 @@ import {assert} from "chai"; -import {PrimitiveMessageV3} from "../../examples/generated/examplecom/primitive_message_v3_pb"; +import {PrimitiveMessageV3} from "../../examples/generated/proto/examplecom/primitive_message_v3_pb"; describe("proto3 - primitive", () => { it("should allow getting primitive fields", () => { diff --git a/test/integration/repeatedPrimitives.ts b/test/integration/repeatedPrimitives.ts index e703aa21..9d4afff0 100644 --- a/test/integration/repeatedPrimitives.ts +++ b/test/integration/repeatedPrimitives.ts @@ -1,5 +1,5 @@ import {assert} from "chai"; -import {RepeatedPrimitiveMessage} from "../../examples/generated/examplecom/repeated_primitive_message_pb"; +import {RepeatedPrimitiveMessage} from "../../examples/generated/proto/examplecom/repeated_primitive_message_pb"; describe("repeated primitives", () => { it("should allow getting repeated primitive fields", () => { diff --git a/test/integration/reservedWords.ts b/test/integration/reservedWords.ts index 3f9cff69..11389c0d 100644 --- a/test/integration/reservedWords.ts +++ b/test/integration/reservedWords.ts @@ -1,5 +1,5 @@ import {assert} from "chai"; -import {ReservedWordsMessage} from "../../examples/generated/examplecom/reserved_words_pb"; +import {ReservedWordsMessage} from "../../examples/generated/proto/examplecom/reserved_words_pb"; describe("reserved words", () => { diff --git a/test/integration/service/grpcweb.ts b/test/integration/service/grpcweb.ts index 42a5c647..c122defb 100644 --- a/test/integration/service/grpcweb.ts +++ b/test/integration/service/grpcweb.ts @@ -5,9 +5,9 @@ import { grpc } from "grpc-web-client"; import { createContext, runInContext } from "vm"; import { StubTransportBuilder } from "../../helpers/fakeGrpcTransport"; -import { ExternalChildMessage } from "../../../examples/generated/othercom/external_child_message_pb"; -import { SimpleService, SimpleServiceClient } from "../../../examples/generated/examplecom/simple_service_pb_service"; -import { StreamRequest, UnaryRequest } from "../../../examples/generated/examplecom/simple_service_pb"; +import { ExternalChildMessage } from "../../../examples/generated/proto/othercom/external_child_message_pb"; +import { SimpleService, SimpleServiceClient } from "../../../examples/generated/proto/examplecom/simple_service_pb_service"; +import { StreamRequest, UnaryRequest } from "../../../examples/generated/proto/examplecom/simple_service_pb"; describe("service/grpc-web", () => { @@ -35,15 +35,15 @@ describe("service/grpc-web", () => { }); it("should not output imports for namespaces that are not used in the service definition", () => { - const generatedService = readFileSync(resolve(__dirname, "../../../examples/generated/examplecom/simple_service_pb_service.d.ts"), "utf8"); + const generatedService = readFileSync(resolve(__dirname, "../../../examples/generated/proto/examplecom/simple_service_pb_service.d.ts"), "utf8"); assert.notInclude(generatedService, "google-protobuf/google/protobuf/timestamp_pb"); - const generatedProto = readFileSync(resolve(__dirname, "../../../examples/generated/examplecom/simple_service_pb.js"), "utf8"); + const generatedProto = readFileSync(resolve(__dirname, "../../../examples/generated/proto/examplecom/simple_service_pb.js"), "utf8"); assert.include(generatedProto, "google-protobuf/google/protobuf/timestamp_pb"); }); it("should generate valid javascript sources", () => { - const generatedService = readFileSync(resolve(__dirname, "../../../examples/generated/examplecom/simple_service_pb_service.js"), "utf8"); + const generatedService = readFileSync(resolve(__dirname, "../../../examples/generated/proto/examplecom/simple_service_pb_service.js"), "utf8"); // Create a sandbox into which the javascript module will be exported. const sandbox = { exports: { SimpleService: SimpleService } }; diff --git a/test/integration/wellKnownTypes.ts b/test/integration/wellKnownTypes.ts index 7aefeb3b..0b466462 100644 --- a/test/integration/wellKnownTypes.ts +++ b/test/integration/wellKnownTypes.ts @@ -1,5 +1,5 @@ import {assert} from "chai"; -import {WellKnownMessage} from "../../examples/generated/examplecom/well_known_message_pb"; +import {WellKnownMessage} from "../../examples/generated/proto/examplecom/well_known_message_pb"; import {Any} from "google-protobuf/google/protobuf/any_pb"; import {CodeGeneratorRequest} from "google-protobuf/google/protobuf/compiler/plugin_pb"; import {Method} from "google-protobuf/google/protobuf/api_pb"; diff --git a/test/unit/util.ts b/test/unit/util.ts index 0ab1b4e1..edc9ed50 100644 --- a/test/unit/util.ts +++ b/test/unit/util.ts @@ -30,4 +30,4 @@ describe("util", () => { }); }); -}); \ No newline at end of file +}); From 53aa49ccb3fa7832934ff1cbf86ec62df1cde4cd Mon Sep 17 00:00:00 2001 From: bianbian-org Date: Thu, 14 Jun 2018 02:49:52 +0800 Subject: [PATCH 02/14] add debug to ServiceClientOptions (#90) --- src/service/grpcweb.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/service/grpcweb.ts b/src/service/grpcweb.ts index 9f0fc785..fbdd87b4 100644 --- a/src/service/grpcweb.ts +++ b/src/service/grpcweb.ts @@ -204,7 +204,7 @@ function generateTypescriptDefinition(fileDescriptor: FileDescriptorProto, expor printer.printLn(`export type ServiceError = { message: string, code: number; metadata: grpc.Metadata }`); printer.printLn(`export type Status = { details: string, code: number; metadata: grpc.Metadata }`); - printer.printLn(`export type ServiceClientOptions = { transport: grpc.TransportConstructor }`); + printer.printLn(`export type ServiceClientOptions = { transport: grpc.TransportConstructor; debug?: boolean }`); printer.printEmptyLn(); printer.printLn(`interface ResponseStream {`); printer.printIndentedLn(`cancel(): void;`); @@ -315,6 +315,7 @@ function printUnaryStubMethod(printer: CodePrinter, method: RPCMethodDescriptor) .printLn(`host: this.serviceHost,`) .printLn(`metadata: metadata,`) .printLn(`transport: this.options.transport,`) + .printLn(`debug: this.options.debug,`) .printLn(`onEnd: function (response) {`) .indent().printLn(`if (callback) {`) .indent().printLn(`if (response.status !== grpc.Code.OK) {`) @@ -341,6 +342,7 @@ function printServerStreamStubMethod(printer: CodePrinter, method: RPCMethodDesc .printLn(`host: this.serviceHost,`) .printLn(`metadata: metadata,`) .printLn(`transport: this.options.transport,`) + .printLn(`debug: this.options.debug,`) .printLn(`onMessage: function (responseMessage) {`) .indent().printLn(`listeners.data.forEach(function (handler) {`) .indent().printLn(`handler(responseMessage);`) From 940f34f88dc45f39a228ffa8d21c649dad36c988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian-Ionu=C5=A3=20Nancu?= Date: Wed, 18 Jul 2018 14:57:57 +0100 Subject: [PATCH 03/14] README update: add git repo for ts_protoc_gen and remove rule duplicate (#96) --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c8cf5457..ccec8767 100644 --- 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( @@ -58,6 +58,12 @@ git_repository( load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories") node_repositories(package_json = ["//:package.json"]) +git_repository( + name = "ts_protoc_gen", + remote = "https://github.com/improbable-eng/ts-protoc-gen.git", + commit = "05c52b843edf9420be3a9549d01352dfeff76a5e", +) + load("@ts_protoc_gen//:defs.bzl", "typescript_proto_dependencies") typescript_proto_dependencies() @@ -86,11 +92,6 @@ proto_library( ], ) -typescript_proto_library( - name = "generate", - proto = ":proto", -) - typescript_proto_library( name = "generate", proto = ":proto", From e0bfeab5d663b60b362db225084765ec4a51fd1d Mon Sep 17 00:00:00 2001 From: Jonny Reeves Date: Wed, 18 Jul 2018 14:58:44 +0100 Subject: [PATCH 04/14] Update Changelog --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a21c9f41..924ac7b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -## 0.7.4-pre +## 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 From 78e47f4439bca3ef7eb4c497c67ac0335e5a40a7 Mon Sep 17 00:00:00 2001 From: Jonny Reeves Date: Wed, 18 Jul 2018 14:59:49 +0100 Subject: [PATCH 05/14] Release 0.7.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e701704f..9525b762 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.4-pre", + "version": "0.7.4", "description": "Protoc Plugin for TypeScript Declarations and Service Definitions", "scripts": { "lint": "tslint -c tslint.json 'test/**/*.ts' 'src/**/*.ts'", From c653364a7ef6560c9486f628f5c7386a54da52ff Mon Sep 17 00:00:00 2001 From: Jonny Reeves Date: Wed, 18 Jul 2018 15:00:21 +0100 Subject: [PATCH 06/14] Release 0.7.4 --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index fd772715..3849fee2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.4-pre", + "version": "0.7.4", "lockfileVersion": 1, "requires": true, "dependencies": { From eb2fc0435eaab196981d3aa6224fd5fb8eca8725 Mon Sep 17 00:00:00 2001 From: Jonny Reeves Date: Wed, 18 Jul 2018 15:00:44 +0100 Subject: [PATCH 07/14] Bumped to v0.7.5-pre --- CHANGELOG.md | 2 ++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 924ac7b5..99591806 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 0.7.5-pre + ## 0.7.4 ### Changes diff --git a/package-lock.json b/package-lock.json index 3849fee2..4740df4a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.4", + "version": "0.7.5-pre", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9525b762..9d32090a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.4", + "version": "0.7.5-pre", "description": "Protoc Plugin for TypeScript Declarations and Service Definitions", "scripts": { "lint": "tslint -c tslint.json 'test/**/*.ts' 'src/**/*.ts'", From 64914b2368613dd2690f7b003c7670ec61cabf4e Mon Sep 17 00:00:00 2001 From: Jonny Reeves Date: Wed, 18 Jul 2018 15:28:00 +0100 Subject: [PATCH 08/14] Fixes #97 (#98) --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5ca82cd0..769678e9 100644 --- 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" From 423547f8f514af69b0224ce3280212e10d1fdfb7 Mon Sep 17 00:00:00 2001 From: Jonny Reeves Date: Wed, 18 Jul 2018 21:31:28 +0100 Subject: [PATCH 09/14] Remove legacy generated artificats. --- .../examplecom/empty_message_no_service_pb_service.d.ts | 3 --- .../examplecom/empty_message_no_service_pb_service.js | 3 --- examples/generated/examplecom/enum_message_pb_service.d.ts | 3 --- examples/generated/examplecom/enum_message_pb_service.js | 3 --- examples/generated/examplecom/map_message_pb_service.d.ts | 3 --- examples/generated/examplecom/map_message_pb_service.js | 3 --- examples/generated/examplecom/oneof_message_pb_service.d.ts | 3 --- examples/generated/examplecom/oneof_message_pb_service.js | 3 --- .../generated/examplecom/parent_message_v2_pb_service.d.ts | 3 --- examples/generated/examplecom/parent_message_v2_pb_service.js | 3 --- .../generated/examplecom/parent_message_v3_pb_service.d.ts | 3 --- examples/generated/examplecom/parent_message_v3_pb_service.js | 3 --- .../generated/examplecom/primitive_message_v2_pb_service.d.ts | 3 --- .../generated/examplecom/primitive_message_v2_pb_service.js | 3 --- .../generated/examplecom/primitive_message_v3_pb_service.d.ts | 3 --- .../generated/examplecom/primitive_message_v3_pb_service.js | 3 --- .../examplecom/repeated_primitive_message_pb_service.d.ts | 3 --- .../examplecom/repeated_primitive_message_pb_service.js | 3 --- examples/generated/examplecom/reserved_words_pb_service.d.ts | 3 --- examples/generated/examplecom/reserved_words_pb_service.js | 3 --- examples/generated/examplecom/simple_pb_service.d.ts | 3 --- examples/generated/examplecom/simple_pb_service.js | 3 --- examples/generated/examplecom/simplevalue_pb_service.d.ts | 3 --- examples/generated/examplecom/simplevalue_pb_service.js | 3 --- .../generated/examplecom/well_known_message_pb_service.d.ts | 3 --- examples/generated/examplecom/well_known_message_pb_service.js | 3 --- .../generated/othercom/external_child_message_pb_service.d.ts | 3 --- .../generated/othercom/external_child_message_pb_service.js | 3 --- examples/generated/othercom/external_enum_pb_service.d.ts | 3 --- examples/generated/othercom/external_enum_pb_service.js | 3 --- .../{ => proto}/examplecom/empty_message_no_service_pb.d.ts | 2 +- .../{ => proto}/examplecom/empty_message_no_service_pb.js | 0 .../proto/examplecom/empty_message_no_service_pb_service.d.ts | 3 +++ .../proto/examplecom/empty_message_no_service_pb_service.js | 3 +++ .../generated/proto/examplecom/enum_message_pb_service.d.ts | 3 +++ examples/generated/proto/examplecom/enum_message_pb_service.js | 3 +++ .../generated/proto/examplecom/map_message_pb_service.d.ts | 3 +++ examples/generated/proto/examplecom/map_message_pb_service.js | 3 +++ .../generated/proto/examplecom/oneof_message_pb_service.d.ts | 3 +++ .../generated/proto/examplecom/oneof_message_pb_service.js | 3 +++ .../proto/examplecom/parent_message_v2_pb_service.d.ts | 3 +++ .../generated/proto/examplecom/parent_message_v2_pb_service.js | 3 +++ .../proto/examplecom/parent_message_v3_pb_service.d.ts | 3 +++ .../generated/proto/examplecom/parent_message_v3_pb_service.js | 3 +++ .../proto/examplecom/primitive_message_v2_pb_service.d.ts | 3 +++ .../proto/examplecom/primitive_message_v2_pb_service.js | 3 +++ .../proto/examplecom/primitive_message_v3_pb_service.d.ts | 3 +++ .../proto/examplecom/primitive_message_v3_pb_service.js | 3 +++ .../examplecom/repeated_primitive_message_pb_service.d.ts | 3 +++ .../proto/examplecom/repeated_primitive_message_pb_service.js | 3 +++ .../generated/proto/examplecom/reserved_words_pb_service.d.ts | 3 +++ .../generated/proto/examplecom/reserved_words_pb_service.js | 3 +++ examples/generated/proto/examplecom/simple_pb_service.d.ts | 3 +++ examples/generated/proto/examplecom/simple_pb_service.js | 3 +++ .../generated/proto/examplecom/simple_service_pb_service.d.ts | 2 +- .../generated/proto/examplecom/simple_service_pb_service.js | 3 +++ .../generated/proto/examplecom/simplevalue_pb_service.d.ts | 3 +++ examples/generated/proto/examplecom/simplevalue_pb_service.js | 3 +++ .../proto/examplecom/well_known_message_pb_service.d.ts | 3 +++ .../proto/examplecom/well_known_message_pb_service.js | 3 +++ examples/generated/proto/orphan_pb_service.d.ts | 2 +- examples/generated/proto/orphan_pb_service.js | 2 ++ .../proto/othercom/external_child_message_pb_service.d.ts | 3 +++ .../proto/othercom/external_child_message_pb_service.js | 3 +++ .../generated/proto/othercom/external_enum_pb_service.d.ts | 3 +++ examples/generated/proto/othercom/external_enum_pb_service.js | 3 +++ 66 files changed, 98 insertions(+), 93 deletions(-) delete mode 100644 examples/generated/examplecom/empty_message_no_service_pb_service.d.ts delete mode 100644 examples/generated/examplecom/empty_message_no_service_pb_service.js delete mode 100644 examples/generated/examplecom/enum_message_pb_service.d.ts delete mode 100644 examples/generated/examplecom/enum_message_pb_service.js delete mode 100644 examples/generated/examplecom/map_message_pb_service.d.ts delete mode 100644 examples/generated/examplecom/map_message_pb_service.js delete mode 100644 examples/generated/examplecom/oneof_message_pb_service.d.ts delete mode 100644 examples/generated/examplecom/oneof_message_pb_service.js delete mode 100644 examples/generated/examplecom/parent_message_v2_pb_service.d.ts delete mode 100644 examples/generated/examplecom/parent_message_v2_pb_service.js delete mode 100644 examples/generated/examplecom/parent_message_v3_pb_service.d.ts delete mode 100644 examples/generated/examplecom/parent_message_v3_pb_service.js delete mode 100644 examples/generated/examplecom/primitive_message_v2_pb_service.d.ts delete mode 100644 examples/generated/examplecom/primitive_message_v2_pb_service.js delete mode 100644 examples/generated/examplecom/primitive_message_v3_pb_service.d.ts delete mode 100644 examples/generated/examplecom/primitive_message_v3_pb_service.js delete mode 100644 examples/generated/examplecom/repeated_primitive_message_pb_service.d.ts delete mode 100644 examples/generated/examplecom/repeated_primitive_message_pb_service.js delete mode 100644 examples/generated/examplecom/reserved_words_pb_service.d.ts delete mode 100644 examples/generated/examplecom/reserved_words_pb_service.js delete mode 100644 examples/generated/examplecom/simple_pb_service.d.ts delete mode 100644 examples/generated/examplecom/simple_pb_service.js delete mode 100644 examples/generated/examplecom/simplevalue_pb_service.d.ts delete mode 100644 examples/generated/examplecom/simplevalue_pb_service.js delete mode 100644 examples/generated/examplecom/well_known_message_pb_service.d.ts delete mode 100644 examples/generated/examplecom/well_known_message_pb_service.js delete mode 100644 examples/generated/othercom/external_child_message_pb_service.d.ts delete mode 100644 examples/generated/othercom/external_child_message_pb_service.js delete mode 100644 examples/generated/othercom/external_enum_pb_service.d.ts delete mode 100644 examples/generated/othercom/external_enum_pb_service.js rename examples/generated/{ => proto}/examplecom/empty_message_no_service_pb.d.ts (93%) rename examples/generated/{ => proto}/examplecom/empty_message_no_service_pb.js (100%) create mode 100644 examples/generated/proto/examplecom/empty_message_no_service_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/empty_message_no_service_pb_service.js create mode 100644 examples/generated/proto/examplecom/enum_message_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/enum_message_pb_service.js create mode 100644 examples/generated/proto/examplecom/map_message_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/map_message_pb_service.js create mode 100644 examples/generated/proto/examplecom/oneof_message_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/oneof_message_pb_service.js create mode 100644 examples/generated/proto/examplecom/parent_message_v2_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/parent_message_v2_pb_service.js create mode 100644 examples/generated/proto/examplecom/parent_message_v3_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/parent_message_v3_pb_service.js create mode 100644 examples/generated/proto/examplecom/primitive_message_v2_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/primitive_message_v2_pb_service.js create mode 100644 examples/generated/proto/examplecom/primitive_message_v3_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/primitive_message_v3_pb_service.js create mode 100644 examples/generated/proto/examplecom/repeated_primitive_message_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/repeated_primitive_message_pb_service.js create mode 100644 examples/generated/proto/examplecom/reserved_words_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/reserved_words_pb_service.js create mode 100644 examples/generated/proto/examplecom/simple_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/simple_pb_service.js create mode 100644 examples/generated/proto/examplecom/simplevalue_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/simplevalue_pb_service.js create mode 100644 examples/generated/proto/examplecom/well_known_message_pb_service.d.ts create mode 100644 examples/generated/proto/examplecom/well_known_message_pb_service.js create mode 100644 examples/generated/proto/othercom/external_child_message_pb_service.d.ts create mode 100644 examples/generated/proto/othercom/external_child_message_pb_service.js create mode 100644 examples/generated/proto/othercom/external_enum_pb_service.d.ts create mode 100644 examples/generated/proto/othercom/external_enum_pb_service.js 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 deleted file mode 100644 index e01864c6..00000000 --- a/examples/generated/examplecom/empty_message_no_service_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/empty_message_no_service.proto - diff --git a/examples/generated/examplecom/empty_message_no_service_pb_service.js b/examples/generated/examplecom/empty_message_no_service_pb_service.js deleted file mode 100644 index e01864c6..00000000 --- a/examples/generated/examplecom/empty_message_no_service_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/empty_message_no_service.proto - diff --git a/examples/generated/examplecom/enum_message_pb_service.d.ts b/examples/generated/examplecom/enum_message_pb_service.d.ts deleted file mode 100644 index 1ce9b128..00000000 --- a/examples/generated/examplecom/enum_message_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/enum_message.proto - diff --git a/examples/generated/examplecom/enum_message_pb_service.js b/examples/generated/examplecom/enum_message_pb_service.js deleted file mode 100644 index 1ce9b128..00000000 --- a/examples/generated/examplecom/enum_message_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/enum_message.proto - diff --git a/examples/generated/examplecom/map_message_pb_service.d.ts b/examples/generated/examplecom/map_message_pb_service.d.ts deleted file mode 100644 index 8a545362..00000000 --- a/examples/generated/examplecom/map_message_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/map_message.proto - diff --git a/examples/generated/examplecom/map_message_pb_service.js b/examples/generated/examplecom/map_message_pb_service.js deleted file mode 100644 index 8a545362..00000000 --- a/examples/generated/examplecom/map_message_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/map_message.proto - diff --git a/examples/generated/examplecom/oneof_message_pb_service.d.ts b/examples/generated/examplecom/oneof_message_pb_service.d.ts deleted file mode 100644 index 9ce8bd5f..00000000 --- a/examples/generated/examplecom/oneof_message_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/oneof_message.proto - diff --git a/examples/generated/examplecom/oneof_message_pb_service.js b/examples/generated/examplecom/oneof_message_pb_service.js deleted file mode 100644 index 9ce8bd5f..00000000 --- a/examples/generated/examplecom/oneof_message_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/oneof_message.proto - diff --git a/examples/generated/examplecom/parent_message_v2_pb_service.d.ts b/examples/generated/examplecom/parent_message_v2_pb_service.d.ts deleted file mode 100644 index 8a56219e..00000000 --- a/examples/generated/examplecom/parent_message_v2_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/parent_message_v2.proto - diff --git a/examples/generated/examplecom/parent_message_v2_pb_service.js b/examples/generated/examplecom/parent_message_v2_pb_service.js deleted file mode 100644 index 8a56219e..00000000 --- a/examples/generated/examplecom/parent_message_v2_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/parent_message_v2.proto - diff --git a/examples/generated/examplecom/parent_message_v3_pb_service.d.ts b/examples/generated/examplecom/parent_message_v3_pb_service.d.ts deleted file mode 100644 index 904da543..00000000 --- a/examples/generated/examplecom/parent_message_v3_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/parent_message_v3.proto - diff --git a/examples/generated/examplecom/parent_message_v3_pb_service.js b/examples/generated/examplecom/parent_message_v3_pb_service.js deleted file mode 100644 index 904da543..00000000 --- a/examples/generated/examplecom/parent_message_v3_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/parent_message_v3.proto - diff --git a/examples/generated/examplecom/primitive_message_v2_pb_service.d.ts b/examples/generated/examplecom/primitive_message_v2_pb_service.d.ts deleted file mode 100644 index 764a1c29..00000000 --- a/examples/generated/examplecom/primitive_message_v2_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/primitive_message_v2.proto - diff --git a/examples/generated/examplecom/primitive_message_v2_pb_service.js b/examples/generated/examplecom/primitive_message_v2_pb_service.js deleted file mode 100644 index 764a1c29..00000000 --- a/examples/generated/examplecom/primitive_message_v2_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/primitive_message_v2.proto - diff --git a/examples/generated/examplecom/primitive_message_v3_pb_service.d.ts b/examples/generated/examplecom/primitive_message_v3_pb_service.d.ts deleted file mode 100644 index 51427e09..00000000 --- a/examples/generated/examplecom/primitive_message_v3_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/primitive_message_v3.proto - diff --git a/examples/generated/examplecom/primitive_message_v3_pb_service.js b/examples/generated/examplecom/primitive_message_v3_pb_service.js deleted file mode 100644 index 51427e09..00000000 --- a/examples/generated/examplecom/primitive_message_v3_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/primitive_message_v3.proto - diff --git a/examples/generated/examplecom/repeated_primitive_message_pb_service.d.ts b/examples/generated/examplecom/repeated_primitive_message_pb_service.d.ts deleted file mode 100644 index 0d9d56af..00000000 --- a/examples/generated/examplecom/repeated_primitive_message_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/repeated_primitive_message.proto - diff --git a/examples/generated/examplecom/repeated_primitive_message_pb_service.js b/examples/generated/examplecom/repeated_primitive_message_pb_service.js deleted file mode 100644 index 0d9d56af..00000000 --- a/examples/generated/examplecom/repeated_primitive_message_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/repeated_primitive_message.proto - diff --git a/examples/generated/examplecom/reserved_words_pb_service.d.ts b/examples/generated/examplecom/reserved_words_pb_service.d.ts deleted file mode 100644 index a63285d5..00000000 --- a/examples/generated/examplecom/reserved_words_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/reserved_words.proto - diff --git a/examples/generated/examplecom/reserved_words_pb_service.js b/examples/generated/examplecom/reserved_words_pb_service.js deleted file mode 100644 index a63285d5..00000000 --- a/examples/generated/examplecom/reserved_words_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/reserved_words.proto - diff --git a/examples/generated/examplecom/simple_pb_service.d.ts b/examples/generated/examplecom/simple_pb_service.d.ts deleted file mode 100644 index b1e12cf9..00000000 --- a/examples/generated/examplecom/simple_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/simple.proto - diff --git a/examples/generated/examplecom/simple_pb_service.js b/examples/generated/examplecom/simple_pb_service.js deleted file mode 100644 index b1e12cf9..00000000 --- a/examples/generated/examplecom/simple_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/simple.proto - diff --git a/examples/generated/examplecom/simplevalue_pb_service.d.ts b/examples/generated/examplecom/simplevalue_pb_service.d.ts deleted file mode 100644 index f92cd8ad..00000000 --- a/examples/generated/examplecom/simplevalue_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/simplevalue.proto - diff --git a/examples/generated/examplecom/simplevalue_pb_service.js b/examples/generated/examplecom/simplevalue_pb_service.js deleted file mode 100644 index f92cd8ad..00000000 --- a/examples/generated/examplecom/simplevalue_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/simplevalue.proto - diff --git a/examples/generated/examplecom/well_known_message_pb_service.d.ts b/examples/generated/examplecom/well_known_message_pb_service.d.ts deleted file mode 100644 index bb43a9d1..00000000 --- a/examples/generated/examplecom/well_known_message_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/well_known_message.proto - diff --git a/examples/generated/examplecom/well_known_message_pb_service.js b/examples/generated/examplecom/well_known_message_pb_service.js deleted file mode 100644 index bb43a9d1..00000000 --- a/examples/generated/examplecom/well_known_message_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: examplecom -// file: examplecom/well_known_message.proto - diff --git a/examples/generated/othercom/external_child_message_pb_service.d.ts b/examples/generated/othercom/external_child_message_pb_service.d.ts deleted file mode 100644 index e9f4f74e..00000000 --- a/examples/generated/othercom/external_child_message_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: othercom -// file: othercom/external_child_message.proto - diff --git a/examples/generated/othercom/external_child_message_pb_service.js b/examples/generated/othercom/external_child_message_pb_service.js deleted file mode 100644 index e9f4f74e..00000000 --- a/examples/generated/othercom/external_child_message_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: othercom -// file: othercom/external_child_message.proto - diff --git a/examples/generated/othercom/external_enum_pb_service.d.ts b/examples/generated/othercom/external_enum_pb_service.d.ts deleted file mode 100644 index eccb1871..00000000 --- a/examples/generated/othercom/external_enum_pb_service.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -// package: othercom -// file: othercom/external_enum.proto - diff --git a/examples/generated/othercom/external_enum_pb_service.js b/examples/generated/othercom/external_enum_pb_service.js deleted file mode 100644 index eccb1871..00000000 --- a/examples/generated/othercom/external_enum_pb_service.js +++ /dev/null @@ -1,3 +0,0 @@ -// package: othercom -// file: othercom/external_enum.proto - diff --git a/examples/generated/examplecom/empty_message_no_service_pb.d.ts b/examples/generated/proto/examplecom/empty_message_no_service_pb.d.ts similarity index 93% rename from examples/generated/examplecom/empty_message_no_service_pb.d.ts rename to examples/generated/proto/examplecom/empty_message_no_service_pb.d.ts index 884d87a1..6990710b 100644 --- a/examples/generated/examplecom/empty_message_no_service_pb.d.ts +++ b/examples/generated/proto/examplecom/empty_message_no_service_pb.d.ts @@ -1,5 +1,5 @@ // package: examplecom -// file: examplecom/empty_message_no_service.proto +// file: proto/examplecom/empty_message_no_service.proto import * as jspb from "google-protobuf"; diff --git a/examples/generated/examplecom/empty_message_no_service_pb.js b/examples/generated/proto/examplecom/empty_message_no_service_pb.js similarity index 100% rename from examples/generated/examplecom/empty_message_no_service_pb.js rename to examples/generated/proto/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 new file mode 100644 index 00000000..8f08f53e --- /dev/null +++ b/examples/generated/proto/examplecom/empty_message_no_service_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/empty_message_no_service.proto + 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 new file mode 100644 index 00000000..8f08f53e --- /dev/null +++ b/examples/generated/proto/examplecom/empty_message_no_service_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/empty_message_no_service.proto + diff --git a/examples/generated/proto/examplecom/enum_message_pb_service.d.ts b/examples/generated/proto/examplecom/enum_message_pb_service.d.ts new file mode 100644 index 00000000..d12dd4aa --- /dev/null +++ b/examples/generated/proto/examplecom/enum_message_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/enum_message.proto + diff --git a/examples/generated/proto/examplecom/enum_message_pb_service.js b/examples/generated/proto/examplecom/enum_message_pb_service.js new file mode 100644 index 00000000..d12dd4aa --- /dev/null +++ b/examples/generated/proto/examplecom/enum_message_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/enum_message.proto + diff --git a/examples/generated/proto/examplecom/map_message_pb_service.d.ts b/examples/generated/proto/examplecom/map_message_pb_service.d.ts new file mode 100644 index 00000000..f80a25a1 --- /dev/null +++ b/examples/generated/proto/examplecom/map_message_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/map_message.proto + diff --git a/examples/generated/proto/examplecom/map_message_pb_service.js b/examples/generated/proto/examplecom/map_message_pb_service.js new file mode 100644 index 00000000..f80a25a1 --- /dev/null +++ b/examples/generated/proto/examplecom/map_message_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/map_message.proto + diff --git a/examples/generated/proto/examplecom/oneof_message_pb_service.d.ts b/examples/generated/proto/examplecom/oneof_message_pb_service.d.ts new file mode 100644 index 00000000..62a2c13b --- /dev/null +++ b/examples/generated/proto/examplecom/oneof_message_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/oneof_message.proto + diff --git a/examples/generated/proto/examplecom/oneof_message_pb_service.js b/examples/generated/proto/examplecom/oneof_message_pb_service.js new file mode 100644 index 00000000..62a2c13b --- /dev/null +++ b/examples/generated/proto/examplecom/oneof_message_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/oneof_message.proto + 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 new file mode 100644 index 00000000..dfa8872c --- /dev/null +++ b/examples/generated/proto/examplecom/parent_message_v2_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/parent_message_v2.proto + diff --git a/examples/generated/proto/examplecom/parent_message_v2_pb_service.js b/examples/generated/proto/examplecom/parent_message_v2_pb_service.js new file mode 100644 index 00000000..dfa8872c --- /dev/null +++ b/examples/generated/proto/examplecom/parent_message_v2_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/parent_message_v2.proto + 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 new file mode 100644 index 00000000..419294c2 --- /dev/null +++ b/examples/generated/proto/examplecom/parent_message_v3_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/parent_message_v3.proto + diff --git a/examples/generated/proto/examplecom/parent_message_v3_pb_service.js b/examples/generated/proto/examplecom/parent_message_v3_pb_service.js new file mode 100644 index 00000000..419294c2 --- /dev/null +++ b/examples/generated/proto/examplecom/parent_message_v3_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/parent_message_v3.proto + 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 new file mode 100644 index 00000000..cd565930 --- /dev/null +++ b/examples/generated/proto/examplecom/primitive_message_v2_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/primitive_message_v2.proto + diff --git a/examples/generated/proto/examplecom/primitive_message_v2_pb_service.js b/examples/generated/proto/examplecom/primitive_message_v2_pb_service.js new file mode 100644 index 00000000..cd565930 --- /dev/null +++ b/examples/generated/proto/examplecom/primitive_message_v2_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/primitive_message_v2.proto + 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 new file mode 100644 index 00000000..e091f3ae --- /dev/null +++ b/examples/generated/proto/examplecom/primitive_message_v3_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/primitive_message_v3.proto + diff --git a/examples/generated/proto/examplecom/primitive_message_v3_pb_service.js b/examples/generated/proto/examplecom/primitive_message_v3_pb_service.js new file mode 100644 index 00000000..e091f3ae --- /dev/null +++ b/examples/generated/proto/examplecom/primitive_message_v3_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/primitive_message_v3.proto + 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 new file mode 100644 index 00000000..b7dbeb7d --- /dev/null +++ b/examples/generated/proto/examplecom/repeated_primitive_message_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/repeated_primitive_message.proto + diff --git a/examples/generated/proto/examplecom/repeated_primitive_message_pb_service.js b/examples/generated/proto/examplecom/repeated_primitive_message_pb_service.js new file mode 100644 index 00000000..b7dbeb7d --- /dev/null +++ b/examples/generated/proto/examplecom/repeated_primitive_message_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/repeated_primitive_message.proto + diff --git a/examples/generated/proto/examplecom/reserved_words_pb_service.d.ts b/examples/generated/proto/examplecom/reserved_words_pb_service.d.ts new file mode 100644 index 00000000..951d1a13 --- /dev/null +++ b/examples/generated/proto/examplecom/reserved_words_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/reserved_words.proto + diff --git a/examples/generated/proto/examplecom/reserved_words_pb_service.js b/examples/generated/proto/examplecom/reserved_words_pb_service.js new file mode 100644 index 00000000..951d1a13 --- /dev/null +++ b/examples/generated/proto/examplecom/reserved_words_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/reserved_words.proto + diff --git a/examples/generated/proto/examplecom/simple_pb_service.d.ts b/examples/generated/proto/examplecom/simple_pb_service.d.ts new file mode 100644 index 00000000..82de7c02 --- /dev/null +++ b/examples/generated/proto/examplecom/simple_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/simple.proto + diff --git a/examples/generated/proto/examplecom/simple_pb_service.js b/examples/generated/proto/examplecom/simple_pb_service.js new file mode 100644 index 00000000..82de7c02 --- /dev/null +++ b/examples/generated/proto/examplecom/simple_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/simple.proto + diff --git a/examples/generated/proto/examplecom/simple_service_pb_service.d.ts b/examples/generated/proto/examplecom/simple_service_pb_service.d.ts index ddafbea9..b2a436ba 100644 --- a/examples/generated/proto/examplecom/simple_service_pb_service.d.ts +++ b/examples/generated/proto/examplecom/simple_service_pb_service.d.ts @@ -41,7 +41,7 @@ export class SimpleService { export type ServiceError = { message: string, code: number; metadata: grpc.Metadata } export type Status = { details: string, code: number; metadata: grpc.Metadata } -export type ServiceClientOptions = { transport: grpc.TransportConstructor } +export type ServiceClientOptions = { transport: grpc.TransportConstructor; debug?: boolean } interface ResponseStream { cancel(): void; diff --git a/examples/generated/proto/examplecom/simple_service_pb_service.js b/examples/generated/proto/examplecom/simple_service_pb_service.js index 0fa10b35..7e5d456c 100644 --- a/examples/generated/proto/examplecom/simple_service_pb_service.js +++ b/examples/generated/proto/examplecom/simple_service_pb_service.js @@ -54,6 +54,7 @@ SimpleServiceClient.prototype.doUnary = function doUnary(requestMessage, metadat host: this.serviceHost, metadata: metadata, transport: this.options.transport, + debug: this.options.debug, onEnd: function (response) { if (callback) { if (response.status !== grpc.Code.OK) { @@ -77,6 +78,7 @@ SimpleServiceClient.prototype.doStream = function doStream(requestMessage, metad host: this.serviceHost, metadata: metadata, transport: this.options.transport, + debug: this.options.debug, onMessage: function (responseMessage) { listeners.data.forEach(function (handler) { handler(responseMessage); @@ -113,6 +115,7 @@ SimpleServiceClient.prototype.delete = function pb_delete(requestMessage, metada host: this.serviceHost, metadata: metadata, transport: this.options.transport, + debug: this.options.debug, onEnd: function (response) { if (callback) { if (response.status !== grpc.Code.OK) { diff --git a/examples/generated/proto/examplecom/simplevalue_pb_service.d.ts b/examples/generated/proto/examplecom/simplevalue_pb_service.d.ts new file mode 100644 index 00000000..5d3f2d5a --- /dev/null +++ b/examples/generated/proto/examplecom/simplevalue_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/simplevalue.proto + diff --git a/examples/generated/proto/examplecom/simplevalue_pb_service.js b/examples/generated/proto/examplecom/simplevalue_pb_service.js new file mode 100644 index 00000000..5d3f2d5a --- /dev/null +++ b/examples/generated/proto/examplecom/simplevalue_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/simplevalue.proto + 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 new file mode 100644 index 00000000..3251d3d5 --- /dev/null +++ b/examples/generated/proto/examplecom/well_known_message_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/well_known_message.proto + diff --git a/examples/generated/proto/examplecom/well_known_message_pb_service.js b/examples/generated/proto/examplecom/well_known_message_pb_service.js new file mode 100644 index 00000000..3251d3d5 --- /dev/null +++ b/examples/generated/proto/examplecom/well_known_message_pb_service.js @@ -0,0 +1,3 @@ +// package: examplecom +// file: proto/examplecom/well_known_message.proto + diff --git a/examples/generated/proto/orphan_pb_service.d.ts b/examples/generated/proto/orphan_pb_service.d.ts index ede90559..727476d8 100644 --- a/examples/generated/proto/orphan_pb_service.d.ts +++ b/examples/generated/proto/orphan_pb_service.d.ts @@ -30,7 +30,7 @@ export class OrphanService { export type ServiceError = { message: string, code: number; metadata: grpc.Metadata } export type Status = { details: string, code: number; metadata: grpc.Metadata } -export type ServiceClientOptions = { transport: grpc.TransportConstructor } +export type ServiceClientOptions = { transport: grpc.TransportConstructor; debug?: boolean } interface ResponseStream { cancel(): void; diff --git a/examples/generated/proto/orphan_pb_service.js b/examples/generated/proto/orphan_pb_service.js index c8c4583c..979be1ea 100644 --- a/examples/generated/proto/orphan_pb_service.js +++ b/examples/generated/proto/orphan_pb_service.js @@ -44,6 +44,7 @@ OrphanServiceClient.prototype.doUnary = function doUnary(requestMessage, metadat host: this.serviceHost, metadata: metadata, transport: this.options.transport, + debug: this.options.debug, onEnd: function (response) { if (callback) { if (response.status !== grpc.Code.OK) { @@ -67,6 +68,7 @@ OrphanServiceClient.prototype.doStream = function doStream(requestMessage, metad host: this.serviceHost, metadata: metadata, transport: this.options.transport, + debug: this.options.debug, onMessage: function (responseMessage) { listeners.data.forEach(function (handler) { handler(responseMessage); 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 new file mode 100644 index 00000000..393230ae --- /dev/null +++ b/examples/generated/proto/othercom/external_child_message_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: othercom +// file: proto/othercom/external_child_message.proto + diff --git a/examples/generated/proto/othercom/external_child_message_pb_service.js b/examples/generated/proto/othercom/external_child_message_pb_service.js new file mode 100644 index 00000000..393230ae --- /dev/null +++ b/examples/generated/proto/othercom/external_child_message_pb_service.js @@ -0,0 +1,3 @@ +// package: othercom +// file: proto/othercom/external_child_message.proto + diff --git a/examples/generated/proto/othercom/external_enum_pb_service.d.ts b/examples/generated/proto/othercom/external_enum_pb_service.d.ts new file mode 100644 index 00000000..e24e3c22 --- /dev/null +++ b/examples/generated/proto/othercom/external_enum_pb_service.d.ts @@ -0,0 +1,3 @@ +// package: othercom +// file: proto/othercom/external_enum.proto + diff --git a/examples/generated/proto/othercom/external_enum_pb_service.js b/examples/generated/proto/othercom/external_enum_pb_service.js new file mode 100644 index 00000000..e24e3c22 --- /dev/null +++ b/examples/generated/proto/othercom/external_enum_pb_service.js @@ -0,0 +1,3 @@ +// package: othercom +// file: proto/othercom/external_enum.proto + From e1667362a9819a26fccea4f1315ac54db2bce824 Mon Sep 17 00:00:00 2001 From: Jonny Reeves Date: Wed, 18 Jul 2018 21:31:38 +0100 Subject: [PATCH 10/14] Release 0.7.5 --- CHANGELOG.md | 5 ++++- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99591806..8fc3a87b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -## 0.7.5-pre +## 0.7.5 + +### Fixes +* Fixed NPM publish. ## 0.7.4 diff --git a/package-lock.json b/package-lock.json index 4740df4a..2f2c6cba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.5-pre", + "version": "0.7.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9d32090a..a2931f5b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.5-pre", + "version": "0.7.5", "description": "Protoc Plugin for TypeScript Declarations and Service Definitions", "scripts": { "lint": "tslint -c tslint.json 'test/**/*.ts' 'src/**/*.ts'", From 98393c8245f4a256632ea1b4c4a3687af4134792 Mon Sep 17 00:00:00 2001 From: Jonny Reeves Date: Wed, 18 Jul 2018 21:32:36 +0100 Subject: [PATCH 11/14] Bumped to v0.7.6-pre --- CHANGELOG.md | 2 ++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fc3a87b..ba8c4adf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 0.7.6-pre + ## 0.7.5 ### Fixes diff --git a/package-lock.json b/package-lock.json index 2f2c6cba..ae1df891 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.5", + "version": "0.7.6-pre", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a2931f5b..b58c9dce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.5", + "version": "0.7.6-pre", "description": "Protoc Plugin for TypeScript Declarations and Service Definitions", "scripts": { "lint": "tslint -c tslint.json 'test/**/*.ts' 'src/**/*.ts'", From 070f2be9e061274d13ace33b43e19643cd4a3c40 Mon Sep 17 00:00:00 2001 From: Jonny Reeves Date: Wed, 18 Jul 2018 21:35:17 +0100 Subject: [PATCH 12/14] Fix broken integration test after cleaning up generated examples protos --- test/integration/service/grpcweb.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/service/grpcweb.ts b/test/integration/service/grpcweb.ts index c122defb..e1f56865 100644 --- a/test/integration/service/grpcweb.ts +++ b/test/integration/service/grpcweb.ts @@ -30,8 +30,8 @@ describe("service/grpc-web", () => { }); it("should generate service definition files for protos that have no service definitions", () => { - assert.isTrue(existsSync(resolve(__dirname, "../../../examples/generated/examplecom/empty_message_no_service_pb_service.d.ts"))); - assert.isTrue(existsSync(resolve(__dirname, "../../../examples/generated/examplecom/empty_message_no_service_pb_service.js"))); + assert.isTrue(existsSync(resolve(__dirname, "../../../examples/generated/proto/examplecom/empty_message_no_service_pb_service.d.ts"))); + assert.isTrue(existsSync(resolve(__dirname, "../../../examples/generated/proto/examplecom/empty_message_no_service_pb_service.js"))); }); it("should not output imports for namespaces that are not used in the service definition", () => { From 10c3fc9cdb01e55d93c51e146a9b2e3c759911d2 Mon Sep 17 00:00:00 2001 From: Jonny Reeves Date: Wed, 18 Jul 2018 21:36:50 +0100 Subject: [PATCH 13/14] Release 0.7.6 --- CHANGELOG.md | 5 ++++- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba8c4adf..90128d65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -## 0.7.6-pre +## 0.7.6 + +### Fixes +* Broken integration tests on master ## 0.7.5 diff --git a/package-lock.json b/package-lock.json index ae1df891..c97cd478 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.6-pre", + "version": "0.7.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b58c9dce..846d48ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.6-pre", + "version": "0.7.6", "description": "Protoc Plugin for TypeScript Declarations and Service Definitions", "scripts": { "lint": "tslint -c tslint.json 'test/**/*.ts' 'src/**/*.ts'", From 50bb30c169b5292d0e0b4a2e98d7402e3e485339 Mon Sep 17 00:00:00 2001 From: Jonny Reeves Date: Wed, 18 Jul 2018 21:37:16 +0100 Subject: [PATCH 14/14] Bumped to v0.7.7-pre --- CHANGELOG.md | 2 ++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90128d65..c5886449 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 0.7.7-pre + ## 0.7.6 ### Fixes diff --git a/package-lock.json b/package-lock.json index c97cd478..0a646d85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.6", + "version": "0.7.7-pre", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 846d48ee..cf0b2ac6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-protoc-gen", - "version": "0.7.6", + "version": "0.7.7-pre", "description": "Protoc Plugin for TypeScript Declarations and Service Definitions", "scripts": { "lint": "tslint -c tslint.json 'test/**/*.ts' 'src/**/*.ts'",