extra-rand 0.2.0 → 0.3.0

package/README.md

@@ -30,13 +30,61 @@ function randomIntInclusive(min: number, max: number): number
 
 The function returns an integer in the range `[Math.ceil(min), Math.floor(max)]`.
 
-### randomByWeight
+### randomBool
 ```ts
-function randomByWeight(weights: number[]): number
+function randomBool(probabilityOfTrue: number): boolean
+```
+
+### randomIndexByWeight
+```ts
+function randomIndexByWeight(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
+```
+
+### randomByWeightModel
+```ts
+type IWeightModel<T> = NonEmptyArray<{
+  weight: number
+  value: T
+}>
+
+function randomByWeightModel<T>(model: IWeightModel<T>): number
+```
+
+### randomByModel
+```ts
+enum Type {
+  Float
+, Integer
+, IntegerInclusive
+}
+
+type IRandomModel =
+| number
+| Getter<number>
+| {
+    type: Type
+    min: number
+    max: number
+  }
+| NonEmptyArray<{
+    weight: number
+    value: IRandomModel
+  }>
+
+function randomByModel(model: IRandomModel): number
+```
+
 ### mapToRange
 ```ts
 function mapToRange(
@@ -50,10 +98,10 @@ A low-level function helps you to use random number generators other than `Math.
 
 ### mapToIndexByWeight
 ```ts
-function mapByWeight(
+function mapToIndexByWeight(
   value: number
 , oldMin: number, oldMax: number
-, weights: number[]
+, weights: NonEmptyArray<number>
 ): number
 ```
 

package/lib/index.d.ts

@@ -1,6 +1,10 @@
-export * from './random';
-export * from './random-int';
-export * from './random-int-inclusive';
-export * from './random-by-weight';
-export * from './map-to-range';
-export * from './map-to-index-by-weight';
+export * from './random.js';
+export * from './random-int.js';
+export * from './random-int-inclusive.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 './map-to-range.js';
+export * from './map-to-index-by-weight.js';

package/lib/index.js

@@ -1,23 +1,11 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./random"), exports);
-__exportStar(require("./random-int"), exports);
-__exportStar(require("./random-int-inclusive"), exports);
-__exportStar(require("./random-by-weight"), exports);
-__exportStar(require("./map-to-range"), exports);
-__exportStar(require("./map-to-index-by-weight"), exports);
+export * from './random.js';
+export * from './random-int.js';
+export * from './random-int-inclusive.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 './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,2CAAwB;AACxB,+CAA4B;AAC5B,yDAAsC;AACtC,qDAAkC;AAElC,iDAA8B;AAC9B,2DAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,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;AAEpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,6BAA6B,CAAA"}

package/lib/map-to-index-by-weight.d.ts

@@ -1 +1,2 @@
-export declare function mapToIndexByWeight(value: number, oldMin: number, oldMax: number, weights: number[]): number;
+import { NonEmptyArray } from 'justypes';
+export declare function mapToIndexByWeight(value: number, oldMin: number, oldMax: number, weights: NonEmptyArray<number>): number;

package/lib/map-to-index-by-weight.js

@@ -1,18 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapToIndexByWeight = void 0;
-const map_to_range_1 = require("./map-to-range");
-function mapToIndexByWeight(value, oldMin, oldMax, weights) {
+import { mapToRange } from './map-to-range.js';
+export function mapToIndexByWeight(value, oldMin, oldMax, weights) {
     const newMin = 0;
     const newMax = weights.reduce((acc, cur) => acc + Math.max(cur, 0));
     if (newMax === 0) {
-        const index = Math.floor((0, map_to_range_1.mapToRange)(value, oldMin, oldMax, newMin, weights.length));
+        const index = Math.floor(mapToRange(value, oldMin, oldMax, newMin, weights.length));
         return index === weights.length
             ? weights.length - 1
             : index;
     }
     else {
-        const newValue = (0, map_to_range_1.mapToRange)(value, oldMin, oldMax, newMin, newMax);
+        const newValue = mapToRange(value, oldMin, oldMax, newMin, newMax);
         let remains = newMax;
         for (let i = weights.length; i--;) {
             const weight = weights[i];
@@ -29,5 +26,4 @@ function mapToIndexByWeight(value, oldMin, oldMax, weights) {
         throw new Error('Impossible route');
     }
 }
-exports.mapToIndexByWeight = mapToIndexByWeight;
 //# sourceMappingURL=map-to-index-by-weight.js.map

package/lib/map-to-index-by-weight.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-to-index-by-weight.js","sourceRoot":"","sources":["../src/map-to-index-by-weight.ts"],"names":[],"mappings":";;;AAAA,iDAA2C;AAE3C,SAAgB,kBAAkB,CAChC,KAAa,EACb,MAAc,EAAE,MAAc,EAC9B,OAAiB;IAEjB,MAAM,MAAM,GAAG,CAAC,CAAA;IAChB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;IACnE,IAAI,MAAM,KAAK,CAAC,EAAE;QAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,yBAAU,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;QAEnF,OAAO,KAAK,KAAK,OAAO,CAAC,MAAM;YAC1B,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YACpB,CAAC,CAAC,KAAK,CAAA;KACb;SAAM;QACL,MAAM,QAAQ,GAAG,IAAA,yBAAU,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;QAElE,IAAI,OAAO,GAAG,MAAM,CAAA;QACpB,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG;YACjC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YACzB,IAAI,MAAM,IAAI,CAAC,EAAE;gBACf,SAAQ;aACT;iBAAM;gBACL,OAAO,IAAI,MAAM,CAAA;gBACjB,IAAI,QAAQ,IAAI,OAAO,EAAE;oBACvB,OAAO,CAAC,CAAA;iBACT;aACF;SACF;QAED,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;KACpC;AACH,CAAC;AAhCD,gDAgCC"}
+{"version":3,"file":"map-to-index-by-weight.js","sourceRoot":"","sources":["../src/map-to-index-by-weight.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,MAAM,UAAU,kBAAkB,CAChC,KAAa,EACb,MAAc,EAAE,MAAc,EAC9B,OAA8B;IAE9B,MAAM,MAAM,GAAG,CAAC,CAAA;IAChB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;IACnE,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QAEjB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;QAEnF,OAAO,KAAK,KAAK,OAAO,CAAC,MAAM;YAC1B,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YACpB,CAAC,CAAC,KAAK,CAAA;IACd,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;QAElE,IAAI,OAAO,GAAG,MAAM,CAAA;QACpB,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC;YAClC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YACzB,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;gBAChB,SAAQ;YACV,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,MAAM,CAAA;gBACjB,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;oBACxB,OAAO,CAAC,CAAA;gBACV,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;IACrC,CAAC;AACH,CAAC"}

package/lib/map-to-range.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapToRange = void 0;
-function mapToRange(value, oldMin, oldMax, newMin, newMax) {
+export function mapToRange(value, oldMin, oldMax, newMin, newMax) {
     return (value - oldMin) / (oldMax - oldMin)
         * (newMax - newMin)
         + newMin;
 }
-exports.mapToRange = mapToRange;
 //# sourceMappingURL=map-to-range.js.map

package/lib/map-to-range.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-to-range.js","sourceRoot":"","sources":["../src/map-to-range.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU,CACxB,KAAa,EACb,MAAc,EAAE,MAAc,EAC9B,MAAc,EAAE,MAAc;IAE9B,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;UACpC,CAAC,MAAM,GAAG,MAAM,CAAC;UACjB,MAAM,CAAA;AACf,CAAC;AARD,gCAQC"}
+{"version":3,"file":"map-to-range.js","sourceRoot":"","sources":["../src/map-to-range.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,UAAU,CACxB,KAAa,EACb,MAAc,EAAE,MAAc,EAC9B,MAAc,EAAE,MAAc;IAE9B,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;UACpC,CAAC,MAAM,GAAG,MAAM,CAAC;UACjB,MAAM,CAAA;AACf,CAAC"}

package/lib/random-bool.d.ts

@@ -0,0 +1 @@
+export declare function randomBool(probabilityOfTrue: number): boolean;

package/lib/random-bool.js

@@ -0,0 +1,5 @@
+import { random } from './random.js';
+export function randomBool(probabilityOfTrue) {
+    return random(0, 1) < probabilityOfTrue;
+}
+//# sourceMappingURL=random-bool.js.map

package/lib/random-bool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-bool.js","sourceRoot":"","sources":["../src/random-bool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,MAAM,UAAU,UAAU,CAAC,iBAAyB;IAClD,OAAO,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,iBAAiB,CAAA;AACzC,CAAC"}

package/lib/random-by-model.d.ts

@@ -0,0 +1,15 @@
+import { Getter, NonEmptyArray } from 'justypes';
+export declare enum Type {
+    Float = 0,
+    Integer = 1,
+    IntegerInclusive = 2
+}
+export type IRandomModel = number | Getter<number> | {
+    type: Type;
+    min: number;
+    max: number;
+} | NonEmptyArray<{
+    weight: number;
+    value: IRandomModel;
+}>;
+export declare function randomByModel(model: IRandomModel): number;

package/lib/random-by-model.js

@@ -0,0 +1,32 @@
+import { isArray, isFunction, isNumber } from 'extra-utils';
+import { randomByWeightModel } from './random-by-weight-model.js';
+import { random } from './random.js';
+import { randomInt } from './random-int.js';
+import { randomIntInclusive } from './random-int-inclusive.js';
+export var Type;
+(function (Type) {
+    Type[Type["Float"] = 0] = "Float";
+    Type[Type["Integer"] = 1] = "Integer";
+    Type[Type["IntegerInclusive"] = 2] = "IntegerInclusive";
+})(Type || (Type = {}));
+export function randomByModel(model) {
+    if (isNumber(model)) {
+        return model;
+    }
+    else if (isFunction(model)) {
+        return model();
+    }
+    else if (isArray(model)) {
+        const subModel = randomByWeightModel(model);
+        return randomByModel(subModel);
+    }
+    else {
+        const { type, min, max } = model;
+        switch (type) {
+            case Type.Float: return random(min, max);
+            case Type.Integer: return randomInt(min, max);
+            case Type.IntegerInclusive: return randomIntInclusive(min, max);
+        }
+    }
+}
+//# sourceMappingURL=random-by-model.js.map

package/lib/random-by-model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-by-model.js","sourceRoot":"","sources":["../src/random-by-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAE9D,MAAM,CAAN,IAAY,IAIX;AAJD,WAAY,IAAI;IACd,iCAAK,CAAA;IACL,qCAAO,CAAA;IACP,uDAAgB,CAAA;AAClB,CAAC,EAJW,IAAI,KAAJ,IAAI,QAIf;AAeD,MAAM,UAAU,aAAa,CAAC,KAAmB;IAC/C,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,QAAQ,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAA;QAC3C,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAA;IAChC,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAA;QAChC,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YACxC,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YAC7C,KAAK,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QACjE,CAAC;IACH,CAAC;AACH,CAAC"}

package/lib/random-by-weight-model.d.ts

@@ -0,0 +1,6 @@
+import { NonEmptyArray } from 'justypes';
+export type IWeightModel<T> = NonEmptyArray<{
+    weight: number;
+    value: T;
+}>;
+export declare function randomByWeightModel<T>(model: IWeightModel<T>): T;

package/lib/random-by-weight-model.js

@@ -0,0 +1,6 @@
+import { randomWeighted } from './random-weighted.js';
+export function randomByWeightModel(model) {
+    const { value } = randomWeighted(model);
+    return value;
+}
+//# sourceMappingURL=random-by-weight-model.js.map

package/lib/random-by-weight-model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-by-weight-model.js","sourceRoot":"","sources":["../src/random-by-weight-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAOrD,MAAM,UAAU,mBAAmB,CAAI,KAAsB;IAC3D,MAAM,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,KAAK,CAAC,CAAA;IACvC,OAAO,KAAK,CAAA;AACd,CAAC"}

package/lib/random-index-by-weight.d.ts

@@ -0,0 +1,2 @@
+import { NonEmptyArray } from 'justypes';
+export declare function randomIndexByWeight(weights: NonEmptyArray<number>): number;

package/lib/random-index-by-weight.js

@@ -0,0 +1,5 @@
+import { mapToIndexByWeight } from './map-to-index-by-weight.js';
+export function randomIndexByWeight(weights) {
+    return mapToIndexByWeight(Math.random(), 0, 1, weights);
+}
+//# sourceMappingURL=random-index-by-weight.js.map

package/lib/random-index-by-weight.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-index-by-weight.js","sourceRoot":"","sources":["../src/random-index-by-weight.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAEhE,MAAM,UAAU,mBAAmB,CAAC,OAA8B;IAChE,OAAO,kBAAkB,CACvB,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,OAAO,CACR,CAAA;AACH,CAAC"}

package/lib/random-int-inclusive.js

@@ -1,9 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomIntInclusive = void 0;
-const map_to_range_1 = require("./map-to-range");
-function randomIntInclusive(min, max) {
-    return Math.floor((0, map_to_range_1.mapToRange)(Math.random(), 0, 1, Math.ceil(min), Math.floor(max) + 1));
+import { mapToRange } from './map-to-range.js';
+export function randomIntInclusive(min, max) {
+    return Math.floor(mapToRange(Math.random(), 0, 1, Math.ceil(min), Math.floor(max) + 1));
 }
-exports.randomIntInclusive = randomIntInclusive;
 //# 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,iDAA2C;AAE3C,SAAgB,kBAAkB,CAAC,GAAW,EAAE,GAAW;IACzD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,yBAAU,EAC1B,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CACpC,CAAC,CAAA;AACJ,CAAC;AAND,gDAMC"}
+{"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,MAAM,UAAU,kBAAkB,CAAC,GAAW,EAAE,GAAW;IACzD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAC1B,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CACpC,CAAC,CAAA;AACJ,CAAC"}

package/lib/random-int.js

@@ -1,9 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomInt = void 0;
-const map_to_range_1 = require("./map-to-range");
-function randomInt(min, max) {
-    return Math.floor((0, map_to_range_1.mapToRange)(Math.random(), 0, 1, Math.ceil(min), Math.floor(max)));
+import { mapToRange } from './map-to-range.js';
+export function randomInt(min, max) {
+    return Math.floor(mapToRange(Math.random(), 0, 1, Math.ceil(min), Math.floor(max)));
 }
-exports.randomInt = randomInt;
 //# 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,iDAA2C;AAE3C,SAAgB,SAAS,CAAC,GAAW,EAAE,GAAW;IAChD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,yBAAU,EAC1B,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAChC,CAAC,CAAA;AACJ,CAAC;AAND,8BAMC"}
+{"version":3,"file":"random-int.js","sourceRoot":"","sources":["../src/random-int.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,MAAM,UAAU,SAAS,CAAC,GAAW,EAAE,GAAW;IAChD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAC1B,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAChC,CAAC,CAAA;AACJ,CAAC"}

package/lib/random-weighted.d.ts

@@ -0,0 +1,5 @@
+import { NonEmptyArray } from 'justypes';
+export interface IWeighted {
+    weight: number;
+}
+export declare function randomWeighted<T extends IWeighted>(values: NonEmptyArray<T>): T;

package/lib/random-weighted.js

@@ -0,0 +1,7 @@
+import { randomIndexByWeight } from './random-index-by-weight.js';
+export function randomWeighted(values) {
+    const weights = values.map(option => option.weight);
+    const index = randomIndexByWeight(weights);
+    return values[index];
+}
+//# sourceMappingURL=random-weighted.js.map

package/lib/random-weighted.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-weighted.js","sourceRoot":"","sources":["../src/random-weighted.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAOjE,MAAM,UAAU,cAAc,CAAsB,MAAwB;IAC1E,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAA0B,CAAA;IAC5E,MAAM,KAAK,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAA;IAC1C,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;AACtB,CAAC"}

package/lib/random.js

@@ -1,9 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.random = void 0;
-const map_to_range_1 = require("./map-to-range");
-function random(min, max) {
-    return (0, map_to_range_1.mapToRange)(Math.random(), 0, 1, min, max);
+import { mapToRange } from './map-to-range.js';
+export function random(min, max) {
+    return mapToRange(Math.random(), 0, 1, min, max);
 }
-exports.random = random;
 //# sourceMappingURL=random.js.map

package/lib/random.js.map

@@ -1 +1 @@
-{"version":3,"file":"random.js","sourceRoot":"","sources":["../src/random.ts"],"names":[],"mappings":";;;AAAA,iDAA2C;AAE3C,SAAgB,MAAM,CAAC,GAAW,EAAE,GAAW;IAC7C,OAAO,IAAA,yBAAU,EACf,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,GAAG,EAAE,GAAG,CACT,CAAA;AACH,CAAC;AAND,wBAMC"}
+{"version":3,"file":"random.js","sourceRoot":"","sources":["../src/random.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,MAAM,UAAU,MAAM,CAAC,GAAW,EAAE,GAAW;IAC7C,OAAO,UAAU,CACf,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,GAAG,EAAE,GAAG,CACT,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-rand",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Yet another random library",
   "keywords": [
     "random"
@@ -12,43 +12,49 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "sideEffects": false,
+  "type": "module",
+  "engines": {
+    "node": ">=18.17.0"
+  },
   "repository": "git@github.com:BlackGlory/extra-rand.git",
   "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
   "license": "MIT",
   "scripts": {
-    "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
-    "test": "jest --config jest.config.js",
-    "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
-    "test:coverage": "jest --coverage --config jest.config.js",
-    "prepublishOnly": "run-s clean build",
+    "prepare": "ts-patch install -s",
+    "lint": "eslint --quiet src __tests__",
+    "test": "vitest --run",
+    "prepublishOnly": "run-s prepare clean build",
     "clean": "rimraf lib",
-    "build": "run-s build:*",
-    "build:compile": "tsc --project tsconfig.build.json --module commonjs --target es2018 --outDir lib",
-    "build:patch": "tscpaths -p tsconfig.build.json -s ./src -o ./lib",
+    "build": "tsc --project tsconfig.build.json --outDir lib",
     "release": "standard-version"
   },
   "husky": {
     "hooks": {
-      "pre-commit": "run-s lint build test",
+      "pre-commit": "run-s prepare lint build test",
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.5.1",
-    "@commitlint/config-conventional": "^17.4.4",
-    "@types/jest": "^29.5.0",
-    "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.57.0",
-    "eslint": "^8.37.0",
+    "@commitlint/cli": "^19.2.2",
+    "@commitlint/config-conventional": "^19.2.2",
+    "@eslint/js": "^9.0.0",
+    "eslint": "^9.0.0",
     "husky": "^4.3.8",
-    "jest": "^29.5.0",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.5",
     "standard-version": "^9.5.0",
-    "ts-jest": "^29.0.5",
-    "tscpaths": "^0.0.9",
-    "tslib": "^2.5.0",
-    "typescript": "^4.7.4"
+    "ts-patch": "^3.1.2",
+    "tslib": "^2.6.2",
+    "typescript": "^5.4.5",
+    "typescript-eslint": "^7.7.0",
+    "typescript-transform-paths": "^3.4.7",
+    "vite": "^5.2.9",
+    "vite-tsconfig-paths": "^4.3.2",
+    "vitest": "^1.5.0"
   },
-  "dependencies": {}
+  "dependencies": {
+    "@blackglory/errors": "^3.0.3",
+    "extra-utils": "^5.7.0",
+    "justypes": "^4.2.1"
+  }
 }

package/src/index.ts

@@ -1,7 +1,11 @@
-export * from './random'
-export * from './random-int'
-export * from './random-int-inclusive'
-export * from './random-by-weight'
+export * from './random.js'
+export * from './random-int.js'
+export * from './random-int-inclusive.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 './map-to-range'
-export * from './map-to-index-by-weight'
+export * from './map-to-range.js'
+export * from './map-to-index-by-weight.js'

package/src/map-to-index-by-weight.ts

@@ -1,9 +1,10 @@
-import { mapToRange } from './map-to-range'
+import { NonEmptyArray } from 'justypes'
+import { mapToRange } from './map-to-range.js'
 
 export function mapToIndexByWeight(
   value: number
 , oldMin: number, oldMax: number
-, weights: number[]
+, weights: NonEmptyArray<number>
 ): number {
   const newMin = 0
   const newMax = weights.reduce((acc, cur) => acc + Math.max(cur, 0))

package/src/random-bool.ts

@@ -0,0 +1,5 @@
+import { random } from './random.js'
+
+export function randomBool(probabilityOfTrue: number): boolean {
+  return random(0, 1) < probabilityOfTrue
+}

package/src/random-by-model.ts

@@ -0,0 +1,43 @@
+import { Getter, NonEmptyArray } from 'justypes'
+import { isArray, isFunction, isNumber } from 'extra-utils'
+import { randomByWeightModel } from './random-by-weight-model.js'
+import { random } from './random.js'
+import { randomInt } from './random-int.js'
+import { randomIntInclusive } from './random-int-inclusive.js'
+
+export enum Type {
+  Float
+, Integer
+, IntegerInclusive
+}
+
+export type IRandomModel =
+| number
+| Getter<number>
+| {
+    type: Type
+    min: number
+    max: number
+  }
+| NonEmptyArray<{
+    weight: number
+    value: IRandomModel
+  }>
+
+export function randomByModel(model: IRandomModel): number {
+  if (isNumber(model)) {
+    return model
+  } else if (isFunction(model)) {
+    return model()
+  } else if (isArray(model)) {
+    const subModel = randomByWeightModel(model)
+    return randomByModel(subModel)
+  } else {
+    const { type, min, max } = model
+    switch (type) {
+      case Type.Float: return random(min, max)
+      case Type.Integer: return randomInt(min, max)
+      case Type.IntegerInclusive: return randomIntInclusive(min, max)
+    }
+  }
+}

package/src/random-by-weight-model.ts

@@ -0,0 +1,12 @@
+import { NonEmptyArray } from 'justypes'
+import { randomWeighted } from './random-weighted.js'
+
+export type IWeightModel<T> = NonEmptyArray<{
+  weight: number
+  value: T
+}>
+
+export function randomByWeightModel<T>(model: IWeightModel<T>): T {
+  const { value } = randomWeighted(model)
+  return value
+}

package/src/random-index-by-weight.ts

@@ -0,0 +1,10 @@
+import { NonEmptyArray } from 'justypes'
+import { mapToIndexByWeight } from './map-to-index-by-weight.js'
+
+export function randomIndexByWeight(weights: NonEmptyArray<number>): number {
+  return mapToIndexByWeight(
+    Math.random()
+  , 0, 1
+  , weights
+  )
+}

package/src/random-int-inclusive.ts

@@ -1,4 +1,4 @@
-import { mapToRange } from './map-to-range'
+import { mapToRange } from './map-to-range.js'
 
 export function randomIntInclusive(min: number, max: number): number {
   return Math.floor(mapToRange(

package/src/random-int.ts

@@ -1,4 +1,4 @@
-import { mapToRange } from './map-to-range'
+import { mapToRange } from './map-to-range.js'
 
 export function randomInt(min: number, max: number): number {
   return Math.floor(mapToRange(

package/src/random-weighted.ts

@@ -0,0 +1,12 @@
+import { randomIndexByWeight } from './random-index-by-weight.js'
+import { NonEmptyArray } from 'justypes'
+
+export interface IWeighted {
+  weight: number
+}
+
+export function randomWeighted<T extends IWeighted>(values: NonEmptyArray<T>): T {
+  const weights = values.map(option => option.weight) as NonEmptyArray<number>
+  const index = randomIndexByWeight(weights)
+  return values[index]
+}

package/src/random.ts

@@ -1,4 +1,4 @@
-import { mapToRange } from './map-to-range'
+import { mapToRange } from './map-to-range.js'
 
 export function random(min: number, max: number): number {
   return mapToRange(

package/lib/random-by-weight.d.ts

@@ -1 +0,0 @@
-export declare function randomByWeight(weights: number[]): number;

package/lib/random-by-weight.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomByWeight = void 0;
-const map_to_index_by_weight_1 = require("./map-to-index-by-weight");
-function randomByWeight(weights) {
-    return (0, map_to_index_by_weight_1.mapToIndexByWeight)(Math.random(), 0, 1, weights);
-}
-exports.randomByWeight = randomByWeight;
-//# sourceMappingURL=random-by-weight.js.map

package/lib/random-by-weight.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"random-by-weight.js","sourceRoot":"","sources":["../src/random-by-weight.ts"],"names":[],"mappings":";;;AAAA,qEAA6D;AAE7D,SAAgB,cAAc,CAAC,OAAiB;IAC9C,OAAO,IAAA,2CAAkB,EACvB,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,OAAO,CACR,CAAA;AACH,CAAC;AAND,wCAMC"}

package/src/random-by-weight.ts

@@ -1,9 +0,0 @@
-import { mapToIndexByWeight } from './map-to-index-by-weight'
-
-export function randomByWeight(weights: number[]): number {
-  return mapToIndexByWeight(
-    Math.random()
-  , 0, 1
-  , weights
-  )
-}