spiceflow 1.1.8 → 1.1.9

package/src/client.test.ts

@@ -4,223 +4,216 @@ import { Spiceflow, t } from './spiceflow.js'
 import { describe, expect, it } from 'vitest'
 
 const app = new Spiceflow()
-	.get('/', () => 'a')
-	.post('/', () => 'a')
-	.get('/number', () => 1)
-	.get('/true', () => true)
-	.get('/false', () => false)
-	.post('/array', async ({ request }) => await request.json(), {
-		body: t.Array(t.String()),
-	})
-	.post('/mirror', async ({ request }) => await request.json())
-	.post('/body', async ({ request }) => await request.text(), {
-		body: t.String(),
-	})
-	.delete('/empty', async ({ request }) => {
-		const body = await request.text()
-		return { body: body || null }
-	})
-	.post('/deep/nested/mirror', async ({ request }) => await request.json(), {
-		body: t.Object({
-			username: t.String(),
-			password: t.String(),
-		}),
-	})
-
-	.use(
-		new Spiceflow({ basePath: '/nested' }).get(
-			'/data',
-			({ params }) => 'hi',
-		),
-	)
-	// .get('/error', ({ error }) => error("I'm a teapot", 'Kirifuji Nagisa'), {
-	// 	response: {
-	// 		200: t.Void(),
-	// 		418: t.Literal('Kirifuji Nagisa'),
-	// 		420: t.Literal('Snoop Dogg')
-	// 	}
-	// })
-	.get(
-		'/validationError',
-		// @ts-expect-error
-		() => {
-			return 'this errors because validation is wrong'
-		},
-		{
-			response: {
-				200: t.Object({
-					x: t.String(),
-				}),
-			},
-		},
-	)
-
-	// TODO ajv does not accept dates for some reason
-	// .post('/date', ({ body: { date } }) => date, {
-	// 	body: t.Object({
-	// 		date: t.Date()
-	// 	})
-	// })
-	.get('/dateObject', () => ({ date: new Date() }))
-	.get('/redirect', ({ redirect }) => redirect('http://localhost:8083/true'))
-	.post(
-		'/redirect',
-		({ redirect }) => redirect('http://localhost:8083/true'),
-		{
-			body: t.Object({
-				username: t.String(),
-			}),
-		},
-	)
-	// .get('/formdata', () => ({
-	// 	image: Bun.file('./test/kyuukurarin.mp4')
-	// }))
-
-	.get('/stream', function* stream() {
-		yield 'a'
-		yield 'b'
-		yield 'c'
-	})
-	.get('/stream-async', async function* stream() {
-		yield 'a'
-		yield 'b'
-		yield 'c'
-	})
-	.get('/stream-return', function* stream() {
-		return 'a'
-	})
-	.get('/stream-return-async', function* stream() {
-		return 'a'
-	})
-	.get('/id/:id?', ({ params: { id = 'unknown' } }) => id)
+  .get('/', () => 'a')
+  .post('/', () => 'a')
+  .get('/number', () => 1)
+  .get('/true', () => true)
+  .get('/false', () => false)
+  .post('/array', async ({ request }) => await request.json(), {
+    body: t.Array(t.String()),
+  })
+  .post('/mirror', async ({ request }) => await request.json())
+  .post('/body', async ({ request }) => await request.text(), {
+    body: t.String(),
+  })
+  .delete('/empty', async ({ request }) => {
+    const body = await request.text()
+    return { body: body || null }
+  })
+  .post('/deep/nested/mirror', async ({ request }) => await request.json(), {
+    body: t.Object({
+      username: t.String(),
+      password: t.String(),
+    }),
+  })
+
+  .use(
+    new Spiceflow({ basePath: '/nested' }).get('/data', ({ params }) => 'hi'),
+  )
+  // .get('/error', ({ error }) => error("I'm a teapot", 'Kirifuji Nagisa'), {
+  // 	response: {
+  // 		200: t.Void(),
+  // 		418: t.Literal('Kirifuji Nagisa'),
+  // 		420: t.Literal('Snoop Dogg')
+  // 	}
+  // })
+  .get(
+    '/validationError',
+    // @ts-expect-error
+    () => {
+      return 'this errors because validation is wrong'
+    },
+    {
+      response: {
+        200: t.Object({
+          x: t.String(),
+        }),
+      },
+    },
+  )
+
+  // TODO ajv does not accept dates for some reason
+  // .post('/date', ({ body: { date } }) => date, {
+  // 	body: t.Object({
+  // 		date: t.Date()
+  // 	})
+  // })
+  .get('/dateObject', () => ({ date: new Date() }))
+  .get('/redirect', ({ redirect }) => redirect('http://localhost:8083/true'))
+  .post('/redirect', ({ redirect }) => redirect('http://localhost:8083/true'), {
+    body: t.Object({
+      username: t.String(),
+    }),
+  })
+  // .get('/formdata', () => ({
+  // 	image: Bun.file('./test/kyuukurarin.mp4')
+  // }))
+
+  .get('/stream', function* stream() {
+    yield 'a'
+    yield 'b'
+    yield 'c'
+  })
+  .get('/stream-async', async function* stream() {
+    yield 'a'
+    yield 'b'
+    yield 'c'
+  })
+  .get('/stream-return', function* stream() {
+    return 'a'
+  })
+  .get('/stream-return-async', function* stream() {
+    return 'a'
+  })
+  .get('/id/:id?', ({ params: { id = 'unknown' } }) => id)
 
 const client = createSpiceflowClient(app)
 
 describe('client', () => {
-	it('get index', async () => {
-		const { data, error } = await client.index.get({})
+  it('get index', async () => {
+    const { data, error } = await client.index.get({})
 
-		expect(data).toBe('a')
-		expect(error).toBeNull()
-	})
+    expect(data).toBe('a')
+    expect(error).toBeNull()
+  })
 
-	it('post index', async () => {
-		const { data, error } = await client.index.post()
+  it('post index', async () => {
+    const { data, error } = await client.index.post()
 
-		expect(data).toBe('a')
-		expect(error).toBeNull()
-	})
+    expect(data).toBe('a')
+    expect(error).toBeNull()
+  })
 
-	it('parse number', async () => {
-		const { data } = await client.number.get()
+  it('parse number', async () => {
+    const { data } = await client.number.get()
 
-		expect(data).toEqual(1)
-	})
+    expect(data).toEqual(1)
+  })
 
-	it('parse true', async () => {
-		const { data } = await client.true.get()
+  it('parse true', async () => {
+    const { data } = await client.true.get()
 
-		expect(data).toEqual(true)
-	})
+    expect(data).toEqual(true)
+  })
 
-	it('parse false', async () => {
-		const { data } = await client.false.get()
+  it('parse false', async () => {
+    const { data } = await client.false.get()
 
-		expect(data).toEqual(false)
-	})
+    expect(data).toEqual(false)
+  })
 
-	it.todo('parse object with date', async () => {
-		const { data } = await client.dateObject.get()
+  it.todo('parse object with date', async () => {
+    const { data } = await client.dateObject.get()
 
-		expect(data?.date).toBeInstanceOf(Date)
-	})
+    expect(data?.date).toBeInstanceOf(Date)
+  })
 
-	it('post array', async () => {
-		const { data } = await client.array.post(['a', 'b'])
+  it('post array', async () => {
+    const { data } = await client.array.post(['a', 'b'])
 
-		expect(data).toEqual(['a', 'b'])
-	})
+    expect(data).toEqual(['a', 'b'])
+  })
 
-	it('post body', async () => {
-		const { data } = await client.body.post('a')
+  it('post body', async () => {
+    const { data } = await client.body.post('a')
 
-		expect(data).toEqual('a')
-	})
+    expect(data).toEqual('a')
+  })
 
-	it('post mirror', async () => {
-		const body = { username: 'A', password: 'B' }
+  it('post mirror', async () => {
+    const body = { username: 'A', password: 'B' }
 
-		const { data } = await client.mirror.post(body)
+    const { data } = await client.mirror.post(body)
 
-		expect(data).toEqual(body)
-	})
+    expect(data).toEqual(body)
+  })
 
-	it('delete empty', async () => {
-		const { data } = await client.empty.delete()
+  it('delete empty', async () => {
+    const { data } = await client.empty.delete()
 
-		expect(data).toEqual({ body: null })
-	})
+    expect(data).toEqual({ body: null })
+  })
 
-	it('post deep nested mirror', async () => {
-		const body = { username: 'A', password: 'B' }
+  it('post deep nested mirror', async () => {
+    const body = { username: 'A', password: 'B' }
 
-		const { data } = await client.deep.nested.mirror.post(body)
+    const { data } = await client.deep.nested.mirror.post(body)
 
-		expect(data).toEqual(body)
-	})
+    expect(data).toEqual(body)
+  })
 
-	it('get nested data', async () => {
-		const { data } = await client.nested.data.get()
+  it('get nested data', async () => {
+    const { data } = await client.nested.data.get()
 
-		expect(data).toEqual('hi')
-	})
+    expect(data).toEqual('hi')
+  })
 
-	it('stream ', async () => {
-		const { data } = await client.stream.get()
-		let all = ''
-		for await (const chunk of data!) {
-			// console.log(chunk)
-			all += chunk + '-'
-		}
-		expect(all).toEqual('a-b-c-')
-	})
-	it('stream async', async () => {
-		const { data } = await client['stream-async'].get()
-		let all = ''
-		for await (const chunk of data!) {
-			// console.log(chunk)
-			all += chunk + '-'
-		}
-		expect(all).toEqual('a-b-c-')
-	})
+  it('stream ', async () => {
+    const { data } = await client.stream.get()
+    let all = ''
+    for await (const chunk of data!) {
+      // console.log(chunk)
+      all += chunk + '-'
+    }
+    expect(all).toEqual('a-b-c-')
+  })
+  it('stream async', async () => {
+    const { data } = await client['stream-async'].get()
+    let all = ''
+    for await (const chunk of data!) {
+      // console.log(chunk)
+      all += chunk + '-'
+    }
+    expect(all).toEqual('a-b-c-')
+  })
 
-	it('stream return', async () => {
-		const { data } = await client['stream-return'].get()
-		expect(data).toEqual('a')
-	})
-	it('stream return async', async () => {
-		const { data } = await client['stream-return-async'].get({})
-		// console.log(data)
-		expect(data).toEqual('a')
-	})
+  it('stream return', async () => {
+    const { data } = await client['stream-return'].get()
+    expect(data).toEqual('a')
+  })
+  it('stream return async', async () => {
+    const { data } = await client['stream-return-async'].get({})
+    // console.log(data)
+    expect(data).toEqual('a')
+  })
 
-	// it('handle error', async () => {
-	// 	const { data, error } = await client.error.get()
+  // it('handle error', async () => {
+  // 	const { data, error } = await client.error.get()
 
-	// 	let value
+  // 	let value
 
-	// 	if (error)
-	// 		switch (error.status) {
-	// 			case 418:
-	// 				value = error.value
-	// 				break
+  // 	if (error)
+  // 		switch (error.status) {
+  // 			case 418:
+  // 				value = error.value
+  // 				break
 
-	// 			case 420:
-	// 				value = error.value
-	// 				break
-	// 		}
+  // 			case 420:
+  // 				value = error.value
+  // 				break
+  // 		}
 
-	// 	expect(data).toBeNull()
-	// 	expect(value).toEqual('Kirifuji Nagisa')
-	// })
+  // 	expect(data).toBeNull()
+  // 	expect(value).toEqual('Kirifuji Nagisa')
+  // })
 })

package/src/context.ts

@@ -1,110 +1,110 @@
 import type {
-	StatusMap,
-	InvertedStatusMap,
-	redirect as Redirect,
+  StatusMap,
+  InvertedStatusMap,
+  redirect as Redirect,
 } from './utils.js'
 
 import type {
-	RouteSchema,
-	Prettify,
-	ResolvePath,
-	SingletonBase,
-	HTTPHeaders,
+  RouteSchema,
+  Prettify,
+  ResolvePath,
+  SingletonBase,
+  HTTPHeaders,
 } from './types.js'
 
 import { SpiceflowRequest } from './spiceflow.js'
 
 export type ErrorContext<
-	in out Route extends RouteSchema = {},
-	in out Singleton extends SingletonBase = {
-		state: {}
-		derive: {}
-		resolve: {}
-	},
-	Path extends string = '',
+  in out Route extends RouteSchema = {},
+  in out Singleton extends SingletonBase = {
+    state: {}
+    derive: {}
+    resolve: {}
+  },
+  Path extends string = '',
 > = Prettify<{
-	// body: Route['body']
-	query: undefined extends Route['query']
-		? Record<string, string | undefined>
-		: Route['query']
-	params: undefined extends Route['params']
-		? Path extends `${string}/${':' | '*'}${string}`
-			? ResolvePath<Path>
-			: { [key in string]: string }
-		: Route['params']
+  // body: Route['body']
+  query: undefined extends Route['query']
+    ? Record<string, string | undefined>
+    : Route['query']
+  params: undefined extends Route['params']
+    ? Path extends `${string}/${':' | '*'}${string}`
+      ? ResolvePath<Path>
+      : { [key in string]: string }
+    : Route['params']
 
-	// server: Server | null
-	redirect: Redirect
+  // server: Server | null
+  redirect: Redirect
 
-	/**
-	 * Path extracted from incoming URL
-	 *
-	 * Represent a value extracted from URL
-	 *
-	 * @example '/id/9'
-	 */
-	path: string
-	/**
-	 * Path as registered to router
-	 *
-	 * Represent a path registered to a router, not a URL
-	 *
-	 * @example '/id/:id'
-	 */
-	// route: string
-	request: SpiceflowRequest<Route['body']>
-	state: Singleton['state']
-	// response: Route['response']
+  /**
+   * Path extracted from incoming URL
+   *
+   * Represent a value extracted from URL
+   *
+   * @example '/id/9'
+   */
+  path: string
+  /**
+   * Path as registered to router
+   *
+   * Represent a path registered to a router, not a URL
+   *
+   * @example '/id/:id'
+   */
+  // route: string
+  request: SpiceflowRequest<Route['body']>
+  state: Singleton['state']
+  // response: Route['response']
 }>
 
 export type Context<
-	in out Route extends RouteSchema = {},
-	in out Singleton extends SingletonBase = {
-		state: {}
-		derive: {}
-		resolve: {}
-	},
-	Path extends string = '',
+  in out Route extends RouteSchema = {},
+  in out Singleton extends SingletonBase = {
+    state: {}
+    derive: {}
+    resolve: {}
+  },
+  Path extends string = '',
 > = Prettify<{
-	query: undefined extends Route['query']
-		? Record<string, string | undefined>
-		: Route['query']
-	params: undefined extends Route['params']
-		? Path extends `${string}/${':' | '*'}${string}`
-			? ResolvePath<Path>
-			: never
-		: Route['params']
+  query: undefined extends Route['query']
+    ? Record<string, string | undefined>
+    : Route['query']
+  params: undefined extends Route['params']
+    ? Path extends `${string}/${':' | '*'}${string}`
+      ? ResolvePath<Path>
+      : never
+    : Route['params']
 
-	// server: Server | null
-	redirect: Redirect
+  // server: Server | null
+  redirect: Redirect
 
-	path: string
+  path: string
 
-	request: SpiceflowRequest<Route['body']>
-	state: Singleton['state']
-	response?: Route['response']
+  request: SpiceflowRequest<Route['body']>
+  state: Singleton['state']
+  response?: Route['response']
 }>
 
 // Use to mimic request before mapping route
 export type MiddlewareContext<
-	in out Singleton extends SingletonBase = {
-		state: {}
-	},
+  in out Singleton extends SingletonBase = {
+    state: {}
+  },
 > = Prettify<{
-	state: Singleton['state']
-	request: Request
-	path: string
-	query?: Record<string, string | undefined>
-	params?: Record<string, string | undefined>
+  state: Singleton['state']
+  request: Request
+  path: string
+  query?: Record<string, string | undefined>
+  params?: Record<string, string | undefined>
 
-	redirect: Redirect
-	// server: Server | null
+  redirect: Redirect
+  // server: Server | null
 
-	// set: {
-	// 	headers: HTTPHeaders
-	// 	status?: number
-	// 	redirect?: string
-	// }
+  // set: {
+  // 	headers: HTTPHeaders
+  // 	status?: number
+  // 	redirect?: string
+  // }
 
-	// error: typeof error
+  // error: typeof error
 }>