starpc 0.31.6 → 0.31.7

package/Makefile

@@ -78,14 +78,14 @@ genproto: vendor node_modules $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTO
 		PROTO_FILES=$$(git ls-files "$$1"); \
 		$(PROTOWRAP) \
 			-I $${OUT} \
-			--plugin=./node_modules/.bin/protoc-gen-es \
+			--plugin=./node_modules/.bin/protoc-gen-es-lite \
 			--plugin=./cmd/protoc-gen-es-starpc/dev/protoc-gen-es-starpc \
 			--go-lite_out=$${OUT} \
 			--go-lite_opt=features=marshal+unmarshal+size+equal+json+clone+text \
+			--es-lite_out=$${OUT} \
+			--es-lite_opt target=ts \
+			--es-lite_opt ts_nocheck=false \
 			--go-starpc_out=$${OUT} \
-			--es_out=$${OUT} \
-			--es_opt target=ts \
-			--es_opt ts_nocheck=false \
 			--es-starpc_out=$${OUT} \
 			--es-starpc_opt target=ts \
 			--es-starpc_opt ts_nocheck=false \

package/cmd/protoc-gen-es-starpc/typescript.ts

@@ -13,11 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import type { DescService } from '@bufbuild/protobuf'
-import { MethodIdempotency, MethodKind } from '@bufbuild/protobuf'
+import { DescService, MethodIdempotency, MethodKind } from '@bufbuild/protobuf'
 import type { GeneratedFile, Schema } from '@bufbuild/protoplugin/ecmascript'
 import { createImportSymbol, localName } from '@bufbuild/protoplugin/ecmascript'
 
+const MessageStream = createImportSymbol('MessageStream', 'starpc')
+const Message = createImportSymbol('Message', '@aptre/protobuf-es-lite')
+
 export function generateTs(schema: Schema) {
   for (const protoFile of schema.files) {
     const file = schema.generateFile(protoFile.name + '_srpc.pb.ts')
@@ -34,9 +36,8 @@ function generateService(
   f: GeneratedFile,
   service: DescService
 ) {
-  const { MethodKind: rtMethodKind, MethodIdempotency: rtMethodIdempotency, PartialMessage } =
+  const { MethodKind: rtMethodKind, MethodIdempotency: rtMethodIdempotency } =
     schema.runtime;
-  const MessageStream = createImportSymbol("MessageStream", "starpc")
 
 // NOTE: This matches generateService from @connectrpc/protoc-gen-connect-es.
   f.print(f.jsDoc(service));
@@ -79,9 +80,9 @@ function generateService(
     f.print(f.jsDoc(method, "  "));
     f.print("  ", method.name, "(");
     if (method.methodKind === MethodKind.Unary) {
-      f.print("request: ", PartialMessage, "<", method.input, ">, abortSignal?: AbortSignal");
+      f.print("request: ", Message, "<", method.input, ">, abortSignal?: AbortSignal");
     } else if (method.methodKind === MethodKind.ServerStreaming) {
-      f.print("request: ", PartialMessage, "<", method.input, ">, abortSignal?: AbortSignal");
+      f.print("request: ", Message, "<", method.input, ">, abortSignal?: AbortSignal");
     } else if (method.methodKind === MethodKind.ClientStreaming) {
       f.print("request: ", MessageStream, "<", method.input, ">, abortSignal?: AbortSignal");
     } else if (method.methodKind === MethodKind.BiDiStreaming) {
@@ -89,11 +90,11 @@ function generateService(
     }
     f.print("): ");
     if (method.methodKind === MethodKind.Unary) {
-      f.print("Promise<", PartialMessage, "<", method.output, ">>");
+      f.print("Promise<", Message, "<", method.output, ">>");
     } else if (method.methodKind === MethodKind.ServerStreaming) {
       f.print(MessageStream, "<", method.output, ">");
     } else if (method.methodKind === MethodKind.ClientStreaming) {
-      f.print("Promise<", PartialMessage, "<", method.output, ">>");
+      f.print("Promise<", Message, "<", method.output, ">>");
     } else if (method.methodKind === MethodKind.BiDiStreaming) {
       f.print(MessageStream, "<", method.output, ">");
     }
@@ -125,9 +126,9 @@ function generateService(
     f.print(f.jsDoc(method, "  "));
     f.print("  ", method.methodKind === MethodKind.Unary || method.methodKind === MethodKind.ClientStreaming ? "async " : "", method.name, "(");
     if (method.methodKind === MethodKind.Unary) {
-      f.print("request: ", PartialMessage, "<", method.input, ">, abortSignal?: AbortSignal");
+      f.print("request: ", Message, "<", method.input, ">, abortSignal?: AbortSignal");
     } else if (method.methodKind === MethodKind.ServerStreaming) {
-      f.print("request: ", PartialMessage, "<", method.input, ">, abortSignal?: AbortSignal");
+      f.print("request: ", Message, "<", method.input, ">, abortSignal?: AbortSignal");
     } else if (method.methodKind === MethodKind.ClientStreaming) {
       f.print("request: ", MessageStream, "<", method.input, ">, abortSignal?: AbortSignal");
     } else if (method.methodKind === MethodKind.BiDiStreaming) {
@@ -135,29 +136,29 @@ function generateService(
     }
     f.print("): ");
     if (method.methodKind === MethodKind.Unary) {
-      f.print("Promise<", PartialMessage, "<", method.output, ">> {");
-      f.print("    const requestMsg = new ", method.input, "(request)");
+      f.print("Promise<", Message, "<", method.output, ">> {");
+      f.print("    const requestMsg = ", method.input, ".create(request)");
       f.print("    const result = await this.rpc.request(");
       f.print("      this.service,");
       f.print("      ", localName(service), "Definition.methods.", method.name, ".name,");
-      f.print("      requestMsg.toBinary(),");
+      f.print("      ", method.input, ".toBinary(requestMsg),");
       f.print("      abortSignal || undefined,");
       f.print("    )");
       f.print("    return ", method.output, ".fromBinary(result)");
       f.print("  }");
     } else if (method.methodKind === MethodKind.ServerStreaming) {
       f.print(MessageStream, "<", method.output, "> {");
-      f.print("    const requestMsg = new ", method.input, "(request)");
+      f.print("    const requestMsg = ", method.input, ".create(request)");
       f.print("    const result = this.rpc.serverStreamingRequest(");
       f.print("      this.service,");
       f.print("      ", localName(service), "Definition.methods.", method.name, ".name,");
-      f.print("      requestMsg.toBinary(),");
+      f.print("      ", method.input, ".toBinary(requestMsg),");
       f.print("      abortSignal || undefined,");
       f.print("    )");
       f.print("    return ", buildDecodeMessageTransformSymbol, "(", method.output, ")(result)");
       f.print("  }");
     } else if (method.methodKind === MethodKind.ClientStreaming) {
-      f.print("Promise<", PartialMessage, "<", method.output, ">> {");
+      f.print("Promise<", Message, "<", method.output, ">> {");
       f.print("    const result = await this.rpc.clientStreamingRequest(");
       f.print("      this.service,");
       f.print("      ", localName(service), "Definition.methods.", method.name, ".name,");

package/dist/cmd/protoc-gen-es-starpc/typescript.js

@@ -14,6 +14,8 @@
 // limitations under the License.
 import { MethodIdempotency, MethodKind } from '@bufbuild/protobuf';
 import { createImportSymbol, localName } from '@bufbuild/protoplugin/ecmascript';
+const MessageStream = createImportSymbol('MessageStream', 'starpc');
+const Message = createImportSymbol('Message', '@aptre/protobuf-es-lite');
 export function generateTs(schema) {
     for (const protoFile of schema.files) {
         const file = schema.generateFile(protoFile.name + '_srpc.pb.ts');
@@ -25,8 +27,7 @@ export function generateTs(schema) {
 }
 // prettier-ignore
 function generateService(schema, f, service) {
-    const { MethodKind: rtMethodKind, MethodIdempotency: rtMethodIdempotency, PartialMessage } = schema.runtime;
-    const MessageStream = createImportSymbol("MessageStream", "starpc");
+    const { MethodKind: rtMethodKind, MethodIdempotency: rtMethodIdempotency } = schema.runtime;
     // NOTE: This matches generateService from @connectrpc/protoc-gen-connect-es.
     f.print(f.jsDoc(service));
     f.print(f.exportDecl("const", localName(service)), "Definition = {");
@@ -55,10 +56,10 @@ function generateService(schema, f, service) {
         f.print(f.jsDoc(method, "  "));
         f.print("  ", method.name, "(");
         if (method.methodKind === MethodKind.Unary) {
-            f.print("request: ", PartialMessage, "<", method.input, ">, abortSignal?: AbortSignal");
+            f.print("request: ", Message, "<", method.input, ">, abortSignal?: AbortSignal");
         }
         else if (method.methodKind === MethodKind.ServerStreaming) {
-            f.print("request: ", PartialMessage, "<", method.input, ">, abortSignal?: AbortSignal");
+            f.print("request: ", Message, "<", method.input, ">, abortSignal?: AbortSignal");
         }
         else if (method.methodKind === MethodKind.ClientStreaming) {
             f.print("request: ", MessageStream, "<", method.input, ">, abortSignal?: AbortSignal");
@@ -68,13 +69,13 @@ function generateService(schema, f, service) {
         }
         f.print("): ");
         if (method.methodKind === MethodKind.Unary) {
-            f.print("Promise<", PartialMessage, "<", method.output, ">>");
+            f.print("Promise<", Message, "<", method.output, ">>");
         }
         else if (method.methodKind === MethodKind.ServerStreaming) {
             f.print(MessageStream, "<", method.output, ">");
         }
         else if (method.methodKind === MethodKind.ClientStreaming) {
-            f.print("Promise<", PartialMessage, "<", method.output, ">>");
+            f.print("Promise<", Message, "<", method.output, ">>");
         }
         else if (method.methodKind === MethodKind.BiDiStreaming) {
             f.print(MessageStream, "<", method.output, ">");
@@ -103,10 +104,10 @@ function generateService(schema, f, service) {
         f.print(f.jsDoc(method, "  "));
         f.print("  ", method.methodKind === MethodKind.Unary || method.methodKind === MethodKind.ClientStreaming ? "async " : "", method.name, "(");
         if (method.methodKind === MethodKind.Unary) {
-            f.print("request: ", PartialMessage, "<", method.input, ">, abortSignal?: AbortSignal");
+            f.print("request: ", Message, "<", method.input, ">, abortSignal?: AbortSignal");
         }
         else if (method.methodKind === MethodKind.ServerStreaming) {
-            f.print("request: ", PartialMessage, "<", method.input, ">, abortSignal?: AbortSignal");
+            f.print("request: ", Message, "<", method.input, ">, abortSignal?: AbortSignal");
         }
         else if (method.methodKind === MethodKind.ClientStreaming) {
             f.print("request: ", MessageStream, "<", method.input, ">, abortSignal?: AbortSignal");
@@ -116,12 +117,12 @@ function generateService(schema, f, service) {
         }
         f.print("): ");
         if (method.methodKind === MethodKind.Unary) {
-            f.print("Promise<", PartialMessage, "<", method.output, ">> {");
-            f.print("    const requestMsg = new ", method.input, "(request)");
+            f.print("Promise<", Message, "<", method.output, ">> {");
+            f.print("    const requestMsg = ", method.input, ".create(request)");
             f.print("    const result = await this.rpc.request(");
             f.print("      this.service,");
             f.print("      ", localName(service), "Definition.methods.", method.name, ".name,");
-            f.print("      requestMsg.toBinary(),");
+            f.print("      ", method.input, ".toBinary(requestMsg),");
             f.print("      abortSignal || undefined,");
             f.print("    )");
             f.print("    return ", method.output, ".fromBinary(result)");
@@ -129,18 +130,18 @@ function generateService(schema, f, service) {
         }
         else if (method.methodKind === MethodKind.ServerStreaming) {
             f.print(MessageStream, "<", method.output, "> {");
-            f.print("    const requestMsg = new ", method.input, "(request)");
+            f.print("    const requestMsg = ", method.input, ".create(request)");
             f.print("    const result = this.rpc.serverStreamingRequest(");
             f.print("      this.service,");
             f.print("      ", localName(service), "Definition.methods.", method.name, ".name,");
-            f.print("      requestMsg.toBinary(),");
+            f.print("      ", method.input, ".toBinary(requestMsg),");
             f.print("      abortSignal || undefined,");
             f.print("    )");
             f.print("    return ", buildDecodeMessageTransformSymbol, "(", method.output, ")(result)");
             f.print("  }");
         }
         else if (method.methodKind === MethodKind.ClientStreaming) {
-            f.print("Promise<", PartialMessage, "<", method.output, ">> {");
+            f.print("Promise<", Message, "<", method.output, ">> {");
             f.print("    const result = await this.rpc.clientStreamingRequest(");
             f.print("      this.service,");
             f.print("      ", localName(service), "Definition.methods.", method.name, ".name,");

package/dist/e2e/mock/mock_pb.d.ts

@@ -1,21 +1,14 @@
-import type { BinaryReadOptions, FieldList, JsonReadOptions, JsonValue, PartialMessage, PlainMessage } from '@bufbuild/protobuf';
-import { Message, proto3 } from '@bufbuild/protobuf';
+import { Message, MessageType } from '@aptre/protobuf-es-lite';
+export declare const protobufPackage = "e2e.mock";
 /**
  * MockMsg is the mock message body.
  *
  * @generated from message e2e.mock.MockMsg
  */
-export declare class MockMsg extends Message<MockMsg> {
+export interface MockMsg extends Message<MockMsg> {
     /**
      * @generated from field: string body = 1;
      */
-    body: string;
-    constructor(data?: PartialMessage<MockMsg>);
-    static readonly runtime: typeof proto3;
-    static readonly typeName = "e2e.mock.MockMsg";
-    static readonly fields: FieldList;
-    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MockMsg;
-    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): MockMsg;
-    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): MockMsg;
-    static equals(a: MockMsg | PlainMessage<MockMsg> | undefined, b: MockMsg | PlainMessage<MockMsg> | undefined): boolean;
+    body?: string;
 }
+export declare const MockMsg: MessageType<MockMsg>;

package/dist/e2e/mock/mock_pb.js

@@ -1,36 +1,12 @@
-// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/e2e/mock/mock.proto (package e2e.mock, syntax proto3)
 /* eslint-disable */
-import { Message, proto3 } from '@bufbuild/protobuf';
-/**
- * MockMsg is the mock message body.
- *
- * @generated from message e2e.mock.MockMsg
- */
-export class MockMsg extends Message {
-    /**
-     * @generated from field: string body = 1;
-     */
-    body = '';
-    constructor(data) {
-        super();
-        proto3.util.initPartial(data, this);
-    }
-    static runtime = proto3;
-    static typeName = 'e2e.mock.MockMsg';
-    static fields = proto3.util.newFieldList(() => [
+import { createMessageType, } from '@aptre/protobuf-es-lite';
+export const protobufPackage = 'e2e.mock';
+export const MockMsg = createMessageType({
+    typeName: 'e2e.mock.MockMsg',
+    fields: [
         { no: 1, name: 'body', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
-    ]);
-    static fromBinary(bytes, options) {
-        return new MockMsg().fromBinary(bytes, options);
-    }
-    static fromJson(jsonValue, options) {
-        return new MockMsg().fromJson(jsonValue, options);
-    }
-    static fromJsonString(jsonString, options) {
-        return new MockMsg().fromJsonString(jsonString, options);
-    }
-    static equals(a, b) {
-        return proto3.util.equals(MockMsg, a, b);
-    }
-}
+    ],
+    packedByDefault: true,
+});

package/dist/e2e/mock/mock_srpc.pb.d.ts

@@ -1,7 +1,7 @@
-import { MockMsg } from "./mock_pb.js";
-import type { PartialMessage } from "@bufbuild/protobuf";
-import { MethodKind } from "@bufbuild/protobuf";
-import { ProtoRpc } from "starpc";
+import { MockMsg } from './mock_pb.js';
+import { MethodKind } from '@bufbuild/protobuf';
+import { Message } from '@aptre/protobuf-es-lite';
+import { ProtoRpc } from 'starpc';
 /**
  * Mock service mocks some RPCs for the e2e tests.
  *
@@ -17,8 +17,8 @@ export declare const MockDefinition: {
          */
         readonly MockRequest: {
             readonly name: "MockRequest";
-            readonly I: typeof MockMsg;
-            readonly O: typeof MockMsg;
+            readonly I: import("@aptre/protobuf-es-lite").MessageType<MockMsg>;
+            readonly O: import("@aptre/protobuf-es-lite").MessageType<MockMsg>;
             readonly kind: MethodKind.Unary;
         };
     };
@@ -34,7 +34,7 @@ export interface Mock {
      *
      * @generated from rpc e2e.mock.Mock.MockRequest
      */
-    MockRequest(request: PartialMessage<MockMsg>, abortSignal?: AbortSignal): Promise<PartialMessage<MockMsg>>;
+    MockRequest(request: Message<MockMsg>, abortSignal?: AbortSignal): Promise<Message<MockMsg>>;
 }
 export declare const MockServiceName: "e2e.mock.Mock";
 export declare class MockClient implements Mock {
@@ -48,5 +48,5 @@ export declare class MockClient implements Mock {
      *
      * @generated from rpc e2e.mock.Mock.MockRequest
      */
-    MockRequest(request: PartialMessage<MockMsg>, abortSignal?: AbortSignal): Promise<PartialMessage<MockMsg>>;
+    MockRequest(request: Message<MockMsg>, abortSignal?: AbortSignal): Promise<Message<MockMsg>>;
 }

package/dist/e2e/mock/mock_srpc.pb.js

@@ -1,15 +1,15 @@
 // @generated by protoc-gen-es-starpc none with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/e2e/mock/mock.proto (package e2e.mock, syntax proto3)
 /* eslint-disable */
-import { MockMsg } from "./mock_pb.js";
-import { MethodKind } from "@bufbuild/protobuf";
+import { MockMsg } from './mock_pb.js';
+import { MethodKind } from '@bufbuild/protobuf';
 /**
  * Mock service mocks some RPCs for the e2e tests.
  *
  * @generated from service e2e.mock.Mock
  */
 export const MockDefinition = {
-    typeName: "e2e.mock.Mock",
+    typeName: 'e2e.mock.Mock',
     methods: {
         /**
          * MockRequest runs a mock unary request.
@@ -17,12 +17,12 @@ export const MockDefinition = {
          * @generated from rpc e2e.mock.Mock.MockRequest
          */
         MockRequest: {
-            name: "MockRequest",
+            name: 'MockRequest',
             I: MockMsg,
             O: MockMsg,
             kind: MethodKind.Unary,
         },
-    }
+    },
 };
 export const MockServiceName = MockDefinition.typeName;
 export class MockClient {
@@ -39,8 +39,8 @@ export class MockClient {
      * @generated from rpc e2e.mock.Mock.MockRequest
      */
     async MockRequest(request, abortSignal) {
-        const requestMsg = new MockMsg(request);
-        const result = await this.rpc.request(this.service, MockDefinition.methods.MockRequest.name, requestMsg.toBinary(), abortSignal || undefined);
+        const requestMsg = MockMsg.create(request);
+        const result = await this.rpc.request(this.service, MockDefinition.methods.MockRequest.name, MockMsg.toBinary(requestMsg), abortSignal || undefined);
         return MockMsg.fromBinary(result);
     }
 }

package/dist/echo/echo_pb.d.ts

@@ -1,21 +1,14 @@
-import type { BinaryReadOptions, FieldList, JsonReadOptions, JsonValue, PartialMessage, PlainMessage } from '@bufbuild/protobuf';
-import { Message, proto3 } from '@bufbuild/protobuf';
+import { Message, MessageType } from '@aptre/protobuf-es-lite';
+export declare const protobufPackage = "echo";
 /**
  * EchoMsg is the message body for Echo.
  *
  * @generated from message echo.EchoMsg
  */
-export declare class EchoMsg extends Message<EchoMsg> {
+export interface EchoMsg extends Message<EchoMsg> {
     /**
      * @generated from field: string body = 1;
      */
-    body: string;
-    constructor(data?: PartialMessage<EchoMsg>);
-    static readonly runtime: typeof proto3;
-    static readonly typeName = "echo.EchoMsg";
-    static readonly fields: FieldList;
-    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): EchoMsg;
-    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): EchoMsg;
-    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): EchoMsg;
-    static equals(a: EchoMsg | PlainMessage<EchoMsg> | undefined, b: EchoMsg | PlainMessage<EchoMsg> | undefined): boolean;
+    body?: string;
 }
+export declare const EchoMsg: MessageType<EchoMsg>;

package/dist/echo/echo_pb.js

@@ -1,36 +1,12 @@
-// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
 /* eslint-disable */
-import { Message, proto3 } from '@bufbuild/protobuf';
-/**
- * EchoMsg is the message body for Echo.
- *
- * @generated from message echo.EchoMsg
- */
-export class EchoMsg extends Message {
-    /**
-     * @generated from field: string body = 1;
-     */
-    body = '';
-    constructor(data) {
-        super();
-        proto3.util.initPartial(data, this);
-    }
-    static runtime = proto3;
-    static typeName = 'echo.EchoMsg';
-    static fields = proto3.util.newFieldList(() => [
+import { createMessageType, } from '@aptre/protobuf-es-lite';
+export const protobufPackage = 'echo';
+export const EchoMsg = createMessageType({
+    typeName: 'echo.EchoMsg',
+    fields: [
         { no: 1, name: 'body', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
-    ]);
-    static fromBinary(bytes, options) {
-        return new EchoMsg().fromBinary(bytes, options);
-    }
-    static fromJson(jsonValue, options) {
-        return new EchoMsg().fromJson(jsonValue, options);
-    }
-    static fromJsonString(jsonString, options) {
-        return new EchoMsg().fromJsonString(jsonString, options);
-    }
-    static equals(a, b) {
-        return proto3.util.equals(EchoMsg, a, b);
-    }
-}
+    ],
+    packedByDefault: true,
+});

package/dist/echo/echo_srpc.pb.d.ts

@@ -1,8 +1,8 @@
-import { EchoMsg } from "./echo_pb.js";
-import type { PartialMessage } from "@bufbuild/protobuf";
-import { MethodKind } from "@bufbuild/protobuf";
-import { RpcStreamPacket } from "../rpcstream/rpcstream_pb.js";
-import { MessageStream, ProtoRpc } from "starpc";
+import { EchoMsg } from './echo_pb.js';
+import { MethodKind } from '@bufbuild/protobuf';
+import { RpcStreamPacket } from '../rpcstream/rpcstream_pb.js';
+import { Message } from '@aptre/protobuf-es-lite';
+import { MessageStream, ProtoRpc } from 'starpc';
 /**
  * Echoer service returns the given message.
  *
@@ -18,8 +18,8 @@ export declare const EchoerDefinition: {
          */
         readonly Echo: {
             readonly name: "Echo";
-            readonly I: typeof EchoMsg;
-            readonly O: typeof EchoMsg;
+            readonly I: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
+            readonly O: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly kind: MethodKind.Unary;
         };
         /**
@@ -29,8 +29,8 @@ export declare const EchoerDefinition: {
          */
         readonly EchoServerStream: {
             readonly name: "EchoServerStream";
-            readonly I: typeof EchoMsg;
-            readonly O: typeof EchoMsg;
+            readonly I: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
+            readonly O: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly kind: MethodKind.ServerStreaming;
         };
         /**
@@ -40,8 +40,8 @@ export declare const EchoerDefinition: {
          */
         readonly EchoClientStream: {
             readonly name: "EchoClientStream";
-            readonly I: typeof EchoMsg;
-            readonly O: typeof EchoMsg;
+            readonly I: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
+            readonly O: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly kind: MethodKind.ClientStreaming;
         };
         /**
@@ -51,8 +51,8 @@ export declare const EchoerDefinition: {
          */
         readonly EchoBidiStream: {
             readonly name: "EchoBidiStream";
-            readonly I: typeof EchoMsg;
-            readonly O: typeof EchoMsg;
+            readonly I: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
+            readonly O: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly kind: MethodKind.BiDiStreaming;
         };
         /**
@@ -62,8 +62,8 @@ export declare const EchoerDefinition: {
          */
         readonly RpcStream: {
             readonly name: "RpcStream";
-            readonly I: typeof RpcStreamPacket;
-            readonly O: typeof RpcStreamPacket;
+            readonly I: import("@aptre/protobuf-es-lite").MessageType<RpcStreamPacket>;
+            readonly O: import("@aptre/protobuf-es-lite").MessageType<RpcStreamPacket>;
             readonly kind: MethodKind.BiDiStreaming;
         };
     };
@@ -79,19 +79,19 @@ export interface Echoer {
      *
      * @generated from rpc echo.Echoer.Echo
      */
-    Echo(request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal): Promise<PartialMessage<EchoMsg>>;
+    Echo(request: Message<EchoMsg>, abortSignal?: AbortSignal): Promise<Message<EchoMsg>>;
     /**
      * EchoServerStream is an example of a server -> client one-way stream.
      *
      * @generated from rpc echo.Echoer.EchoServerStream
      */
-    EchoServerStream(request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal): MessageStream<EchoMsg>;
+    EchoServerStream(request: Message<EchoMsg>, abortSignal?: AbortSignal): MessageStream<EchoMsg>;
     /**
      * EchoClientStream is an example of client->server one-way stream.
      *
      * @generated from rpc echo.Echoer.EchoClientStream
      */
-    EchoClientStream(request: MessageStream<EchoMsg>, abortSignal?: AbortSignal): Promise<PartialMessage<EchoMsg>>;
+    EchoClientStream(request: MessageStream<EchoMsg>, abortSignal?: AbortSignal): Promise<Message<EchoMsg>>;
     /**
      * EchoBidiStream is an example of a two-way stream.
      *
@@ -117,19 +117,19 @@ export declare class EchoerClient implements Echoer {
      *
      * @generated from rpc echo.Echoer.Echo
      */
-    Echo(request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal): Promise<PartialMessage<EchoMsg>>;
+    Echo(request: Message<EchoMsg>, abortSignal?: AbortSignal): Promise<Message<EchoMsg>>;
     /**
      * EchoServerStream is an example of a server -> client one-way stream.
      *
      * @generated from rpc echo.Echoer.EchoServerStream
      */
-    EchoServerStream(request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal): MessageStream<EchoMsg>;
+    EchoServerStream(request: Message<EchoMsg>, abortSignal?: AbortSignal): MessageStream<EchoMsg>;
     /**
      * EchoClientStream is an example of client->server one-way stream.
      *
      * @generated from rpc echo.Echoer.EchoClientStream
      */
-    EchoClientStream(request: MessageStream<EchoMsg>, abortSignal?: AbortSignal): Promise<PartialMessage<EchoMsg>>;
+    EchoClientStream(request: MessageStream<EchoMsg>, abortSignal?: AbortSignal): Promise<Message<EchoMsg>>;
     /**
      * EchoBidiStream is an example of a two-way stream.
      *