From 1573675b73c4a6fcb45e9626b06230869b3c329b Mon Sep 17 00:00:00 2001 From: Ted Armstrong Date: Mon, 6 Apr 2020 11:18:51 -0400 Subject: [PATCH 1/2] fix: rewrite guard to use reason guard --- lib/models/ResultCode.ts | 6 ++++-- package-lock.json | 6 ++++++ package.json | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/models/ResultCode.ts b/lib/models/ResultCode.ts index 8faa52f..f3d94ef 100644 --- a/lib/models/ResultCode.ts +++ b/lib/models/ResultCode.ts @@ -1,3 +1,5 @@ +import {isLiteral} from '@6river/reason-guard'; + /** * 5/30/16 * @author Joshua Chaitin-Pollak @@ -11,6 +13,6 @@ export const resultCodes: {[K in ResultCode]: ResultCode} = { export type ResultCode = 'SUCCESS' | 'FAILURE' | 'RUNNING' | 'ERROR'; -export function isResultCode(res: any): res is ResultCode { - return Object.values(resultCodes).includes(res); +export function isResultCode(res: unknown): res is ResultCode { + return isLiteral(Object.values(resultCodes))(res); } diff --git a/package-lock.json b/package-lock.json index 377d44f..439304d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,12 @@ "@commitlint/config-conventional": "^7.5.0" } }, + "@6river/reason-guard": { + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/@6river/reason-guard/-/reason-guard-3.7.4.tgz", + "integrity": "sha512-06+XoJuu2N82vk6BLCKt1G1IF9uEV6H6R658TUD8UjfF1BOjfnAuIaL0dgTcvCRgcN9sQrcTFASl24LsoYMUrQ==", + "dev": true + }, "@babel/code-frame": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz", diff --git a/package.json b/package.json index 7e09813..d56f369 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "homepage": "https://github.com/6RiverSystems/blueshell#readme", "devDependencies": { "@6river/commitlint-config-6river": "2.1.0", + "@6river/reason-guard": "3.7.4", "@commitlint/cli": "8.3.4", "@types/archy": "0.0.31", "@types/chai": "4.1.7", From 0c05d7732a21b188a4e095c6a73712fa4f23e47c Mon Sep 17 00:00:00 2001 From: Ted Armstrong Date: Mon, 6 Apr 2020 11:21:53 -0400 Subject: [PATCH 2/2] fix: remove wrapping --- lib/models/ResultCode.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/models/ResultCode.ts b/lib/models/ResultCode.ts index f3d94ef..129141f 100644 --- a/lib/models/ResultCode.ts +++ b/lib/models/ResultCode.ts @@ -13,6 +13,4 @@ export const resultCodes: {[K in ResultCode]: ResultCode} = { export type ResultCode = 'SUCCESS' | 'FAILURE' | 'RUNNING' | 'ERROR'; -export function isResultCode(res: unknown): res is ResultCode { - return isLiteral(Object.values(resultCodes))(res); -} +export const isResultCode = isLiteral(Object.values(resultCodes));