refactor: move peerDeps to deps, improve apple errors

jeremybarbet · Jul 18, 2023 · 94e2614 · 94e2614
1 parent 8dedbe3
commit 94e2614
Show file tree

Hide file tree

Showing 11 changed files with 1,838 additions and 2,618 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,8 +1,7 @@
 {
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "version": "1.4.0",
   "npmClient": "yarn",
-  "useWorkspaces": true,
-  "useNx": true,
   "packages": [
     "packages/*"
   ],

diff --git a/nx.json b/nx.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "tasksRunnerOptions": {
     "default": {
       "runner": "nx/tasks-runners/default",
@@ -8,5 +9,15 @@
         ]
       }
     }
+  },
+  "namedInputs": {
+    "default": [
+      "{projectRoot}/**/*",
+      "sharedGlobals"
+    ],
+    "sharedGlobals": [],
+    "production": [
+      "default"
+    ]
   }
 }
diff --git a/package.json b/package.json
@@ -17,17 +17,17 @@
     "release:ci": "lerna publish --yes --no-private"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "5.53.0",
-    "@typescript-eslint/parser": "5.53.0",
-    "conventional-changelog-conventionalcommits": "5.0.0",
-    "eslint": "8.34.0",
-    "eslint-config-prettier": "8.6.0",
+    "@typescript-eslint/eslint-plugin": "6.1.0",
+    "@typescript-eslint/parser": "6.1.0",
+    "conventional-changelog-conventionalcommits": "6.1.0",
+    "eslint": "8.45.0",
+    "eslint-config-prettier": "8.8.0",
     "eslint-plugin-prefer-arrow": "1.2.3",
     "eslint-plugin-simple-import-sort": "9.0.0",
-    "lerna": "5.3.0",
-    "nx": "14.5.2",
-    "patch-package": "6.4.7",
-    "prettier": "2.8.4",
-    "typescript": "4.9.5"
+    "lerna": "7.1.4",
+    "nx": "16.5.2",
+    "patch-package": "7.0.2",
+    "prettier": "3.0.0",
+    "typescript": "5.1.6"
   }
 }
diff --git a/packages/apple-api-types/package.json b/packages/apple-api-types/package.json
@@ -25,7 +25,7 @@
     "lint:tsc": "yarn tsc -p tsconfig.json --noEmit --skipLibCheck"
   },
   "devDependencies": {
-    "@types/node": "18.14.0",
-    "typescript": "4.9.5"
+    "@types/node": "20.4.2",
+    "typescript": "5.1.6"
   }
 }
diff --git a/packages/google-api-types/package.json b/packages/google-api-types/package.json
@@ -25,7 +25,7 @@
     "lint:tsc": "yarn tsc -p tsconfig.json --noEmit --skipLibCheck"
   },
   "devDependencies": {
-    "@types/node": "18.14.0",
-    "typescript": "4.9.5"
+    "@types/node": "20.4.2",
+    "typescript": "5.1.6"
   }
 }
diff --git a/packages/nest-iap/package.json b/packages/nest-iap/package.json
@@ -15,16 +15,13 @@
     "lint:tsc": "yarn tsc -p tsconfig.json --noEmit --skipLibCheck"
   },
   "dependencies": {
-    "@jeremybarbet/node-iap": "1.4.0"
+    "@jeremybarbet/node-iap": "1.4.0",
+    "@nestjs/common": "10.1.0"
   },
   "devDependencies": {
-    "@nestjs/common": "9.0.7",
-    "@types/node": "18.14.0",
+    "@types/node": "20.4.2",
     "reflect-metadata": "0.1.13",
-    "rxjs": "7.5.6",
-    "typescript": "4.9.5"
-  },
-  "peerDependencies": {
-    "@nestjs/common": "*"
+    "rxjs": "7.8.1",
+    "typescript": "5.1.6"
   }
 }
diff --git a/packages/node-iap/package.json b/packages/node-iap/package.json
@@ -16,17 +16,13 @@
   },
   "dependencies": {
     "@jeremybarbet/apple-api-types": "1.4.0",
-    "@jeremybarbet/google-api-types": "1.4.0"
+    "@jeremybarbet/google-api-types": "1.4.0",
+    "axios": "1.4.0",
+    "google-auth-library": "8.9.0"
   },
   "devDependencies": {
-    "@types/node": "18.14.0",
-    "axios": "0.27.2",
-    "google-auth-library": "8.1.1",
+    "@types/node": "20.4.2",
     "ts-node": "10.9.1",
-    "typescript": "4.9.5"
-  },
-  "peerDependencies": {
-    "axios": "*",
-    "google-auth-library": "*"
+    "typescript": "5.1.6"
   }
 }
diff --git a/packages/node-iap/src/apple/apple.ts b/packages/node-iap/src/apple/apple.ts
@@ -22,12 +22,13 @@ export const verify = async ({ transactionReceipt }: RequestBody, config: Config
 
     return handleResponse(data);
   } catch (error) {
-    const status = (error as ErrorResponse)?.response?.status ?? 500;
+    const status = (error as ErrorResponse<ErrorStatus>)?.response?.status;
+    const message = status ? errors[status] : 'Unknown error';
 
     return {
       valid: false,
       data: undefined,
-      message: errors?.[status as ErrorStatus],
+      message,
       status,
     };
   }

diff --git a/packages/node-iap/src/apple/config.interface.ts b/packages/node-iap/src/apple/config.interface.ts
@@ -27,7 +27,7 @@ export interface RequestBody {
 
 export type DataResponse = ResponseBody;
 
-export type StatusResponse = SuccessStatus | ErrorStatus | number;
+export type StatusResponse = SuccessStatus | ErrorStatus;
 
 export interface VerifyResponse {
   valid: boolean;

diff --git a/packages/node-iap/src/types/common.ts b/packages/node-iap/src/types/common.ts
@@ -1,5 +1,5 @@
-export interface ErrorResponse {
+export interface ErrorResponse<T = number> {
   response?: {
-    status: number;
+    status: T;
   };
 }