spiceflow 1.1.12 → 1.1.14

package/src/client/types.ts

@@ -1,9 +1,7 @@
 /// <reference lib="dom" />
 import type { Spiceflow } from '../spiceflow.js'
-// import { EdenWS } from './ws'
-// import type { IsNever, Not, Prettify } from '../types'
-import { EdenFetchError } from './errors.js'
-import { EdenWS } from './ws.js'
+
+import { SpiceflowFetchError } from './errors.js'
 
 export type Prettify<T> = {
   [K in keyof T]: T[K]
@@ -36,22 +34,22 @@ type ReplaceGeneratorWithAsyncGenerator<
     ? And<Not<IsNever<A>>, void extends B ? true : false> extends true
       ? AsyncGenerator<A, B, C>
       : And<IsNever<A>, void extends B ? false : true> extends true
-        ? B
-        : AsyncGenerator<A, B, C> | B
+      ? B
+      : AsyncGenerator<A, B, C> | B
     : RecordType[K] extends AsyncGenerator<infer A, infer B, infer C>
-      ? And<Not<IsNever<A>>, void extends B ? true : false> extends true
-        ? AsyncGenerator<A, B, C>
-        : And<IsNever<A>, void extends B ? false : true> extends true
-          ? B
-          : AsyncGenerator<A, B, C> | B
-      : RecordType[K]
+    ? And<Not<IsNever<A>>, void extends B ? true : false> extends true
+      ? AsyncGenerator<A, B, C>
+      : And<IsNever<A>, void extends B ? false : true> extends true
+      ? B
+      : AsyncGenerator<A, B, C> | B
+    : RecordType[K]
 } & {}
 
 type MaybeArray<T> = T | T[]
 type MaybePromise<T> = T | Promise<T>
 
 export namespace SpiceflowClient {
-  interface TreatyParam {
+  interface ClientParam {
     fetch?: RequestInit
   }
 
@@ -60,91 +58,76 @@ export namespace SpiceflowClient {
       _routes: infer Schema extends Record<string, any>
     }
       ? Prettify<Sign<Schema>>
-      : 'Please install Spiceflow before using Eden'
+      : 'Please install Spiceflow before using the client'
 
   export type Sign<in out Route extends Record<string, any>> = {
-    [K in keyof Route as K extends `:${string}`
-      ? never
-      : K]: K extends 'subscribe' // ? Websocket route
-      ? (undefined extends Route['subscribe']['headers']
-          ? { headers?: Record<string, unknown> }
-          : {
-              headers: Route['subscribe']['headers']
-            }) &
-          (undefined extends Route['subscribe']['query']
-            ? { query?: Record<string, unknown> }
-            : {
-                query: Route['subscribe']['query']
-              }) extends infer Param
+    [K in keyof Route as K extends `:${string}` ? never : K]: Route[K] extends {
+      body: infer Body
+      // headers: infer Headers
+      params: any
+      query: infer Query
+      response: infer Response extends Record<number, unknown>
+    }
+      ? { headers?: Record<string, unknown> } & (undefined extends Query
+          ? { query?: Record<string, unknown> }
+          : { query: Query }) extends infer Param
         ? {} extends Param
-          ? (options?: Param) => EdenWS<Route['subscribe']>
-          : (options?: Param) => EdenWS<Route['subscribe']>
-        : never
-      : Route[K] extends {
-            body: infer Body
-            // headers: infer Headers
-            params: any
-            query: infer Query
-            response: infer Response extends Record<number, unknown>
-          }
-        ? { headers?: Record<string, unknown> } & (undefined extends Query
-            ? { query?: Record<string, unknown> }
-            : { query: Query }) extends infer Param
-          ? {} extends Param
-            ? undefined extends Body
-              ? K extends 'get' | 'head'
-                ? (
-                    options?: Prettify<Param & TreatyParam>,
-                  ) => Promise<
-                    TreatyResponse<ReplaceGeneratorWithAsyncGenerator<Response>>
-                  >
-                : (
-                    body?: Body,
-                    options?: Prettify<Param & TreatyParam>,
-                  ) => Promise<
-                    TreatyResponse<ReplaceGeneratorWithAsyncGenerator<Response>>
-                  >
-              : (
-                  body: Body extends Record<string, unknown>
-                    ? ReplaceBlobWithFiles<Body>
-                    : Body,
-                  options?: Prettify<Param & TreatyParam>,
-                ) => Promise<
-                  TreatyResponse<ReplaceGeneratorWithAsyncGenerator<Response>>
-                >
-            : K extends 'get' | 'head'
+          ? undefined extends Body
+            ? K extends 'get' | 'head'
               ? (
-                  options: Prettify<Param & TreatyParam>,
+                  options?: Prettify<Param & ClientParam>,
                 ) => Promise<
-                  TreatyResponse<ReplaceGeneratorWithAsyncGenerator<Response>>
+                  ClientResponse<ReplaceGeneratorWithAsyncGenerator<Response>>
                 >
               : (
-                  body: Body extends Record<string, unknown>
-                    ? ReplaceBlobWithFiles<Body>
-                    : Body,
-                  options: Prettify<Param & TreatyParam>,
+                  body?: Body,
+                  options?: Prettify<Param & ClientParam>,
                 ) => Promise<
-                  TreatyResponse<ReplaceGeneratorWithAsyncGenerator<Response>>
+                  ClientResponse<ReplaceGeneratorWithAsyncGenerator<Response>>
                 >
-          : never
-        : CreateParams<Route[K]>
+            : (
+                body: Body extends Record<string, unknown>
+                  ? ReplaceBlobWithFiles<Body>
+                  : Body,
+                options?: Prettify<Param & ClientParam>,
+              ) => Promise<
+                ClientResponse<ReplaceGeneratorWithAsyncGenerator<Response>>
+              >
+          : K extends 'get' | 'head'
+          ? (
+              options: Prettify<Param & ClientParam>,
+            ) => Promise<
+              ClientResponse<ReplaceGeneratorWithAsyncGenerator<Response>>
+            >
+          : (
+              body: Body extends Record<string, unknown>
+                ? ReplaceBlobWithFiles<Body>
+                : Body,
+              options: Prettify<Param & ClientParam>,
+            ) => Promise<
+              ClientResponse<ReplaceGeneratorWithAsyncGenerator<Response>>
+            >
+        : never
+      : CreateParams<Route[K]>
   }
 
-  type CreateParams<Route extends Record<string, any>> =
-    Extract<keyof Route, `:${string}`> extends infer Path extends string
-      ? IsNever<Path> extends true
-        ? Prettify<Sign<Route>>
-        : // ! DO NOT USE PRETTIFY ON THIS LINE, OTHERWISE FUNCTION CALLING WILL BE OMITTED
-          (((params: {
-            [param in Path extends `:${infer Param}`
-              ? Param extends `${infer Param}?`
-                ? Param
-                : Param
-              : never]: string | number
-          }) => Prettify<Sign<Route[Path]>> & CreateParams<Route[Path]>) &
-            Prettify<Sign<Route>>) &
-            (Path extends `:${string}?` ? CreateParams<Route[Path]> : {})
-      : never
+  type CreateParams<Route extends Record<string, any>> = Extract<
+    keyof Route,
+    `:${string}`
+  > extends infer Path extends string
+    ? IsNever<Path> extends true
+      ? Prettify<Sign<Route>>
+      : // ! DO NOT USE PRETTIFY ON THIS LINE, OTHERWISE FUNCTION CALLING WILL BE OMITTED
+        (((params: {
+          [param in Path extends `:${infer Param}`
+            ? Param extends `${infer Param}?`
+              ? Param
+              : Param
+            : never]: string | number
+        }) => Prettify<Sign<Route[Path]>> & CreateParams<Route[Path]>) &
+          Prettify<Sign<Route>>) &
+          (Path extends `:${string}?` ? CreateParams<Route[Path]> : {})
+    : never
 
   export interface Config {
     // fetch?: Omit<RequestInit, 'headers' | 'method'>
@@ -164,7 +147,7 @@ export namespace SpiceflowClient {
   //     [K in keyof T]: Awaited<T[K]>
   // }
 
-  export type TreatyResponse<Res extends Record<number, unknown>> =
+  export type ClientResponse<Res extends Record<number, unknown>> =
     | {
         data: Res[200]
         error: null
@@ -175,9 +158,9 @@ export namespace SpiceflowClient {
     | {
         data: null
         error: Exclude<keyof Res, 200> extends never
-          ? EdenFetchError<number, any>
+          ? SpiceflowFetchError<number, any>
           : {
-              [Status in keyof Res]: EdenFetchError<Status, Res[Status]>
+              [Status in keyof Res]: SpiceflowFetchError<Status, Res[Status]>
             }[Exclude<keyof Res, 200>]
         response: Response
         status: number

package/src/cors.test.ts

@@ -48,3 +48,51 @@ describe('cors middleware', () => {
     expect(res.headers.get('Access-Control-Allow-Origin')).toBe('*')
   })
 })
+
+test('CORS headers are set when an error is thrown', async () => {
+  let errorRouteCallCount = 0;
+  const errorApp = new Spiceflow().use(cors()).get('/error', () => {
+    errorRouteCallCount++;
+    throw new Error('Test error')
+  })
+
+  const res = await errorApp.handle(request('error'))
+  expect(res.status).toBe(500)
+  expect(res.headers.get('Access-Control-Allow-Origin')).toBe('*')
+  expect(await res.text()).toContain('Test error')
+  expect(errorRouteCallCount).toBe(1)
+})
+
+test('CORS headers are set for OPTIONS request when an error is thrown', async () => {
+  let errorRouteCallCount = 0;
+  const errorApp = new Spiceflow().use(cors()).options('/error', () => {
+    errorRouteCallCount++;
+    throw new Error('Test error')
+  })
+
+  const res = await errorApp.handle(request('error', 'OPTIONS'))
+  expect(res.status).toBe(204)
+  expect(res.headers.get('Access-Control-Allow-Origin')).toBe('*')
+  expect(res.headers.get('Access-Control-Allow-Methods')).toBe('GET,HEAD,PUT,POST,DELETE,PATCH')
+  expect(errorRouteCallCount).toBe(1)
+})
+
+// TODO should middleware errors be handled? errors can be a way to short circuit other middlewares
+test('CORS headers are set when an error is thrown in middleware', async () => {
+  let errorRouteCallCount = 0;
+  const errorApp = new Spiceflow()
+    .use((c) => {
+      throw new Error('middleware error')
+    })
+    .use(cors())
+    .get('/error', () => {
+      errorRouteCallCount++;
+      throw new Error('Test error')
+    })
+
+  const res = await errorApp.handle(request('error'))
+  expect(res.status).toBe(500)
+  expect(res.headers.get('Access-Control-Allow-Origin')).toBe('*')
+  expect(await res.text()).toContain('middleware error')
+  expect(errorRouteCallCount).toBe(0)
+})

package/src/middleware.test.ts

@@ -276,3 +276,56 @@ test('mutating response returned by next without returning it works', async () =
   expect(res.headers.get('X-Custom-Header')).toBe('Modified')
   expect(res.headers.get('X-Another-Header')).toBe('Added')
 })
+
+test('middleware returning response and middleware adding header', async () => {
+  const res = await new Spiceflow()
+    .use(async (ctx, next) => {
+      // This middleware calls next() and adds a header
+      const response = await next()
+      if (response) {
+        response.headers.set('X-Added-Header', 'HeaderValue')
+      }
+      return response
+    })
+    .use(async (ctx, next) => {
+      // This middleware returns a response directly
+      return new Response('Response from first middleware', { status: 200 })
+    })
+
+    .get('/test', () => {
+      // This handler should not be called
+      return 'This should not be returned'
+    })
+    .handle(new Request('http://localhost/test'))
+
+  expect(res.status).toBe(200)
+  expect(await res.text()).toBe('Response from first middleware')
+  expect(res.headers.get('X-Added-Header')).toBe('HeaderValue')
+})
+
+test('middleware returning response and middleware adding header with mounted Spiceflow', async () => {
+  const res = await new Spiceflow()
+    .use(async (ctx, next) => {
+      // This middleware calls next() and adds a header
+      const response = await next()
+      if (response) {
+        response.headers.set('X-Added-Header', 'HeaderValue')
+      }
+      return response
+    })
+    .use(
+      new Spiceflow({ scoped: false }).use(async (ctx, next) => {
+        // This middleware returns a response directly
+        return new Response('Response from mounted Spiceflow', { status: 200 })
+      }),
+    )
+    .get('/test', () => {
+      // This handler should not be called
+      return 'This should not be returned'
+    })
+    .handle(new Request('http://localhost/test'))
+
+  expect(res.status).toBe(200)
+  expect(await res.text()).toBe('Response from mounted Spiceflow')
+  expect(res.headers.get('X-Added-Header')).toBe('HeaderValue')
+})

package/src/spiceflow.ts

@@ -7,7 +7,7 @@ export { Type as t }
 import addFormats from 'ajv-formats'
 import {
   ComposeSpiceflowResponse,
-  CreateEden,
+  CreateClient,
   DefinitionBase,
   ErrorHandler,
   HTTPMethod,
@@ -311,7 +311,7 @@ export class Spiceflow<
     Definitions,
     Metadata,
     Routes &
-      CreateEden<
+      CreateClient<
         JoinPath<BasePath, Path>,
         {
           post: {
@@ -358,7 +358,7 @@ export class Spiceflow<
     Definitions,
     Metadata,
     Routes &
-      CreateEden<
+      CreateClient<
         JoinPath<BasePath, Path>,
         {
           get: {
@@ -404,7 +404,7 @@ export class Spiceflow<
     Definitions,
     Metadata,
     Routes &
-      CreateEden<
+      CreateClient<
         JoinPath<BasePath, Path>,
         {
           put: {
@@ -451,7 +451,7 @@ export class Spiceflow<
     Definitions,
     Metadata,
     Routes &
-      CreateEden<
+      CreateClient<
         JoinPath<BasePath, Path>,
         {
           patch: {
@@ -498,7 +498,7 @@ export class Spiceflow<
     Definitions,
     Metadata,
     Routes &
-      CreateEden<
+      CreateClient<
         JoinPath<BasePath, Path>,
         {
           delete: {
@@ -545,7 +545,7 @@ export class Spiceflow<
     Definitions,
     Metadata,
     Routes &
-      CreateEden<
+      CreateClient<
         JoinPath<BasePath, Path>,
         {
           options: {
@@ -592,7 +592,7 @@ export class Spiceflow<
     Definitions,
     Metadata,
     Routes &
-      CreateEden<
+      CreateClient<
         JoinPath<BasePath, Path>,
         {
           [method in string]: {
@@ -641,7 +641,7 @@ export class Spiceflow<
     Definitions,
     Metadata,
     Routes &
-      CreateEden<
+      CreateClient<
         JoinPath<BasePath, Path>,
         {
           head: {
@@ -675,7 +675,7 @@ export class Spiceflow<
         Metadata,
         BasePath extends ``
           ? Routes & NewSpiceflow['_routes']
-          : Routes & CreateEden<BasePath, NewSpiceflow['_routes']>
+          : Routes & CreateClient<BasePath, NewSpiceflow['_routes']>
       >
   use<const Schema extends RouteSchema>(
     handler: MiddlewareHandler<
@@ -707,6 +707,7 @@ export class Spiceflow<
 
   async handle(request: Request): Promise<Response> {
     let u = new URL(request.url, 'http://localhost')
+    const self = this
     let path = u.pathname + u.search
     const defaultContext = {
       redirect,
@@ -715,45 +716,60 @@ export class Spiceflow<
     }
     const root = this.topLevelApp || this
     let onErrorHandlers: OnError[] = []
-    try {
-      // Get all middleware and method specific routes in order
-
-      const route = this.match(request.method, path)
-
-      const appsInScope = this.getAppsInScope(route.app)
-      onErrorHandlers = appsInScope.flatMap((x) => x.onErrorHandlers)
-      let {
-        params: _params,
-        app: { defaultState },
-      } = route
-      const middlewares = appsInScope.flatMap((x) => x.middlewares)
-      // console.log({ onReqHandlers })
-      let state = structuredClone(defaultState)
-
-      let content = route?.internalRoute?.hooks?.content
-
-      if (route.internalRoute?.validateBody) {
-        // TODO don't clone the request
-        let typedRequest =
-          request instanceof SpiceflowRequest
-            ? request
-            : new SpiceflowRequest(u, request)
-        typedRequest.validateBody = route.internalRoute?.validateBody
-        request = typedRequest
-      }
 
-      let index = 0
-      let context = {
-        ...defaultContext,
+    const route = this.match(request.method, path)
+
+    const appsInScope = this.getAppsInScope(route.app)
+    onErrorHandlers = appsInScope.flatMap((x) => x.onErrorHandlers)
+    let {
+      params: _params,
+      app: { defaultState },
+    } = route
+    const middlewares = appsInScope.flatMap((x) => x.middlewares)
+
+    let state = structuredClone(defaultState)
+
+    let content = route?.internalRoute?.hooks?.content
+
+    if (route.internalRoute?.validateBody) {
+      // TODO don't clone the request
+      let typedRequest =
+        request instanceof SpiceflowRequest
+          ? request
+          : new SpiceflowRequest(u, request)
+      typedRequest.validateBody = route.internalRoute?.validateBody
+      request = typedRequest
+    }
+
+    let index = 0
+    let context = {
+      ...defaultContext,
+      request,
+      state,
+      path,
+      query: parseQuery.parse((u.search || '').slice(1)),
+      params: _params,
+      redirect,
+    } satisfies MiddlewareContext<any>
+    let handlerResponse: Response | undefined
+    async function getResForError(err: any) {
+      if (isResponse(err)) return err
+      let res = await self.runErrorHandlers({
+        onErrorHandlers,
+        error: err,
         request,
-        state,
-        path,
-        query: parseQuery.parse((u.search || '').slice(1)),
-        params: _params,
-        redirect,
-      } satisfies MiddlewareContext<any>
-      let handlerResponse: Response | undefined
-      const next = async () => {
+      })
+      if (isResponse(res)) return res
+
+      let status = err?.status ?? 500
+      res ||= new Response(err?.message || 'Internal Server Error', {
+        status,
+      })
+      return res
+    }
+
+    const next = async () => {
+      try {
         if (index < middlewares.length) {
           const middleware = middlewares[index]
           index++
@@ -781,7 +797,7 @@ export class Spiceflow<
           route.internalRoute?.validateParams,
         )
 
-        const res = route.internalRoute?.handler(context)
+        const res = await route.internalRoute?.handler(context)
         if (isAsyncIterable(res)) {
           handlerResponse = await this.handleStream({
             generator: res,
@@ -790,28 +806,16 @@ export class Spiceflow<
           })
           return handlerResponse
         }
-
         handlerResponse = await turnHandlerResultIntoResponse(res)
         return handlerResponse
+      } catch (err) {
+        handlerResponse = await getResForError(err)
+        return await next()
       }
-      const response = await next()
-
-      return response
-    } catch (err: any) {
-      if (isResponse(err)) return err
-      let res = await this.runErrorHandlers({
-        onErrorHandlers,
-        error: err,
-        request,
-      })
-      if (isResponse(res)) return res
-
-      let status = err?.status ?? 500
-      res ||= new Response(err?.message || 'Internal Server Error', {
-        status,
-      })
-      return res
     }
+    const response = await next()
+
+    return response
   }
 
   private async runErrorHandlers({

package/src/types.ts

@@ -636,25 +636,25 @@ export type BaseMacro = Record<
 >
 export type BaseMacroFn = Record<string, (...a: any) => unknown>
 
-type _CreateEden<
+type _CreateClient<
   Path extends string,
   Property extends Record<string, unknown> = {},
 > = Path extends `${infer Start}/${infer Rest}`
   ? {
-      [x in Start]: _CreateEden<Rest, Property>
+      [x in Start]: _CreateClient<Rest, Property>
     }
   : {
       [x in Path]: Property
     }
 
-export type CreateEden<
+export type CreateClient<
   Path extends string,
   Property extends Record<string, unknown> = {},
 > = Path extends `/${infer Rest}`
-  ? _CreateEden<Rest, Property>
+  ? _CreateClient<Rest, Property>
   : Path extends ''
-    ? _CreateEden<'index', Property>
-    : _CreateEden<Path, Property>
+    ? _CreateClient<'index', Property>
+    : _CreateClient<Path, Property>
 
 export type ComposeSpiceflowResponse<Response, Handle> = Handle extends (
   ...a: any[]

package/src/utils.ts

@@ -113,20 +113,20 @@ export function isResponse(result: any): result is Response {
   if (result instanceof Response) {
     return true
   }
-  if (
-    result &&
-    typeof result === 'object' &&
-    'status' in result &&
-    'headers' in result &&
-    'body' in result
-  ) {
-    console.warn(
-      'spiceflow WARNING: you returned a Response that does not satisfy instanceof Response, probably because of some dumb polyfill\n',
-      result,
-    )
+  // if (
+  //   result &&
+  //   typeof result === 'object' &&
+  //   'status' in result &&
+  //   'headers' in result &&
+  //   'body' in result
+  // ) {
+  //   console.warn(
+  //     'spiceflow WARNING: you returned a Response that does not satisfy instanceof Response, probably because of some dumb polyfill\n',
+  //     result,
+  //   )
 
-    return true
-  }
+  //   return true
+  // }
 
   return false
 }

package/dist/client/ws.d.ts

@@ -1,15 +0,0 @@
-import type { InputSchema } from '../types.js';
-import type { SpiceflowClient } from './types.js';
-export declare class EdenWS<in out Schema extends InputSchema<any> = {}> {
-    url: string;
-    ws: WebSocket;
-    constructor(url: string);
-    send(data: Schema['body'] | Schema['body'][]): this;
-    on<K extends keyof WebSocketEventMap>(type: K, listener: (event: SpiceflowClient.WSEvent<K, Schema['response']>) => void, options?: boolean | AddEventListenerOptions): this;
-    off<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, options?: boolean | EventListenerOptions): this;
-    subscribe(onMessage: (event: SpiceflowClient.WSEvent<'message', Schema['response']>) => void, options?: boolean | AddEventListenerOptions): this;
-    addEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (event: SpiceflowClient.WSEvent<K, Schema['response']>) => void, options?: boolean | AddEventListenerOptions): this;
-    removeEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, options?: boolean | EventListenerOptions): this;
-    close(): this;
-}
-//# sourceMappingURL=ws.d.ts.map

package/dist/client/ws.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/client/ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAGjD,qBAAa,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,SAAS,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE;IAG1C,GAAG,EAAE,MAAM;IAF9B,EAAE,EAAE,SAAS,CAAA;gBAEM,GAAG,EAAE,MAAM;IAI9B,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE;IAc5C,EAAE,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAClC,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,IAAI,EACzE,OAAO,CAAC,EAAE,OAAO,GAAG,uBAAuB;IAK7C,GAAG,CAAC,CAAC,SAAS,MAAM,iBAAiB,EACnC,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,GAAG,EAC5D,OAAO,CAAC,EAAE,OAAO,GAAG,oBAAoB;IAO1C,SAAS,CACP,SAAS,EAAE,CACT,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,KAC1D,IAAI,EACT,OAAO,CAAC,EAAE,OAAO,GAAG,uBAAuB;IAK7C,gBAAgB,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAChD,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,IAAI,EACzE,OAAO,CAAC,EAAE,OAAO,GAAG,uBAAuB;IAoB7C,mBAAmB,CAAC,CAAC,SAAS,MAAM,iBAAiB,EACnD,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,GAAG,EAC5D,OAAO,CAAC,EAAE,OAAO,GAAG,oBAAoB;IAO1C,KAAK;CAKN"}