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.

Sign up for GitHub

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

Jump to bottom

feat(validator): check for json subtypes in validator #2634

Merged
merged 4 commits into from
May 9, 2024
Merged

feat(validator): check for json subtypes in validator #2634

merged 4 commits into from
May 9, 2024

Conversation

ztiromoritz
Copy link
Contributor

@ztiromoritz ztiromoritz commented May 7, 2024 •
edited

A minimal fix for #2633 using a regex.
I liked the simplicity of the current startsWith-approach but it excluded subtypes.

I did:

  • Add tests
  • Run tests
  • bun denoify to generate files for Deno

yusukebe
yusukebe reviewed May 7, 2024
View reviewed changes
deno_dist/validator/validator.ts Outdated
@@ -67,7 +67,7 @@ export const validator = <

switch (target) {
case 'json':
if (!contentType || !contentType.startsWith('application/json')) {
if (!contentType || !contentType.match(/^application\/[a-z-]*\+json(\s*;.*)?$/)) {
Copy link
Member

Choose a reason for hiding this comment

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

  • You should use the test instead of the match if you don't capture strings.
  • ^application\/[a-z-]*\+ should be application\/([a-z-]+\+)*.
  • The last (\s*;.*)? is necessary?

@yusukebe yusukebe changed the title check for json subtypes in validator feat(validator): check for json subtypes in validator May 7, 2024
@ztiromoritz
Copy link
Contributor Author

Thanks!

  • I use test now
  • Landed on this regexp: /^application\/([a-z-]+\+)?json/
    • the ^ in front is needed to not fail the Xapplication/json test
    • I added ? to the ([a-z-]+\+) group instead of *, because there can only be one subtype
  • Yes, (\s*;.*)? is not needed.

@yusukebe
Copy link
Member

yusukebe commented May 9, 2024

Hi @ztiromoritz

Thanks! Looks good. To avoid the CI error, could you run bun run format:fix && bun run lint:fix to format the code?

yusukebe
yusukebe approved these changes May 9, 2024
View reviewed changes
Copy link
Member

@yusukebe yusukebe left a comment

Choose a reason for hiding this comment

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

LGTM!

@yusukebe
Copy link
Member

yusukebe commented May 9, 2024

Hi @ztiromoritz

Thank you for your contribution. I'll merge this into the main now and will release it in a patch release since this is a minor feat.

@yusukebe yusukebe merged commit aebaa28 into honojs:main May 9, 2024
10 checks passed
@ztiromoritz
Copy link
Contributor Author

Fine. My pleasure.
I close #2633 then. There where minor additional ideas, but overall I see no problem now.

@ztiromoritz
Copy link
Contributor Author

(Hope this is according to the projects workflow. 😁 )

nicolewhite pushed a commit to autoblocksai/cli that referenced this pull request May 13, 2024
@renovate
Update dependency hono to v4.3.6 (#76)
6bf7175 
[![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.3.0` ->
`4.3.6`](https://renovatebot.com/diffs/npm/hono/4.3.0/4.3.6) |
[![age](https://developer.mend.io/api/mc/badges/age/npm/hono/4.3.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/hono/4.3.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/hono/4.3.0/4.3.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/hono/4.3.0/4.3.6?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

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

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

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

#### What's Changed

- feat(cache): improved customizability by
[@&#8203;MathurAditya724](https://togithub.com/MathurAditya724) in
[honojs/hono#2652
- fix(utils/body): support multiple `File`s by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[honojs/hono#2665

#### New Contributors

- [@&#8203;MathurAditya724](https://togithub.com/MathurAditya724) made
their first contribution in
[honojs/hono#2652

**Full Changelog**:
honojs/hono@v4.3.5...v4.3.6

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

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

#### What's Changed

- refactor(context): remove some `any` by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[honojs/hono#2658
- feat(hono-base): tweaks `fetch` signature for better compatibility
with `deno serve` by [@&#8203;usualoma](https://togithub.com/usualoma)
in
[honojs/hono#2661
- perf(types): add type annotations by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[honojs/hono#2663

**Full Changelog**:
honojs/hono@v4.3.4...v4.3.5

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

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

#### What's Changed

- chore: update the pull request template by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[honojs/hono#2647
- feat(validator): check for json subtypes in validator by
[@&#8203;ztiromoritz](https://togithub.com/ztiromoritz) in
[honojs/hono#2634
- feat(jsx/dom): support getServerSnapshot in useSyncExternalStore by
[@&#8203;usualoma](https://togithub.com/usualoma) in
[honojs/hono#2646

#### New Contributors

- [@&#8203;ztiromoritz](https://togithub.com/ztiromoritz) made their
first contribution in
[honojs/hono#2634

**Full Changelog**:
honojs/hono@v4.3.3...v4.3.4

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

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

#### What's Changed

- fix(types): relax the type of `c.req.param()` by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[honojs/hono#2613
- chore(eslint): enable `@typescript-eslint/unbound-method` by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[honojs/hono#2622
- fix(factory): support `createFactory()` destruction by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[honojs/hono#2623
- fix(aws-lambda): avoid duplicating already set headers by
[@&#8203;Amorim33](https://togithub.com/Amorim33) in
[honojs/hono#2585
- refactor: improve parseBody function and docs by
[@&#8203;mgrithm](https://togithub.com/mgrithm) in
[honojs/hono#2628
- fix(validator): `form` supports multiple values with `foo[]` by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[honojs/hono#2639

#### New Contributors

- [@&#8203;Amorim33](https://togithub.com/Amorim33) made their first
contribution in
[honojs/hono#2585

**Full Changelog**:
honojs/hono@v4.3.2...v4.3.3

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

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

#### What's Changed

- fix(types): correct inferring when Method has Endponts as Union by
[@&#8203;yusukebe](https://togithub.com/yusukebe) in
[honojs/hono#2610

**Full Changelog**:
honojs/hono@v4.3.1...v4.3.2

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

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

#### What's Changed

- fix(types): `ToSchema` compatibility by
[@&#8203;NamesMT](https://togithub.com/NamesMT) in
[honojs/hono#2605

**Full Changelog**:
honojs/hono@v4.3.0...v4.3.1

</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:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNDAuMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zNTEuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

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
Reviewers

@yusukebe yusukebe yusukebe approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ztiromoritz @yusukebe