style: format fixed!

unnoq · Nov 18, 2024 · 76179b3 · 76179b3
1 parent 90282e4
commit 76179b3
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 27 deletions.
diff --git a/packages/server/src/adapters/fetch.test.ts b/packages/server/src/adapters/fetch.test.ts
@@ -398,22 +398,21 @@ describe('file upload', () => {
   })
 })
 
-
-describe("accept header", () => {
+describe('accept header', () => {
   const router = os.router({
     ping: os.handler(async () => 'pong'),
   })
   const handler = createFetchHandler({
     router,
   })
 
-  it("application/json", async () => {
+  it('application/json', async () => {
     const response = await handler({
       prefix: '/orpc',
       request: new Request('http://localhost/orpc/ping', {
         method: 'POST',
         headers: {
-          'Accept': 'application/json',
+          Accept: 'application/json',
         },
       }),
     })
@@ -423,47 +422,51 @@ describe("accept header", () => {
     expect(await response.json()).toEqual('pong')
   })
 
-  it("multipart/form-data", async () => {
+  it('multipart/form-data', async () => {
     const response = await handler({
       prefix: '/orpc',
       request: new Request('http://localhost/orpc/ping', {
         method: 'POST',
         headers: {
-          'Accept': 'multipart/form-data',
+          Accept: 'multipart/form-data',
         },
       }),
     })
 
-    expect(response.headers.get('Content-Type')).toContain('multipart/form-data')
+    expect(response.headers.get('Content-Type')).toContain(
+      'multipart/form-data',
+    )
 
     const form = await response.formData()
     expect(form.get('')).toEqual('pong')
   })
 
-  it("application/x-www-form-urlencoded", async () => {
+  it('application/x-www-form-urlencoded', async () => {
     const response = await handler({
       prefix: '/orpc',
       request: new Request('http://localhost/orpc/ping', {
         method: 'POST',
         headers: {
-          'Accept': 'application/x-www-form-urlencoded',
+          Accept: 'application/x-www-form-urlencoded',
         },
       }),
     })
 
-    expect(response.headers.get('Content-Type')).toEqual('application/x-www-form-urlencoded')
+    expect(response.headers.get('Content-Type')).toEqual(
+      'application/x-www-form-urlencoded',
+    )
 
     const params = new URLSearchParams(await response.text())
     expect(params.get('')).toEqual('pong')
   })
 
-  it("*/*", async () => {
+  it('*/*', async () => {
     const response = await handler({
       prefix: '/orpc',
       request: new Request('http://localhost/orpc/ping', {
         method: 'POST',
         headers: {
-          'Accept': '*/*',
+          Accept: '*/*',
         },
       }),
     })
@@ -472,22 +475,22 @@ describe("accept header", () => {
     expect(await response.json()).toEqual('pong')
   })
 
-  it("invalid", async () => {
+  it('invalid', async () => {
     const response = await handler({
       prefix: '/orpc',
       request: new Request('http://localhost/orpc/ping', {
         method: 'POST',
         headers: {
-          'Accept': 'invalid',
+          Accept: 'invalid',
         },
       }),
     })
 
     expect(response.headers.get('Content-Type')).toEqual('application/json')
     expect(await response.json()).toEqual({
-      "code": "NOT_ACCEPTABLE",
-      "message": "Unsupported content-type: invalid",
-      "status": 406,
+      code: 'NOT_ACCEPTABLE',
+      message: 'Unsupported content-type: invalid',
+      status: 406,
     })
   })
-})
+})
diff --git a/packages/server/src/adapters/fetch.ts b/packages/server/src/adapters/fetch.ts
@@ -131,8 +131,8 @@ export function createFetchHandler<TRouter extends Router<any>>(
         const deserializer = isORPCTransformer
           ? new ORPCDeserializer()
           : new OpenAPIDeserializer({
-            schema: procedure.zz$p.contract.zz$cp.InputSchema,
-          })
+              schema: procedure.zz$p.contract.zz$cp.InputSchema,
+            })
 
         const input_ = await (async () => {
           try {
@@ -193,7 +193,9 @@ export function createFetchHandler<TRouter extends Router<any>>(
         const error = toORPCError(e)
 
         // fallback to OpenAPI serializer (without accept) when expected serializer has failed
-        const { body, headers } = new OpenAPISerializer().serialize(error.toJSON())
+        const { body, headers } = new OpenAPISerializer().serialize(
+          error.toJSON(),
+        )
 
         return new Response(body, {
           status: error.status,
@@ -232,13 +234,12 @@ export interface FetchHandler<TRouter extends Router<any>> {
   (options: FetchHandlerOptions<TRouter>): Promise<Response>
 }
 
-
 function toORPCError(e: unknown): ORPCError<any, any> {
   return e instanceof ORPCError
     ? e
     : new ORPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: 'Internal server error',
-      cause: e,
-    })
-}
+        code: 'INTERNAL_SERVER_ERROR',
+        message: 'Internal server error',
+        cause: e,
+      })
+}
diff --git a/packages/shared/src/object.ts b/packages/shared/src/object.ts
@@ -32,10 +32,18 @@ export function get(
   let preSegment: string | number = 'root'
 
   for (const segment of segments) {
+    if (typeof currentRef !== 'object' || currentRef === null) {
+      return undefined
+    }
+
     currentRef = currentRef[preSegment]
     preSegment = segment
   }
 
+  if (typeof currentRef !== 'object' || currentRef === null) {
+    return undefined
+  }
+
   return currentRef[preSegment]
 }