From 15c65c520b142ce8fa0021a2c4320db8bab3f0c2 Mon Sep 17 00:00:00 2001 From: Alex Shelkovskiy Date: Mon, 24 Jan 2022 09:21:51 +0600 Subject: [PATCH] Fix isErr for unknown --- package.json | 2 +- src/checks.ts | 8 +++----- src/index.ts | 2 +- src/utils.ts | 11 ++--------- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 987768c..3cd0ec6 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "error", "error-handling" ], - "version": "1.0.21", + "version": "1.0.22", "author": "Alex Shelkovskiy ", "repository": "https://github.com/alexshelkov/result", "license": "MIT", diff --git a/src/checks.ts b/src/checks.ts index 9b2a3db..ad6dac5 100644 --- a/src/checks.ts +++ b/src/checks.ts @@ -1,14 +1,12 @@ import { Err } from './err'; import { Failure, Success } from './result'; -export const isUnknownErr = (input: unknown): input is Err => { +export const isErr = ( + input: Error | unknown +): input is Error extends Err ? Error : never => { return typeof input === 'object' && input !== null && 'type' in input; }; -export const isErr = (input: Error): input is Error extends Err ? Error : never => { - return isUnknownErr(input); -}; - export const isErrType = < Type extends string, Fail, diff --git a/src/index.ts b/src/index.ts index 861c6e6..3786ecc 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,7 @@ export { ErrUtil as Err, Err as ErrInfo, ErrLevel, Errs } from './err'; export { Success, Failure, Result, Response } from './result'; -export { isUnknownErr, isErr, isErrType, isSuccessLike, isFailureLike } from './checks'; +export { isErr, isErrType, isSuccessLike, isFailureLike } from './checks'; export { ok, diff --git a/src/utils.ts b/src/utils.ts index 3e59223..7361d29 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -9,14 +9,7 @@ import { Response, } from './result'; -import { - isPromise, - isHaveStatus, - isSuccessLike, - isFailureLike, - isErr, - isUnknownErr, -} from './checks'; +import { isPromise, isHaveStatus, isSuccessLike, isFailureLike, isErr } from './checks'; import { Err, ErrUtil } from './err'; @@ -63,7 +56,7 @@ const maybeFailToResult = ( prevResult.message, prevResult.code ); - } else if (isUnknownErr(result)) { + } else if (isErr(result)) { exception = new FailureException( result.type, result as unknown as Fail,