randex 0.11.0 → 0.13.0

package/README.md

@@ -14,7 +14,7 @@ Installation:
 npm i randex
 ```
 
-Functions:
+Strings:
 
 - [random](#random)
 - [randomFileName](#randomfilename)
@@ -23,6 +23,13 @@ Functions:
 - [randomName](#randomname)
 - [randomFullName](#randomfullname)
 
+Numbers:
+- [randomNumber](#randomnumber)
+- [randomNumberArray](#randomnumberarray)
+
+Generic Type:
+- [randomArray](#randomarray)
+
 Deeps:
 
 - [Customization](#customization)
@@ -293,6 +300,50 @@ Options:
 |secondLength|[RandexLength](#randexlength) | Second name length of chars. Default: [2,10] |
 |alphabet|[RandexAlphabet](#randexalphabet) | Defined alphabet. Default: `english` |
 
+
+## randomNumber
+
+Generates random number from a range of numbers.
+
+```ts
+import { randomNumber } from "randex";
+
+// Generates a number from a range: [0, 3] (includes 0 and 3).
+randomNumber(3);
+
+// Generates a number from a specified range: [3, 7].
+randomNumber([3, 7]);
+```
+
+## randomNumberArray
+
+Generates random array with values from a range.
+
+```ts
+import { randomNumberArray } from "randex";
+
+// Generates an array (with length equals 2) with unique numbers from a range: [0, 3].
+randomNumberArray(3, 2);
+
+// Generates an array (with length equals 3) with unique numbers from a range: [3, 7].
+randomNumber([3, 7], 3);
+```
+
+## randomArray
+
+Generates random array with values from defined array.
+
+```ts
+import { randomArray } from "randex";
+
+// Generates an array (with length equals 2) with values picked from defined array as the first parameter.
+randomArray([1, 2, 3, 4], 2);
+// [2, 4]
+randomArray(["1", "2", "3", "4"], 2);
+// ["1", "3"]
+```
+
+
 ## Customization
 
 [random](#random) function is very flexible, there are many custom functions can be created.

package/lib/basic/index.js

@@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.random = void 0;
 var set_1 = require("./set");
 var type_1 = require("./type");
-function randomInt(max) {
-    return Math.floor(Math.random() * max);
-}
 function randomString(params) {
     var length = params.length, range = params.range;
     var result = "";
@@ -15,10 +12,10 @@ function randomString(params) {
     }
     else if (Array.isArray(length)) {
         var min = length[0], max = length[1];
-        currentLength = min + randomInt(max - min);
+        currentLength = min + set_1.RandexSetUtil.randomNumber(max - min + 1);
     }
     for (var i = 0; i < currentLength; i++) {
-        var index = randomInt(range.length - 1);
+        var index = set_1.RandexSetUtil.randomNumber(range.length - 1);
         if (range.length >= index || range.length <= index) {
             result += range[index];
         }

package/lib/basic/set.d.ts

@@ -11,4 +11,5 @@ export declare class RandexSetUtil {
     private static toAlphabetRange;
     static toRange(set: RandexSet): string;
     static getLength(reservedChars: number, length: RandexLength | undefined, defaultLength: RandexLength): RandexLength;
+    static randomNumber(length: number): number;
 }

package/lib/basic/set.js

@@ -94,6 +94,9 @@ var RandexSetUtil = /** @class */ (function () {
         }
         return result;
     };
+    RandexSetUtil.randomNumber = function (length) {
+        return Math.floor(Math.random() * length);
+    };
     RandexSetUtil.defaultFileNameLength = [3, 10];
     RandexSetUtil.defaultExtensionLength = [2, 5];
     RandexSetUtil.fileNameExtraChars = ""; //"-_.";

package/lib/custom/array.d.ts

@@ -0,0 +1 @@
+export declare function randomArray<T>(array: T[], count: number): T[];

package/lib/custom/array.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.randomArray = void 0;
+var number_1 = require("./number");
+function randomArray(array, count) {
+    var result = [];
+    var maxCount = array.length;
+    var uniqueArray = [];
+    for (var i = 0; i < array.length; i++) {
+        uniqueArray.push(array[i]);
+    }
+    for (var i = 0; i < count && i < maxCount; i++) {
+        var arrayCount = uniqueArray.length - 1;
+        var index = (0, number_1.randomNumber)(arrayCount);
+        var value = uniqueArray[index];
+        result.push(value);
+        uniqueArray.splice(index, 1);
+    }
+    return result;
+}
+exports.randomArray = randomArray;

package/lib/custom/filename.js

@@ -5,7 +5,7 @@ var basic_1 = require("../basic");
 var set_1 = require("../basic/set");
 var type_1 = require("../basic/type");
 function randomFileName(p1, p2) {
-    var fileNameLength = set_1.RandexSetUtil.getLength(1, set_1.RandexSetUtil.defaultFileNameLength, set_1.RandexSetUtil.defaultFileNameLength);
+    var fileNameLength = set_1.RandexSetUtil.defaultFileNameLength;
     var extensionLength = set_1.RandexSetUtil.defaultExtensionLength;
     var extension = "";
     if (type_1.RandexTypeParser.isLength(p1)) {
@@ -31,6 +31,7 @@ function randomFileName(p1, p2) {
             extension = p1.extension;
         }
     }
+    fileNameLength = set_1.RandexSetUtil.getLength(1, fileNameLength, fileNameLength);
     if (!extension) {
         extension = (0, basic_1.random)([["english", "l"], extensionLength]);
     }

package/lib/custom/index.d.ts

@@ -3,3 +3,5 @@ export * from "./filename";
 export * from "./name";
 export * from "./username";
 export * from "./fullname";
+export * from "./number";
+export * from "./number-array";

package/lib/custom/index.js

@@ -19,3 +19,5 @@ __exportStar(require("./filename"), exports);
 __exportStar(require("./name"), exports);
 __exportStar(require("./username"), exports);
 __exportStar(require("./fullname"), exports);
+__exportStar(require("./number"), exports);
+__exportStar(require("./number-array"), exports);

package/lib/custom/number-array.d.ts

@@ -0,0 +1,2 @@
+import { RandexLength } from "../interfaces";
+export declare function randomNumberArray(length: RandexLength, count: number): number[];

package/lib/custom/number-array.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.randomNumberArray = void 0;
+var number_1 = require("./number");
+function randomNumberArray(length, count) {
+    var min = 0;
+    var max = 0;
+    var result = [];
+    if (typeof length === "number") {
+        max = length;
+    }
+    else {
+        min = length[0];
+        max = length[1];
+    }
+    var maxCount = max - min + 1;
+    var numberArray = [];
+    for (var i = min; i <= max; i++) {
+        numberArray.push(i);
+    }
+    for (var i = 0; i < count && i < maxCount; i++) {
+        var arrayCount = numberArray.length - 1;
+        var index = (0, number_1.randomNumber)(arrayCount);
+        var value = numberArray[index];
+        result.push(value);
+        numberArray.splice(index, 1);
+    }
+    return result;
+}
+exports.randomNumberArray = randomNumberArray;

package/lib/custom/number.d.ts

@@ -0,0 +1,2 @@
+import { RandexLength } from "../interfaces";
+export declare function randomNumber(length: RandexLength): number;

package/lib/custom/number.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.randomNumber = void 0;
+var set_1 = require("../basic/set");
+function randomNumber(length) {
+    if (typeof length === "number") {
+        return set_1.RandexSetUtil.randomNumber(length + 1);
+    }
+    else {
+        var min = length[0], max = length[1];
+        return set_1.RandexSetUtil.randomNumber(max - min + 1) + min;
+    }
+}
+exports.randomNumber = randomNumber;

package/lib/test/array.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/test/array.test.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var array_1 = require("../custom/array");
+function testUniqueArray(array, count) {
+    var value = (0, array_1.randomArray)(array, count);
+    var uniqueResult = [];
+    var _loop_1 = function (i) {
+        var uniqueValue = value[i];
+        expect(uniqueResult.find(function (x) { return x === uniqueValue; })).toBeFalsy();
+        uniqueResult.push(uniqueValue);
+    };
+    for (var i = 0; i < count; i++) {
+        _loop_1(i);
+    }
+}
+describe("randomNumberArray", function () {
+    it("param: number", function () {
+        testUniqueArray([1, 2, 3, 4, 5, 6], 6);
+    });
+    it("param: string", function () {
+        testUniqueArray(["1", "2", "3", "4", "5", "6"], 6);
+    });
+    it("max count - array count", function () {
+        testUniqueArray([1, 2, 3, 4, 5, 6], 8);
+    });
+});

package/lib/test/filename.test.js

@@ -49,7 +49,7 @@ describe("randomFileName", function () {
             testFileName({ fullFileName: fullFileName, fileNameLength: r.defaultFileNameLength, extensionLength: extensionLength });
         });
     });
-    it("params: extension", function () {
+    it("params2: extension", function () {
         var fileNameLength = [10, 15];
         var extension = "xml";
         test_util_1.TestUtil.loop(function () {

package/lib/test/number-array.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/test/number-array.test.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var number_array_1 = require("../custom/number-array");
+function testNumber(min, max, count) {
+    var value = (0, number_array_1.randomNumberArray)([min, max], count);
+    var uniqueResult = [];
+    var _loop_1 = function (i) {
+        var uniqueValue = value[i];
+        expect(uniqueResult.find(function (x) { return x === uniqueValue; })).toBeFalsy();
+        expect(value[i]).toBeGreaterThanOrEqual(min);
+        expect(value[i]).toBeLessThanOrEqual(max);
+        uniqueResult.push(uniqueValue);
+    };
+    for (var i = 0; i < count; i++) {
+        _loop_1(i);
+    }
+}
+describe("randomNumberArray", function () {
+    it("param: number", function () {
+        testNumber(0, 2, 0);
+        testNumber(1, 5, 1);
+        testNumber(5, 10, 2);
+    });
+    it("param: big number", function () {
+        testNumber(50, 500, 50);
+    });
+    it("max count - unique", function () {
+        testNumber(10, 20, 11);
+    });
+    it("count limit", function () {
+        var min = 5;
+        var max = 10;
+        var count = max - min + 1;
+        var value = (0, number_array_1.randomNumberArray)([min, max], count);
+        expect(value.length).toBe(count);
+        // max length limit
+        value = (0, number_array_1.randomNumberArray)([min, max], count + 10);
+        expect(value.length).toBe(count);
+    });
+    it("range: fill all possible values", function () {
+        var min = 5;
+        var max = 10;
+        var count = max - min + 1;
+        var value = (0, number_array_1.randomNumberArray)([min, max], count);
+        expect(value.length).toBe(count);
+        var _loop_2 = function (i) {
+            expect(value.find(function (x) { return x === i; })).toBeTruthy();
+        };
+        for (var i = min; i <= max; i++) {
+            _loop_2(i);
+        }
+    });
+});

package/lib/test/number.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/test/number.test.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var number_1 = require("../custom/number");
+var test_util_1 = require("./test-util");
+function testNumber(max) {
+    var value = (0, number_1.randomNumber)(max);
+    expect(value).toBeGreaterThanOrEqual(0);
+    expect(value).toBeLessThanOrEqual(max);
+}
+function testNumberWithArray(range) {
+    var min = range[0], max = range[1];
+    var value = (0, number_1.randomNumber)(range);
+    expect(value).toBeGreaterThanOrEqual(min);
+    expect(value).toBeLessThanOrEqual(max);
+}
+describe("randomNumber", function () {
+    it("param: number", function () {
+        testNumber(0);
+        testNumber(1);
+        testNumber(5);
+    });
+    it("much range", function () {
+        var max = 4;
+        var result = {};
+        test_util_1.TestUtil.loop(function () {
+            var value = (0, number_1.randomNumber)(max);
+            result[value] = (result[value] || 0) + 1;
+        });
+        for (var i = 0; i <= max; i++) {
+            expect(result[i]).toBeGreaterThan(0);
+        }
+    });
+    it("param: number array", function () {
+        test_util_1.TestUtil.loop(function () {
+            testNumberWithArray([10, 15]);
+        });
+    });
+});

package/lib/test/random.test.js

@@ -26,6 +26,28 @@ describe("random", function () {
         inRange("abc", 3);
         inRange("1234abc!@#", 3);
     });
+    it("result 1: number", function () {
+        var length = [0, 4];
+        var result = {};
+        test_util_1.TestUtil.loop(function () {
+            var l = (0, basic_1.random)({ set: "english", length: length }).length;
+            result[l] = (result[l] || 0) + 1;
+        });
+        for (var i = 0; i <= 4; i++) {
+            expect(result[i]).toBeGreaterThan(0);
+        }
+    });
+    it("result 2: number range", function () {
+        var length = [5, 8];
+        var result = {};
+        test_util_1.TestUtil.loop(function () {
+            var l = (0, basic_1.random)({ set: "english", length: length }).length;
+            result[l] = (result[l] || 0) + 1;
+        });
+        for (var i = 5; i <= 8; i++) {
+            expect(result[i]).toBeGreaterThan(0);
+        }
+    });
     it("length: alphabet", function () {
         inSet("english", 0);
         inSet("english", [0, 0]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "randex",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",