@temporalio/testing 1.12.3 → 1.13.1

package/lib/client.d.ts

@@ -1,27 +1,24 @@
 import 'abort-controller/polyfill';
-import { Client, ClientOptions, WorkflowClient, WorkflowClientOptions, WorkflowResultOptions } from '@temporalio/client';
-import { Connection, TestService } from './connection';
-export interface TimeSkippingWorkflowClientOptions extends WorkflowClientOptions {
-    connection: Connection;
-    enableTimeSkipping: boolean;
-}
-export interface TestEnvClientOptions extends ClientOptions {
-    connection: Connection;
-    enableTimeSkipping: boolean;
-}
+import { Client, ClientOptions, TestService, WorkflowClient, WorkflowClientOptions, WorkflowResultOptions } from '@temporalio/client';
 /**
  * Subset of the "normal" client options that are used to create a client for the test environment.
  */
 export type ClientOptionsForTestEnv = Omit<ClientOptions, 'namespace' | 'connection'>;
 /**
- * A client with the exact same API as the "normal" client with 1 exception,
- * When this client waits on a Workflow's result, it will enable time skipping
- * in the test server.
+ * A client with the exact same API as the "normal" client with one exception:
+ * when `TestEnvClient.workflow` (an instance of {@link TimeSkippingWorkflowClient})
+ * waits on a Workflow's result, it will enable time skipping in the Test Server.
+ */
+export declare class TimeSkippingClient extends Client {
+    constructor(options: ClientOptions);
+}
+/**
+ * A client with the exact same API as the "normal" client with one exception: when this client
+ * waits on a Workflow's result, it will enable time skipping in the Test Server.
  */
 export declare class TimeSkippingWorkflowClient extends WorkflowClient {
     protected readonly testService: TestService;
-    protected readonly enableTimeSkipping: boolean;
-    constructor(options: TimeSkippingWorkflowClientOptions);
+    constructor(options: WorkflowClientOptions);
     /**
      * Gets the result of a Workflow execution.
      *
@@ -29,11 +26,3 @@ export declare class TimeSkippingWorkflowClient extends WorkflowClient {
      */
     result<T>(workflowId: string, runId?: string | undefined, opts?: WorkflowResultOptions | undefined): Promise<T>;
 }
-/**
- * A client with the exact same API as the "normal" client with one exception:
- * when `TestEnvClient.workflow` (an instance of {@link TimeSkippingWorkflowClient}) waits on a Workflow's result, it will enable time skipping
- * in the Test Server.
- */
-export declare class TestEnvClient extends Client {
-    constructor(options: TestEnvClientOptions);
-}

package/lib/client.js

@@ -1,20 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TestEnvClient = exports.TimeSkippingWorkflowClient = void 0;
+exports.TimeSkippingWorkflowClient = exports.TimeSkippingClient = void 0;
 require("abort-controller/polyfill"); // eslint-disable-line import/no-unassigned-import
 const client_1 = require("@temporalio/client");
 /**
- * A client with the exact same API as the "normal" client with 1 exception,
- * When this client waits on a Workflow's result, it will enable time skipping
- * in the test server.
+ * A client with the exact same API as the "normal" client with one exception:
+ * when `TestEnvClient.workflow` (an instance of {@link TimeSkippingWorkflowClient})
+ * waits on a Workflow's result, it will enable time skipping in the Test Server.
+ */
+class TimeSkippingClient extends client_1.Client {
+    constructor(options) {
+        super(options);
+        // Recreate the client (this isn't optimal but it's better than adding public methods just for testing).
+        // NOTE: we cast to "any" to work around `workflow` being a readonly attribute.
+        this.workflow = new TimeSkippingWorkflowClient({
+            ...this.workflow.options,
+            connection: options.connection,
+        });
+    }
+}
+exports.TimeSkippingClient = TimeSkippingClient;
+/**
+ * A client with the exact same API as the "normal" client with one exception: when this client
+ * waits on a Workflow's result, it will enable time skipping in the Test Server.
  */
 class TimeSkippingWorkflowClient extends client_1.WorkflowClient {
     testService;
-    enableTimeSkipping;
     constructor(options) {
         super(options);
-        this.enableTimeSkipping = options.enableTimeSkipping;
-        this.testService = options.connection.testService;
+        const testService = options.connection.testService;
+        if (!testService) {
+            throw new TypeError('TestService must be present when creating a TimeSkippingWorkflowClient');
+        }
+        this.testService = testService;
     }
     /**
      * Gets the result of a Workflow execution.
@@ -22,37 +40,14 @@ class TimeSkippingWorkflowClient extends client_1.WorkflowClient {
      * @see {@link WorkflowClient.result}
      */
     async result(workflowId, runId, opts) {
-        if (this.enableTimeSkipping) {
-            await this.testService.unlockTimeSkipping({});
-            try {
-                return await super.result(workflowId, runId, opts);
-            }
-            finally {
-                await this.testService.lockTimeSkipping({});
-            }
-        }
-        else {
+        await this.testService.unlockTimeSkipping({});
+        try {
             return await super.result(workflowId, runId, opts);
         }
+        finally {
+            await this.testService.lockTimeSkipping({});
+        }
     }
 }
 exports.TimeSkippingWorkflowClient = TimeSkippingWorkflowClient;
-/**
- * A client with the exact same API as the "normal" client with one exception:
- * when `TestEnvClient.workflow` (an instance of {@link TimeSkippingWorkflowClient}) waits on a Workflow's result, it will enable time skipping
- * in the Test Server.
- */
-class TestEnvClient extends client_1.Client {
-    constructor(options) {
-        super(options);
-        // Recreate the client (this isn't optimal but it's better than adding public methods just for testing).
-        // NOTE: we cast to "any" to work around `workflow` being a readonly attribute.
-        this.workflow = new TimeSkippingWorkflowClient({
-            ...this.workflow.options,
-            connection: options.connection,
-            enableTimeSkipping: options.enableTimeSkipping,
-        });
-    }
-}
-exports.TestEnvClient = TestEnvClient;
 //# sourceMappingURL=client.js.map

package/lib/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";;;AAAA,qCAAmC,CAAC,kDAAkD;AACtF,+CAM4B;AAkB5B;;;;GAIG;AACH,MAAa,0BAA2B,SAAQ,uBAAc;IACzC,WAAW,CAAc;IACzB,kBAAkB,CAAU;IAE/C,YAAY,OAA0C;QACpD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;QACrD,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACM,KAAK,CAAC,MAAM,CACnB,UAAkB,EAClB,KAA0B,EAC1B,IAAwC;QAExC,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;YAC9C,IAAI,CAAC;gBACH,OAAO,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YACrD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;CACF;AA/BD,gEA+BC;AAED;;;;GAIG;AACH,MAAa,aAAc,SAAQ,eAAM;IACvC,YAAY,OAA6B;QACvC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,wGAAwG;QACxG,+EAA+E;QAC9E,IAAY,CAAC,QAAQ,GAAG,IAAI,0BAA0B,CAAC;YACtD,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO;YACxB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;SAC/C,CAAC,CAAC;IACL,CAAC;CACF;AAZD,sCAYC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";;;AAAA,qCAAmC,CAAC,kDAAkD;AACtF,+CAQ4B;AAO5B;;;;GAIG;AACH,MAAa,kBAAmB,SAAQ,eAAM;IAC5C,YAAY,OAAsB;QAChC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,wGAAwG;QACxG,+EAA+E;QAC9E,IAAY,CAAC,QAAQ,GAAG,IAAI,0BAA0B,CAAC;YACtD,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO;YACxB,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;IACL,CAAC;CACF;AAXD,gDAWC;AAED;;;GAGG;AACH,MAAa,0BAA2B,SAAQ,uBAAc;IACzC,WAAW,CAAc;IAE5C,YAAY,OAA8B;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,MAAM,WAAW,GAAI,OAAO,CAAC,UAAyB,CAAC,WAAW,CAAC;QACnE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,SAAS,CAAC,wEAAwE,CAAC,CAAC;QAChG,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACM,KAAK,CAAC,MAAM,CACnB,UAAkB,EAClB,KAA0B,EAC1B,IAAwC;QAExC,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACrD,CAAC;gBAAS,CAAC;YACT,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;CACF;AA7BD,gEA6BC"}

package/lib/index.d.ts

@@ -9,7 +9,7 @@
  */
 export { TestWorkflowEnvironment, type LocalTestWorkflowEnvironmentOptions, type TimeSkippingTestWorkflowEnvironmentOptions, type ExistingServerTestWorkflowEnvironmentOptions, } from './testing-workflow-environment';
 export { type DevServerConfig, type TimeSkippingServerConfig, type EphemeralServerExecutable, } from './ephemeral-server';
-export { type ClientOptionsForTestEnv, type TestEnvClientOptions, type TimeSkippingWorkflowClientOptions, TestEnvClient, TimeSkippingWorkflowClient, } from './client';
+export { type ClientOptionsForTestEnv, TimeSkippingWorkflowClient } from './client';
 export { type MockActivityEnvironmentOptions, MockActivityEnvironment, defaultActivityInfo, } from './mocking-activity-environment';
 /**
  * Convenience workflow interceptors

package/lib/index.js

@@ -12,12 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.workflowInterceptorModules = exports.defaultActivityInfo = exports.MockActivityEnvironment = exports.TimeSkippingWorkflowClient = exports.TestEnvClient = exports.TestWorkflowEnvironment = void 0;
+exports.workflowInterceptorModules = exports.defaultActivityInfo = exports.MockActivityEnvironment = exports.TimeSkippingWorkflowClient = exports.TestWorkflowEnvironment = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 var testing_workflow_environment_1 = require("./testing-workflow-environment");
 Object.defineProperty(exports, "TestWorkflowEnvironment", { enumerable: true, get: function () { return testing_workflow_environment_1.TestWorkflowEnvironment; } });
 var client_1 = require("./client");
-Object.defineProperty(exports, "TestEnvClient", { enumerable: true, get: function () { return client_1.TestEnvClient; } });
 Object.defineProperty(exports, "TimeSkippingWorkflowClient", { enumerable: true, get: function () { return client_1.TimeSkippingWorkflowClient; } });
 var mocking_activity_environment_1 = require("./mocking-activity-environment");
 Object.defineProperty(exports, "MockActivityEnvironment", { enumerable: true, get: function () { return mocking_activity_environment_1.MockActivityEnvironment; } });

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;;;AAEH,0DAA6B;AAE7B,+EAKwC;AAJtC,uIAAA,uBAAuB,OAAA;AAYzB,mCAOkB;AAFhB,uGAAA,aAAa,OAAA;AACb,oHAAA,0BAA0B,OAAA;AAG5B,+EAIwC;AAFtC,uIAAA,uBAAuB,OAAA;AACvB,mIAAA,mBAAmB,OAAA;AAGrB;;;;;GAKG;AACU,QAAA,0BAA0B,GAAG,CAAC,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,+BAA+B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;;;AAEH,0DAA6B;AAE7B,+EAKwC;AAJtC,uIAAA,uBAAuB,OAAA;AAYzB,mCAAoF;AAA7C,oHAAA,0BAA0B,OAAA;AAEjE,+EAIwC;AAFtC,uIAAA,uBAAuB,OAAA;AACvB,mIAAA,mBAAmB,OAAA;AAGrB;;;;;GAKG;AACU,QAAA,0BAA0B,GAAG,CAAC,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,+BAA+B,CAAC,CAAC,CAAC"}

package/lib/mocking-activity-environment.d.ts

@@ -2,12 +2,14 @@ import 'abort-controller/polyfill';
 import events from 'node:events';
 import * as activity from '@temporalio/activity';
 import { ActivityFunction, Logger, MetricMeter, ActivityCancellationDetails } from '@temporalio/common';
+import { Client } from '@temporalio/client';
 import { ActivityInterceptorsFactory } from '@temporalio/worker';
 import { CancelReason } from '@temporalio/worker/lib/activity';
 export interface MockActivityEnvironmentOptions {
     interceptors?: ActivityInterceptorsFactory[];
     logger?: Logger;
     metricMeter?: MetricMeter;
+    client?: Client;
 }
 /**
  * An execution environment for testing Activities.

package/lib/mocking-activity-environment.js

@@ -31,7 +31,7 @@ class MockActivityEnvironment extends node_events_1.default.EventEmitter {
             payloadCodecs: [],
             failureConverter: common_1.defaultFailureConverter,
         };
-        this.activity = new activity_1.Activity({ ...exports.defaultActivityInfo, ...info }, undefined, loadedDataConverter, heartbeatCallback, logger_1.LoggerWithComposedMetadata.compose(opts?.logger ?? new worker_1.DefaultLogger(), { sdkComponent: common_1.SdkComponent.worker }), opts?.metricMeter ?? common_1.noopMetricMeter, opts?.interceptors ?? []);
+        this.activity = new activity_1.Activity({ ...exports.defaultActivityInfo, ...info }, undefined, loadedDataConverter, heartbeatCallback, opts?.client, logger_1.LoggerWithComposedMetadata.compose(opts?.logger ?? new worker_1.DefaultLogger(), { sdkComponent: common_1.SdkComponent.worker }), opts?.metricMeter ?? common_1.noopMetricMeter, opts?.interceptors ?? []);
         this.context = this.activity.context;
         this.cancel = (reason, details) => {
             // Default to CANCELLED if nothing provided.
@@ -72,5 +72,6 @@ exports.defaultActivityInfo = {
     scheduleToCloseTimeoutMs: 1000,
     currentAttemptScheduledTimestampMs: 1,
     priority: undefined,
+    retryPolicy: undefined,
 };
 //# sourceMappingURL=mocking-activity-environment.js.map

package/lib/mocking-activity-environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"mocking-activity-environment.js","sourceRoot":"","sources":["../src/mocking-activity-environment.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAmC,CAAC,kDAAkD;AACtF,8DAAiC;AAEjC,+CAS4B;AAC5B,0DAA2E;AAC3E,+CAAgF;AAChF,8DAAyE;AAQzE;;;;;;;;GAQG;AACH,MAAa,uBAAwB,SAAQ,qBAAM,CAAC,YAAY;IACvD,MAAM,GAA2E,GAAG,EAAE,CAAC,SAAS,CAAC;IACxF,OAAO,CAAmB;IACzB,QAAQ,CAAW;IAEpC,YAAY,IAA6B,EAAE,IAAqC;QAC9E,KAAK,EAAE,CAAC;QACR,MAAM,iBAAiB,GAAG,CAAC,OAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACjF,MAAM,mBAAmB,GAAG;YAC1B,gBAAgB,EAAE,gCAAuB;YACzC,aAAa,EAAE,EAAE;YACjB,gBAAgB,EAAE,gCAAuB;SAC1C,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAQ,CAC1B,EAAE,GAAG,2BAAmB,EAAE,GAAG,IAAI,EAAE,EACnC,SAAS,EACT,mBAAmB,EACnB,iBAAiB,EACjB,mCAA0B,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,IAAI,IAAI,sBAAa,EAAE,EAAE,EAAE,YAAY,EAAE,qBAAY,CAAC,MAAM,EAAE,CAAC,EAC9G,IAAI,EAAE,WAAW,IAAI,wBAAe,EACpC,IAAI,EAAE,YAAY,IAAI,EAAE,CACzB,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,CAAC,MAAqB,EAAE,OAAqC,EAAE,EAAE;YAC7E,4CAA4C;YAC5C,MAAM,CAAC,GAAG,MAAM,IAAI,WAAW,CAAC;YAChC,MAAM,CAAC,GAAG,OAAO,IAAI,IAAI,oCAA2B,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;YAChF,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,GAAG,CAAuD,EAAK,EAAE,GAAG,IAAO;QACtF,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAgC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAe,CAAC;IAC5G,CAAC;CACF;AArCD,0DAqCC;AAED;;;;GAIG;AACU,QAAA,mBAAmB,GAAkB;IAChD,OAAO,EAAE,CAAC;IACV,SAAS,EAAE,MAAM;IACjB,OAAO,EAAE,KAAK;IACd,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;IAC9B,UAAU,EAAE,MAAM;IAClB,YAAY,EAAE,SAAS;IACvB,YAAY,EAAE,MAAM;IACpB,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACvD,kBAAkB,EAAE,SAAS;IAC7B,gBAAgB,EAAE,SAAS;IAC3B,iBAAiB,EAAE,SAAS;IAC5B,iBAAiB,EAAE,SAAS;IAC5B,iBAAiB,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,sCAAsC,EAAE;IACxF,oBAAoB,EAAE,CAAC;IACvB,qBAAqB,EAAE,IAAI;IAC3B,wBAAwB,EAAE,IAAI;IAC9B,kCAAkC,EAAE,CAAC;IACrC,QAAQ,EAAE,SAAS;CACpB,CAAC"}
+{"version":3,"file":"mocking-activity-environment.js","sourceRoot":"","sources":["../src/mocking-activity-environment.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAmC,CAAC,kDAAkD;AACtF,8DAAiC;AAEjC,+CAS4B;AAC5B,0DAA2E;AAE3E,+CAAgF;AAChF,8DAAyE;AASzE;;;;;;;;GAQG;AACH,MAAa,uBAAwB,SAAQ,qBAAM,CAAC,YAAY;IACvD,MAAM,GAA2E,GAAG,EAAE,CAAC,SAAS,CAAC;IACxF,OAAO,CAAmB;IACzB,QAAQ,CAAW;IAEpC,YAAY,IAA6B,EAAE,IAAqC;QAC9E,KAAK,EAAE,CAAC;QACR,MAAM,iBAAiB,GAAG,CAAC,OAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACjF,MAAM,mBAAmB,GAAG;YAC1B,gBAAgB,EAAE,gCAAuB;YACzC,aAAa,EAAE,EAAE;YACjB,gBAAgB,EAAE,gCAAuB;SAC1C,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAQ,CAC1B,EAAE,GAAG,2BAAmB,EAAE,GAAG,IAAI,EAAE,EACnC,SAAS,EACT,mBAAmB,EACnB,iBAAiB,EACjB,IAAI,EAAE,MAAM,EACZ,mCAA0B,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,IAAI,IAAI,sBAAa,EAAE,EAAE,EAAE,YAAY,EAAE,qBAAY,CAAC,MAAM,EAAE,CAAC,EAC9G,IAAI,EAAE,WAAW,IAAI,wBAAe,EACpC,IAAI,EAAE,YAAY,IAAI,EAAE,CACzB,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,CAAC,MAAqB,EAAE,OAAqC,EAAE,EAAE;YAC7E,4CAA4C;YAC5C,MAAM,CAAC,GAAG,MAAM,IAAI,WAAW,CAAC;YAChC,MAAM,CAAC,GAAG,OAAO,IAAI,IAAI,oCAA2B,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;YAChF,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,GAAG,CAAuD,EAAK,EAAE,GAAG,IAAO;QACtF,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAgC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAe,CAAC;IAC5G,CAAC;CACF;AAtCD,0DAsCC;AAED;;;;GAIG;AACU,QAAA,mBAAmB,GAAkB;IAChD,OAAO,EAAE,CAAC;IACV,SAAS,EAAE,MAAM;IACjB,OAAO,EAAE,KAAK;IACd,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;IAC9B,UAAU,EAAE,MAAM;IAClB,YAAY,EAAE,SAAS;IACvB,YAAY,EAAE,MAAM;IACpB,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACvD,kBAAkB,EAAE,SAAS;IAC7B,gBAAgB,EAAE,SAAS;IAC3B,iBAAiB,EAAE,SAAS;IAC5B,iBAAiB,EAAE,SAAS;IAC5B,iBAAiB,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,sCAAsC,EAAE;IACxF,oBAAoB,EAAE,CAAC;IACvB,qBAAqB,EAAE,IAAI;IAC3B,wBAAwB,EAAE,IAAI;IAC9B,kCAAkC,EAAE,CAAC;IACrC,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,SAAS;CACvB,CAAC"}

package/lib/testing-workflow-environment.d.ts

@@ -1,9 +1,8 @@
 import 'abort-controller/polyfill';
-import { AsyncCompletionClient, Client, WorkflowClient } from '@temporalio/client';
+import { AsyncCompletionClient, Client, Connection, WorkflowClient } from '@temporalio/client';
 import { Duration } from '@temporalio/common';
 import { NativeConnection, Runtime } from '@temporalio/worker';
 import { native } from '@temporalio/core-bridge';
-import { Connection } from './connection';
 import { DevServerConfig, TimeSkippingServerConfig } from './ephemeral-server';
 import { ClientOptionsForTestEnv } from './client';
 /**
@@ -50,7 +49,7 @@ export declare class TestWorkflowEnvironment {
      */
     readonly connection: Connection;
     /**
-     * A {@link TestEnvClient} for interacting with the ephemeral server
+     * A {@link TimeSkippingClient} for interacting with the ephemeral server
      */
     readonly client: Client;
     /**

package/lib/testing-workflow-environment.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestWorkflowEnvironment = void 0;
 require("abort-controller/polyfill"); // eslint-disable-line import/no-unassigned-import
+const client_1 = require("@temporalio/client");
+const connection_1 = require("@temporalio/client/lib/connection");
 const common_1 = require("@temporalio/common");
 const time_1 = require("@temporalio/common/lib/time");
 const worker_1 = require("@temporalio/worker");
 const core_bridge_1 = require("@temporalio/core-bridge");
 const internal_workflow_1 = require("@temporalio/common/lib/internal-workflow");
-const connection_1 = require("./connection");
 const ephemeral_server_1 = require("./ephemeral-server");
-const client_1 = require("./client");
+const client_2 = require("./client");
 /**
  * An execution environment for running Workflow integration tests.
  *
@@ -30,7 +31,7 @@ class TestWorkflowEnvironment {
      */
     connection;
     /**
-     * A {@link TestEnvClient} for interacting with the ephemeral server
+     * A {@link TimeSkippingClient} for interacting with the ephemeral server
      */
     client;
     /**
@@ -59,12 +60,17 @@ class TestWorkflowEnvironment {
         this.connection = connection;
         this.nativeConnection = nativeConnection;
         this.namespace = namespace;
-        this.client = new client_1.TestEnvClient({
-            connection,
-            namespace: this.namespace,
-            enableTimeSkipping: supportsTimeSkipping,
-            ...options.client,
-        });
+        this.client = supportsTimeSkipping
+            ? new client_2.TimeSkippingClient({
+                connection,
+                namespace: this.namespace,
+                ...options.client,
+            })
+            : new client_1.Client({
+                connection,
+                namespace: this.namespace,
+                ...options.client,
+            });
         this.asyncCompletionClient = this.client.activity; // eslint-disable-line deprecation/deprecation
         this.workflowClient = this.client.workflow; // eslint-disable-line deprecation/deprecation
     }
@@ -174,8 +180,14 @@ class TestWorkflowEnvironment {
             address = opts.address ?? 'localhost:7233';
             server = 'existing';
         }
-        const nativeConnection = await worker_1.NativeConnection.connect({ address });
-        const connection = await connection_1.Connection.connect({ address });
+        const nativeConnection = await worker_1.NativeConnection.connect({
+            address,
+            [connection_1.InternalConnectionOptionsSymbol]: { supportsTestService: supportsTimeSkipping },
+        });
+        const connection = await client_1.Connection.connect({
+            address,
+            [connection_1.InternalConnectionOptionsSymbol]: { supportsTestService: supportsTimeSkipping },
+        });
         return new this(runtime, optsWithDefaults, supportsTimeSkipping, server, connection, nativeConnection, namespace);
     }
     /**

package/lib/testing-workflow-environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"testing-workflow-environment.js","sourceRoot":"","sources":["../src/testing-workflow-environment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testing-workflow-environment.js","sourceRoot":"","sources":["../src/testing-workflow-environment.ts"],"names":[],"mappings":";;;AAAA,qCAAmC,CAAC,kDAAkD;AACtF,+CAA+F;AAC/F,kEAI2C;AAC3C,+CAAqE;AACrE,sDAAyE;AACzE,+CAAwF;AACxF,yDAAiD;AACjD,gFAAkF;AAClF,yDAA8G;AAC9G,qCAAuE;AA6BvE;;;;;GAKG;AACH,MAAa,uBAAuB;IAsCf;IACD;IACA;IACG;IAxCrB;;OAEG;IACa,SAAS,CAAU;IAEnC;;OAEG;IACa,UAAU,CAAa;IAEvC;;OAEG;IACa,MAAM,CAAS;IAE/B;;;;OAIG;IACa,qBAAqB,CAAwB;IAE7D;;;;OAIG;IACa,cAAc,CAAiB;IAE/C;;;;OAIG;IACa,gBAAgB,CAAmB;IAEnD,YACmB,OAAgB,EACjB,OAAmD,EACnD,oBAA6B,EAC1B,MAA2C,EAC9D,UAAsB,EACtB,gBAAkC,EAClC,SAA6B;QANZ,YAAO,GAAP,OAAO,CAAS;QACjB,YAAO,GAAP,OAAO,CAA4C;QACnD,yBAAoB,GAApB,oBAAoB,CAAS;QAC1B,WAAM,GAAN,MAAM,CAAqC;QAK9D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,oBAAoB;YAChC,CAAC,CAAC,IAAI,2BAAkB,CAAC;gBACrB,UAAU;gBACV,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,GAAG,OAAO,CAAC,MAAM;aAClB,CAAC;YACJ,CAAC,CAAC,IAAI,eAAM,CAAC;gBACT,UAAU;gBACV,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,GAAG,OAAO,CAAC,MAAM;aAClB,CAAC,CAAC;QACP,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,8CAA8C;QACjG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,8CAA8C;IAC5F,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAiD;QAC/E,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC;YACvB,MAAM,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;YAClD,MAAM,EAAE,IAAI,EAAE,MAAM;YACpB,oBAAoB,EAAE,IAAI;SAC3B,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAA0C;QACjE,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC;YACvB,MAAM,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;YAC/C,MAAM,EAAE,IAAI,EAAE,MAAM;YACpB,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS;YAClC,oBAAoB,EAAE,KAAK;SAC5B,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,wBAAwB,CACnC,IAAmD;QAEnD,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC;YACvB,MAAM,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;YAC5B,MAAM,EAAE,IAAI,EAAE,MAAM;YACpB,SAAS,EAAE,IAAI,EAAE,SAAS,IAAI,SAAS;YACvC,oBAAoB,EAAE,KAAK;YAC3B,OAAO,EAAE,IAAI,EAAE,OAAO;SACvB,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,KAAK,CAAC,MAAM,CACzB,IAIC;QAED,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAC1D,MAAM,gBAAgB,GAAG,WAAW,CAAC,IAAA,0CAAsB,EAAC,IAAI,CAAC,CAAC,CAAC;QAEnE,IAAI,OAAe,CAAC;QACpB,MAAM,OAAO,GAAG,gBAAO,CAAC,QAAQ,EAAE,CAAC;QACnC,IAAI,MAA2C,CAAC;QAChD,IAAI,gBAAgB,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAChD,gDAAgD;YAChD,IAAI,kBAAkB,IAAI,gBAAgB,CAAC,MAAM,IAAI,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBAC9F,IAAI,OAAO,GAAa,EAAE,CAAC;gBAC3B,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;oBACtE,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;oBACnC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,8BAAqB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACxE,CAAC;gBACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;gBAClE,gBAAgB,CAAC,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC;YAC9C,CAAC;YAED,MAAM,GAAG,MAAM,OAAO,CAAC,qBAAqB,CAAC,IAAA,gDAA6B,EAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;YACrG,OAAO,GAAG,oBAAM,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,gBAAgB,CAAC;YAC3C,MAAM,GAAG,UAAU,CAAC;QACtB,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,yBAAgB,CAAC,OAAO,CAAsD;YAC3G,OAAO;YACP,CAAC,4CAA+B,CAAC,EAAE,EAAE,mBAAmB,EAAE,oBAAoB,EAAE;SACjF,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,mBAAU,CAAC,OAAO,CAAgD;YACzF,OAAO;YACP,CAAC,4CAA+B,CAAC,EAAE,EAAE,mBAAmB,EAAE,oBAAoB,EAAE;SACjF,CAAC,CAAC;QAEH,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAC;IACpH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACxC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,YAAY;QACd,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,YAAY;QACd,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBAClE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,YAAY;YACd,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2CG;IACH,KAAK,GAAG,KAAK,EAAE,UAAoB,EAAiB,EAAE;QACpD,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,UAAU,CAAC,WAAY,CAAC,2BAA2B,CAAC,EAAE,QAAQ,EAAE,IAAA,aAAM,EAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACnG,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAA,iBAAU,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC,CAAC;IAEF;;;;;OAKG;IACH,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC9B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAY,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YACvE,OAAO,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;CACF;AAzRD,0DAyRC;AAcD,SAAS,WAAW,CAAC,IAAoC;IACvD,OAAO;QACL,MAAM,EAAE,EAAE;QACV,GAAG,IAAI;QACP,MAAM,EAAE;YACN,GAAG,IAAI,CAAC,MAAM;SACf;KACF,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@temporalio/testing",
-  "version": "1.12.3",
+  "version": "1.13.1",
   "description": "Temporal.io SDK Testing sub-package",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,13 +12,13 @@
   "author": "Temporal Technologies Inc. <sdk@temporal.io>",
   "license": "MIT",
   "dependencies": {
-    "@temporalio/activity": "1.12.3",
-    "@temporalio/client": "1.12.3",
-    "@temporalio/common": "1.12.3",
-    "@temporalio/core-bridge": "1.12.3",
-    "@temporalio/proto": "1.12.3",
-    "@temporalio/worker": "1.12.3",
-    "@temporalio/workflow": "1.12.3",
+    "@temporalio/activity": "1.13.1",
+    "@temporalio/client": "1.13.1",
+    "@temporalio/common": "1.13.1",
+    "@temporalio/core-bridge": "1.13.1",
+    "@temporalio/proto": "1.13.1",
+    "@temporalio/worker": "1.13.1",
+    "@temporalio/workflow": "1.13.1",
     "abort-controller": "^3.0.0"
   },
   "bugs": {
@@ -40,5 +40,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e25f1d5ddaf0b5c755457b1cc1dde7c6e089a63b"
+  "gitHead": "7904e19bc72dcdf9eb0275ecaa585a2ff2fec072"
 }

package/src/client.ts

@@ -2,21 +2,12 @@ import 'abort-controller/polyfill'; // eslint-disable-line import/no-unassigned-
 import {
   Client,
   ClientOptions,
+  Connection,
+  TestService,
   WorkflowClient,
   WorkflowClientOptions,
   WorkflowResultOptions,
 } from '@temporalio/client';
-import { Connection, TestService } from './connection';
-
-export interface TimeSkippingWorkflowClientOptions extends WorkflowClientOptions {
-  connection: Connection;
-  enableTimeSkipping: boolean;
-}
-
-export interface TestEnvClientOptions extends ClientOptions {
-  connection: Connection;
-  enableTimeSkipping: boolean;
-}
 
 /**
  * Subset of the "normal" client options that are used to create a client for the test environment.
@@ -24,18 +15,37 @@ export interface TestEnvClientOptions extends ClientOptions {
 export type ClientOptionsForTestEnv = Omit<ClientOptions, 'namespace' | 'connection'>;
 
 /**
- * A client with the exact same API as the "normal" client with 1 exception,
- * When this client waits on a Workflow's result, it will enable time skipping
- * in the test server.
+ * A client with the exact same API as the "normal" client with one exception:
+ * when `TestEnvClient.workflow` (an instance of {@link TimeSkippingWorkflowClient})
+ * waits on a Workflow's result, it will enable time skipping in the Test Server.
+ */
+export class TimeSkippingClient extends Client {
+  constructor(options: ClientOptions) {
+    super(options);
+
+    // Recreate the client (this isn't optimal but it's better than adding public methods just for testing).
+    // NOTE: we cast to "any" to work around `workflow` being a readonly attribute.
+    (this as any).workflow = new TimeSkippingWorkflowClient({
+      ...this.workflow.options,
+      connection: options.connection,
+    });
+  }
+}
+
+/**
+ * A client with the exact same API as the "normal" client with one exception: when this client
+ * waits on a Workflow's result, it will enable time skipping in the Test Server.
  */
 export class TimeSkippingWorkflowClient extends WorkflowClient {
   protected readonly testService: TestService;
-  protected readonly enableTimeSkipping: boolean;
 
-  constructor(options: TimeSkippingWorkflowClientOptions) {
+  constructor(options: WorkflowClientOptions) {
     super(options);
-    this.enableTimeSkipping = options.enableTimeSkipping;
-    this.testService = options.connection.testService;
+    const testService = (options.connection as Connection).testService;
+    if (!testService) {
+      throw new TypeError('TestService must be present when creating a TimeSkippingWorkflowClient');
+    }
+    this.testService = testService;
   }
 
   /**
@@ -48,34 +58,11 @@ export class TimeSkippingWorkflowClient extends WorkflowClient {
     runId?: string | undefined,
     opts?: WorkflowResultOptions | undefined
   ): Promise<T> {
-    if (this.enableTimeSkipping) {
-      await this.testService.unlockTimeSkipping({});
-      try {
-        return await super.result(workflowId, runId, opts);
-      } finally {
-        await this.testService.lockTimeSkipping({});
-      }
-    } else {
+    await this.testService.unlockTimeSkipping({});
+    try {
       return await super.result(workflowId, runId, opts);
+    } finally {
+      await this.testService.lockTimeSkipping({});
     }
   }
 }
-
-/**
- * A client with the exact same API as the "normal" client with one exception:
- * when `TestEnvClient.workflow` (an instance of {@link TimeSkippingWorkflowClient}) waits on a Workflow's result, it will enable time skipping
- * in the Test Server.
- */
-export class TestEnvClient extends Client {
-  constructor(options: TestEnvClientOptions) {
-    super(options);
-
-    // Recreate the client (this isn't optimal but it's better than adding public methods just for testing).
-    // NOTE: we cast to "any" to work around `workflow` being a readonly attribute.
-    (this as any).workflow = new TimeSkippingWorkflowClient({
-      ...this.workflow.options,
-      connection: options.connection,
-      enableTimeSkipping: options.enableTimeSkipping,
-    });
-  }
-}

package/src/index.ts

@@ -23,14 +23,7 @@ export {
   type EphemeralServerExecutable,
 } from './ephemeral-server';
 
-export {
-  // FIXME: Revise the pertinence of these types
-  type ClientOptionsForTestEnv,
-  type TestEnvClientOptions,
-  type TimeSkippingWorkflowClientOptions,
-  TestEnvClient,
-  TimeSkippingWorkflowClient,
-} from './client';
+export { type ClientOptionsForTestEnv, TimeSkippingWorkflowClient } from './client';
 
 export {
   type MockActivityEnvironmentOptions,

package/src/mocking-activity-environment.ts

@@ -12,6 +12,7 @@ import {
   ActivityCancellationDetails,
 } from '@temporalio/common';
 import { LoggerWithComposedMetadata } from '@temporalio/common/lib/logger';
+import { Client } from '@temporalio/client';
 import { ActivityInterceptorsFactory, DefaultLogger } from '@temporalio/worker';
 import { Activity, CancelReason } from '@temporalio/worker/lib/activity';
 
@@ -19,6 +20,7 @@ export interface MockActivityEnvironmentOptions {
   interceptors?: ActivityInterceptorsFactory[];
   logger?: Logger;
   metricMeter?: MetricMeter;
+  client?: Client;
 }
 
 /**
@@ -48,6 +50,7 @@ export class MockActivityEnvironment extends events.EventEmitter {
       undefined,
       loadedDataConverter,
       heartbeatCallback,
+      opts?.client,
       LoggerWithComposedMetadata.compose(opts?.logger ?? new DefaultLogger(), { sdkComponent: SdkComponent.worker }),
       opts?.metricMeter ?? noopMetricMeter,
       opts?.interceptors ?? []
@@ -93,4 +96,5 @@ export const defaultActivityInfo: activity.Info = {
   scheduleToCloseTimeoutMs: 1000,
   currentAttemptScheduledTimestampMs: 1,
   priority: undefined,
+  retryPolicy: undefined,
 };

package/src/testing-workflow-environment.ts

@@ -1,13 +1,17 @@
 import 'abort-controller/polyfill'; // eslint-disable-line import/no-unassigned-import
-import { AsyncCompletionClient, Client, WorkflowClient } from '@temporalio/client';
+import { AsyncCompletionClient, Client, Connection, WorkflowClient } from '@temporalio/client';
+import {
+  ConnectionOptions,
+  InternalConnectionOptions,
+  InternalConnectionOptionsSymbol,
+} from '@temporalio/client/lib/connection';
 import { Duration, TypedSearchAttributes } from '@temporalio/common';
 import { msToNumber, msToTs, tsToMs } from '@temporalio/common/lib/time';
-import { NativeConnection, Runtime } from '@temporalio/worker';
+import { NativeConnection, NativeConnectionOptions, Runtime } from '@temporalio/worker';
 import { native } from '@temporalio/core-bridge';
 import { filterNullAndUndefined } from '@temporalio/common/lib/internal-workflow';
-import { Connection } from './connection';
 import { toNativeEphemeralServerConfig, DevServerConfig, TimeSkippingServerConfig } from './ephemeral-server';
-import { ClientOptionsForTestEnv, TestEnvClient } from './client';
+import { ClientOptionsForTestEnv, TimeSkippingClient } from './client';
 
 /**
  * Options for {@link TestWorkflowEnvironment.createLocal}
@@ -54,7 +58,7 @@ export class TestWorkflowEnvironment {
   public readonly connection: Connection;
 
   /**
-   * A {@link TestEnvClient} for interacting with the ephemeral server
+   * A {@link TimeSkippingClient} for interacting with the ephemeral server
    */
   public readonly client: Client;
 
@@ -91,12 +95,17 @@ export class TestWorkflowEnvironment {
     this.connection = connection;
     this.nativeConnection = nativeConnection;
     this.namespace = namespace;
-    this.client = new TestEnvClient({
-      connection,
-      namespace: this.namespace,
-      enableTimeSkipping: supportsTimeSkipping,
-      ...options.client,
-    });
+    this.client = supportsTimeSkipping
+      ? new TimeSkippingClient({
+          connection,
+          namespace: this.namespace,
+          ...options.client,
+        })
+      : new Client({
+          connection,
+          namespace: this.namespace,
+          ...options.client,
+        });
     this.asyncCompletionClient = this.client.activity; // eslint-disable-line deprecation/deprecation
     this.workflowClient = this.client.workflow; // eslint-disable-line deprecation/deprecation
   }
@@ -220,8 +229,14 @@ export class TestWorkflowEnvironment {
       server = 'existing';
     }
 
-    const nativeConnection = await NativeConnection.connect({ address });
-    const connection = await Connection.connect({ address });
+    const nativeConnection = await NativeConnection.connect(<NativeConnectionOptions & InternalConnectionOptions>{
+      address,
+      [InternalConnectionOptionsSymbol]: { supportsTestService: supportsTimeSkipping },
+    });
+    const connection = await Connection.connect(<ConnectionOptions & InternalConnectionOptions>{
+      address,
+      [InternalConnectionOptionsSymbol]: { supportsTestService: supportsTimeSkipping },
+    });
 
     return new this(runtime, optsWithDefaults, supportsTimeSkipping, server, connection, nativeConnection, namespace);
   }
@@ -292,7 +307,7 @@ export class TestWorkflowEnvironment {
    */
   sleep = async (durationMs: Duration): Promise<void> => {
     if (this.supportsTimeSkipping) {
-      await (this.connection as Connection).testService.unlockTimeSkippingWithSleep({ duration: msToTs(durationMs) });
+      await this.connection.testService!.unlockTimeSkippingWithSleep({ duration: msToTs(durationMs) });
     } else {
       await new Promise((resolve) => setTimeout(resolve, msToNumber(durationMs)));
     }
@@ -306,7 +321,7 @@ export class TestWorkflowEnvironment {
    */
   async currentTimeMs(): Promise<number> {
     if (this.supportsTimeSkipping) {
-      const { time } = await (this.connection as Connection).testService.getCurrentTime({});
+      const { time } = await this.connection.testService!.getCurrentTime({});
       return tsToMs(time);
     } else {
       return Date.now();

package/lib/connection.d.ts

@@ -1,19 +0,0 @@
-import { Connection as BaseConnection, ConnectionOptions } from '@temporalio/client';
-import { ConnectionCtorOptions as BaseConnectionCtorOptions } from '@temporalio/client/lib/connection';
-import { temporal } from '@temporalio/proto';
-export type TestService = temporal.api.testservice.v1.TestService;
-export declare const TestService: typeof temporal.api.testservice.v1.TestService;
-interface ConnectionCtorOptions extends BaseConnectionCtorOptions {
-    testService: TestService;
-}
-/**
- * A Connection class that can be used to interact with both the test server's TestService and WorkflowService
- */
-export declare class Connection extends BaseConnection {
-    readonly testService: TestService;
-    protected static createCtorOptions(options?: ConnectionOptions): ConnectionCtorOptions;
-    static lazy(options?: ConnectionOptions): Connection;
-    static connect(options?: ConnectionOptions): Promise<Connection>;
-    protected constructor(options: ConnectionCtorOptions);
-}
-export {};

package/lib/connection.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Connection = exports.TestService = void 0;
-const client_1 = require("@temporalio/client");
-const proto_1 = require("@temporalio/proto");
-exports.TestService = proto_1.temporal.api.testservice.v1.TestService;
-/**
- * A Connection class that can be used to interact with both the test server's TestService and WorkflowService
- */
-class Connection extends client_1.Connection {
-    testService;
-    static createCtorOptions(options) {
-        const ctorOptions = client_1.Connection.createCtorOptions(options);
-        const rpcImpl = this.generateRPCImplementation({
-            serviceName: 'temporal.api.testservice.v1.TestService',
-            client: ctorOptions.client,
-            callContextStorage: ctorOptions.callContextStorage,
-            interceptors: ctorOptions.options.interceptors,
-            staticMetadata: ctorOptions.options.metadata,
-            apiKeyFnRef: {},
-        });
-        const testService = exports.TestService.create(rpcImpl, false, false);
-        return { ...ctorOptions, testService };
-    }
-    static lazy(options) {
-        const ctorOptions = this.createCtorOptions(options);
-        return new this(ctorOptions);
-    }
-    static async connect(options) {
-        const ret = this.lazy(options);
-        await ret.ensureConnected();
-        return ret;
-    }
-    constructor(options) {
-        super(options);
-        this.testService = options.testService;
-    }
-}
-exports.Connection = Connection;
-//# sourceMappingURL=connection.js.map

package/lib/connection.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;;AAAA,+CAAqF;AAErF,6CAA6C;AAG9B,mBAAW,GAAK,gBAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,aAAC;AAM3D;;GAEG;AACH,MAAa,UAAW,SAAQ,mBAAc;IAC5B,WAAW,CAAc;IAE/B,MAAM,CAAC,iBAAiB,CAAC,OAA2B;QAC5D,MAAM,WAAW,GAAG,mBAAc,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC;YAC7C,WAAW,EAAE,yCAAyC;YACtD,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,kBAAkB,EAAE,WAAW,CAAC,kBAAkB;YAClD,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,YAAY;YAC9C,cAAc,EAAE,WAAW,CAAC,OAAO,CAAC,QAAQ;YAC5C,WAAW,EAAE,EAAE;SAChB,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,mBAAW,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9D,OAAO,EAAE,GAAG,WAAW,EAAE,WAAW,EAAE,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,OAA2B;QACrC,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACpD,OAAO,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAA2B;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,GAAG,CAAC,eAAe,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAC;IACb,CAAC;IAED,YAAsB,OAA8B;QAClD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IACzC,CAAC;CACF;AAhCD,gCAgCC"}

package/src/connection.ts

@@ -1,47 +0,0 @@
-import { Connection as BaseConnection, ConnectionOptions } from '@temporalio/client';
-import { ConnectionCtorOptions as BaseConnectionCtorOptions } from '@temporalio/client/lib/connection';
-import { temporal } from '@temporalio/proto';
-
-export type TestService = temporal.api.testservice.v1.TestService;
-export const { TestService } = temporal.api.testservice.v1;
-
-interface ConnectionCtorOptions extends BaseConnectionCtorOptions {
-  testService: TestService;
-}
-
-/**
- * A Connection class that can be used to interact with both the test server's TestService and WorkflowService
- */
-export class Connection extends BaseConnection {
-  public readonly testService: TestService;
-
-  protected static createCtorOptions(options?: ConnectionOptions): ConnectionCtorOptions {
-    const ctorOptions = BaseConnection.createCtorOptions(options);
-    const rpcImpl = this.generateRPCImplementation({
-      serviceName: 'temporal.api.testservice.v1.TestService',
-      client: ctorOptions.client,
-      callContextStorage: ctorOptions.callContextStorage,
-      interceptors: ctorOptions.options.interceptors,
-      staticMetadata: ctorOptions.options.metadata,
-      apiKeyFnRef: {},
-    });
-    const testService = TestService.create(rpcImpl, false, false);
-    return { ...ctorOptions, testService };
-  }
-
-  static lazy(options?: ConnectionOptions): Connection {
-    const ctorOptions = this.createCtorOptions(options);
-    return new this(ctorOptions);
-  }
-
-  static async connect(options?: ConnectionOptions): Promise<Connection> {
-    const ret = this.lazy(options);
-    await ret.ensureConnected();
-    return ret;
-  }
-
-  protected constructor(options: ConnectionCtorOptions) {
-    super(options);
-    this.testService = options.testService;
-  }
-}