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

Preserve Array.modify and Array.modifyOption non emptiness #3496

Merged
merged 8 commits into from
Aug 22, 2024
Merged

Preserve Array.modify and Array.modifyOption non emptiness #3496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d271ba
Preserve non emptiness for Array.modify and Array.modifyOption
vinassefranche Aug 22, 2024
2151140
Add changeset
vinassefranche Aug 22, 2024
b58cdd4
Fix bad inference of function parameter
vinassefranche Aug 22, 2024
51c716a
Merge branch 'next-minor' into preserve-array-replace-non-emptiness
vinassefranche Aug 22, 2024
a47f382
Separate modify and modifyOption in dtslint
vinassefranche Aug 22, 2024
dc32dce
Use existing type helper
vinassefranche Aug 22, 2024
ec4acb7
Improve dtslint tests
vinassefranche Aug 22, 2024
da5813e
Fix inference of n parameter for data last variant
vinassefranche Aug 22, 2024
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/curvy-cats-smoke.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"effect": minor
---

preserve `Array.modify` `Array.modifyOption` non emptiness
114 changes: 114 additions & 0 deletions packages/effect/dtslint/Array.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1363,6 +1363,9 @@ pipe(nonEmptyNumbers, Array.replace(0, "a" as const))
// $ExpectType ("a" | 1 | 2)[]
pipe(new Set([1, 2] as const), Array.replace(0, "a" as const))

// $ExpectType [number | "a", ...(number | "a")[]]
pipe(Array.of(1), Array.replace(0, "a" as const))

// -------------------------------------------------------------------------------------
// replaceOption
// -------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1390,3 +1393,114 @@ pipe(nonEmptyNumbers, Array.replaceOption(0, "a" as const))

// $ExpectType Option<("a" | 1 | 2)[]>
pipe(new Set([1, 2] as const), Array.replaceOption(0, "a" as const))

// -------------------------------------------------------------------------------------
// modify
// -------------------------------------------------------------------------------------

// $ExpectType string[]
Array.modify([], 0, (
_n // $ExpectType never
) => "a")
// $ExpectType (string | number)[]
Array.modify(numbers, 0, (
_n // $ExpectType number
) => "a")

// $ExpectType [number | "a", ...(number | "a")[]]
Array.modify(nonEmptyNumbers, 0, (
_n // $ExpectType number
) => "a" as const)

// $ExpectType ("a" | 1 | 2)[]
Array.modify(new Set([1, 2] as const), 0, (
_n // $ExpectType 1 | 2
) => "a" as const)

// $ExpectType string[]
pipe(
[],
Array.modify(0, (
_n // $ExpectType never
) => "a")
)

// $ExpectType (string | number)[]
pipe(
numbers,
Array.modify(0, (
_n // $ExpectType number
) => "a")
)

// $ExpectType [number | "a", ...(number | "a")[]]
pipe(
nonEmptyNumbers,
Array.modify(0, (
_n // $ExpectType number
) => "a" as const)
)

// $ExpectType ("a" | 1 | 2)[]
pipe(
new Set([1, 2] as const),
Array.modify(0, (
_n // $ExpectType 1 | 2
) => "a" as const)
)

// -------------------------------------------------------------------------------------
// modifyOption
// -------------------------------------------------------------------------------------

// $ExpectType Option<string[]>
Array.modifyOption([], 0, (
_n // $ExpectType never
) => "a")

// $ExpectType Option<(string | number)[]>
Array.modifyOption(numbers, 0, (
_n // $ExpectType number
) => "a")

// $ExpectType Option<[number | "a", ...(number | "a")[]]>
Array.modifyOption(nonEmptyNumbers, 0, (
_n // $ExpectType number
) => "a" as const)

// $ExpectType Option<("a" | 1 | 2)[]>
Array.modifyOption(new Set([1, 2] as const), 0, (
_n // $ExpectType 1 | 2
) => "a" as const)

// $ExpectType Option<string[]>
pipe(
[],
Array.modifyOption(0, (
_n // $ExpectType never
) => "a")
)

// $ExpectType Option<(string | number)[]>
pipe(
numbers,
Array.modifyOption(0, (
_n // $ExpectType number
) => "a")
)

// $ExpectType Option<[number | "a", ...(number | "a")[]]>
pipe(
nonEmptyNumbers,
Array.modifyOption(0, (
_n // $ExpectType number
) => "a" as const)
)

// $ExpectType Option<("a" | 1 | 2)[]>
pipe(
new Set([1, 2] as const),
Array.modifyOption(0, (
_n // $ExpectType 1 | 2
) => "a" as const)
)
22 changes: 18 additions & 4 deletions packages/effect/src/Array.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,8 +1109,15 @@ export const replaceOption: {
* @since 2.0.0
*/
export const modify: {
<A, B>(i: number, f: (a: A) => B): (self: Iterable<A>) => Array<A | B>
<A, B>(self: Iterable<A>, i: number, f: (a: A) => B): Array<A | B>
<A, B, S extends Iterable<A> = Iterable<A>>(
i: number,
f: (a: ReadonlyArray.Infer<S>) => B
): (self: S) => ReadonlyArray.With<S, ReadonlyArray.Infer<S> | B>
<A, B, S extends Iterable<A> = Iterable<A>>(
self: S,
i: number,
f: (a: ReadonlyArray.Infer<S>) => B
): ReadonlyArray.With<S, ReadonlyArray.Infer<S> | B>
} = dual(
3,
<A, B>(self: Iterable<A>, i: number, f: (a: A) => B): Array<A | B> =>
Expand All @@ -1134,8 +1141,15 @@ export const modify: {
* @since 2.0.0
*/
export const modifyOption: {
<A, B>(i: number, f: (a: A) => B): (self: Iterable<A>) => Option<Array<A | B>>
<A, B>(self: Iterable<A>, i: number, f: (a: A) => B): Option<Array<A | B>>
<A, B, S extends Iterable<A> = Iterable<A>>(
i: number,
f: (a: ReadonlyArray.Infer<S>) => B
): (self: S) => Option<ReadonlyArray.With<S, ReadonlyArray.Infer<S> | B>>
<A, B, S extends Iterable<A> = Iterable<A>>(
self: S,
i: number,
f: (a: ReadonlyArray.Infer<S>) => B
): Option<ReadonlyArray.With<S, ReadonlyArray.Infer<S> | B>>
} = dual(3, <A, B>(self: Iterable<A>, i: number, f: (a: A) => B): Option<Array<A | B>> => {
const out = Array.from(self)
if (isOutOfBound(i, out)) {
Expand Down