Skip to content

accept UrlParams.Input in some UrlParams apis #2505

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

Merged
tim-smart merged 5 commits into from
Jul 1, 2026
Merged

accept UrlParams.Input in some UrlParams apis #2505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5af42f
make input type like in great duration module
KhraksMamtsov Jun 29, 2026
a801177
remove input from the contravariant position
KhraksMamtsov Jun 30, 2026
3954cf2
fix: rollback header module
KhraksMamtsov Jun 30, 2026
396e16a
wip
tim-smart Jul 1, 2026
6ab7cfd
changeset
tim-smart Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/shaky-beans-throw.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"effect": patch
---

accept UrlParams.Input in some UrlParams apis
4 changes: 2 additions & 2 deletions packages/effect/src/unstable/http/HttpBody.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,8 @@ export const jsonSchema = <S extends Schema.Constraint>(
* @category constructors
* @since 4.0.0
*/
export const urlParams = (urlParams: UrlParams.UrlParams, contentType?: string): Uint8Array =>
text(UrlParams.toString(urlParams), contentType ?? "application/x-www-form-urlencoded")
export const urlParams = (urlParams: UrlParams.Input, contentType?: string): Uint8Array =>
text(UrlParams.toString(UrlParams.fromInput(urlParams)), contentType ?? "application/x-www-form-urlencoded")

/**
* HTTP body variant backed by Web `FormData`.
Expand Down
2 changes: 1 addition & 1 deletion packages/effect/src/unstable/http/HttpClientRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const Proto = {
export function makeWith(
method: HttpMethod,
url: string,
urlParams: UrlParams.UrlParams,
urlParams: UrlParams.Input,
hash: Option.Option<string>,
headers: Headers.Headers,
body: HttpBody.HttpBody
Expand Down
14 changes: 7 additions & 7 deletions packages/effect/src/unstable/http/Url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,11 +259,11 @@ export const setUsername: {
* @since 4.0.0
*/
export const setUrlParams: {
(urlParams: UrlParams.UrlParams): (url: URL) => URL
(url: URL, urlParams: UrlParams.UrlParams): URL
} = dual(2, (url: URL, searchParams: UrlParams.UrlParams) =>
(urlParams: UrlParams.Input): (url: URL) => URL
(url: URL, urlParams: UrlParams.Input): URL
} = dual(2, (url: URL, urlParams: UrlParams.Input) =>
mutate(url, (url) => {
url.search = UrlParams.toString(searchParams)
url.search = UrlParams.toString(UrlParams.fromInput(urlParams))
}))

/**
Expand Down Expand Up @@ -321,9 +321,9 @@ export const urlParams = (url: URL): UrlParams.UrlParams => UrlParams.fromInput(
* @since 4.0.0
*/
export const modifyUrlParams: {
(f: (urlParams: UrlParams.UrlParams) => UrlParams.UrlParams): (url: URL) => URL
(url: URL, f: (urlParams: UrlParams.UrlParams) => UrlParams.UrlParams): URL
} = dual(2, (url: URL, f: (urlParams: UrlParams.UrlParams) => UrlParams.UrlParams) =>
(f: (urlParams: UrlParams.UrlParams) => UrlParams.Input): (url: URL) => URL
(url: URL, f: (urlParams: UrlParams.UrlParams) => UrlParams.Input): URL
} = dual(2, (url: URL, f: (urlParams: UrlParams.UrlParams) => UrlParams.Input) =>
mutate(url, (url) => {
const params = f(UrlParams.fromInput(url.searchParams))
url.search = UrlParams.toString(params)
Expand Down
6 changes: 5 additions & 1 deletion packages/effect/src/unstable/http/UrlParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export const isUrlParams = (u: unknown): u is UrlParams => hasProperty(u, TypeId
* @since 4.0.0
*/
export type Input =
| UrlParams
| CoercibleRecordInput
| Iterable<readonly [string, Coercible]>
| URLSearchParams
Expand Down Expand Up @@ -157,6 +158,9 @@ export const make = (params: ReadonlyArray<readonly [string, string]>): UrlParam
* @since 4.0.0
*/
export const fromInput = (input: Input): UrlParams => {
if (isUrlParams(input)) {
return input
}
const parsed = fromInputNested(input)
const out: Array<[string, string]> = []
for (let i = 0; i < parsed.length; i++) {
Expand Down Expand Up @@ -495,7 +499,7 @@ export const makeUrl = (
* @category converting
* @since 4.0.0
*/
export const toString = (self: UrlParams): string => new URLSearchParams(self.params as any).toString()
export const toString = (input: Input): string => new URLSearchParams(fromInput(input).params as any).toString()

const baseUrl = (): string | undefined => {
if (
Expand Down
Loading