update comments, move inteceptor adapters to wf client creation

Author: THardy98

packages/client/src/interceptor-adapters.ts

@@ -1,6 +1,5 @@
 import { WorkflowClientInterceptor, WorkflowStartInput, WorkflowStartOutput } from './interceptors';
 
-// Apply adapters to workflow client interceptor.
 export function adaptWorkflowClientInterceptor(i: WorkflowClientInterceptor): WorkflowClientInterceptor {
   return adaptLegacyStartInterceptor(i);
 }

packages/client/src/interceptors.ts

@@ -132,8 +132,7 @@ export interface WorkflowClientInterceptor {
   /**
    * Intercept a service call to startWorkflowExecution
    *
-   * Successor to {@link start}. Unlike {@link start}, this method returns
-   * start details via {@link WorkflowStartOutput}.
+   * This method returns start details via {@link WorkflowStartOutput}.
    *
    * If you implement this method,
    * {@link signalWithStart} most likely needs to be implemented too

packages/client/src/workflow-client.ts

@@ -511,6 +511,7 @@ export class WorkflowClient extends BaseClient {
       ...filterNullAndUndefined(options ?? {}),
       loadedDataConverter: this.dataConverter,
     };
+    this.options.interceptors = this.adaptInterceptors();
   }
 
   /**
@@ -1645,18 +1646,31 @@ export class WorkflowClient extends BaseClient {
     return decodeCountWorkflowExecutionsResponse(response);
   }
 
-  protected getOrMakeInterceptors(workflowId: string, runId?: string): WorkflowClientInterceptor[] {
+  protected adaptInterceptors(): WorkflowClientInterceptors | WorkflowClientInterceptor[] {
     if (typeof this.options.interceptors === 'object' && 'calls' in this.options.interceptors) {
       // eslint-disable-next-line deprecation/deprecation
       const factories = (this.options.interceptors as WorkflowClientInterceptors).calls ?? [];
-      return factories.map((ctor) => ctor({ workflowId, runId }));
+      // Compose factory functions with adapters.
+      return {
+        calls: factories.map((ctor) => {
+          return (input) => adaptWorkflowClientInterceptor(ctor(input));
+        }),
+      };
     }
     const interceptors = Array.isArray(this.options.interceptors)
       ? (this.options.interceptors as WorkflowClientInterceptor[])
       : [];
-    // Apply adapters to workflow client interceptors.
     return interceptors.map((i) => adaptWorkflowClientInterceptor(i));
   }
+
+  protected getOrMakeInterceptors(workflowId: string, runId?: string): WorkflowClientInterceptor[] {
+    if (typeof this.options.interceptors === 'object' && 'calls' in this.options.interceptors) {
+      // eslint-disable-next-line deprecation/deprecation
+      const factories = (this.options.interceptors as WorkflowClientInterceptors).calls ?? [];
+      return factories.map((ctor) => ctor({ workflowId, runId }));
+    }
+    return Array.isArray(this.options.interceptors) ? (this.options.interceptors as WorkflowClientInterceptor[]) : [];
+  }
 }
 
 @SymbolBasedInstanceOfError('QueryRejectedError')

packages/client/src/workflow-options.ts

@@ -56,7 +56,7 @@ export interface WorkflowOptions extends CommonWorkflowOptions {
   versioningOverride?: VersioningOverride;
 
   /**
-   * Potentially reduce the latency to start this workflow by encouraging the server to
+   * Potentially reduce the latency to start this workflow by requesting that the server
    * start it on a local worker running with this same client.
    */
   requestEagerStart?: boolean;