-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into windows-fix
- Loading branch information
Showing
9 changed files
with
1,368 additions
and
1,126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| proseWrap: always | ||
| singleQuote: false | ||
| trailingComma: all |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,111 +1,140 @@ | ||
| load("@rules_proto//proto:defs.bzl", "ProtoInfo") | ||
|
|
||
| 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 _ts_proto_library(ctx): | ||
|
|
||
| transitive_descriptors = [] | ||
| direct_sources = [] | ||
|
|
||
| for target in ctx.attr.deps: | ||
| if ProtoInfo not in target: | ||
| fail("All targets in the deps attribute should be proto_library target.") | ||
| else: | ||
| info = target[ProtoInfo] | ||
| transitive_descriptors.extend(info.transitive_descriptor_sets.to_list()) | ||
| direct_sources.extend(info.direct_sources) | ||
|
|
||
| ts_outputs = [] | ||
|
|
||
|
|
||
| for proto in direct_sources: | ||
| normalizedProtoName = proto.path.replace(ctx.label.package, "").lstrip("/")[:-len(proto.extension) - 1] | ||
| ts_outputs.append(ctx.actions.declare_file("%s.ts" % (normalizedProtoName))) | ||
|
|
||
| protoc_args = ctx.actions.args() | ||
|
|
||
| protoc_args.add("--plugin=protoc-gen-ts=%s" % (ctx.executable.protoc_gen_ts_bin.path)) | ||
|
|
||
| protoc_args.add("--ts_out=%s" % (ctx.bin_dir.path)) | ||
|
|
||
| protoc_args.add("--descriptor_set_in=%s" % (":".join([desc.path for desc in transitive_descriptors]))) | ||
|
|
||
| protoc_args.add_all(direct_sources) | ||
|
|
||
| print(args) | ||
|
|
||
| env = dict() | ||
|
|
||
| env["GRPC_PACKAGE_NAME"] = ctx.attr.grpc_package_name | ||
|
|
||
| if ctx.attr.experimental_features: | ||
| env['EXPERIMENTAL_FEATURES'] = "true" | ||
|
|
||
| ctx.actions.run( | ||
| inputs = direct_sources + transitive_descriptors, | ||
| tools = ctx.files.protoc_gen_ts_bin, | ||
| executable = ctx.executable._protoc, | ||
| outputs = ts_outputs, | ||
| arguments = [protoc_args], | ||
| env = env, | ||
| progress_message = "Generating Protocol Buffers for Typescript %s" % ctx.label, | ||
| ) | ||
|
|
||
| return [ | ||
| DefaultInfo(files = depset(ts_outputs)) | ||
| ] | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| ts_proto_library = rule( | ||
| implementation = _ts_proto_library, | ||
| attrs = { | ||
| "deps": attr.label_list( | ||
| doc = "List of proto_library targets.", | ||
| providers = [ProtoInfo], | ||
| mandatory = True | ||
| ), | ||
| "experimental_features": attr.bool( | ||
| doc = "Enable experimental features.", | ||
| default = False | ||
| ), | ||
| "grpc_package_name": attr.string( | ||
| doc = "Configures name of the grpc package to use. '@grpc/grpc-js' or 'grpc'", | ||
| default = "@grpc/grpc-js" | ||
| ), | ||
| "protoc_gen_ts_bin": attr.label( | ||
| executable = True, | ||
| cfg = "host", | ||
| default = ( | ||
| "//protoc-gen-ts/bin:protoc-gen-ts" | ||
| ), | ||
| ), | ||
| "_protoc": attr.label( | ||
| cfg = "host", | ||
| executable = True, | ||
| allow_single_file = True, | ||
| default = ( | ||
| "@com_google_protobuf//:protoc" | ||
| ), | ||
| ), | ||
|
|
||
| } | ||
| ) | ||
| load("@rules_proto//proto:defs.bzl", "ProtoInfo") | ||
|
|
||
| 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 _ts_proto_library(ctx): | ||
|
|
||
| transitive_descriptors = [] | ||
| direct_sources = [] | ||
|
|
||
| for target in ctx.attr.deps: | ||
| if ProtoInfo not in target: | ||
| fail("All targets in the deps attribute should be proto_library target.") | ||
| else: | ||
| info = target[ProtoInfo] | ||
| transitive_descriptors.extend(info.transitive_descriptor_sets.to_list()) | ||
| direct_sources.extend(info.direct_sources) | ||
|
|
||
| ts_outputs = [] | ||
|
|
||
|
|
||
| for proto in direct_sources: | ||
| normalizedProtoName = proto.path.replace(ctx.label.package, "").lstrip("/")[:-len(proto.extension) - 1] | ||
| ts_outputs.append(ctx.actions.declare_file("%s.ts" % (normalizedProtoName))) | ||
|
|
||
| args = ctx.actions.args() | ||
|
|
||
| args.add("--plugin=protoc-gen-ts=%s" % (ctx.executable.protoc_gen_ts_bin.path)) | ||
|
|
||
| args.add("--ts_out=%s" % (ctx.bin_dir.path)) | ||
|
|
||
| args.add("--descriptor_set_in=%s" % (":".join([desc.path for desc in transitive_descriptors]))) | ||
|
|
||
| args.add_all(direct_sources) | ||
|
|
||
| args.add("--ts_opt=grpc_package=%s" % ctx.attr.grpc_package_name) | ||
|
|
||
| if ctx.attr.experimental_features: | ||
| args.add("--ts_opt=unary_rpc_promise") | ||
|
|
||
| args.add_all(direct_sources) | ||
|
|
||
|
|
||
| executable = "" | ||
|
|
||
| is_windows_host = ctx.configuration.host_path_separator == ";" | ||
|
|
||
|
|
||
| if is_windows_host: | ||
| executable = ctx.actions.declare_file("_protoc.cmd") | ||
| ctx.actions.write( | ||
| executable, | ||
| content = | ||
| """@echo off | ||
| CALL "{protoc}" %* | ||
| """.format( | ||
| protoc = ctx.executable._protoc.path, | ||
| ), | ||
| is_executable = True, | ||
| ) | ||
| else: | ||
| executable = ctx.actions.declare_file("_protoc.sh") | ||
| ctx.actions.write( | ||
| executable, | ||
| content = | ||
| """#!/usr/bin/env bash | ||
| set -e | ||
| {protoc} $@ | ||
| """.format( | ||
| protoc = ctx.executable._protoc.path, | ||
| ), | ||
| is_executable = True, | ||
| ) | ||
|
|
||
| ctx.actions.run( | ||
| inputs = direct_sources + transitive_descriptors, | ||
| tools = [ctx.executable.protoc_gen_ts_bin, ctx.executable._protoc], | ||
| executable = executable, | ||
| outputs = ts_outputs, | ||
| arguments = [args], | ||
| progress_message = "Generating Protocol Buffers for Typescript %s" % ctx.label, | ||
| ) | ||
|
|
||
| return [ | ||
| DefaultInfo(files = depset(ts_outputs)) | ||
| ] | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| ts_proto_library = rule( | ||
| implementation = _ts_proto_library, | ||
| attrs = { | ||
| "deps": attr.label_list( | ||
| doc = "List of proto_library targets.", | ||
| providers = [ProtoInfo], | ||
| mandatory = True | ||
| ), | ||
| "experimental_features": attr.bool( | ||
| doc = "Enable experimental features.", | ||
| default = False | ||
| ), | ||
| "grpc_package_name": attr.string( | ||
| doc = "Configures name of the grpc package to use. '@grpc/grpc-js' or 'grpc'", | ||
| default = "@grpc/grpc-js" | ||
| ), | ||
| "protoc_gen_ts_bin": attr.label( | ||
| executable = True, | ||
| cfg = "host", | ||
| default = ( | ||
| "//protoc-gen-ts/bin:protoc-gen-ts" | ||
| ), | ||
| ), | ||
| "_protoc": attr.label( | ||
| cfg = "host", | ||
| executable = True, | ||
| allow_single_file = True, | ||
| default = ( | ||
| "@com_google_protobuf//:protoc" | ||
| ), | ||
| ), | ||
|
|
||
| } | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "name": "protoc-gen-ts", | ||
| "description": "Compile protocol buffers descriptors to Typescript.", | ||
| "version": "0.5.0", | ||
| "version": "0.6.0", | ||
| "license": "MIT", | ||
| "author": { | ||
| "email": "[email protected]", | ||
|
|
||
Oops, something went wrong.