Skip to content

Commit 93a4d9c

Browse files
authored
fix: Remove instanceof Error checks from is methods (#1162)
1 parent 0d825d8 commit 93a4d9c

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

packages/activity/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export class CompleteAsyncError extends Error {
117117
* Instanceof check that works when multiple versions of @temporalio/activity are installed.
118118
*/
119119
static is(error: unknown): error is CompleteAsyncError {
120-
return error instanceof CompleteAsyncError || (error instanceof Error && (error as any)[isCompleteAsyncError]);
120+
return error instanceof CompleteAsyncError || (error as any)?.[isCompleteAsyncError] === true;
121121
}
122122
}
123123

packages/common/src/failure.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class TemporalFailure extends Error {
6666
* Instanceof check that works when multiple versions of @temporalio/common are installed.
6767
*/
6868
static is(error: unknown): error is TemporalFailure {
69-
return error instanceof TemporalFailure || (error instanceof Error && (error as any)[isTemporalFailure]);
69+
return error instanceof TemporalFailure || (error as any)?.[isTemporalFailure] === true;
7070
}
7171
}
7272

@@ -89,7 +89,7 @@ export class ServerFailure extends TemporalFailure {
8989
* Instanceof check that works when multiple versions of @temporalio/common are installed.
9090
*/
9191
static is(error: unknown): error is ServerFailure {
92-
return error instanceof ServerFailure || (error instanceof Error && (error as any)[isServerFailure]);
92+
return error instanceof ServerFailure || (error as any)?.[isServerFailure] === true;
9393
}
9494
}
9595

@@ -142,7 +142,7 @@ export class ApplicationFailure extends TemporalFailure {
142142
* Instanceof check that works when multiple versions of @temporalio/common are installed.
143143
*/
144144
static is(error: unknown): error is ApplicationFailure {
145-
return error instanceof ApplicationFailure || (error instanceof Error && (error as any)[isApplicationFailure]);
145+
return error instanceof ApplicationFailure || (error as any)?.[isApplicationFailure] === true;
146146
}
147147

148148
/**
@@ -248,7 +248,7 @@ export class CancelledFailure extends TemporalFailure {
248248
* Instanceof check that works when multiple versions of @temporalio/common are installed.
249249
*/
250250
static is(error: unknown): error is CancelledFailure {
251-
return error instanceof CancelledFailure || (error instanceof Error && (error as any)[isCancelledFailure]);
251+
return error instanceof CancelledFailure || (error as any)?.[isCancelledFailure] === true;
252252
}
253253
}
254254

@@ -273,7 +273,7 @@ export class TerminatedFailure extends TemporalFailure {
273273
* Instanceof check that works when multiple versions of @temporalio/common are installed.
274274
*/
275275
static is(error: unknown): error is TerminatedFailure {
276-
return error instanceof TerminatedFailure || (error instanceof Error && (error as any)[isTerminatedFailure]);
276+
return error instanceof TerminatedFailure || (error as any)?.[isTerminatedFailure] === true;
277277
}
278278
}
279279

@@ -302,7 +302,7 @@ export class TimeoutFailure extends TemporalFailure {
302302
* Instanceof check that works when multiple versions of @temporalio/common are installed.
303303
*/
304304
static is(error: unknown): error is TimeoutFailure {
305-
return error instanceof TimeoutFailure || (error instanceof Error && (error as any)[isTimeoutFailure]);
305+
return error instanceof TimeoutFailure || (error as any)?.[isTimeoutFailure] === true;
306306
}
307307
}
308308

@@ -337,7 +337,7 @@ export class ActivityFailure extends TemporalFailure {
337337
* Instanceof check that works when multiple versions of @temporalio/common are installed.
338338
*/
339339
static is(error: unknown): error is ActivityFailure {
340-
return error instanceof ActivityFailure || (error instanceof Error && (error as any)[isActivityFailure]);
340+
return error instanceof ActivityFailure || (error as any)?.[isActivityFailure] === true;
341341
}
342342
}
343343

@@ -371,7 +371,7 @@ export class ChildWorkflowFailure extends TemporalFailure {
371371
* Instanceof check that works when multiple versions of @temporalio/common are installed.
372372
*/
373373
static is(error: unknown): error is ChildWorkflowFailure {
374-
return error instanceof ChildWorkflowFailure || (error instanceof Error && (error as any)[isChildWorkflowFailure]);
374+
return error instanceof ChildWorkflowFailure || (error as any)?.[isChildWorkflowFailure] === true;
375375
}
376376
}
377377

packages/core-bridge/ts/errors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class ShutdownError extends Error {
1717
* Instanceof check that works when multiple versions of @temporalio/core-bridge are installed.
1818
*/
1919
static is(error: unknown): error is ShutdownError {
20-
return error instanceof ShutdownError || (error instanceof Error && (error as any)[isShutdownError]);
20+
return error instanceof ShutdownError || (error as any)?.[isShutdownError] === true;
2121
}
2222
}
2323

packages/workflow/src/interfaces.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ export class ContinueAsNew extends Error {
186186
* Instanceof check that works when multiple versions of @temporalio/workflow are installed.
187187
*/
188188
static is(error: unknown): error is ContinueAsNew {
189-
return error instanceof ContinueAsNew || (error instanceof Error && (error as any)[isContinueAsNew]);
189+
return error instanceof ContinueAsNew || (error as any)?.[isContinueAsNew] === true;
190190
}
191191
}
192192

0 commit comments

Comments
 (0)