fix: interceptor error from extension issue

packages/hoppscotch-backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hoppscotch-backend",
-  "version": "2023.8.4-1",
+  "version": "2023.8.3-1",
   "description": "",
   "author": "",
   "private": true,

packages/hoppscotch-common/locales/en.json

@@ -139,21 +139,7 @@
     "password": "Password",
     "token": "Token",
     "type": "Authorization Type",
-    "username": "Username",
-    "oauth": {
-      "token_generation_oidc_discovery_failed": "Failure on token generation: OpenID Connect Discovery Failed",
-      "something_went_wrong_on_token_generation": "Something went wrong on token generation",
-      "redirect_auth_server_returned_error": "Auth Server returned an error state",
-      "redirect_no_auth_code": "No Authorization Code present in the redirect",
-      "redirect_invalid_state": "Invalid State value present in the redirect",
-      "redirect_no_token_endpoint": "No Token Endpoint Defined",
-      "redirect_no_client_id": "No Client ID defined",
-      "redirect_no_client_secret": "No Client Secret Defined",
-      "redirect_no_code_verifier": "No Code Verifier Defined",
-      "redirect_auth_token_request_failed": "Request to get the auth token failed",
-      "redirect_auth_token_request_invalid_response": "Invalid Response from the Token Endpoint when requesting for an auth token",
-      "something_went_wrong_on_oauth_redirect": "Something went wrong during OAuth Redirect"
-    }
+    "username": "Username"
   },
   "collection": {
     "created": "Collection created",

packages/hoppscotch-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/common",
   "private": true,
-  "version": "2023.8.4-1",
+  "version": "2023.8.3-1",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",
     "test": "vitest --run",

packages/hoppscotch-common/src/components/http/OAuth2Authorization.vue

@@ -78,15 +78,6 @@ const clientSecret = pluckRef(auth, "clientSecret" as any)
 
 const scope = pluckRef(auth, "scope")
 
-function translateTokenRequestError(error: string) {
-  switch (error) {
-    case "OIDC_DISCOVERY_FAILED":
-      return t("authorization.oauth.token_generation_oidc_discovery_failed")
-    default:
-      return t("authorization.oauth.something_went_wrong_on_token_generation")
-  }
-}
-
 const handleAccessTokenRequest = async () => {
   if (
     oidcDiscoveryURL.value === "" &&
@@ -111,7 +102,7 @@ const handleAccessTokenRequest = async () => {
     const res = await tokenRequest(tokenReqParams)
 
     if (res && E.isLeft(res)) {
-      toast.error(translateTokenRequestError(res.left))
+      toast.error(res.left)
     }
   } catch (e) {
     toast.error(`${e}`)

packages/hoppscotch-common/src/pages/oauth.vue

@@ -7,7 +7,6 @@
 <script setup lang="ts">
 import { handleOAuthRedirect } from "~/helpers/oauth"
 import { useToast } from "~/composables/toast"
-import { useI18n } from "~/composables/i18n"
 
 import * as E from "fp-ts/Either"
 import { useService } from "dioc/vue"
@@ -16,54 +15,17 @@ import { onMounted } from "vue"
 
 import { useRouter } from "vue-router"
 
-const t = useI18n()
 const router = useRouter()
 
 const toast = useToast()
 
 const tabs = useService(RESTTabService)
 
-function translateOAuthRedirectError(error: string) {
-  switch (error) {
-    case "AUTH_SERVER_RETURNED_ERROR":
-      return t("authorization.oauth.redirect_auth_server_returned_error")
-
-    case "NO_AUTH_CODE":
-      return t("authorization.oauth.redirect_no_auth_code")
-
-    case "INVALID_STATE":
-      return t("authorization.oauth.redirect_invalid_state")
-
-    case "NO_TOKEN_ENDPOINT":
-      return t("authorization.oauth.redirect_no_token_endpoint")
-
-    case "NO_CLIENT_ID":
-      return t("authorization.oauth.redirect_no_client_id")
-
-    case "NO_CLIENT_SECRET":
-      return t("authorization.oauth.redirect_no_client_secret")
-
-    case "NO_CODE_VERIFIER":
-      return t("authorization.oauth.redirect_no_code_verifier")
-
-    case "AUTH_TOKEN_REQUEST_FAILED":
-      return t("authorization.oauth.redirect_auth_token_request_failed")
-
-    case "AUTH_TOKEN_REQUEST_INVALID_RESPONSE":
-      return t(
-        "authorization.oauth.redirect_auth_token_request_invalid_response"
-      )
-
-    default:
-      return t("authorization.oauth.something_went_wrong_on_oauth_redirect")
-  }
-}
-
 onMounted(async () => {
   const tokenInfo = await handleOAuthRedirect()
 
   if (E.isLeft(tokenInfo)) {
-    toast.error(translateOAuthRedirectError(tokenInfo.left))
+    toast.error(tokenInfo.left)
     router.push("/")
     return
   }

packages/hoppscotch-data/package.json

@@ -43,7 +43,7 @@
     "io-ts": "^2.2.20",
     "lodash": "^4.17.21",
     "parser-ts": "^0.7.0",
-    "verzod": "^0.2.2",
+    "verzod": "^0.1.1",
     "zod": "^3.22.4"
   }
 }

packages/hoppscotch-data/src/graphql/v/1.ts

@@ -2,9 +2,9 @@ import { z } from "zod"
 import { defineVersion } from "verzod"
 
 export const GQLHeader = z.object({
-  key: z.string().catch(""),
-  value: z.string().catch(""),
-  active: z.boolean().catch(true)
+  key: z.string(),
+  value: z.string(),
+  active: z.boolean()
 })
 
 export type GQLHeader = z.infer<typeof GQLHeader>
@@ -13,7 +13,7 @@ export const V1_SCHEMA = z.object({
   v: z.literal(1),
   name: z.string(),
   url: z.string(),
-  headers: z.array(GQLHeader).catch([]),
+  headers: z.array(GQLHeader),
   query: z.string(),
   variables: z.string(),
 })

packages/hoppscotch-data/src/graphql/v/2.ts

@@ -11,8 +11,8 @@ export type HoppGQLAuthNone = z.infer<typeof HoppGQLAuthNone>
 export const HoppGQLAuthBasic = z.object({
   authType: z.literal("basic"),
 
-  username: z.string().catch(""),
-  password: z.string().catch("")
+  username: z.string(),
+  password: z.string()
 })
 
 export type HoppGQLAuthBasic = z.infer<typeof HoppGQLAuthBasic>
@@ -20,7 +20,7 @@ export type HoppGQLAuthBasic = z.infer<typeof HoppGQLAuthBasic>
 export const HoppGQLAuthBearer = z.object({
   authType: z.literal("bearer"),
 
-  token: z.string().catch("")
+  token: z.string()
 })
 
 export type HoppGQLAuthBearer = z.infer<typeof HoppGQLAuthBearer>
@@ -28,12 +28,12 @@ export type HoppGQLAuthBearer = z.infer<typeof HoppGQLAuthBearer>
 export const HoppGQLAuthOAuth2 = z.object({
   authType: z.literal("oauth-2"),
 
-  token: z.string().catch(""),
-  oidcDiscoveryURL: z.string().catch(""),
-  authURL: z.string().catch(""),
-  accessTokenURL: z.string().catch(""),
-  clientID: z.string().catch(""),
-  scope: z.string().catch("")
+  token: z.string(),
+  oidcDiscoveryURL: z.string(),
+  authURL: z.string(),
+  accessTokenURL: z.string(),
+  clientID: z.string(),
+  scope: z.string()
 })
 
 export type HoppGQLAuthOAuth2 = z.infer<typeof HoppGQLAuthOAuth2>
@@ -41,9 +41,9 @@ export type HoppGQLAuthOAuth2 = z.infer<typeof HoppGQLAuthOAuth2>
 export const HoppGQLAuthAPIKey = z.object({
   authType: z.literal("api-key"),
 
-  key: z.string().catch(""),
-  value: z.string().catch(""),
-  addTo: z.string().catch("Headers")
+  key: z.string(),
+  value: z.string(),
+  addTo: z.string()
 })
 
 export type HoppGQLAuthAPIKey = z.infer<typeof HoppGQLAuthAPIKey>
@@ -68,7 +68,7 @@ const V2_SCHEMA = z.object({
 
   name: z.string(),
   url: z.string(),
-  headers: z.array(GQLHeader).catch([]),
+  headers: z.array(GQLHeader),
   query: z.string(),
   variables: z.string(),
 

packages/hoppscotch-data/src/rest/index.ts

@@ -52,7 +52,6 @@ export const HoppRESTRequest = createVersionedEntity({
 
 export type HoppRESTRequest = InferredEntity<typeof HoppRESTRequest>
 
-// TODO: Handle the issue with the preRequestScript and testScript type check failures on pre-commit
 const HoppRESTRequestEq = Eq.struct<HoppRESTRequest>({
   id: undefinedEq(S.Eq),
   v: S.Eq,
@@ -60,11 +59,11 @@ const HoppRESTRequestEq = Eq.struct<HoppRESTRequest>({
   body: lodashIsEqualEq,
   endpoint: S.Eq,
   headers: mapThenEq(
-    (arr) => arr.filter((h: any) => h.key !== "" && h.value !== ""),
+    (arr) => arr.filter((h) => h.key !== "" && h.value !== ""),
     lodashIsEqualEq
   ),
   params: mapThenEq(
-    (arr) => arr.filter((p: any) => p.key !== "" && p.value !== ""),
+    (arr) => arr.filter((p) => p.key !== "" && p.value !== ""),
     lodashIsEqualEq
   ),
   method: S.Eq,

packages/hoppscotch-data/src/rest/v/1.ts

@@ -10,7 +10,7 @@ export const FormDataKeyValue = z.object({
   z.union([
     z.object({
       isFile: z.literal(true),
-      value: z.array(z.instanceof(Blob).nullable())
+      value: z.array(z.instanceof(Blob))
     }),
     z.object({
       isFile: z.literal(false),
@@ -31,11 +31,11 @@ export type HoppRESTReqBodyFormData = z.infer<typeof HoppRESTReqBodyFormData>
 export const HoppRESTReqBody = z.union([
   z.object({
     contentType: z.literal(null),
-    body: z.literal(null).catch(null)
+    body: z.literal(null)
   }),
   z.object({
     contentType: z.literal("multipart/form-data"),
-    body: z.array(FormDataKeyValue).catch([])
+    body: FormDataKeyValue
   }),
   z.object({
     contentType: z.union([
@@ -48,7 +48,7 @@ export const HoppRESTReqBody = z.union([
       z.literal("text/html"),
       z.literal("text/plain"),
     ]),
-    body: z.string().catch("")
+    body: z.string()
   })
 ])
 
@@ -62,36 +62,36 @@ export type HoppRESTAuthNone = z.infer<typeof HoppRESTAuthNone>
 
 export const HoppRESTAuthBasic = z.object({
   authType: z.literal("basic"),
-  username: z.string().catch(""),
-  password: z.string().catch(""),
+  username: z.string(),
+  password: z.string(),
 })
 
 export type HoppRESTAuthBasic = z.infer<typeof HoppRESTAuthBasic>
 
 export const HoppRESTAuthBearer = z.object({
   authType: z.literal("bearer"),
-  token: z.string().catch(""),
+  token: z.string(),
 })
 
 export type HoppRESTAuthBearer = z.infer<typeof HoppRESTAuthBearer>
 
 export const HoppRESTAuthOAuth2 = z.object({
   authType: z.literal("oauth-2"),
-  token: z.string().catch(""),
-  oidcDiscoveryURL: z.string().catch(""),
-  authURL: z.string().catch(""),
-  accessTokenURL: z.string().catch(""),
-  clientID: z.string().catch(""),
-  scope: z.string().catch(""),
+  token: z.string(),
+  oidcDiscoveryURL: z.string(),
+  authURL: z.string(),
+  accessTokenURL: z.string(),
+  clientID: z.string(),
+  scope: z.string(),
 })
 
 export type HoppRESTAuthOAuth2 = z.infer<typeof HoppRESTAuthOAuth2>
 
 export const HoppRESTAuthAPIKey = z.object({
   authType: z.literal("api-key"),
-  key: z.string().catch(""),
-  value: z.string().catch(""),
-  addTo: z.string().catch("Headers"),
+  key: z.string(),
+  value: z.string(),
+  addTo: z.string(),
 })
 
 export type HoppRESTAuthAPIKey = z.infer<typeof HoppRESTAuthAPIKey>
@@ -112,9 +112,9 @@ export type HoppRESTAuth = z.infer<typeof HoppRESTAuth>
 
 export const HoppRESTParams = z.array(
   z.object({
-    key: z.string().catch(""),
-    value: z.string().catch(""),
-    active: z.boolean().catch(true)
+    key: z.string(),
+    value: z.string(),
+    active: z.boolean()
   })
 )
 
@@ -122,9 +122,9 @@ export type HoppRESTParams = z.infer<typeof HoppRESTParams>
 
 export const HoppRESTHeaders = z.array(
   z.object({
-    key: z.string().catch(""),
-    value: z.string().catch(""),
-    active: z.boolean().catch(true)
+    key: z.string(),
+    value: z.string(),
+    active: z.boolean()
   })
 )
 
@@ -139,8 +139,8 @@ const V1_SCHEMA = z.object({
   endpoint: z.string(),
   params: HoppRESTParams,
   headers: HoppRESTHeaders,
-  preRequestScript: z.string().catch(""),
-  testScript: z.string().catch(""),
+  preRequestScript: z.string(),
+  testScript: z.string(),
 
   auth: HoppRESTAuth,
 

packages/hoppscotch-selfhost-desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/selfhost-desktop",
   "private": true,
-  "version": "2023.8.4-1",
+  "version": "2023.8.3-1",
   "type": "module",
   "scripts": {
     "dev:vite": "vite",

packages/hoppscotch-selfhost-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/selfhost-web",
   "private": true,
-  "version": "2023.8.4-1",
+  "version": "2023.8.3-1",
   "type": "module",
   "scripts": {
     "dev:vite": "vite",

packages/hoppscotch-sh-admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hoppscotch-sh-admin",
   "private": true,
-  "version": "2023.8.4-1",
+  "version": "2023.8.3-1",
   "type": "module",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",

pnpm-lock.yaml

@@ -798,8 +798,8 @@ importers:
         specifier: ^0.7.0
         version: 0.7.0(fp-ts@2.16.1)
       verzod:
-        specifier: ^0.2.2
-        version: 0.2.2(zod@3.22.4)
+        specifier: ^0.1.1
+        version: 0.1.1
       zod:
         specifier: ^3.22.4
         version: 3.22.4
@@ -830,7 +830,7 @@ importers:
         version: 0.15.0
       tsup:
         specifier: ^5.12.5
-        version: 5.12.9(typescript@4.9.5)
+        version: 5.12.9(@swc/core@1.2.213)(typescript@4.7.4)
     devDependencies:
       '@digitak/esrun':
         specifier: ^3.1.2
@@ -849,10 +849,10 @@ importers:
         version: 17.0.45
       '@typescript-eslint/eslint-plugin':
         specifier: ^5.19.0
-        version: 5.30.6(@typescript-eslint/parser@5.30.6)(eslint@8.19.0)(typescript@4.9.5)
+        version: 5.30.6(@typescript-eslint/parser@5.30.6)(eslint@8.19.0)(typescript@4.7.4)
       '@typescript-eslint/parser':
         specifier: ^5.19.0
-        version: 5.30.6(eslint@8.19.0)(typescript@4.9.5)
+        version: 5.30.6(eslint@8.19.0)(typescript@4.7.4)
       eslint:
         specifier: ^8.13.0
         version: 8.19.0
@@ -873,10 +873,10 @@ importers:
         version: 2.8.4
       ts-jest:
         specifier: ^27.1.4
-        version: 27.1.5(@babel/core@7.23.2)(@types/jest@27.5.2)(esbuild@0.14.48)(jest@27.5.1)(typescript@4.9.5)
+        version: 27.1.5(@babel/core@7.23.2)(@types/jest@27.5.2)(esbuild@0.14.48)(jest@27.5.1)(typescript@4.7.4)
       typescript:
         specifier: ^4.6.3
-        version: 4.9.5
+        version: 4.7.4
 
   packages/hoppscotch-selfhost-desktop:
     dependencies:
@@ -9923,7 +9923,6 @@ packages:
     cpu: [arm]
     os: [android]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-android-arm64@1.2.213:
@@ -9932,7 +9931,6 @@ packages:
     cpu: [arm64]
     os: [android]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-darwin-arm64@1.2.213:
@@ -9941,7 +9939,6 @@ packages:
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-darwin-x64@1.2.213:
@@ -9950,7 +9947,6 @@ packages:
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-freebsd-x64@1.2.213:
@@ -9959,7 +9955,6 @@ packages:
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-linux-arm-gnueabihf@1.2.213:
@@ -9968,7 +9963,6 @@ packages:
     cpu: [arm]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-linux-arm64-gnu@1.2.213:
@@ -9977,7 +9971,6 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-linux-arm64-musl@1.2.213:
@@ -9986,7 +9979,6 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-linux-x64-gnu@1.2.213:
@@ -9995,7 +9987,6 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-linux-x64-musl@1.2.213:
@@ -10004,7 +9995,6 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-win32-arm64-msvc@1.2.213:
@@ -10013,7 +10003,6 @@ packages:
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-win32-ia32-msvc@1.2.213:
@@ -10022,7 +10011,6 @@ packages:
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core-win32-x64-msvc@1.2.213:
@@ -10031,7 +10019,6 @@ packages:
     cpu: [x64]
     os: [win32]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@swc/core@1.2.213:
@@ -10052,7 +10039,6 @@ packages:
       '@swc/core-win32-arm64-msvc': 1.2.213
       '@swc/core-win32-ia32-msvc': 1.2.213
       '@swc/core-win32-x64-msvc': 1.2.213
-    dev: true
 
   /@tauri-apps/api@1.5.1:
     resolution: {integrity: sha512-6unsZDOdlXTmauU3NhWhn+Cx0rODV+rvNvTdvolE5Kls5ybA6cqndQENDt1+FS0tF7ozCP66jwWoH6a5h90BrA==}
@@ -10750,7 +10736,7 @@ packages:
       '@types/yargs-parser': 21.0.0
     dev: true
 
-  /@typescript-eslint/eslint-plugin@5.30.6(@typescript-eslint/parser@5.30.6)(eslint@8.19.0)(typescript@4.9.5):
+  /@typescript-eslint/eslint-plugin@5.30.6(@typescript-eslint/parser@5.30.6)(eslint@8.19.0)(typescript@4.7.4):
     resolution: {integrity: sha512-J4zYMIhgrx4MgnZrSDD7sEnQp7FmhKNOaqaOpaoQ/SfdMfRB/0yvK74hTnvH+VQxndZynqs5/Hn4t+2/j9bADg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -10761,18 +10747,18 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.30.6(eslint@8.19.0)(typescript@4.9.5)
+      '@typescript-eslint/parser': 5.30.6(eslint@8.19.0)(typescript@4.7.4)
       '@typescript-eslint/scope-manager': 5.30.6
-      '@typescript-eslint/type-utils': 5.30.6(eslint@8.19.0)(typescript@4.9.5)
-      '@typescript-eslint/utils': 5.30.6(eslint@8.19.0)(typescript@4.9.5)
+      '@typescript-eslint/type-utils': 5.30.6(eslint@8.19.0)(typescript@4.7.4)
+      '@typescript-eslint/utils': 5.30.6(eslint@8.19.0)(typescript@4.7.4)
       debug: 4.3.4(supports-color@9.2.2)
       eslint: 8.19.0
       functional-red-black-tree: 1.0.1
       ignore: 5.2.0
       regexpp: 3.2.0
       semver: 7.3.7
-      tsutils: 3.21.0(typescript@4.9.5)
-      typescript: 4.9.5
+      tsutils: 3.21.0(typescript@4.7.4)
+      typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -10917,7 +10903,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@5.30.6(eslint@8.19.0)(typescript@4.9.5):
+  /@typescript-eslint/parser@5.30.6(eslint@8.19.0)(typescript@4.7.4):
     resolution: {integrity: sha512-gfF9lZjT0p2ZSdxO70Xbw8w9sPPJGfAdjK7WikEjB3fcUI/yr9maUVEdqigBjKincUYNKOmf7QBMiTf719kbrA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -10929,10 +10915,10 @@ packages:
     dependencies:
       '@typescript-eslint/scope-manager': 5.30.6
       '@typescript-eslint/types': 5.30.6
-      '@typescript-eslint/typescript-estree': 5.30.6(typescript@4.9.5)
+      '@typescript-eslint/typescript-estree': 5.30.6(typescript@4.7.4)
       debug: 4.3.4(supports-color@9.2.2)
       eslint: 8.19.0
-      typescript: 4.9.5
+      typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -11070,7 +11056,7 @@ packages:
       '@typescript-eslint/visitor-keys': 6.4.0
     dev: true
 
-  /@typescript-eslint/type-utils@5.30.6(eslint@8.19.0)(typescript@4.9.5):
+  /@typescript-eslint/type-utils@5.30.6(eslint@8.19.0)(typescript@4.7.4):
     resolution: {integrity: sha512-GFVVzs2j0QPpM+NTDMXtNmJKlF842lkZKDSanIxf+ArJsGeZUIaeT4jGg+gAgHt7AcQSFwW7htzF/rbAh2jaVA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -11080,11 +11066,11 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/utils': 5.30.6(eslint@8.19.0)(typescript@4.9.5)
+      '@typescript-eslint/utils': 5.30.6(eslint@8.19.0)(typescript@4.7.4)
       debug: 4.3.4(supports-color@9.2.2)
       eslint: 8.19.0
-      tsutils: 3.21.0(typescript@4.9.5)
-      typescript: 4.9.5
+      tsutils: 3.21.0(typescript@4.7.4)
+      typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -11209,7 +11195,7 @@ packages:
     engines: {node: ^16.0.0 || >=18.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree@5.30.6(typescript@4.9.5):
+  /@typescript-eslint/typescript-estree@5.30.6(typescript@4.7.4):
     resolution: {integrity: sha512-Z7TgPoeYUm06smfEfYF0RBkpF8csMyVnqQbLYiGgmUSTaSXTP57bt8f0UFXstbGxKIreTwQCujtaH0LY9w9B+A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -11224,8 +11210,8 @@ packages:
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
-      tsutils: 3.21.0(typescript@4.9.5)
-      typescript: 4.9.5
+      tsutils: 3.21.0(typescript@4.7.4)
+      typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -11335,7 +11321,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils@5.30.6(eslint@8.19.0)(typescript@4.9.5):
+  /@typescript-eslint/utils@5.30.6(eslint@8.19.0)(typescript@4.7.4):
     resolution: {integrity: sha512-xFBLc/esUbLOJLk9jKv0E9gD/OH966M40aY9jJ8GiqpSkP2xOV908cokJqqhVd85WoIvHVHYXxSFE4cCSDzVvA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -11344,7 +11330,7 @@ packages:
       '@types/json-schema': 7.0.9
       '@typescript-eslint/scope-manager': 5.30.6
       '@typescript-eslint/types': 5.30.6
-      '@typescript-eslint/typescript-estree': 5.30.6(typescript@4.9.5)
+      '@typescript-eslint/typescript-estree': 5.30.6(typescript@4.7.4)
       eslint: 8.19.0
       eslint-scope: 5.1.1
       eslint-utils: 3.0.0(eslint@8.19.0)
@@ -19797,7 +19783,7 @@ packages:
     resolution: {integrity: sha512-9xZPKVYp9DxnM3sd1yAsh/d59iIaswDkai8oTxbursfKYbg/ibjX0IzFt35+VZ8iEW453TVTXztnRvYUQlAfUQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.11.2
+      acorn: 8.10.0
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
       semver: 7.5.4
@@ -21003,7 +20989,7 @@ packages:
   /mlly@1.4.2:
     resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==}
     dependencies:
-      acorn: 8.11.2
+      acorn: 8.10.0
       pathe: 1.1.1
       pkg-types: 1.0.3
       ufo: 1.3.1
@@ -24289,42 +24275,6 @@ packages:
       yargs-parser: 20.2.9
     dev: true
 
-  /ts-jest@27.1.5(@babel/core@7.23.2)(@types/jest@27.5.2)(esbuild@0.14.48)(jest@27.5.1)(typescript@4.9.5):
-    resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-    hasBin: true
-    peerDependencies:
-      '@babel/core': '>=7.0.0-beta.0 <8'
-      '@types/jest': ^27.0.0
-      babel-jest: '>=27.0.0 <28'
-      esbuild: '*'
-      jest: ^27.0.0
-      typescript: '>=3.8 <5.0'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      '@types/jest':
-        optional: true
-      babel-jest:
-        optional: true
-      esbuild:
-        optional: true
-    dependencies:
-      '@babel/core': 7.23.2
-      '@types/jest': 27.5.2
-      bs-logger: 0.2.6
-      esbuild: 0.14.48
-      fast-json-stable-stringify: 2.1.0
-      jest: 27.5.1
-      jest-util: 27.5.1
-      json5: 2.2.1
-      lodash.memoize: 4.1.2
-      make-error: 1.3.6
-      semver: 7.3.7
-      typescript: 4.9.5
-      yargs-parser: 20.2.9
-    dev: true
-
   /ts-jest@29.0.5(@babel/core@7.23.2)(jest@29.4.1)(typescript@4.9.3):
     resolution: {integrity: sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -24430,7 +24380,7 @@ packages:
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.3
       '@types/node': 18.18.8
-      acorn: 8.11.2
+      acorn: 8.10.0
       acorn-walk: 8.2.0
       arg: 4.1.3
       create-require: 1.1.1
@@ -24608,42 +24558,16 @@ packages:
     transitivePeerDependencies:
       - supports-color
       - ts-node
-    dev: true
 
-  /tsup@5.12.9(typescript@4.9.5):
-    resolution: {integrity: sha512-dUpuouWZYe40lLufo64qEhDpIDsWhRbr2expv5dHEMjwqeKJS2aXA/FPqs1dxO4T6mBojo7rvo3jP9NNzaKyDg==}
-    hasBin: true
+  /tsutils@3.21.0(typescript@4.7.4):
+    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
+    engines: {node: '>= 6'}
     peerDependencies:
-      '@swc/core': ^1
-      postcss: ^8.4.12
-      typescript: ^4.1.0
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      postcss:
-        optional: true
-      typescript:
-        optional: true
+      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
     dependencies:
-      bundle-require: 3.0.4(esbuild@0.14.48)
-      cac: 6.7.12
-      chokidar: 3.5.3
-      debug: 4.3.4(supports-color@9.2.2)
-      esbuild: 0.14.48
-      execa: 5.1.1
-      globby: 11.1.0
-      joycon: 3.1.1
-      postcss-load-config: 3.1.4
-      resolve-from: 5.0.0
-      rollup: 2.79.1
-      source-map: 0.8.0-beta.0
-      sucrase: 3.23.0
-      tree-kill: 1.2.2
-      typescript: 4.9.5
-    transitivePeerDependencies:
-      - supports-color
-      - ts-node
-    dev: false
+      tslib: 1.14.1
+      typescript: 4.7.4
+    dev: true
 
   /tsutils@3.21.0(typescript@4.9.3):
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
@@ -24780,7 +24704,6 @@ packages:
     resolution: {integrity: sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==}
     engines: {node: '>=4.2.0'}
     hasBin: true
-    dev: true
 
   /typescript@4.9.3:
     resolution: {integrity: sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==}
@@ -24797,6 +24720,7 @@ packages:
     resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
     engines: {node: '>=4.2.0'}
     hasBin: true
+    dev: true
 
   /typescript@5.0.4:
     resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
@@ -25579,11 +25503,9 @@ packages:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
     engines: {node: '>= 0.8'}
 
-  /verzod@0.2.2(zod@3.22.4):
-    resolution: {integrity: sha512-TnM0O2SUcXuY63qQ+W+W4/5bDaIhyV9ZDWwL0ztDOawX7q7ar+jHNdYKUR43rf8ku23p2ROgrfoKABjl2IiiZQ==}
+  /verzod@0.1.1:
+    resolution: {integrity: sha512-T0o2GHjSdERgt3FCrhGB+ctXdPhRjj/gL/mFjkb1HsYQQQr6pF10oPY1jVHI0RMsG6L2+6VKe4zDN0gAarZmzg==}
     engines: {node: '>=16'}
-    peerDependencies:
-      zod: ^3.22.0
     dependencies:
       zod: 3.22.4
     dev: false