From 3af744c24d9032d79041ab3bf6afebca9263ae0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20BECHER?= <hbdu68@gmail.com>
Date: Wed, 8 May 2024 20:42:49 +0200
Subject: [PATCH] refactor random options init and merge

---
 src/random.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/random.ts b/src/random.ts
index fce31eb..99e98b3 100644
--- a/src/random.ts
+++ b/src/random.ts
@@ -41,7 +41,7 @@ function mergeOptions<T>(first: RandomOptions<T> | undefined, second: RandomOpti
 }
 
 function withDefaultOptions<T>(options: RandomOptions<T> | undefined): Required<RandomOptions<T>> {
-  if (!options) {
+  if (!options || options === defaultOptions) {
     return defaultOptions;
   }
 
@@ -52,8 +52,8 @@ function withDefaultOptions<T>(options: RandomOptions<T> | undefined): Required<
   };
 }
 
-export function getRandomElement<T>(sequence: Iterable<T>, options?: RandomOptions<T>) {
-  const { predicate, weight, random } = withDefaultOptions(options);
+function _getRandomElement<T>(sequence: Iterable<T>, options: Required<RandomOptions<T>>) {
+  const { predicate, weight, random } = options;
 
   let result: T | undefined = undefined;
   let resultIndex = -1;
@@ -89,7 +89,7 @@ export function getRandomElement<T>(sequence: Iterable<T>, options?: RandomOptio
 export class RandomPicker<T> {
   readonly #elements: Iterable<T>;
   readonly #flags: BitArray;
-  readonly #options: RandomOptions<T>;
+  readonly #options: Required<RandomOptions<T>>;
 
   public constructor(elements: T[], options?: RandomOptions<T>) {
     this.#elements = elements;
@@ -116,7 +116,7 @@ export class RandomPicker<T> {
   }
 
   public next() {
-    const result = getRandomElement(this.#elements, this.#options);
+    const result = _getRandomElement(this.#elements, this.#options);
 
     if (result.index < 0) {
       this.reset();