cafe-utility 8.0.2 → 9.0.1

package/index.d.ts

@@ -12,8 +12,7 @@ declare function initializeArray<T>(count: number, initializer: (index: number)
 declare function rotate2DArray<T>(array: T[][]): T[][];
 declare function initialize2DArray<T>(width: number, height: number, initialValue: T): T[][];
 declare function containsShape<T>(array2D: T[][], shape: T[][], x: number, y: number): boolean;
-declare function takeRandomly<T>(array: T[], count: number, generator?: () => number): T[];
-declare function pickRandomIndices<T>(array: T[], count: number): number[];
+declare function pickRandomIndices<T>(array: T[], count: number, generator?: () => number): number[];
 declare function pluck<T, K extends keyof T>(array: T[], key: K): T[K][];
 declare function makeSeededRng(seed: number): () => number;
 declare function intBetween(min: number, max: number): number;
@@ -21,6 +20,8 @@ declare function floatBetween(min: number, max: number): number;
 declare function signedRandom(): number;
 declare function chance(threshold: number): boolean;
 declare function pick<T>(array: T[], generator?: () => number): T;
+declare function pickMany<T>(array: T[], count: number, generator?: () => number): T[];
+declare function pickManyUnique<T>(array: T[], count: number, equalityFunction: (a: T, b: T) => boolean, generator?: () => number): T[];
 declare function last<T>(array: T[]): T;
 declare function pickWeighted<T>(array: T[], weights: number[], randomNumber?: number): T;
 declare function sortWeighted<T>(array: T[], weights: number[], generator?: () => number): T[];
@@ -316,8 +317,6 @@ export declare const Arrays: {
     onlyOrNull: typeof onlyOrNull;
     firstOrNull: typeof firstOrNull;
     shuffle: typeof shuffle;
-    takeRandomly: typeof takeRandomly;
-    pickRandomIndices: typeof pickRandomIndices;
     initialize: typeof initializeArray;
     initialize2D: typeof initialize2DArray;
     rotate2D: typeof rotate2DArray;
@@ -325,8 +324,11 @@ export declare const Arrays: {
     glue: typeof glue;
     pluck: typeof pluck;
     pick: typeof pick;
-    last: typeof last;
+    pickMany: typeof pickMany;
+    pickManyUnique: typeof pickManyUnique;
     pickWeighted: typeof pickWeighted;
+    pickRandomIndices: typeof pickRandomIndices;
+    last: typeof last;
     sortWeighted: typeof sortWeighted;
     pushAll: typeof pushAll;
     unshiftAll: typeof unshiftAll;

package/index.js

@@ -104,12 +104,8 @@ function containsShape(array2D, shape, x, y) {
     return true
 }
 
-function takeRandomly(array, count, generator = Math.random) {
-    return shuffle(array, generator).slice(0, count)
-}
-
-function pickRandomIndices(array, count) {
-    return shuffle(range(0, array.length - 1)).slice(0, count)
+function pickRandomIndices(array, count, generator = Math.random) {
+    return shuffle(range(0, array.length - 1), generator).slice(0, count)
 }
 
 function pluck(array, key) {
@@ -150,6 +146,29 @@ function pick(array, generator = Math.random) {
     return array[Math.floor(array.length * generator())]
 }
 
+function pickMany(array, count, generator = Math.random) {
+    if (count > array.length) {
+        throw new Error(`Count (${count}) is greater than array length (${array.length})`)
+    }
+    const indices = pickRandomIndices(array, count, generator)
+    return indices.map(index => array[index])
+}
+
+function pickManyUnique(array, count, equalityFunction, generator = Math.random) {
+    if (count > array.length) {
+        throw new Error(`Count (${count}) is greater than array length (${array.length})`)
+    }
+    const results = []
+    while (results.length < count) {
+        const candidate = pick(array, generator)
+        if (results.some(result => equalityFunction(result, candidate))) {
+            continue
+        }
+        results.push(candidate)
+    }
+    return results
+}
+
 function last(array) {
     return array[array.length - 1]
 }
@@ -292,12 +311,16 @@ function convertBytes(bytes) {
 }
 
 function isObject(value) {
-    return (
-        value !== null &&
-        typeof value === 'object' &&
-        !value.constructor.isBuffer &&
-        value.constructor.name !== 'Uint8Array'
-    )
+    if (!value) {
+        return false
+    }
+    if (value._readableState) {
+        return false
+    }
+    if (value.constructor && (value.constructor.isBuffer || value.constructor.name == 'Uint8Array')) {
+        return false
+    }
+    return typeof value === 'object'
 }
 
 function isStrictlyObject(value) {
@@ -2164,8 +2187,6 @@ exports.Arrays = {
     onlyOrNull,
     firstOrNull,
     shuffle,
-    takeRandomly,
-    pickRandomIndices,
     initialize: initializeArray,
     initialize2D: initialize2DArray,
     rotate2D: rotate2DArray,
@@ -2173,8 +2194,11 @@ exports.Arrays = {
     glue,
     pluck,
     pick,
-    last,
+    pickMany,
+    pickManyUnique,
     pickWeighted,
+    pickRandomIndices,
+    last,
     sortWeighted,
     pushAll,
     unshiftAll,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cafe-utility",
-    "version": "8.0.2",
+    "version": "9.0.1",
     "description": "",
     "main": "index.js",
     "exports": {