chore: Update samples to SDK 1.5.2 (#213)

Author: mjameswh

.scripts/upgrade-versions.mjs

@@ -11,18 +11,20 @@ if (!versionToSet) {
 for (const sample of STORED_SAMPLES) {
   const packagePath = path.join(sample, 'package.json');
   const content = JSON.parse(await fs.readFile(packagePath));
-  const changedDeps = replaceDeps({ content, sample, field: 'dependencies' });
-  const changedDevDeps = replaceDeps({ content, field: 'devDependencies' });
-  if (changedDeps || changedDevDeps) {
-    await fs.writeFile(packagePath, JSON.stringify(content));
+  const changed =
+    replaceDeps({ content, sample, field: 'dependencies' }) ||
+    replaceDeps({ content, sample, field: 'devDependencies' }) ||
+    replaceDeps({ content, sample, field: 'resolutions' });
+  if (changed) {
+    await fs.writeFile(packagePath, JSON.stringify(content, null, 2));
   } else {
     console.log(`Version up to date for ${sample}`);
   }
 }
 
 function replaceDeps({ content, sample, field }) {
   let changed = false;
-  for (const [dep, version] of Object.entries(content[field])) {
+  for (const [dep, version] of Object.entries(content[field] ?? {})) {
     if (dep.startsWith('@temporalio/')) {
       if (version !== versionToSet) {
         content[field][dep] = versionToSet;

activities-cancellation-heartbeating/package.json

@@ -20,10 +20,10 @@
     ]
   },
   "dependencies": {
-    "@temporalio/activity": "^1.0.0",
-    "@temporalio/client": "^1.0.0",
-    "@temporalio/worker": "^1.0.0",
-    "@temporalio/workflow": "^1.0.0"
+    "@temporalio/activity": "^1.5.2",
+    "@temporalio/client": "^1.5.2",
+    "@temporalio/worker": "^1.5.2",
+    "@temporalio/workflow": "^1.5.2"
   },
   "devDependencies": {
     "@tsconfig/node16": "^1.0.0",

activities-cancellation-heartbeating/src/client.ts

@@ -1,11 +1,11 @@
-import { Connection, WorkflowClient, WorkflowFailedError, CancelledFailure } from '@temporalio/client';
+import { Connection, Client, WorkflowFailedError, CancelledFailure } from '@temporalio/client';
 import { runCancellableActivity } from './workflows';
 
 async function run() {
   const connection = await Connection.connect();
-  const client = new WorkflowClient({ connection });
+  const client = new Client({ connection });
 
-  const handle = await client.start(runCancellableActivity, {
+  const handle = await client.workflow.start(runCancellableActivity, {
     taskQueue: 'cancellation-heartbeating',
     workflowId: 'cancellation-heartbeating-0',
   });

activities-dependency-injection/package.json

@@ -20,10 +20,10 @@
     ]
   },
   "dependencies": {
-    "@temporalio/activity": "^1.0.0",
-    "@temporalio/client": "^1.0.0",
-    "@temporalio/worker": "^1.0.0",
-    "@temporalio/workflow": "^1.0.0"
+    "@temporalio/activity": "^1.5.2",
+    "@temporalio/client": "^1.5.2",
+    "@temporalio/worker": "^1.5.2",
+    "@temporalio/workflow": "^1.5.2"
   },
   "devDependencies": {
     "@tsconfig/node16": "^1.0.0",

activities-dependency-injection/src/client.ts

@@ -1,10 +1,10 @@
-import { WorkflowClient } from '@temporalio/client';
+import { Client } from '@temporalio/client';
 import { dependencyWF } from './workflows';
 
 async function run(): Promise<void> {
-  const client = new WorkflowClient();
+  const client = new Client();
 
-  const result = await client.execute(dependencyWF, {
+  const result = await client.workflow.execute(dependencyWF, {
     taskQueue: 'dependency-injection',
     workflowId: 'dependency-injection',
   });

activities-examples/package.json

@@ -24,16 +24,16 @@
     ]
   },
   "dependencies": {
-    "@temporalio/activity": "^1.4.0",
-    "@temporalio/client": "^1.4.0",
-    "@temporalio/worker": "^1.4.0",
-    "@temporalio/workflow": "^1.4.0",
+    "@temporalio/activity": "^1.5.2",
+    "@temporalio/client": "^1.5.2",
+    "@temporalio/worker": "^1.5.2",
+    "@temporalio/workflow": "^1.5.2",
     "axios": "^0.26.0",
     "node-fetch": "2.x"
   },
   "devDependencies": {
-    "@temporalio/nyc-test-coverage": "^1.4.0",
-    "@temporalio/testing": "^1.4.0",
+    "@temporalio/nyc-test-coverage": "^1.5.2",
+    "@temporalio/testing": "^1.5.2",
     "@tsconfig/node16": "^1.0.0",
     "@types/jest": "^27.5.1",
     "@types/mocha": "8.x",

activities-examples/src/client.ts

@@ -1,16 +1,16 @@
-import { WorkflowClient } from '@temporalio/client';
+import { Client } from '@temporalio/client';
 import { asyncActivityWorkflow, httpWorkflow } from './workflows';
 
 async function run(): Promise<void> {
-  const client = new WorkflowClient();
+  const client = new Client();
 
-  let result = await client.execute(httpWorkflow, {
+  let result = await client.workflow.execute(httpWorkflow, {
     taskQueue: 'activities-examples',
     workflowId: 'activities-examples',
   });
   console.log(result); // 'The answer is 42'
 
-  result = await client.execute(asyncActivityWorkflow, {
+  result = await client.workflow.execute(asyncActivityWorkflow, {
     taskQueue: 'activities-examples',
     workflowId: 'activities-examples',
   });

activities-examples/src/mocha/workflows.test.ts

@@ -1,4 +1,4 @@
-import { ActivityFailure, ApplicationFailure, WorkflowClient, WorkflowFailedError } from '@temporalio/client';
+import { ActivityFailure, ApplicationFailure, Client, WorkflowFailedError } from '@temporalio/client';
 import { Runtime, DefaultLogger, Worker } from '@temporalio/worker';
 import { TestWorkflowEnvironment } from '@temporalio/testing';
 import assert from 'assert';
@@ -15,7 +15,7 @@ const workflowCoverage = new WorkflowCoverage();
 describe('example workflow', async function () {
   let shutdown: () => Promise<void>;
   let execute: () => ReturnType<typeof httpWorkflow>;
-  let getClient: () => WorkflowClient;
+  let getClient: () => Client;
 
   this.slow(10_000);
   this.timeout(20_000);
@@ -40,14 +40,14 @@ describe('example workflow', async function () {
       await runPromise;
       await env.teardown();
     };
-    getClient = () => env.client.workflow;
+    getClient = () => env.client;
   });
 
   beforeEach(() => {
     const client = getClient();
 
     execute = () =>
-      client.execute(httpWorkflow, {
+      client.workflow.execute(httpWorkflow, {
         taskQueue: 'test-activities',
         workflowExecutionTimeout: 10_000,
         // Use random ID because ID is meaningless for this test

activities-sticky-queues/package.json

@@ -20,10 +20,10 @@
     ]
   },
   "dependencies": {
-    "@temporalio/activity": "^1.0.0",
-    "@temporalio/client": "^1.0.0",
-    "@temporalio/worker": "^1.0.0",
-    "@temporalio/workflow": "^1.0.0",
+    "@temporalio/activity": "^1.5.2",
+    "@temporalio/client": "^1.5.2",
+    "@temporalio/worker": "^1.5.2",
+    "@temporalio/workflow": "^1.5.2",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

activities-sticky-queues/src/client.ts

@@ -1,10 +1,10 @@
-import { Connection, WorkflowClient } from '@temporalio/client';
+import { Connection, Client } from '@temporalio/client';
 import { fileProcessingWorkflow } from './workflows';
 
 async function run() {
   const connection = await Connection.connect();
-  const client = new WorkflowClient({ connection });
-  await client.execute(fileProcessingWorkflow, {
+  const client = new Client({ connection });
+  await client.workflow.execute(fileProcessingWorkflow, {
     taskQueue: 'sticky-activity-tutorial',
     workflowId: 'file-processing-0',
   });