feat(workflow)!: Change condition parameter order (temporalio#371)

bergundy · web-flow · commit 96d99c465ba0 · 2021-11-10T22:47:04.000Z
diff --git a/packages/test/src/workflows/condition.ts b/packages/test/src/workflows/condition.ts
@@ -13,7 +13,7 @@ export async function conditionWaiter(): Promise<void> {
     condition(() => x === 2),
   ]);
 
-  if (await condition('1s', () => x === 3)) {
+  if (await condition(() => x === 3, '1s')) {
     throw new Error('Condition returned true');
   }
 
diff --git a/packages/workflow/src/workflow.ts b/packages/workflow/src/workflow.ts
@@ -840,18 +840,18 @@ function patchInternal(patchId: string, deprecated: boolean): boolean {
  *
  * @returns a boolean indicating whether the condition was true before the timeout expires
  */
-export function condition(timeout: number | string, fn: () => boolean): Promise<boolean>;
+export function condition(fn: () => boolean, timeout: number | string): Promise<boolean>;
 
 /**
  * Returns a Promise that resolves when `fn` evaluates to `true`.
  */
 export function condition(fn: () => boolean): Promise<void>;
 
-export function condition(fnOrTimeout: (() => boolean) | number | string, fn?: () => boolean): Promise<void | boolean> {
-  if ((typeof fnOrTimeout === 'number' || typeof fnOrTimeout === 'string') && fn !== undefined) {
-    return Promise.race([sleep(fnOrTimeout).then(() => false), conditionInner(fn).then(() => true)]);
+export function condition(fn: () => boolean, timeout?: number | string): Promise<void | boolean> {
+  if (timeout) {
+    return Promise.race([sleep(timeout).then(() => false), conditionInner(fn).then(() => true)]);
   }
-  return conditionInner(fnOrTimeout as () => boolean);
+  return conditionInner(fn);
 }
 
 function conditionInner(fn: () => boolean): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export async function conditionWaiter(): Promise<void> {`
`13`	`13`	`condition(() => x === 2),`
`14`	`14`	`]);`
`15`	`15`
`16`		`- if (await condition('1s', () => x === 3)) {`
	`16`	`+ if (await condition(() => x === 3, '1s')) {`
`17`	`17`	`throw new Error('Condition returned true');`
`18`	`18`	`}`
`19`	`19`