Skip to content

Commit 88605c0

Browse files
committed
Rename undefined to undefineds
1 parent 1908bf9 commit 88605c0

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

collections/deep_merge.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ export function deepMerge<
208208
arrays: "merge";
209209
sets: "merge";
210210
maps: "merge";
211-
undefined: "replace";
211+
undefineds: "replace";
212212
},
213213
>(
214214
record: Readonly<T>,
@@ -225,7 +225,7 @@ function deepMergeInternal<
225225
arrays: "merge";
226226
sets: "merge";
227227
maps: "merge";
228-
undefined: "replace";
228+
undefineds: "replace";
229229
},
230230
>(
231231
record: Readonly<T>,
@@ -255,7 +255,7 @@ function deepMergeInternal<
255255

256256
if (
257257
!Object.hasOwn(other, key) ||
258-
(other[key] === undefined && options?.undefined === "ignore")
258+
(other[key] === undefined && options?.undefineds === "ignore")
259259
) {
260260
result[key] = a;
261261

@@ -289,7 +289,7 @@ function mergeObjects(
289289
arrays: "merge",
290290
sets: "merge",
291291
maps: "merge",
292-
undefined: "replace",
292+
undefineds: "replace",
293293
},
294294
): Readonly<NonNullable<Record<string, unknown> | Iterable<unknown>>> {
295295
// Recursively merge mergeable objects
@@ -403,7 +403,7 @@ export type DeepMergeOptions = {
403403
*
404404
* @default {"replace"}
405405
*/
406-
undefined?: "replace" | "ignore";
406+
undefineds?: "replace" | "ignore";
407407
};
408408

409409
/**

collections/deep_merge_test.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -434,15 +434,15 @@ Deno.test("deepMerge() handles number vs undefined", () => {
434434
deepMerge<{ a: number | undefined }>(
435435
{ a: 1 },
436436
{ a: undefined },
437-
{ undefined: "ignore" },
437+
{ undefineds: "ignore" },
438438
),
439439
{ a: 1 },
440440
);
441441
assertEquals(
442442
deepMerge(
443443
{ a: 1 },
444444
{ a: undefined },
445-
{ undefined: "replace" },
445+
{ undefineds: "replace" },
446446
),
447447
{ a: undefined },
448448
);
@@ -458,15 +458,15 @@ Deno.test("deepMerge() handles number vs undefined", () => {
458458
deepMerge(
459459
{ a: undefined },
460460
{ a: 1 },
461-
{ undefined: "ignore" },
461+
{ undefineds: "ignore" },
462462
),
463463
{ a: 1 },
464464
);
465465
assertEquals(
466466
deepMerge(
467467
{ a: undefined },
468468
{ a: 1 },
469-
{ undefined: "replace" },
469+
{ undefineds: "replace" },
470470
),
471471
{ a: 1 },
472472
);
@@ -483,15 +483,15 @@ Deno.test("deepMerge() handles number vs undefined", () => {
483483
deepMerge(
484484
{ a: undefined },
485485
{ a: undefined },
486-
{ undefined: "ignore" },
486+
{ undefineds: "ignore" },
487487
),
488488
{ a: undefined },
489489
);
490490
assertEquals(
491491
deepMerge(
492492
{ a: undefined },
493493
{ a: undefined },
494-
{ undefined: "replace" },
494+
{ undefineds: "replace" },
495495
),
496496
{ a: undefined },
497497
);
@@ -510,15 +510,15 @@ Deno.test("deepMerge() handles mergeable vs undefined", () => {
510510
deepMerge(
511511
{ a: { b: 1 } },
512512
{ a: undefined },
513-
{ undefined: "ignore" },
513+
{ undefineds: "ignore" },
514514
),
515515
{ a: { b: 1 } },
516516
);
517517
assertEquals(
518518
deepMerge(
519519
{ a: { b: 1 } },
520520
{ a: undefined },
521-
{ undefined: "replace" },
521+
{ undefineds: "replace" },
522522
),
523523
{ a: undefined },
524524
);
@@ -527,15 +527,15 @@ Deno.test("deepMerge() handles mergeable vs undefined", () => {
527527
deepMerge<{ a: { b: number; c: number | undefined } }>(
528528
{ a: { b: 1, c: 2 } },
529529
{ a: { b: 1, c: undefined } },
530-
{ undefined: "ignore" },
530+
{ undefineds: "ignore" },
531531
),
532532
{ a: { b: 1, c: 2 } },
533533
);
534534
assertEquals(
535535
deepMerge(
536536
{ a: { b: 1, c: 2 } },
537537
{ a: { b: 1, c: undefined } },
538-
{ undefined: "replace" },
538+
{ undefineds: "replace" },
539539
),
540540
{ a: { b: 1, c: undefined } },
541541
);
@@ -546,31 +546,31 @@ Deno.test("deepMerge() handles undefined vs omitted", () => {
546546
deepMerge(
547547
{ a: undefined },
548548
{},
549-
{ undefined: "ignore" },
549+
{ undefineds: "ignore" },
550550
),
551551
{ a: undefined },
552552
);
553553
assertEquals(
554554
deepMerge(
555555
{ a: undefined },
556556
{},
557-
{ undefined: "replace" },
557+
{ undefineds: "replace" },
558558
),
559559
{ a: undefined },
560560
);
561561
assertEquals(
562562
deepMerge(
563563
{},
564564
{ a: undefined },
565-
{ undefined: "ignore" },
565+
{ undefineds: "ignore" },
566566
),
567567
{ a: undefined },
568568
);
569569
assertEquals(
570570
deepMerge(
571571
{},
572572
{ a: undefined },
573-
{ undefined: "replace" },
573+
{ undefineds: "replace" },
574574
),
575575
{ a: undefined },
576576
);

0 commit comments

Comments
 (0)