refactor: replace oneOf codec with enumeration

ScaleLeap · Nov 7, 2020 · d71d51f · d71d51f
1 parent 43e3c68
commit d71d51f
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 63 deletions.
diff --git a/src/error-codec.ts b/src/error-codec.ts
@@ -1,51 +1,51 @@
 import { Codec, exactly, oneOf, optional, string } from 'purify-ts/Codec'
 
+export enum CodeEnum {
+  InputStreamDisconnected,
+  InvalidParameterValue,
+  AccessDenied,
+  InvalidAccessKeyId,
+  SignatureDoesNotMatch,
+  InvalidAddress,
+  InternalError,
+  'Internal Error',
+  QuotaExceeded,
+  RequestThrottled,
+  ResourceNotFound,
+  ScheduledPackageAlreadyExists,
+  RegionNotSupported,
+  ScheduleWindowExpired,
+  InvalidOrderState,
+  PickupSlotNotAvailable,
+  AccessToFeedProcessingResultDenied,
+  ContentMD5Missing,
+  ContentMD5DoesNotMatch,
+  FeedCanceled,
+  FeedProcessingResultNoLongerAvailable,
+  FeedProcessingResultNotReady,
+  InputDataError,
+  InvalidFeedSubmissionId,
+  InvalidFeedType,
+  InvalidRequest,
+  NonRetriableInternalError,
+  RetriableInternalError,
+  AccessToReportDenied,
+  InvalidReportId,
+  InvalidReportRequestId,
+  InvalidReportType,
+  InvalidScheduleFrequency,
+  ReportNoLongerAvailable,
+  ReportNotReady,
+  DependencyFatalException,
+  DependencyRetriableException,
+  DependencyUnauthorizedException,
+  InternalErrorFatalException,
+  InvalidInputFatalException,
+}
+
 export const Error = Codec.interface({
   Type: string,
-  Code: oneOf(
-    ([
-      'InputStreamDisconnected',
-      'InvalidParameterValue',
-      'AccessDenied',
-      'InvalidAccessKeyId',
-      'SignatureDoesNotMatch',
-      'InvalidAddress',
-      'InternalError',
-      'Internal Error',
-      'QuotaExceeded',
-      'RequestThrottled',
-      'ResourceNotFound',
-      'ScheduledPackageAlreadyExists',
-      'RegionNotSupported',
-      'ScheduleWindowExpired',
-      'InvalidOrderState',
-      'PickupSlotNotAvailable',
-      'AccessToFeedProcessingResultDenied',
-      'ContentMD5Missing',
-      'ContentMD5DoesNotMatch',
-      'FeedCanceled',
-      'FeedProcessingResultNoLongerAvailable',
-      'FeedProcessingResultNotReady',
-      'InputDataError',
-      'InvalidFeedSubmissionId',
-      'InvalidFeedType',
-      'InvalidRequest',
-      'NonRetriableInternalError',
-      'RetriableInternalError',
-      'AccessToReportDenied',
-      'InvalidReportId',
-      'InvalidReportRequestId',
-      'InvalidReportType',
-      'InvalidScheduleFrequency',
-      'ReportNoLongerAvailable',
-      'ReportNotReady',
-      'DependencyFatalException',
-      'DependencyRetriableException',
-      'DependencyUnauthorizedException',
-      'InternalErrorFatalException',
-      'InvalidInputFatalException',
-    ] as const).map((element) => exactly(element)),
-  ),
+  Code: oneOf(Object.keys(CodeEnum).map((x) => exactly(x)) as [Codec<string>, ...Codec<string>[]]),
   Message: string,
   Detail: optional(string),
 })

diff --git a/src/error.ts b/src/error.ts
@@ -1,5 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import { GetInterface } from 'purify-ts/Codec'
+import { GetInterface } from 'purify-ts'
 import { ExtendableError } from 'ts-error'
 
 import { MWSApiError } from './error-codec'

diff --git a/src/http.ts b/src/http.ts
@@ -485,7 +485,7 @@ export class HttpClient {
           InvalidInputFatalException: InvalidInputFatalExceptionError,
         }
 
-        const ErrorToThrow = errorMap[errorCode]
+        const ErrorToThrow = errorMap[errorCode as keyof typeof errorMap]
 
         throw enhanceError(new ErrorToThrow(`${info.action} request failed`), response)
       } else {

diff --git a/src/sections/fulfillment-inventory.ts b/src/sections/fulfillment-inventory.ts
@@ -1,4 +1,4 @@
-import { Codec, exactly, GetInterface, number, oneOf, optional, string } from 'purify-ts'
+import { Codec, enumeration, GetInterface, number, optional, string } from 'purify-ts'
 
 import { ParsingError } from '../error'
 import { HttpClient, RequestMeta, Resource } from '../http'
@@ -50,13 +50,13 @@ export enum SupplyType {
 }
 
 const Timepoint = Codec.interface({
-  TimepointType: oneOf(Object.values(TimepointType).map((x) => exactly(x))),
+  TimepointType: enumeration(TimepointType),
   DateTime: optional(mwsDate),
 })
 
 const InventorySupplyDetail = Codec.interface({
   Quantity: number,
-  SupplyType: oneOf(Object.values(SupplyType).map((x) => exactly(x))),
+  SupplyType: enumeration(SupplyType),
   EarliestAvailableToPick: Timepoint,
   LatestAvailableToPick: Timepoint,
 })
@@ -65,7 +65,7 @@ const InventorySupply = Codec.interface({
   SellerSKU: optional(string),
   FNSKU: string,
   ASIN: optional(ensureString),
-  Condition: optional(oneOf(Object.values(InventoryCondition).map((x) => exactly(x)))),
+  Condition: optional(enumeration(InventoryCondition)),
   TotalSupplyQuantity: number,
   InStockSupplyQuantity: number,
   EarliestAvailability: optional(Timepoint),

diff --git a/src/sections/orders.ts b/src/sections/orders.ts
@@ -1,10 +1,9 @@
 import {
   boolean,
   Codec,
-  exactly,
+  enumeration,
   GetInterface,
   number,
-  oneOf,
   optional,
   string,
 } from 'purify-ts/Codec'
@@ -84,17 +83,11 @@ export enum ConditionSubtype {
   Other = 'Other',
 }
 
-const orderStatus: Codec<OrderStatusEnum> = oneOf(
-  Object.values(OrderStatusEnum).map((x) => exactly(x)),
-)
-const fulfillmentChannel: Codec<FulfillmentChannelEnum> = oneOf(
-  Object.values(FulfillmentChannelEnum).map((x) => exactly(x)),
-)
-const adddressType: Codec<AddressType> = oneOf(Object.values(AddressType).map((x) => exactly(x)))
-const condition: Codec<Condition> = oneOf(Object.values(Condition).map((x) => exactly(x)))
-const conditionSubtype: Codec<ConditionSubtype> = oneOf(
-  Object.values(ConditionSubtype).map((x) => exactly(x)),
-)
+const orderStatus = enumeration(OrderStatusEnum)
+const fulfillmentChannel = enumeration(FulfillmentChannelEnum)
+const adddressType = enumeration(AddressType)
+const condition = enumeration(Condition)
+const conditionSubtype = enumeration(ConditionSubtype)
 
 const Address = Codec.interface({
   Name: optional(string),