extra-rand 0.3.2 → 0.4.0

package/README.md

@@ -15,13 +15,13 @@ interface IRandomNumberGenerator {
 }
 ```
 
-### random
+### randomFloat
 ```ts
-function random(min: number, max: number): number
-function random(generator: IRandomNumberGenerator, min: number, max: number): number
+function randomFloat(min: number, max: number): number
+function randomFloat(generator: IRandomNumberGenerator, min: number, max: number): number
 ```
 
-The function returns a number in the range `[min, max)`.
+The function returns a float in the range `[min, max)`.
 
 ### randomInt
 ```ts
@@ -43,97 +43,83 @@ function randomIntInclusive(
 
 The function returns an integer in the range `[Math.ceil(min), Math.floor(max)]`.
 
-### randomBool
-```ts
-function randomBool(probabilityOfTrue: number): boolean
-function randomBool(generator: IRandomNumberGenerator, probabilityOfTrue: number): boolean
-```
-
-### randomIndexByWeight
-```ts
-function randomIndexByWeight(weights: NonEmptyArray<number>): number
-function randomIndexByWeight(
-  generator: IRandomNumberGenerator
-, weights: NonEmptyArray<number>
-): number
-```
-
-The function returns an index of one of weights.
-
-### randomWeighted
-```ts
-interface IWeighted {
-  weight: number
-}
-
-function randomWeighted<T extends IWeighted>(values: NonEmptyArray<T>): T
-function randomWeighted<T extends IWeighted>(
-  generator: IRandomNumberGenerator
-, values: NonEmptyArray<T>
-): T
-```
-
-### randomByWeightModel
-```ts
-type IWeightModel<T> = NonEmptyArray<{
-  weight: number
-  value: T
-}>
-
-function randomByWeightModel<T>(model: IWeightModel<T>): T
-function randomByWeightModel<T>(generator: IRandomNumberGenerator, model: IWeightModel<T>): T
-```
-
-### randomByModel
+### randomNumber
 ```ts
-enum Type {
+enum NumberType {
   Float
 , Integer
 , IntegerInclusive
 }
 
-type IRandomModel =
+type INumberModel =
 | number
 | Getter<number>
 | {
-    type: Type
+    type: NumberType
     min: number
     max: number
   }
 | NonEmptyArray<{
     weight: number
-    value: IRandomModel
+    model: INumberModel
   }>
 
+function randomNumber(model: INumberModel): number
+function randomNumber(generator: IRandomNumberGenerator, model: INumberModel): number
+```
 
-function randomByModel(model: IRandomModel): number
-function randomByModel(generator: IRandomNumberGenerator, model: IRandomModel): number
+### randomBool
+```ts
+function randomBool(probabilityOfTrue: number): boolean
+function randomBool(generator: IRandomNumberGenerator, probabilityOfTrue: number): boolean
 ```
 
-### shuffle
+### randomPickItem
 ```ts
-function shuffle(arr: unknown[]): void
-function shuffle(generator: IRandomNumberGenerator, arr: unknown[]): void
+function randomPickItem<T>(items: NonEmptyArray<T>): T
+function randomPickItem<T>(
+  generator: IRandomNumberGenerator
+, items: NonEmptyArray<T>
+): T
+```
+
+### randomPickWeightedItem
+```ts
+interface IWeightedItem {
+  weight: number
+}
+
+function randomPickWeightedItem<T extends IWeightedItem>(items: NonEmptyArray<T>): T
+function randomPickWeightedItem<T extends IWeightedItem>(
+  generator: IRandomNumberGenerator
+, items: NonEmptyArray<T>
+): T
 ```
 
-### mapToRange
+### randomPickIndex
 ```ts
-function mapToRange(
-  value: number
-, oldMin: number, oldMax: number
-, newMin: number, newMax: number
+function randomPickIndex(items: NonEmptyArray<unknown>): number
+function randomPickIndex(
+  generator: IRandomNumberGenerator
+, items: NonEmptyArray<unknown>
 ): number
 ```
 
-A low-level function helps you to use random number generators other than `Math.random()`.
+The function returns an integer in the range `[0, items.length]`.
 
-### mapToIndexByWeight
+### randomPickWeightedIndex
 ```ts
-function mapToIndexByWeight(
-  value: number
-, oldMin: number, oldMax: number
+function randomPickWeightedIndex(weights: NonEmptyArray<number>): number
+function randomPickWeightedIndex(
+  generator: IRandomNumberGenerator
 , weights: NonEmptyArray<number>
 ): number
 ```
 
-A low-level function helps you to use random number generators other than `Math.random()`.
+The function returns an integer in the range `[0, weights.length]`.
+
+### shuffle
+```ts
+function shuffle(arr: unknown[]): void
+function shuffle(generator: IRandomNumberGenerator, arr: unknown[]): void
+```

package/lib/index.d.ts

@@ -1,12 +1,11 @@
 export * from './types.js';
-export * from './random.js';
+export * from './random-float.js';
 export * from './random-int.js';
 export * from './random-int-inclusive.js';
+export * from './random-number.js';
 export * from './random-bool.js';
-export * from './random-index-by-weight.js';
-export * from './random-weighted.js';
-export * from './random-by-weight-model.js';
-export * from './random-by-model.js';
+export * from './random-pick-item.js';
+export * from './random-pick-weighted-item.js';
+export * from './random-pick-index.js';
+export * from './random-pick-weighted-index.js';
 export * from './shuffle.js';
-export * from './map-to-range.js';
-export * from './map-to-index-by-weight.js';

package/lib/index.js

@@ -1,13 +1,12 @@
 export * from './types.js';
-export * from './random.js';
+export * from './random-float.js';
 export * from './random-int.js';
 export * from './random-int-inclusive.js';
+export * from './random-number.js';
 export * from './random-bool.js';
-export * from './random-index-by-weight.js';
-export * from './random-weighted.js';
-export * from './random-by-weight-model.js';
-export * from './random-by-model.js';
+export * from './random-pick-item.js';
+export * from './random-pick-weighted-item.js';
+export * from './random-pick-index.js';
+export * from './random-pick-weighted-index.js';
 export * from './shuffle.js';
-export * from './map-to-range.js';
-export * from './map-to-index-by-weight.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAE1B,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,2BAA2B,CAAA;AACzC,cAAc,kBAAkB,CAAA;AAChC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,sBAAsB,CAAA;AACpC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAE5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,6BAA6B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAE1B,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,uBAAuB,CAAA;AACrC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,wBAAwB,CAAA;AACtC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,cAAc,CAAA"}

package/lib/native-random-number-generator.d.ts

@@ -1,2 +1,2 @@
 import { IRandomNumberGenerator } from './types.js';
-export declare const NativeRandomNumberGenerator: IRandomNumberGenerator;
+export declare const nativeRandomNumberGenerator: IRandomNumberGenerator;

package/lib/native-random-number-generator.js

@@ -1,4 +1,4 @@
-export const NativeRandomNumberGenerator = {
+export const nativeRandomNumberGenerator = {
     next: Math.random
 };
 //# sourceMappingURL=native-random-number-generator.js.map

package/lib/random-bool.js

@@ -1,15 +1,15 @@
-import { NativeRandomNumberGenerator } from './native-random-number-generator.js';
-import { random } from './random.js';
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js';
+import { randomFloat } from './random-float.js';
 export function randomBool(...args) {
     let generator;
     let probabilityOfTrue;
     if (args.length === 1) {
-        generator = NativeRandomNumberGenerator;
+        generator = nativeRandomNumberGenerator;
         [probabilityOfTrue] = args;
     }
     else {
         [generator, probabilityOfTrue] = args;
     }
-    return random(generator, 0, 1) < probabilityOfTrue;
+    return randomFloat(generator, 0, 1) < probabilityOfTrue;
 }
 //# sourceMappingURL=random-bool.js.map

package/lib/random-bool.js.map

@@ -1 +1 @@
-{"version":3,"file":"random-bool.js","sourceRoot":"","sources":["../src/random-bool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AACjF,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAOpC,MAAM,UAAU,UAAU,CAAC,GAAG,IAEkC;IAE9D,IAAI,SAAiC,CAAA;IACrC,IAAI,iBAAyB,CAAA;IAE7B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAA;IAC7B,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,iBAAiB,CAAC,GAAG,IAAI,CAAA;IACvC,CAAC;IAED,OAAO,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,iBAAiB,CAAA;AACpD,CAAC"}
+{"version":3,"file":"random-bool.js","sourceRoot":"","sources":["../src/random-bool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAO/C,MAAM,UAAU,UAAU,CAAC,GAAG,IAEkC;IAE9D,IAAI,SAAiC,CAAA;IACrC,IAAI,iBAAyB,CAAA;IAE7B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAA;IAC7B,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,iBAAiB,CAAC,GAAG,IAAI,CAAA;IACvC,CAAC;IAED,OAAO,WAAW,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,iBAAiB,CAAA;AACzD,CAAC"}

package/lib/random-float.d.ts

@@ -0,0 +1,3 @@
+import { IRandomNumberGenerator } from './types.js';
+export declare function randomFloat(min: number, max: number): number;
+export declare function randomFloat(generator: IRandomNumberGenerator, min: number, max: number): number;

package/lib/random-float.js

@@ -0,0 +1,16 @@
+import { remap } from 'extra-utils';
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js';
+export function randomFloat(...args) {
+    let generator;
+    let min;
+    let max;
+    if (args.length === 2) {
+        generator = nativeRandomNumberGenerator;
+        [min, max] = args;
+    }
+    else {
+        [generator, min, max] = args;
+    }
+    return remap(generator.next(), [0, 1], [min, max]);
+}
+//# sourceMappingURL=random-float.js.map

package/lib/random-float.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-float.js","sourceRoot":"","sources":["../src/random-float.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AAQjF,MAAM,UAAU,WAAW,CAAC,GAAG,IAEgC;IAE7D,IAAI,SAAiC,CAAA;IACrC,IAAI,GAAW,CAAA;IACf,IAAI,GAAW,CAAA;IAEf,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAA;IACpB,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAA;IAC9B,CAAC;IAED,OAAO,KAAK,CACV,SAAS,CAAC,IAAI,EAAE,EAChB,CAAC,CAAC,EAAE,CAAC,CAAC,EACN,CAAC,GAAG,EAAE,GAAG,CAAC,CACX,CAAA;AACH,CAAC"}

package/lib/random-int-inclusive.js

@@ -1,16 +1,16 @@
-import { mapToRange } from './map-to-range.js';
-import { NativeRandomNumberGenerator } from './native-random-number-generator.js';
+import { remap } from 'extra-utils';
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js';
 export function randomIntInclusive(...args) {
     let generator;
     let min;
     let max;
     if (args.length === 2) {
-        generator = NativeRandomNumberGenerator;
+        generator = nativeRandomNumberGenerator;
         [min, max] = args;
     }
     else {
         [generator, min, max] = args;
     }
-    return Math.floor(mapToRange(generator.next(), 0, 1, Math.ceil(min), Math.floor(max) + 1));
+    return Math.floor(remap(generator.next(), [0, 1], [Math.ceil(min), Math.floor(max) + 1]));
 }
 //# sourceMappingURL=random-int-inclusive.js.map

package/lib/random-int-inclusive.js.map

@@ -1 +1 @@
-{"version":3,"file":"random-int-inclusive.js","sourceRoot":"","sources":["../src/random-int-inclusive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AAWjF,MAAM,UAAU,kBAAkB,CAAC,GAAG,IAEyB;IAE7D,IAAI,SAAiC,CAAA;IACrC,IAAI,GAAW,CAAA;IACf,IAAI,GAAW,CAAA;IAEf,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAA;IACpB,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAA;IAC9B,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAC1B,SAAS,CAAC,IAAI,EAAE,EAChB,CAAC,EAAE,CAAC,EACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CACpC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"random-int-inclusive.js","sourceRoot":"","sources":["../src/random-int-inclusive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AAWjF,MAAM,UAAU,kBAAkB,CAAC,GAAG,IAEyB;IAE7D,IAAI,SAAiC,CAAA;IACrC,IAAI,GAAW,CAAA;IACf,IAAI,GAAW,CAAA;IAEf,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAA;IACpB,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAA;IAC9B,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CACrB,SAAS,CAAC,IAAI,EAAE,EAChB,CAAC,CAAC,EAAE,CAAC,CAAC,EACN,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CACtC,CAAC,CAAA;AACJ,CAAC"}

package/lib/random-int.js

@@ -1,16 +1,16 @@
-import { mapToRange } from './map-to-range.js';
-import { NativeRandomNumberGenerator } from './native-random-number-generator.js';
+import { remap } from 'extra-utils';
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js';
 export function randomInt(...args) {
     let generator;
     let min;
     let max;
     if (args.length === 2) {
-        generator = NativeRandomNumberGenerator;
+        generator = nativeRandomNumberGenerator;
         [min, max] = args;
     }
     else {
         [generator, min, max] = args;
     }
-    return Math.floor(mapToRange(generator.next(), 0, 1, Math.ceil(min), Math.floor(max)));
+    return Math.floor(remap(generator.next(), [0, 1], [Math.ceil(min), Math.floor(max)]));
 }
 //# sourceMappingURL=random-int.js.map

package/lib/random-int.js.map

@@ -1 +1 @@
-{"version":3,"file":"random-int.js","sourceRoot":"","sources":["../src/random-int.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AAQjF,MAAM,UAAU,SAAS,CAAC,GAAG,IAEkC;IAE7D,IAAI,SAAiC,CAAA;IACrC,IAAI,GAAW,CAAA;IACf,IAAI,GAAW,CAAA;IAEf,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAA;IACpB,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAA;IAC9B,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAC1B,SAAS,CAAC,IAAI,EAAE,EAChB,CAAC,EAAE,CAAC,EACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAChC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"random-int.js","sourceRoot":"","sources":["../src/random-int.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AAQjF,MAAM,UAAU,SAAS,CAAC,GAAG,IAEkC;IAE7D,IAAI,SAAiC,CAAA;IACrC,IAAI,GAAW,CAAA;IACf,IAAI,GAAW,CAAA;IAEf,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAA;IACpB,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAA;IAC9B,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CACrB,SAAS,CAAC,IAAI,EAAE,EAChB,CAAC,CAAC,EAAE,CAAC,CAAC,EACN,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAClC,CAAC,CAAA;AACJ,CAAC"}

package/lib/random-number.d.ts

@@ -0,0 +1,17 @@
+import { Getter, NonEmptyArray } from 'justypes';
+import { IRandomNumberGenerator } from './types.js';
+export declare enum NumberType {
+    Float = 0,
+    Integer = 1,
+    IntegerInclusive = 2
+}
+export type INumberModel = number | Getter<number> | {
+    type: NumberType;
+    min: number;
+    max: number;
+} | NonEmptyArray<{
+    weight: number;
+    model: INumberModel;
+}>;
+export declare function randomNumber(model: INumberModel): number;
+export declare function randomNumber(generator: IRandomNumberGenerator, model: INumberModel): number;

package/lib/random-number.js

@@ -0,0 +1,42 @@
+import { isArray, isFunction, isNumber } from 'extra-utils';
+import { randomFloat } from './random-float.js';
+import { randomInt } from './random-int.js';
+import { randomIntInclusive } from './random-int-inclusive.js';
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js';
+import { randomPickWeightedItem } from './random-pick-weighted-item.js';
+export var NumberType;
+(function (NumberType) {
+    NumberType[NumberType["Float"] = 0] = "Float";
+    NumberType[NumberType["Integer"] = 1] = "Integer";
+    NumberType[NumberType["IntegerInclusive"] = 2] = "IntegerInclusive";
+})(NumberType || (NumberType = {}));
+export function randomNumber(...args) {
+    let generator;
+    let model;
+    if (args.length === 1) {
+        generator = nativeRandomNumberGenerator;
+        [model] = args;
+    }
+    else {
+        [generator, model] = args;
+    }
+    if (isNumber(model)) {
+        return model;
+    }
+    else if (isFunction(model)) {
+        return model();
+    }
+    else if (isArray(model)) {
+        const item = randomPickWeightedItem(generator, model);
+        return randomNumber(generator, item.model);
+    }
+    else {
+        const { type, min, max } = model;
+        switch (type) {
+            case NumberType.Float: return randomFloat(generator, min, max);
+            case NumberType.Integer: return randomInt(generator, min, max);
+            case NumberType.IntegerInclusive: return randomIntInclusive(generator, min, max);
+        }
+    }
+}
+//# sourceMappingURL=random-number.js.map

package/lib/random-number.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-number.js","sourceRoot":"","sources":["../src/random-number.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAE9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAEvE,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,6CAAK,CAAA;IACL,iDAAO,CAAA;IACP,mEAAgB,CAAA;AAClB,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AAoBD,MAAM,UAAU,YAAY,CAAC,GAAG,IAE0B;IAExD,IAAI,SAAiC,CAAA;IACrC,IAAI,KAAmB,CAAA;IAEvB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;IACjB,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,IAAI,CAAA;IAC3B,CAAC;IAED,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,KAAK,CAAA;IACd,CAAC;SAAM,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,EAAE,CAAA;IAChB,CAAC;SAAM,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,sBAAsB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QACrD,OAAO,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;IAC5C,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAA;QAChC,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO,WAAW,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;YAC9D,KAAK,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,SAAS,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;YAC9D,KAAK,UAAU,CAAC,gBAAgB,CAAC,CAAC,OAAO,kBAAkB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QAClF,CAAC;IACH,CAAC;AACH,CAAC"}

package/lib/random-pick-index.d.ts

@@ -0,0 +1,4 @@
+import { NonEmptyArray } from 'justypes';
+import { IRandomNumberGenerator } from './types.js';
+export declare function randomPickIndex(items: NonEmptyArray<unknown>): number;
+export declare function randomPickIndex(generator: IRandomNumberGenerator, items: NonEmptyArray<unknown>): number;

package/lib/random-pick-index.js

@@ -0,0 +1,15 @@
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js';
+import { randomInt } from './random-int.js';
+export function randomPickIndex(...args) {
+    let generator;
+    let items;
+    if (args.length === 1) {
+        generator = nativeRandomNumberGenerator;
+        [items] = args;
+    }
+    else {
+        [generator, items] = args;
+    }
+    return randomInt(generator, 0, items.length);
+}
+//# sourceMappingURL=random-pick-index.js.map

package/lib/random-pick-index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-pick-index.js","sourceRoot":"","sources":["../src/random-pick-index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAO3C,MAAM,UAAU,eAAe,CAAC,GAAG,IAEiC;IAElE,IAAI,SAAiC,CAAA;IACrC,IAAI,KAA6B,CAAA;IAEjC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;IACjB,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,IAAI,CAAA;IAC3B,CAAC;IAED,OAAO,SAAS,CAAC,SAAS,EAAE,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;AAC9C,CAAC"}

package/lib/random-pick-item.d.ts

@@ -0,0 +1,4 @@
+import { NonEmptyArray } from 'justypes';
+import { IRandomNumberGenerator } from './types.js';
+export declare function randomPickItem<T>(items: NonEmptyArray<T>): T;
+export declare function randomPickItem<T>(generator: IRandomNumberGenerator, items: NonEmptyArray<T>): T;

package/lib/random-pick-item.js

@@ -0,0 +1,16 @@
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js';
+import { randomPickIndex } from './random-pick-index.js';
+export function randomPickItem(...args) {
+    let generator;
+    let items;
+    if (args.length === 1) {
+        generator = nativeRandomNumberGenerator;
+        [items] = args;
+    }
+    else {
+        [generator, items] = args;
+    }
+    const index = randomPickIndex(generator, items);
+    return items[index];
+}
+//# sourceMappingURL=random-pick-item.js.map

package/lib/random-pick-item.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-pick-item.js","sourceRoot":"","sources":["../src/random-pick-item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAOxD,MAAM,UAAU,cAAc,CAAI,GAAG,IAEyB;IAE5D,IAAI,SAAiC,CAAA;IACrC,IAAI,KAAuB,CAAA;IAE3B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;IACjB,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,IAAI,CAAA;IAC3B,CAAC;IAED,MAAM,KAAK,GAAG,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;IAC/C,OAAO,KAAK,CAAC,KAAK,CAAC,CAAA;AACrB,CAAC"}

package/lib/random-pick-weighted-index.d.ts

@@ -0,0 +1,4 @@
+import { NonEmptyArray } from 'justypes';
+import { IRandomNumberGenerator } from './types.js';
+export declare function randomPickWeightedIndex(weights: NonEmptyArray<number>): number;
+export declare function randomPickWeightedIndex(generator: IRandomNumberGenerator, weights: NonEmptyArray<number>): number;

package/lib/random-pick-weighted-index.js

@@ -0,0 +1,15 @@
+import { remapToWeightedIndex } from 'extra-utils';
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js';
+export function randomPickWeightedIndex(...args) {
+    let generator;
+    let weights;
+    if (args.length === 1) {
+        generator = nativeRandomNumberGenerator;
+        [weights] = args;
+    }
+    else {
+        [generator, weights] = args;
+    }
+    return remapToWeightedIndex(generator.next(), [0, 1], weights);
+}
+//# sourceMappingURL=random-pick-weighted-index.js.map

package/lib/random-pick-weighted-index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-pick-weighted-index.js","sourceRoot":"","sources":["../src/random-pick-weighted-index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAElD,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AAOjF,MAAM,UAAU,uBAAuB,CAAC,GAAG,IAE0B;IAEnE,IAAI,SAAiC,CAAA;IACrC,IAAI,OAA8B,CAAA;IAElC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;IACnB,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;IAC7B,CAAC;IAED,OAAO,oBAAoB,CACzB,SAAS,CAAC,IAAI,EAAE,EAChB,CAAC,CAAC,EAAE,CAAC,CAAC,EACN,OAAO,CACR,CAAA;AACH,CAAC"}

package/lib/random-pick-weighted-item.d.ts

@@ -0,0 +1,7 @@
+import { NonEmptyArray } from 'justypes';
+import { IRandomNumberGenerator } from './types.js';
+export interface IWeightedItem {
+    weight: number;
+}
+export declare function randomPickWeightedItem<T extends IWeightedItem>(items: NonEmptyArray<T>): T;
+export declare function randomPickWeightedItem<T extends IWeightedItem>(generator: IRandomNumberGenerator, items: NonEmptyArray<T>): T;

package/lib/random-pick-weighted-item.js

@@ -0,0 +1,17 @@
+import { randomPickWeightedIndex } from './random-pick-weighted-index.js';
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js';
+export function randomPickWeightedItem(...args) {
+    let generator;
+    let items;
+    if (args.length === 1) {
+        generator = nativeRandomNumberGenerator;
+        [items] = args;
+    }
+    else {
+        [generator, items] = args;
+    }
+    const weights = items.map(option => option.weight);
+    const index = randomPickWeightedIndex(generator, weights);
+    return items[index];
+}
+//# sourceMappingURL=random-pick-weighted-item.js.map

package/lib/random-pick-weighted-item.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-pick-weighted-item.js","sourceRoot":"","sources":["../src/random-pick-weighted-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AAGzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAA;AAWjF,MAAM,UAAU,sBAAsB,CAA0B,GAAG,IAEL;IAE5D,IAAI,SAAiC,CAAA;IACrC,IAAI,KAAuB,CAAA;IAE3B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,SAAS,GAAG,2BAA2B,CACtC;QAAA,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;IACjB,CAAC;SAAM,CAAC;QACN,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,IAAI,CAAA;IAC3B,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAA0B,CAAA;IAC3E,MAAM,KAAK,GAAG,uBAAuB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACzD,OAAO,KAAK,CAAC,KAAK,CAAC,CAAA;AACrB,CAAC"}

package/lib/shuffle.js

@@ -1,10 +1,10 @@
-import { NativeRandomNumberGenerator } from './native-random-number-generator.js';
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js';
 import { randomInt } from './random-int.js';
 export function shuffle(...args) {
     let generator;
     let arr;
     if (args.length === 1) {
-        generator = NativeRandomNumberGenerator;
+        generator = nativeRandomNumberGenerator;
         [arr] = args;
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-rand",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Yet another random library",
   "keywords": [
     "random"
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "@blackglory/errors": "^3.0.3",
-    "extra-utils": "^5.7.0",
+    "extra-utils": "^5.15.0",
     "justypes": "^4.2.1"
   }
 }

package/src/index.ts

@@ -1,14 +1,12 @@
 export * from './types.js'
 
-export * from './random.js'
+export * from './random-float.js'
 export * from './random-int.js'
 export * from './random-int-inclusive.js'
+export * from './random-number.js'
 export * from './random-bool.js'
-export * from './random-index-by-weight.js'
-export * from './random-weighted.js'
-export * from './random-by-weight-model.js'
-export * from './random-by-model.js'
+export * from './random-pick-item.js'
+export * from './random-pick-weighted-item.js'
+export * from './random-pick-index.js'
+export * from './random-pick-weighted-index.js'
 export * from './shuffle.js'
-
-export * from './map-to-range.js'
-export * from './map-to-index-by-weight.js'

package/src/native-random-number-generator.ts

@@ -1,5 +1,5 @@
 import { IRandomNumberGenerator } from './types.js'
 
-export const NativeRandomNumberGenerator: IRandomNumberGenerator = {
+export const nativeRandomNumberGenerator: IRandomNumberGenerator = {
   next: Math.random
 }

package/src/random-bool.ts

@@ -1,6 +1,6 @@
 import { IRandomNumberGenerator } from './types.js'
-import { NativeRandomNumberGenerator } from './native-random-number-generator.js'
-import { random } from './random.js'
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js'
+import { randomFloat } from './random-float.js'
 
 export function randomBool(probabilityOfTrue: number): boolean
 export function randomBool(
@@ -15,11 +15,11 @@ export function randomBool(...args:
   let probabilityOfTrue: number
 
   if (args.length === 1) {
-    generator = NativeRandomNumberGenerator
+    generator = nativeRandomNumberGenerator
     ;[probabilityOfTrue] = args
   } else {
     [generator, probabilityOfTrue] = args
   }
 
-  return random(generator, 0, 1) < probabilityOfTrue
+  return randomFloat(generator, 0, 1) < probabilityOfTrue
 }

package/src/{random.ts → random-float.ts}

@@ -1,14 +1,14 @@
-import { mapToRange } from './map-to-range.js'
+import { remap } from 'extra-utils'
 import { IRandomNumberGenerator } from './types.js'
-import { NativeRandomNumberGenerator } from './native-random-number-generator.js'
+import { nativeRandomNumberGenerator } from './native-random-number-generator.js'
 
-export function random(min: number, max: number): number
-export function random(
+export function randomFloat(min: number, max: number): number
+export function randomFloat(
   generator: IRandomNumberGenerator
 , min: number
 , max: number
 ): number
-export function random(...args:
+export function randomFloat(...args:
 | [min: number, max: number]
 | [generator: IRandomNumberGenerator, min: number, max: number]
 ): number {
@@ -17,15 +17,15 @@ export function random(...args:
   let max: number
 
   if (args.length === 2) {
-    generator = NativeRandomNumberGenerator
+    generator = nativeRandomNumberGenerator
     ;[min, max] = args
   } else {
     [generator, min, max] = args
   }
 
-  return mapToRange(
+  return remap(
     generator.next()
-  , 0, 1
-  , min, max
+  , [0, 1]
+  , [min, max]
   )
 }