v1.14.0

putdotio · Jan 23, 2024 · 8786d75 · 8786d75
1 parent ece23fd
commit 8786d75
Show file tree

Hide file tree

Showing 7 changed files with 2,641 additions and 2,504 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: .node-version
 
       - uses: bahmutov/npm-install@v1
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: .node-version
           registry-url: https://registry.npmjs.org/
       - run: yarn install
       - run: yarn lint

diff --git a/.node-version b/.node-version
@@ -0,0 +1 @@
+20.10.0
diff --git a/.nvmrc b/.nvmrc
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@putdotio/utilities",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "license": "MIT",
   "author": "put.io <ui@put.io>",
   "main": "dist/index.js",
@@ -47,7 +47,7 @@
     }
   ],
   "devDependencies": {
-    "@putdotio/api-client": "8.40.0",
+    "@putdotio/api-client": "^8.46.0",
     "@size-limit/preset-small-lib": "^8.2.4",
     "@tsconfig/recommended": "^1.0.2",
     "@types/bytes": "^3.1.1",
@@ -65,7 +65,7 @@
     "truncate-middle": "^1.0.6"
   },
   "peerDependencies": {
-    "@putdotio/api-client": ">=8.40.0"
+    "@putdotio/api-client": ">=8.46.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/src/localized-error/localizeError.ts b/src/localized-error/localizeError.ts
@@ -1,8 +1,8 @@
 import {
   type IPutioAPIClientError,
-  type IPutioAPIClientErrorData,
   isPutioAPIError,
   isPutioAPIErrorResponse,
+  createMockErrorResponse,
 } from '@putdotio/api-client';
 import { LocalizedError, type LocalizedErrorParams } from './LocalizedError';
 
@@ -13,13 +13,13 @@ export type LocalizeFn<E> = (
 export type APIErrorByStatusCodeLocalizer = {
   kind: 'api_status_code';
   status_code: number;
-  localize: LocalizeFn<IPutioAPIClientError | IPutioAPIClientErrorData>;
+  localize: LocalizeFn<IPutioAPIClientError>;
 };
 
 export type APIErrorByErrorTypeLocalizer = {
   kind: 'api_error_type';
   error_type: string;
-  localize: LocalizeFn<IPutioAPIClientError | IPutioAPIClientErrorData>;
+  localize: LocalizeFn<IPutioAPIClientError>;
 };
 
 export type MatchConditionLocalizer<E> = {
@@ -55,16 +55,15 @@ export const createLocalizeError =
   ): LocalizedError => {
     const localizers = [...scopedLocalizers, ...globalLocalizers];
 
-    // API ERROR
     if (isPutioAPIError(error) || isPutioAPIErrorResponse(error)) {
+      const apiError = isPutioAPIErrorResponse(error)
+        ? createMockErrorResponse(error)
+        : error;
+
       const byErrorType = localizers.find(
         (l): l is APIErrorByErrorTypeLocalizer => {
           if (l.kind === 'api_error_type') {
-            if (isPutioAPIErrorResponse(error)) {
-              return l.error_type === error.error_type;
-            }
-
-            return l.error_type === error.data.error_type;
+            return l.error_type === apiError.data.error_type;
           }
 
           return false;
@@ -73,34 +72,33 @@ export const createLocalizeError =
 
       if (byErrorType) {
         return new LocalizedError({
-          ...byErrorType.localize(error),
-          underlyingError: error,
+          underlyingError: apiError,
+          ...byErrorType.localize(apiError),
         });
       }
 
       const byStatusCode = localizers.find(
         (l): l is APIErrorByStatusCodeLocalizer => {
           if (l.kind === 'api_status_code') {
-            if (isPutioAPIErrorResponse(error)) {
-              return l.status_code === error.status_code;
-            }
-
-            return l.status_code === error.data.status_code;
+            return l.status_code === apiError.data.status_code;
           }
 
           return false;
         }
       );
 
       if (byStatusCode) {
+        const apiError = isPutioAPIErrorResponse(error)
+          ? createMockErrorResponse(error)
+          : error;
+
         return new LocalizedError({
-          ...byStatusCode.localize(error),
-          underlyingError: error,
+          underlyingError: apiError,
+          ...byStatusCode.localize(apiError),
         });
       }
     }
 
-    // MATCH CONDITION
     const matchConditionLocalizer = localizers.find(
       (l): l is MatchConditionLocalizer<ScopedError> => {
         if (l.kind === 'match_condition') {
@@ -113,12 +111,11 @@ export const createLocalizeError =
 
     if (matchConditionLocalizer) {
       return new LocalizedError({
-        ...matchConditionLocalizer.localize(error),
         underlyingError: error,
+        ...matchConditionLocalizer.localize(error),
       });
     }
 
-    // GENERIC
     const genericLocalizer = localizers.find(
       (l): l is GenericErrorLocalizer => {
         if (l.kind === 'generic') {
@@ -131,8 +128,8 @@ export const createLocalizeError =
 
     if (genericLocalizer) {
       return new LocalizedError({
-        ...genericLocalizer.localize(error),
         underlyingError: error,
+        ...genericLocalizer.localize(error),
       });
     }