Ensure com_google_api's service protos are correctly built

e2e/typescript_proto_usage/BUILD.bazel

@@ -6,8 +6,6 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
 load("@com_github_gonzojive_rules_ts_proto//ts_proto:defs.bzl", "ts_proto_library")
 load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
 load("@example_npm//:defs.bzl", example_npm_link_all_packages = "npm_link_all_packages")
-
-#load("@rules_ts_proto_npm//:defs.bzl", ts_proto_link_all_packages = "npm_link_all_packages")
 load("@aspect_rules_js//js:defs.bzl", "js_binary")
 
 # Replace with a usage of your rule/macro
@@ -80,9 +78,86 @@ js_binary(
 
 example_npm_link_all_packages(name = "node_modules")
 
-#ts_proto_link_all_packages(name = "node_modules")
+proto_library(
+    name = "extending_proto",
+    srcs = ["extending.proto"],
+    import_prefix = "github.com/gonzojive/rules_ts_proto/example/prefix",
+    deps = [
+        "@com_google_protobuf//:descriptor_proto",
+        "@com_google_api//google/longrunning:operations_proto",
+    ],
+)
+
+ts_proto_library(
+    name = "extending_ts_proto",
+    proto = ":extending_proto",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":descriptor_ts_proto",
+        ":operations_ts_proto",
+    ],
+)
+
+ts_proto_library(
+    name = "operations_ts_proto",
+    proto = "@com_google_api//google/longrunning:operations_proto",
+    deps = [
+        ":annotations_ts_proto",
+        ":any_ts_proto",
+        ":client_ts_proto",
+        ":descriptor_ts_proto",
+        ":duration_ts_proto",
+        ":empty_ts_proto",
+        ":status_ts_proto",
+    ],
+)
+
+ts_proto_library(
+    name = "annotations_ts_proto",
+    proto = "@com_google_api//google/api:annotations_proto",
+    deps = [
+        ":descriptor_ts_proto",
+        ":http_ts_proto",
+    ],
+)
+
+ts_proto_library(
+    name = "any_ts_proto",
+    proto = "@com_google_protobuf//:any_proto",
+)
+
+ts_proto_library(
+    name = "client_ts_proto",
+    proto = "@com_google_api//google/api:client_proto",
+    deps = [
+        ":descriptor_ts_proto",
+    ],
+)
+
+ts_proto_library(
+    name = "descriptor_ts_proto",
+    proto = "@com_google_protobuf//:descriptor_proto",
+)
 
-# npm_link_package(
-#     name = "node_modules/google-protobuf",
-#     src = "//google-protobuf-debug:google-protobuf",
-# )
+ts_proto_library(
+    name = "duration_ts_proto",
+    proto = "@com_google_protobuf//:duration_proto",
+)
+
+ts_proto_library(
+    name = "empty_ts_proto",
+    proto = "@com_google_protobuf//:empty_proto",
+)
+
+ts_proto_library(
+    name = "http_ts_proto",
+    proto = "@com_google_api//google/api:http_proto",
+)
+
+ts_proto_library(
+    name = "status_ts_proto",
+    proto = "@com_google_api//google/rpc:status_proto",
+    deps = [
+        ":any_ts_proto",
+    ],
+)

e2e/typescript_proto_usage/WORKSPACE.bazel

@@ -187,3 +187,16 @@ esbuild_register_toolchains(
     name = "esbuild",
     esbuild_version = ESBUILD_VERSION,
 )
+
+##############################################################################
+# Google API Common Language Imports
+##############################################################################
+
+load("@com_google_api//:repository_rules.bzl", "switched_rules_by_language")
+
+switched_rules_by_language(
+    name = "com_google_googleapis_imports",
+    go = True,
+    grpc = True,
+    java = True,
+)

e2e/typescript_proto_usage/extending.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+package com.example.extending;
+
+import "google/protobuf/descriptor.proto";
+import "google/longrunning/operations.proto";
+
+extend google.protobuf.MethodOptions {
+  double foo = 999999;
+}
+
+message ExampleMessage {
+  google.longrunning.Operation foo = 1;
+}

e2e/typescript_proto_usage/google-protobuf-debug/BUILD.bazel

@@ -1,12 +0,0 @@
-# load("@aspect_rules_js//npm:defs.bzl", "npm_package")
-
-# npm_package(
-#     name = "google-protobuf",
-#     srcs = [
-#         "google-protobuf.js",
-#         "google-protobuf.js.map",
-#         "package.json",
-#     ],
-#     package = "google-protobuf",
-#     visibility = ["//visibility:public"],
-# )

e2e/typescript_proto_usage/tests/extending_jasmine/BUILD.bazel

@@ -0,0 +1,12 @@
+load("@aspect_rules_jasmine//jasmine:defs.bzl", "jasmine_test")
+
+jasmine_test(
+    name = "test",
+    args = ["*.spec.js"],
+    chdir = package_name(),
+    data = [
+        "extending.spec.js",
+        "package.json",
+        "//:extending_ts_proto",
+    ],
+)

e2e/typescript_proto_usage/tests/extending_jasmine/extending.spec.js

@@ -0,0 +1,7 @@
+import { ExampleMessage } from "../../extending_pb.mjs"
+
+describe("Extending proto", () => {
+  it("should have example message defined", () => {
+    expect(new ExampleMessage()).not.toBeUndefined();
+  });
+});

e2e/typescript_proto_usage/tests/extending_jasmine/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

e2e/typescript_proto_usage/tests/extending_jasmine/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "paths": {
+      "*": ["./", "../../bazel-bin/tests/extending_jasmine"]
+    }
+  }
+}

e2e/typescript_proto_usage/tests/greeting_jasmine/greeting.spec.js

@@ -1,6 +1,5 @@
 import { Ancestor1, GreetingRequest, TopLevelEnumExample, RepeatedThing, MutuallyExclusiveThing } from "../../greeting_pb.mjs"
 import { Position } from "../../location/location_pb.mjs"
-//import { GreetingRequest } from "../../greeting_pb";
 
 function say_hi() {
   return new GreetingRequest().setName("hello").getName();

ts_proto/repositories.bzl

@@ -45,7 +45,7 @@ def rules_ts_proto_dependencies():
 
     git_repository(
         name = "com_google_protobuf_javascript",
-        commit = "885b9cdad5acc46d67f3850155d34226e2b4ee8b",
+        commit = "7f11c3ec881adcad71c1c53b185fba9b3c55b9d5",
         remote = "https://github.com/gonzojive/protobuf-javascript.git",
     )
 
@@ -113,3 +113,17 @@ def rules_ts_proto_dependencies():
         commit = "f6eb07753a3d004ea0022eec541bed975e7fa0e8",
         remote = "https://github.com/gonzojive/grpc-web.git",
     )
+
+    git_repository(
+        name = "com_google_api",
+        commit = "f454c15b49a13f8834002814a62fd22d67c521c4",
+        remote = "https://github.com/googleapis/googleapis.git",
+        shallow_since = "1658776854 +0000",
+    )
+
+    git_repository(
+        name = "io_grpc_grpc_java",
+        commit = "3500243f4320fcde1d567184b822c98de017498e",
+        remote = "https://github.com/grpc/grpc-java.git",
+        shallow_since = "1650910743 -0700",
+    )