Skip to content

Commit 0c106ce

Browse files
Millylambdalisue
authored andcommitted
fix[isParametersOf]: rename predElse to predRest
1 parent e7185c4 commit 0c106ce

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

is/__snapshots__/parameters_of_test.ts.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ snapshot[`isParametersOf<T> > returns properly named predicate function 4`] = `
2424
])"
2525
`;
2626
27-
snapshot[`isParametersOf<T, E> > returns properly named predicate function 1`] = `
27+
snapshot[`isParametersOf<T, R> > returns properly named predicate function 1`] = `
2828
"isParametersOf([
2929
isNumber,
3030
isString,
3131
asOptional(isBoolean)
3232
], isArray)"
3333
`;
3434
35-
snapshot[`isParametersOf<T, E> > returns properly named predicate function 2`] = `"isParametersOf([(anonymous)], isArrayOf(isString))"`;
35+
snapshot[`isParametersOf<T, R> > returns properly named predicate function 2`] = `"isParametersOf([(anonymous)], isArrayOf(isString))"`;
3636
37-
snapshot[`isParametersOf<T, E> > returns properly named predicate function 3`] = `"isParametersOf([], isArrayOf(isString))"`;
37+
snapshot[`isParametersOf<T, R> > returns properly named predicate function 3`] = `"isParametersOf([], isArrayOf(isString))"`;
3838
39-
snapshot[`isParametersOf<T, E> > returns properly named predicate function 4`] = `
39+
snapshot[`isParametersOf<T, R> > returns properly named predicate function 4`] = `
4040
"isParametersOf([
4141
isParametersOf([
4242
isParametersOf([

is/parameters_of.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { isArray } from "./array.ts";
2828
* }
2929
* ```
3030
*
31-
* With `predElse`:
31+
* With `predRest` to represent rest parameters:
3232
*
3333
* ```ts
3434
* import { as, is } from "@core/unknownutil";
@@ -71,18 +71,18 @@ export function isParametersOf<
7171
E extends Predicate<unknown[]>,
7272
>(
7373
predTup: T,
74-
predElse: E,
74+
predRest: E,
7575
): Predicate<[...ParametersOf<T>, ...PredicateType<E>]>;
7676
export function isParametersOf<
7777
T extends readonly [...Predicate<unknown>[]],
7878
E extends Predicate<unknown[]>,
7979
>(
8080
predTup: T,
81-
predElse?: E,
81+
predRest?: E,
8282
): Predicate<ParametersOf<T> | [...ParametersOf<T>, ...PredicateType<E>]> {
8383
const requiresLength = 1 +
8484
predTup.findLastIndex((pred) => !hasOptional(pred));
85-
if (!predElse) {
85+
if (!predRest) {
8686
return rewriteName(
8787
(x: unknown): x is ParametersOf<T> => {
8888
if (
@@ -103,11 +103,11 @@ export function isParametersOf<
103103
}
104104
const head = x.slice(0, predTup.length);
105105
const tail = x.slice(predTup.length);
106-
return predTup.every((pred, i) => pred(head[i])) && predElse(tail);
106+
return predTup.every((pred, i) => pred(head[i])) && predRest(tail);
107107
},
108108
"isParametersOf",
109109
predTup,
110-
predElse,
110+
predRest,
111111
);
112112
}
113113
}

is/parameters_of_test.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Deno.test("isParametersOf<T>", async (t) => {
5959
});
6060
});
6161

62-
Deno.test("isParametersOf<T, E>", async (t) => {
62+
Deno.test("isParametersOf<T, R>", async (t) => {
6363
await t.step("returns properly named predicate function", async (t) => {
6464
assertEquals(typeof isParametersOf([], is.Array), "function");
6565
await assertSnapshot(
@@ -92,32 +92,32 @@ Deno.test("isParametersOf<T, E>", async (t) => {
9292

9393
await t.step("returns true on T tuple", () => {
9494
const predTup = [is.Number, is.String, as.Optional(is.Boolean)] as const;
95-
const predElse = is.ArrayOf(is.Number);
95+
const predRest = is.ArrayOf(is.Number);
9696
assertEquals(
97-
isParametersOf(predTup, predElse)([0, "a", true, 0, 1, 2]),
97+
isParametersOf(predTup, predRest)([0, "a", true, 0, 1, 2]),
9898
true,
9999
);
100100
assertEquals(
101-
isParametersOf(predTup, predElse)([0, "a", undefined, 0, 1, 2]),
101+
isParametersOf(predTup, predRest)([0, "a", undefined, 0, 1, 2]),
102102
true,
103103
);
104-
assertEquals(isParametersOf(predTup, predElse)([0, "a"]), true);
104+
assertEquals(isParametersOf(predTup, predRest)([0, "a"]), true);
105105
});
106106

107107
await t.step("returns false on non T tuple", () => {
108108
const predTup = [is.Number, is.String, as.Optional(is.Boolean)] as const;
109-
const predElse = is.ArrayOf(is.String);
110-
assertEquals(isParametersOf(predTup, predElse)([0, 1, 2, 0, 1, 2]), false);
111-
assertEquals(isParametersOf(predTup, predElse)([0, "a", 0, 1, 2]), false);
109+
const predRest = is.ArrayOf(is.String);
110+
assertEquals(isParametersOf(predTup, predRest)([0, 1, 2, 0, 1, 2]), false);
111+
assertEquals(isParametersOf(predTup, predRest)([0, "a", 0, 1, 2]), false);
112112
assertEquals(
113-
isParametersOf(predTup, predElse)([0, "a", true, 0, 1, 2]),
113+
isParametersOf(predTup, predRest)([0, "a", true, 0, 1, 2]),
114114
false,
115115
);
116116
assertEquals(
117-
isParametersOf(predTup, predElse)([0, "a", undefined, 0, 1, 2]),
117+
isParametersOf(predTup, predRest)([0, "a", undefined, 0, 1, 2]),
118118
false,
119119
);
120-
assertEquals(isParametersOf(predTup, predElse)([0, "a", "b"]), false);
120+
assertEquals(isParametersOf(predTup, predRest)([0, "a", "b"]), false);
121121
});
122122

123123
await t.step("predicated type is correct", () => {
@@ -127,9 +127,9 @@ Deno.test("isParametersOf<T, E>", async (t) => {
127127
as.Optional(is.String),
128128
as.Optional(is.Boolean),
129129
] as const;
130-
const predElse = is.ArrayOf(is.Number);
130+
const predRest = is.ArrayOf(is.Number);
131131
const a: unknown = [0, "a"];
132-
if (isParametersOf(predTup, predElse)(a)) {
132+
if (isParametersOf(predTup, predRest)(a)) {
133133
assertType<
134134
Equal<
135135
typeof a,

0 commit comments

Comments
 (0)