Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(request): shorten parseBody and remove unnecessary check #2947

Merged
merged 2 commits into from
Jun 10, 2024

Conversation

yusukebe
Copy link
Member

@yusukebe yusukebe commented Jun 9, 2024

This refactoring shortens code inside parseBody and removes an unnecessary conditional check.

The author should do the following, if applicable

  • Add tests
  • Run tests
  • bun run format:fix && bun run lint:fix to format the code
  • Add TSDoc/JSDoc to document the code

@@ -220,9 +215,6 @@ export class HonoRequest<P extends string = '/', I extends Input['out'] = {}> {

if (!bodyCache[key]) {
for (const keyOfBodyCache of Object.keys(bodyCache)) {
if (keyOfBodyCache === 'parsedBody') {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition never triggered.

Copy link

codecov bot commented Jun 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.64%. Comparing base (0a974ff) to head (42f0797).
Report is 4 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2947      +/-   ##
==========================================
+ Coverage   94.44%   94.64%   +0.20%     
==========================================
  Files         136      136              
  Lines       13349    13341       -8     
  Branches     2284     2234      -50     
==========================================
+ Hits        12607    12627      +20     
+ Misses        742      714      -28     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@yusukebe
Copy link
Member Author

yusukebe commented Jun 9, 2024

Hi @usualoma Please review this one too!

@usualoma
Copy link
Member

Hi @yusukebe
Confirmed. Good!

How about organising it a bit more as follows.

diff --git a/src/request.ts b/src/request.ts
index fbec9dcf..64801ef5 100644
--- a/src/request.ts
+++ b/src/request.ts
@@ -213,17 +213,14 @@ export class HonoRequest<P extends string = '/', I extends Input['out'] = {}> {
       return cachedBody
     }
 
-    if (!bodyCache[key]) {
-      for (const keyOfBodyCache of Object.keys(bodyCache)) {
-        return (async () => {
-          // @ts-expect-error bodyCache[keyOfBodyCache] can be passed as a body
-          let body = await bodyCache[keyOfBodyCache]
-          if (keyOfBodyCache === 'json') {
-            body = JSON.stringify(body)
-          }
-          return await new Response(body)[key]()
-        })()
-      }
+    const anyCachedKey = Object.keys(bodyCache)[0]
+    if (anyCachedKey) {
+      return (bodyCache[anyCachedKey as keyof Body] as Promise<BodyInit>).then((body) => {
+        if (anyCachedKey === 'json') {
+          body = JSON.stringify(body)
+        }
+        return new Response(body)[key]()
+      })
     }
 
     return (bodyCache[key] = raw[key]())

@yusukebe
Copy link
Member Author

@usualoma

Thanks for the review. You are right. It does not need the loop! Let's go with it.

@yusukebe yusukebe merged commit 32ba5ba into main Jun 10, 2024
14 checks passed
@yusukebe yusukebe deleted the refactor/request branch June 10, 2024 14:51
nicolewhite referenced this pull request in autoblocksai/cli Jun 24, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [hono](https://hono.dev/) ([source](https://togithub.com/honojs/hono))
| [`4.4.4` ->
`4.4.7`](https://renovatebot.com/diffs/npm/hono/4.4.4/4.4.7) |
[![age](https://developer.mend.io/api/mc/badges/age/npm/hono/4.4.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/hono/4.4.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/hono/4.4.4/4.4.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/hono/4.4.4/4.4.7?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>honojs/hono (hono)</summary>

### [`v4.4.7`](https://togithub.com/honojs/hono/releases/tag/v4.4.7)

[Compare
Source](https://togithub.com/honojs/hono/compare/v4.4.6...v4.4.7)

#### What's Changed

- use correct return type for c.html depending on input by
[@&#8203;asmadsen](https://togithub.com/asmadsen) in
[https://github.com/honojs/hono/pull/2973](https://togithub.com/honojs/hono/pull/2973)
- test: test uncovered return statement by
[@&#8203;yasuaki640](https://togithub.com/yasuaki640) in
[https://github.com/honojs/hono/pull/2985](https://togithub.com/honojs/hono/pull/2985)
- test: Update request.test.ts to remove duplicate checks by
[@&#8203;JoaquimLey](https://togithub.com/JoaquimLey) in
[https://github.com/honojs/hono/pull/2984](https://togithub.com/honojs/hono/pull/2984)
- fix(types): env variables override ContextVariableMap by
[@&#8203;KaelWD](https://togithub.com/KaelWD) in
[https://github.com/honojs/hono/pull/2987](https://togithub.com/honojs/hono/pull/2987)

#### New Contributors

- [@&#8203;asmadsen](https://togithub.com/asmadsen) made their first
contribution in
[https://github.com/honojs/hono/pull/2973](https://togithub.com/honojs/hono/pull/2973)
- [@&#8203;JoaquimLey](https://togithub.com/JoaquimLey) made their first
contribution in
[https://github.com/honojs/hono/pull/2984](https://togithub.com/honojs/hono/pull/2984)
- [@&#8203;KaelWD](https://togithub.com/KaelWD) made their first
contribution in
[https://github.com/honojs/hono/pull/2987](https://togithub.com/honojs/hono/pull/2987)

**Full Changelog**:
honojs/hono@v4.4.6...v4.4.7

### [`v4.4.6`](https://togithub.com/honojs/hono/releases/tag/v4.4.6)

[Compare
Source](https://togithub.com/honojs/hono/compare/v4.4.5...v4.4.6)

##### What's Changed

- fix(aws-lambda): handle multiple cookies in streaming responses by
[@&#8203;KnisterPeter](https://togithub.com/KnisterPeter) in
[https://github.com/honojs/hono/pull/2926](https://togithub.com/honojs/hono/pull/2926)

**Full Changelog**:
honojs/hono@v4.4.5...v4.4.6

### [`v4.4.5`](https://togithub.com/honojs/hono/releases/tag/v4.4.5)

[Compare
Source](https://togithub.com/honojs/hono/compare/v4.4.4...v4.4.5)

##### What's Changed

- fix(cors): allow custom vary header by
[@&#8203;fzn0x](https://togithub.com/fzn0x) in
[https://github.com/honojs/hono/pull/2934](https://togithub.com/honojs/hono/pull/2934)
- fix(jsx): rename `Hono` to `JSX` and export `JSX` namespace by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[https://github.com/honojs/hono/pull/2937](https://togithub.com/honojs/hono/pull/2937)
- refactor(hono-base): make 2nd arg of `app.route()` required by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[https://github.com/honojs/hono/pull/2945](https://togithub.com/honojs/hono/pull/2945)
- refactor(hono-base): don't check 1st argument of `app.on()` by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[https://github.com/honojs/hono/pull/2946](https://togithub.com/honojs/hono/pull/2946)
- refactor(context): remove unnecessary initialization add add tests for
Context by [@&#8203;yusukebe](https://togithub.com/yusukebe) in
[https://github.com/honojs/hono/pull/2949](https://togithub.com/honojs/hono/pull/2949)
- test(hono-base): add tests for covering 100% by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[https://github.com/honojs/hono/pull/2952](https://togithub.com/honojs/hono/pull/2952)
- fix(context): default JSONRespond and TextRespond StatusCode generic
arg by [@&#8203;EdamAme-x](https://togithub.com/EdamAme-x) in
[https://github.com/honojs/hono/pull/2954](https://togithub.com/honojs/hono/pull/2954)
- refactor(request): shorten `parseBody` and remove unnecessary check by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[https://github.com/honojs/hono/pull/2947](https://togithub.com/honojs/hono/pull/2947)
- refactor(jsx): reduce code size and improve maintainability by
[@&#8203;usualoma](https://togithub.com/usualoma) in
[https://github.com/honojs/hono/pull/2956](https://togithub.com/honojs/hono/pull/2956)

**Full Changelog**:
honojs/hono@v4.4.4...v4.4.5

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on Monday" in timezone
America/Chicago, Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/autoblocksai/cli).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjQxMC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants