fix: import Observable as a type (#826)

* import Observable as a type * fix: only generation of services should import Observable as a type, the test suite should stay as it is
stephenh · May 7, 2023 · 52e84ba · 52e84ba
1 parent e60706b
commit 52e84ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/generate-services.ts b/src/generate-services.ts
@@ -338,7 +338,7 @@ export function generateRpcType(ctx: Context, hasStreamingMethods: boolean): Cod
   const maybeAbortSignalParam = options.useAbortSignal ? "abortSignal?: AbortSignal," : "";
   const methods = [[code`request`, code`Uint8Array`, code`Promise<Uint8Array>`]];
   if (hasStreamingMethods) {
-    const observable = observableType(ctx);
+    const observable = observableType(ctx, true);
     methods.push([code`clientStreamingRequest`, code`${observable}<Uint8Array>`, code`Promise<Uint8Array>`]);
     methods.push([code`serverStreamingRequest`, code`Uint8Array`, code`${observable}<Uint8Array>`]);
     methods.push([

diff --git a/src/types.ts b/src/types.ts
@@ -690,11 +690,14 @@ export function rawRequestType(
   return messageToTypeName(ctx, methodDesc.inputType, typeOptions);
 }
 
-export function observableType(ctx: Context): Code {
+export function observableType(ctx: Context, asType: boolean = false): Code {
   if (ctx.options.useAsyncIterable) {
     return code`AsyncIterable`;
+  } else if (asType) {
+    return code`${imp("t:Observable@rxjs")}`;
+  } else {
+    return code`${imp("Observable@rxjs")}`;
   }
-  return code`${imp("Observable@rxjs")}`;
 }
 
 export function requestType(ctx: Context, methodDesc: MethodDescriptorProto, partial: boolean = false): Code {