randex 1.1.0 → 1.4.0

package/lib/test/spreader.test.js

@@ -1,27 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var set_1 = require("../basic/set");
-var spreader_1 = require("../utils/spreader");
-describe("RandexSpreader", function () {
-    it("spreads from temp items without replacement", function () {
-        var picker = new spreader_1.RandexSpreader(["a", "b", "c"]);
-        var randomSpy = jest.spyOn(set_1.RandexSetUtil, "randomSingleNumber");
+/* eslint-disable no-underscore-dangle */
+const set_1 = require("../basic/set");
+const spreader_1 = require("../utils/spreader");
+describe("RandexSpreader", () => {
+    it("spreads from temp items without replacement", () => {
+        const picker = new spreader_1.RandexSpreader(["a", "b", "c"]);
+        const randomSpy = jest.spyOn(set_1.RandexSetUtil, "randomSingleNumber");
         randomSpy.mockReturnValueOnce(1).mockReturnValueOnce(0).mockReturnValueOnce(0);
         expect(picker.spread(3)).toEqual(["b", "a", "c"]);
         expect(picker._tempItems).toEqual([]);
         randomSpy.mockRestore();
     });
-    it("keeps refilling until it returns the requested count", function () {
-        var picker = new spreader_1.RandexSpreader([1, 2]);
-        var randomSpy = jest.spyOn(set_1.RandexSetUtil, "randomSingleNumber");
+    it("keeps refilling until it returns the requested count", () => {
+        const picker = new spreader_1.RandexSpreader([1, 2]);
+        const randomSpy = jest.spyOn(set_1.RandexSetUtil, "randomSingleNumber");
         randomSpy.mockReturnValueOnce(0).mockReturnValueOnce(0).mockReturnValueOnce(1).mockReturnValueOnce(0).mockReturnValueOnce(0);
         expect(picker.spread(5)).toEqual([1, 2, 2, 1, 1]);
         expect(picker._tempItems).toEqual([2]);
         randomSpy.mockRestore();
     });
-    it("refills temp items until the requested count is reached", function () {
-        var picker = new spreader_1.RandexSpreader(["x", "y"]);
-        var randomSpy = jest.spyOn(set_1.RandexSetUtil, "randomSingleNumber");
+    it("refills temp items until the requested count is reached", () => {
+        const picker = new spreader_1.RandexSpreader(["x", "y"]);
+        const randomSpy = jest.spyOn(set_1.RandexSetUtil, "randomSingleNumber");
         randomSpy.mockReturnValueOnce(1).mockReturnValueOnce(0).mockReturnValueOnce(0);
         expect(picker.spread(3)).toEqual(["y", "x", "x"]);
         expect(picker._tempItems).toEqual(["y"]);

package/lib/test/testUtil.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestUtil = void 0;
+const const_1 = require("../basic/const");
+const set_1 = require("../basic/set");
+class TestUtil {
+    static testIn(value, length = 1, action) {
+        if (typeof length === "number") {
+            expect(value.length).toBe(length);
+        }
+        else if (Array.isArray(length)) {
+            const [min, max] = length;
+            expect(value.length).toBeGreaterThanOrEqual(min);
+            expect(value.length).toBeLessThanOrEqual(max);
+        }
+        if (value) {
+            action();
+        }
+    }
+    static loop(action) {
+        for (let i = 0; i < 100; i++) {
+            action(i);
+        }
+    }
+    static testInSet(value, set, length = 1) {
+        TestUtil.testIn(value, length, () => {
+            expect(TestUtil.inSet(value, set)).toBeTruthy();
+        });
+    }
+    static testInSetRange(value, set, range, length = 1) {
+        TestUtil.testIn(value, length, () => {
+            expect(TestUtil.inSet(value, set, range)).toBeTruthy();
+        });
+    }
+    static testInRange(value, range, length = 1) {
+        TestUtil.testIn(value, length, () => {
+            expect(TestUtil.inRange(value, range)).toBeTruthy();
+        });
+    }
+    static testInBoth(value, set, range, length = 1) {
+        TestUtil.testIn(value, length, () => {
+            expect(TestUtil.inBoth(value, set, range)).toBeTruthy();
+        });
+    }
+    static inRange(value, range) {
+        for (let i = 0; i < value.length; i++) {
+            if (!range.includes(value[i])) {
+                return false;
+            }
+        }
+        return value.length > 0;
+    }
+    static inSet(value, set, range) {
+        const fullRange = set_1.RandexSetUtil.toRange(set) + (range ? range : "");
+        return TestUtil.inRange(value, fullRange);
+    }
+    static inBoth(value, set, range) {
+        const fullRange = set_1.RandexSetUtil.toRange(set) + range;
+        return TestUtil.inRange(value, fullRange);
+    }
+    static isEmailValid(email) {
+        return String(email)
+            .toLowerCase()
+            .match(/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|.(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/);
+    }
+    static isUsernameValid(email) {
+        return String(email)
+            .toLowerCase()
+            .match(/^[a-z][a-z0-9]{5,}$/);
+    }
+    static isNameValid(email) {
+        return String(email).match(/^[A-Z][a-z]{1,}$/);
+    }
+    static isWordValid(text, length = const_1.DEFAULT_WORD_RANGE) {
+        const l = TestUtil.getLength(length);
+        return String(text).match(new RegExp(`^[a-z]{${l}}$`));
+    }
+    static isSentenceValid(text, length = const_1.DEFAULT_SENTENCE_RANGE) {
+        const splits = text.split(" ");
+        if (Array.isArray(length)) {
+            const [min, max] = length;
+            return splits.length >= min && splits.length <= max;
+        }
+        else {
+            return splits.length === length;
+        }
+    }
+    static isPhraseValid(text, length = const_1.DEFAULT_PHRASE_RANGE) {
+        const splits = text.split(" ");
+        if (Array.isArray(length)) {
+            const [min, max] = length;
+            return splits.length >= min && splits.length <= max;
+        }
+        else {
+            return splits.length === length;
+        }
+    }
+    static isUpperCharValid(value, length = 1) {
+        const l = TestUtil.getLength(length);
+        return String(value).match(new RegExp(`^[A-Z]{${l}}$`));
+    }
+    static isLowerCharValid(value, length = 1) {
+        const l = TestUtil.getLength(length);
+        return String(value).match(new RegExp(`^[a-z]{${l}}$`));
+    }
+    static isFullNameValid(email) {
+        return String(email).match(/^[A-Z][a-z]{1,}[ ][A-Z][a-z]{1,}$/);
+    }
+    static isFileNameValid(email) {
+        return String(email)
+            .toLowerCase()
+            .match(/^[a-z0-9_.]{2,}$/);
+    }
+    static inNumberRange(value, range) {
+        return value >= range[0] && value <= range[1];
+    }
+    static getLength(length) {
+        return Array.isArray(length) ? `${length[0]},${length[1]}` : length;
+    }
+}
+exports.TestUtil = TestUtil;

package/lib/test/type.test.js

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var type_1 = require("../basic/type");
-function isLength(value, expectedResult) {
-    if (expectedResult === void 0) { expectedResult = true; }
-    var result = type_1.RandexTypeParser.isLength(value);
+const type_1 = require("../basic/type");
+function isLength(value, expectedResult = true) {
+    const result = type_1.RandexTypeParser.isLength(value);
     expect(expectedResult).toBe(result);
 }
-function isSetSingle(value, expectedResult) {
-    if (expectedResult === void 0) { expectedResult = true; }
-    var result = type_1.RandexTypeParser.isSetSingle(value);
+function isSetSingle(value, expectedResult = true) {
+    const result = type_1.RandexTypeParser.isSetSingle(value);
     expect(expectedResult).toBe(result);
 }
-function isSet(value, expectedResult) {
-    if (expectedResult === void 0) { expectedResult = true; }
-    var result = type_1.RandexTypeParser.isSet(value);
+function isSet(value, expectedResult = true) {
+    const result = type_1.RandexTypeParser.isSet(value);
     expect(expectedResult).toBe(result);
 }
-describe("type", function () {
-    it("isLength", function () {
+describe("type", () => {
+    it("isLength", () => {
         // true
         isLength(1);
         isLength([1, 2]);
@@ -26,7 +23,7 @@ describe("type", function () {
         isLength("hi", false);
         isLength(null, false);
     });
-    it("isSetSingle", function () {
+    it("isSetSingle", () => {
         // true
         isSetSingle("english");
         isSetSingle("hex");
@@ -39,7 +36,7 @@ describe("type", function () {
         isSetSingle(null, false);
         isSetSingle(["lower", "english"], false);
     });
-    it("RandomSet", function () {
+    it("RandomSet", () => {
         // true single
         isSet("english");
         isSet("hex");

package/lib/test/username.test.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var custom_1 = require("../custom");
-var test_util_1 = require("./test-util");
-describe("randomEmail", function () {
-    it("simple", function () {
-        test_util_1.TestUtil.loop(function () {
-            var value = custom_1.Randex.username();
-            expect(test_util_1.TestUtil.isUsernameValid(value)).toBeTruthy();
+const custom_1 = require("../custom");
+const testUtil_1 = require("./testUtil");
+describe("randomEmail", () => {
+    it("simple", () => {
+        testUtil_1.TestUtil.loop(() => {
+            const value = custom_1.Randex.username();
+            expect(testUtil_1.TestUtil.isUsernameValid(value)).toBeTruthy();
         });
     });
-    it("options", function () {
-        var value = custom_1.Randex.username({ length: 5 });
+    it("options", () => {
+        let value = custom_1.Randex.username({ length: 5 });
         expect(value.length).toBe(5);
         value = custom_1.Randex.username(5);
         expect(value.length).toBe(5);
@@ -21,8 +21,8 @@ describe("randomEmail", function () {
         expect(value.length).toBe(5);
         //
         value = custom_1.Randex.username({ length: [1, 5] });
-        expect(test_util_1.TestUtil.inNumberRange(value.length, [1, 5])).toBeTruthy();
+        expect(testUtil_1.TestUtil.inNumberRange(value.length, [1, 5])).toBeTruthy();
         value = custom_1.Randex.username([1, 5]);
-        expect(test_util_1.TestUtil.inNumberRange(value.length, [1, 5])).toBeTruthy();
+        expect(testUtil_1.TestUtil.inNumberRange(value.length, [1, 5])).toBeTruthy();
     });
 });

package/lib/test/word.test.js

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var const_1 = require("../basic/const");
-var custom_1 = require("../custom");
-var test_util_1 = require("./test-util");
-describe("word", function () {
-    it("classic", function () {
-        test_util_1.TestUtil.loop(function () {
-            var w = custom_1.Randex.word();
-            expect(test_util_1.TestUtil.isWordValid(w, const_1.DEFAULT_WORD_RANGE)).toBeTruthy();
+const const_1 = require("../basic/const");
+const custom_1 = require("../custom");
+const testUtil_1 = require("./testUtil");
+describe("word", () => {
+    it("classic", () => {
+        testUtil_1.TestUtil.loop(() => {
+            const w = custom_1.Randex.word();
+            expect(testUtil_1.TestUtil.isWordValid(w, const_1.DEFAULT_WORD_RANGE)).toBeTruthy();
         });
     });
-    it("many - number", function () {
-        var count = 5;
-        var ws = custom_1.Randex.many(count).word();
+    it("many - number", () => {
+        const count = 5;
+        const ws = custom_1.Randex.many(count).word();
         expect(ws.length).toBe(count);
-        for (var i = 0; i < count; i++) {
-            expect(test_util_1.TestUtil.isWordValid(ws[i], const_1.DEFAULT_WORD_RANGE)).toBeTruthy();
+        for (let i = 0; i < count; i++) {
+            expect(testUtil_1.TestUtil.isWordValid(ws[i], const_1.DEFAULT_WORD_RANGE)).toBeTruthy();
         }
     });
-    it("many - range", function () {
-        var count = [5, 10];
-        var ws = custom_1.Randex.many(count).word();
+    it("many - range", () => {
+        const count = [5, 10];
+        const ws = custom_1.Randex.many(count).word();
         expect(ws.length).toBeGreaterThanOrEqual(5);
         expect(ws.length).toBeLessThanOrEqual(10);
     });

package/lib/utils/spreader.d.ts

@@ -3,5 +3,6 @@ export declare class RandexSpreader<TItem = any> {
     private readonly _items;
     private _tempItems;
     constructor(items?: TItem[]);
+    get isEmpty(): boolean;
     spread(count?: number): TItem[];
 }

package/lib/utils/spreader.js

@@ -1,39 +1,33 @@
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RandexSpreader = void 0;
-var set_1 = require("../basic/set");
-var RandexSpreader = /** @class */ (function () {
-    function RandexSpreader(items) {
-        if (items === void 0) { items = []; }
+const set_1 = require("../basic/set");
+class RandexSpreader {
+    items;
+    _items;
+    _tempItems;
+    constructor(items = []) {
         this.items = items;
         this._items = items;
-        this._tempItems = __spreadArray([], items, true);
+        this._tempItems = [...items];
     }
-    RandexSpreader.prototype.spread = function (count) {
-        if (count === void 0) { count = 1; }
+    get isEmpty() {
+        return this._tempItems.length === 0;
+    }
+    spread(count = 1) {
         if (!this._items.length || count <= 0) {
             return [];
         }
-        var result = [];
-        for (var i = 0; i < count; i++) {
-            if (!this._tempItems.length) {
-                this._tempItems = __spreadArray([], this._items, true);
+        const result = [];
+        for (let i = 0; i < count; i++) {
+            if (this.isEmpty) {
+                this._tempItems = [...this._items];
             }
-            var index = set_1.RandexSetUtil.randomSingleNumber(this._tempItems.length);
-            var item = this._tempItems.splice(index, 1)[0];
+            const index = set_1.RandexSetUtil.randomSingleNumber(this._tempItems.length);
+            const [item] = this._tempItems.splice(index, 1);
             result.push(item);
         }
         return result;
-    };
-    return RandexSpreader;
-}());
+    }
+}
 exports.RandexSpreader = RandexSpreader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "randex",
-  "version": "1.1.0",
+  "version": "1.4.0",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -19,13 +19,13 @@
   "author": "",
   "license": "ISC",
   "bugs": {},
+  "prettier": "eslint-config-varp/prettier",
   "devDependencies": {
     "@types/jest": "^24.9.1",
-    "eslint-config-varp-common": "^1.0.0",
-    "eslint-plugin-tsc": "^2.0.0",
+    "eslint-config-varp": "^2.16.0",
     "jest": "^24.9.0",
     "ts-jest": "^24.1.0",
-    "typescript": "^4.2.4"
+    "typescript": "^5.9.3"
   },
   "keywords": [
     "random",

package/.eslintignore

@@ -1,3 +0,0 @@
-.*
-/lib
-node_modules

package/.eslintrc.js

@@ -1,3 +0,0 @@
-module.exports = {
-    extends: ['varp-common']
-};

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

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var custom_1 = require("../custom");
-var test_util_1 = require("./test-util");
-describe("randomArrayItem", function () {
-    it("param: number", function () {
-        var array = [1, 2, 3, 4, 5, 6];
-        var resultArray = {};
-        test_util_1.TestUtil.loop(function () {
-            var value = custom_1.Randex.arrayItem(array);
-            resultArray[value] = (resultArray[value] || 0) + 1;
-        });
-        for (var _i = 0, array_1 = array; _i < array_1.length; _i++) {
-            var item = array_1[_i];
-            expect(resultArray[item]).toBeTruthy();
-        }
-    });
-});

package/lib/test/test-util.js

@@ -1,134 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TestUtil = void 0;
-var const_1 = require("../basic/const");
-var set_1 = require("../basic/set");
-var TestUtil = /** @class */ (function () {
-    function TestUtil() {
-    }
-    TestUtil.testIn = function (value, length, action) {
-        if (length === void 0) { length = 1; }
-        if (typeof length === "number") {
-            expect(value.length).toBe(length);
-        }
-        else if (Array.isArray(length)) {
-            var min = length[0], max = length[1];
-            expect(value.length).toBeGreaterThanOrEqual(min);
-            expect(value.length).toBeLessThanOrEqual(max);
-        }
-        if (value) {
-            action();
-        }
-    };
-    TestUtil.loop = function (action) {
-        for (var i = 0; i < 100; i++) {
-            action(i);
-        }
-    };
-    TestUtil.testInSet = function (value, set, length) {
-        if (length === void 0) { length = 1; }
-        TestUtil.testIn(value, length, function () {
-            expect(TestUtil.inSet(value, set)).toBeTruthy();
-        });
-    };
-    TestUtil.testInSetRange = function (value, set, range, length) {
-        if (length === void 0) { length = 1; }
-        TestUtil.testIn(value, length, function () {
-            expect(TestUtil.inSet(value, set, range)).toBeTruthy();
-        });
-    };
-    TestUtil.testInRange = function (value, range, length) {
-        if (length === void 0) { length = 1; }
-        TestUtil.testIn(value, length, function () {
-            expect(TestUtil.inRange(value, range)).toBeTruthy();
-        });
-    };
-    TestUtil.testInBoth = function (value, set, range, length) {
-        if (length === void 0) { length = 1; }
-        TestUtil.testIn(value, length, function () {
-            expect(TestUtil.inBoth(value, set, range)).toBeTruthy();
-        });
-    };
-    TestUtil.inRange = function (value, range) {
-        for (var i = 0; i < value.length; i++) {
-            if (!range.includes(value[i])) {
-                return false;
-            }
-        }
-        return value.length > 0;
-    };
-    TestUtil.inSet = function (value, set, range) {
-        var fullRange = set_1.RandexSetUtil.toRange(set) + (range ? range : "");
-        return TestUtil.inRange(value, fullRange);
-    };
-    TestUtil.inBoth = function (value, set, range) {
-        var fullRange = set_1.RandexSetUtil.toRange(set) + range;
-        return TestUtil.inRange(value, fullRange);
-    };
-    TestUtil.isEmailValid = function (email) {
-        return String(email)
-            .toLowerCase()
-            .match(/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|.(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/);
-    };
-    TestUtil.isUsernameValid = function (email) {
-        return String(email)
-            .toLowerCase()
-            .match(/^[a-z][a-z0-9]{5,}$/);
-    };
-    TestUtil.isNameValid = function (email) {
-        return String(email).match(/^[A-Z][a-z]{1,}$/);
-    };
-    TestUtil.isWordValid = function (text, length) {
-        if (length === void 0) { length = const_1.DEFAULT_WORD_RANGE; }
-        var l = TestUtil.getLength(length);
-        return String(text).match(new RegExp("^[a-z]{".concat(l, "}$")));
-    };
-    TestUtil.isSentenceValid = function (text, length) {
-        if (length === void 0) { length = const_1.DEFAULT_SENTENCE_RANGE; }
-        var splits = text.split(" ");
-        if (Array.isArray(length)) {
-            var min = length[0], max = length[1];
-            return splits.length >= min && splits.length <= max;
-        }
-        else {
-            return splits.length === length;
-        }
-    };
-    TestUtil.isPhraseValid = function (text, length) {
-        if (length === void 0) { length = const_1.DEFAULT_PHRASE_RANGE; }
-        var splits = text.split(" ");
-        if (Array.isArray(length)) {
-            var min = length[0], max = length[1];
-            return splits.length >= min && splits.length <= max;
-        }
-        else {
-            return splits.length === length;
-        }
-    };
-    TestUtil.isUpperCharValid = function (value, length) {
-        if (length === void 0) { length = 1; }
-        var l = TestUtil.getLength(length);
-        return String(value).match(new RegExp("^[A-Z]{".concat(l, "}$")));
-    };
-    TestUtil.isLowerCharValid = function (value, length) {
-        if (length === void 0) { length = 1; }
-        var l = TestUtil.getLength(length);
-        return String(value).match(new RegExp("^[a-z]{".concat(l, "}$")));
-    };
-    TestUtil.isFullNameValid = function (email) {
-        return String(email).match(/^[A-Z][a-z]{1,}[ ][A-Z][a-z]{1,}$/);
-    };
-    TestUtil.isFileNameValid = function (email) {
-        return String(email)
-            .toLowerCase()
-            .match(/^[a-z0-9_\.]{2,}$/);
-    };
-    TestUtil.inNumberRange = function (value, range) {
-        return value >= range[0] && value <= range[1];
-    };
-    TestUtil.getLength = function (length) {
-        return Array.isArray(length) ? "".concat(length[0], ",").concat(length[1]) : length;
-    };
-    return TestUtil;
-}());
-exports.TestUtil = TestUtil;