spiceflow 1.0.8 → 1.1.1

package/src/spiceflow.test.ts

@@ -20,6 +20,9 @@ test('dynamic route', async () => {
 test('GET dynamic route', async () => {
 	const res = await new Spiceflow()
 		.get('/ids/:id', () => 'hi')
+		.post('/ids/:id', ({ params: { id } }) => id, {
+			params: z.object({ id: z.string() }),
+		})
 		.handle(new Request('http://localhost/ids/xxx', { method: 'GET' }))
 	expect(res.status).toBe(200)
 	expect(await res.json()).toEqual('hi')
@@ -115,7 +118,7 @@ test('missing route is not found', async () => {
 test('state works', async () => {
 	const res = await new Spiceflow()
 		.state('id', '')
-		.onRequest(({ store, request }) => {
+		.use(({ store, request }) => {
 			store.id = 'xxx'
 		})
 		.get('/get', ({ store }) => {
@@ -210,13 +213,13 @@ test('validate body works, request fails', async () => {
 	)
 })
 
-test('run onRequest', async () => {
+test('run use', async () => {
 	const res = await new Spiceflow()
-		.onRequest(({ request }) => {
+		.use(({ request }) => {
 			expect(request.method).toBe('HEAD')
 			return new Response('ok', { status: 401 })
 		})
-		.onRequest(({ request }) => {
+		.use(({ request }) => {
 			expect(request.method).toBe('HEAD')
 			return 'second one'
 		})
@@ -226,13 +229,13 @@ test('run onRequest', async () => {
 	expect(await res.text()).toBe('ok')
 })
 
-test('run onRequest', async () => {
+test('run use', async () => {
 	const res = await new Spiceflow()
-		.onRequest(({ request }) => {
+		.use(({ request }) => {
 			expect(request.method).toBe('HEAD')
 			return new Response('ok', { status: 401 })
 		})
-		.onRequest(({ request }) => {
+		.use(({ request }) => {
 			expect(request.method).toBe('HEAD')
 			return 'second one'
 		})
@@ -284,29 +287,84 @@ test('getRouteAndParents', async () => {
 			),
 		)
 
-	let routers = bfs(app['routerTree'])
+	let routers = bfs(app)
 	let last = routers[routers.length - 1]
 
-	expect(app['getRouteAndParents'](last).map((x) => x.prefix))
+	expect(app['getAppAndParents'](last).map((x) => x.prefix))
 		.toMatchInlineSnapshot(`
 			[
+			  "/one",
+			  "/two",
 			  "/three",
+			]
+		`)
+})
+
+test('getAppsInScope include all parent apps', async () => {
+	let app = new Spiceflow({ basePath: '/one' })
+		.get('/ids/:id', () => 'hi')
+		.use(
+			new Spiceflow({ basePath: '/two' }).use(
+				new Spiceflow({ basePath: '/three' }).use(
+					new Spiceflow({ basePath: '/four' })
+						.get('/five', () => 'hi')
+						.use(({ request }) => {}),
+				),
+			),
+		)
+
+	let routers = bfs(app)
+	let secondLast = routers[routers.length - 2]
+
+	expect(app['getAppsInScope'](secondLast).map((x) => x.prefix))
+		.toMatchInlineSnapshot(`
+			[
+			  "/one",
 			  "/two",
+			  "/three",
+			]
+		`)
+})
+
+test('getAppsInScope include all parent apps and non scoped apps', async () => {
+	let app = new Spiceflow({ basePath: '/one' })
+		.get('/ids/:id', () => 'hi')
+		.use(
+			new Spiceflow({ basePath: '/two' }).use(
+				new Spiceflow({ basePath: '/three' }).use(
+					new Spiceflow({ basePath: '/four', scoped: false })
+						.get('/five', () => 'hi')
+						.use(({ request }) => {}),
+				),
+			),
+		)
+
+	let routers = bfs(app)
+	let secondLast = routers[routers.length - 2]
+
+	expect(app['getAppsInScope'](secondLast).map((x) => x.prefix))
+		.toMatchInlineSnapshot(`
+			[
 			  "/one",
+			  "/two",
+			  "/three",
+			  "/four",
 			]
 		`)
 })
+
 test('use with 2 basPath works', async () => {
 	let oneOnReq = false
 	let twoOnReq = false
 	let onReqCalled: string[] = []
 	const app = await new Spiceflow()
-		.onRequest(({ request }) => {
+		.use(({ request }) => {
 			onReqCalled.push('root')
 		})
 		.use(
 			new Spiceflow({ basePath: '/one' })
-				.onRequest(({ request }) => {
+
+				.use(({ request }) => {
 					oneOnReq = true
 					onReqCalled.push('one')
 				})
@@ -314,11 +372,11 @@ test('use with 2 basPath works', async () => {
 		)
 		.use(
 			new Spiceflow({ basePath: '/two' })
-				.onRequest((c) => {
+				.use((c) => {
 					twoOnReq = true
 					onReqCalled.push('two')
 				})
-				.get('/ids/:id', ({ params }) => params.id),
+				.get('/ids/:id', ({ params }) => params.id, {}),
 		)
 
 	{
@@ -383,7 +441,7 @@ test('errors inside basPath works', async () => {
 			onErrorTriggered.push('root')
 			// return new Response('root', { status: 500 })
 		})
-		.onRequest(({ request }) => {
+		.use(({ request }) => {
 			onReqTriggered.push('root')
 			// return new Response('root', { status: 500 })
 		})
@@ -394,7 +452,7 @@ test('errors inside basPath works', async () => {
 					onErrorTriggered.push('two')
 					// return new Response('two', { status: 500 })
 				})
-				.onRequest(({ request }) => {
+				.use(({ request }) => {
 					onReqTriggered.push('two')
 					// return new Response('two', { status: 500 })
 				})
@@ -404,7 +462,7 @@ test('errors inside basPath works', async () => {
 							onErrorTriggered.push('nested')
 							// return new Response('nested', { status: 500 })
 						})
-						.onRequest(({ request }) => {
+						.use(({ request }) => {
 							onReqTriggered.push('nested')
 							// return new Response('nested', { status: 500 })
 						})