@@ -381,11 +381,11 @@ export const composeHandler = ({
381381 hooks . type !== 'none' &&
382382 ( inference . body || ! ! validator . body )
383383
384- // @ts -ignore private
385- const setHeaders = app . setHeaders
384+ // @ts -expect-error private
385+ const defaultHeaders = app . setHeaders
386386
387+ // ? defaultHeaders doesn't imply that user will use headers in handler
387388 const hasHeaders = inference . headers || validator . headers
388-
389389 const hasCookie = inference . cookie || ! ! validator . cookie
390390
391391 // @ts -ignore private property
@@ -488,7 +488,7 @@ export const composeHandler = ({
488488 }`
489489 : 'undefined'
490490
491- if ( hasHeaders || ( setHeaders && ! ! Object . keys ( setHeaders ) . length ) )
491+ if ( hasHeaders )
492492 fnLiteral += `\nc.cookie = await parseCookie(c.set, c.headers.cookie, ${ options } )\n`
493493 else
494494 fnLiteral += `\nc.cookie = await parseCookie(c.set, c.request.headers.get('cookie'), ${ options } )\n`
@@ -552,7 +552,7 @@ export const composeHandler = ({
552552 inference . set ||
553553 hasTraceSet ||
554554 hasHeaders ||
555- ( setHeaders && ! ! Object . keys ( setHeaders ) . length )
555+ ( defaultHeaders && ! ! Object . keys ( defaultHeaders ) . length )
556556
557557 if ( hasTrace ) fnLiteral += '\nconst id = c.$$requestId\n'
558558
@@ -1354,6 +1354,9 @@ export const composeGeneralHandler = (
13541354 let decoratorsLiteral = ''
13551355 let fnLiteral = ''
13561356
1357+ // @ts -expect-error private
1358+ const defaultHeaders = app . setHeaders
1359+
13571360 // @ts -ignore
13581361 for ( const key of Object . keys ( app . singleton . decorator ) )
13591362 decoratorsLiteral += `,${ key } : app.singleton.decorator.${ key } `
@@ -1365,7 +1368,7 @@ export const composeGeneralHandler = (
13651368 const route = router.find(request.method, path) ${
13661369 router . http . root . ALL ? '?? router.find("ALL", path)' : ''
13671370 }
1368-
1371+
13691372 if (route === null)
13701373 return ${
13711374 app . event . error . length
@@ -1378,8 +1381,7 @@ export const composeGeneralHandler = (
13781381 : `error404.clone()`
13791382 }
13801383
1381- ctx.params = route.params
1382- `
1384+ ctx.params = route.params\n`
13831385
13841386 const shouldPrecompile =
13851387 app . config . precompile === true ||
@@ -1457,8 +1459,7 @@ export const composeGeneralHandler = (
14571459 store,
14581460 set: {
14591461 headers: ${
1460- // @ts -ignore
1461- Object . keys ( app . setHeaders ?? { } ) . length
1462+ Object . keys ( defaultHeaders ?? { } ) . length
14621463 ? 'Object.assign({}, app.setHeaders)'
14631464 : '{}'
14641465 } ,
@@ -1529,8 +1530,7 @@ export const composeGeneralHandler = (
15291530 path,
15301531 set: {
15311532 headers: ${
1532- // @ts -ignore
1533- Object . keys ( app . setHeaders ?? { } ) . length
1533+ Object . keys ( defaultHeaders ?? { } ) . length
15341534 ? 'Object.assign({}, app.setHeaders)'
15351535 : '{}'
15361536 } ,
0 commit comments