randex 0.7.0 → 0.9.0

package/README.md

@@ -1,11 +1,11 @@
 # randex
 
+TypeScript library to random most common things like filename, username, email, name, full name, etc.
+
 <a href="https://www.npmjs.com/package/randex">
     <img src="https://nodei.co/npm/randex.png?mini=true">
 </a>
 
-TypeScript library for random thing like string, username, email, name, etc.
-
 ## Usage
 
 Installation:
@@ -30,7 +30,7 @@ Deeps:
 
 ## random
 
-Basic function for construct random thing.
+Basic function to construct random things.
 
 ```ts
 import { random } from "randex";
@@ -117,13 +117,46 @@ Randoms file name.
 ```ts
 import { randomFileName } from "randex";
 
+// default
 randomFileName({
   extension: "txt",
 });
-
 // td1TX31eOB.txt
+
+// defined extension
+randomFileName({
+  extension: "txt",
+});
+// or short:
+randomFileName("txt");
+// HkmOjqHC6.txt
+
+// defined file name length and extension length
+randomFileName({
+  fileNameLength: [7, 10],
+  extensionLength: 5,
+});
+// or short:
+randomFileName([7, 10], 5);
+// 1SJVkHSBjq.tejuw
+
+// defined file name length and extension
+randomFileName({
+  fileNameLength: 8,
+  extension: "xml",
+});
+// or short:
+randomFileName(8, "xml");
+// JyCsuN5kD.xml
 ```
 
+Options:
+| Name | Type| Description|
+| ------------------------ | ---- |------------ |
+|fileNameLength|[RandexLength](#randexlength) | Length of file name (not including extension). Default: [3,10] |
+|extensionLength|[RandexLength](#randexlength) | Length of extension (not including file name) chars. Default: [2,5] |
+|extension| `string`| File extension. |
+
 ## randomUsername
 
 Randoms username.
@@ -151,7 +184,7 @@ randomUsername([2, 5]);
 Options:
 | Name | Type| Description|
 | ------------------------ | ---- |------------ |
-|length|[RandexLength](#randexlength) | Length of chars. Default: min - 6, max - 10 chars. |
+|length|[RandexLength](#randexlength) | Length of chars. Default: [6,10] |
 
 ## randomEmail
 
@@ -160,10 +193,45 @@ Randoms an email.
 ```ts
 import { randomEmail } from "randex";
 
+// default
 randomEmail();
 // stv4ox27sevt@mqsyin.fil
+
+// defined prefix length
+randomEmail({
+  prefixLength: 8,
+});
+// or shot:
+randomEmail(8);
+// epzn3hbz@vu.xsp
+
+// defined prefix, low domain and hight domain length
+randomEmail({
+  prefixLength: 8,
+  lowDomainLength: 4,
+  hightDomainLength: 2,
+});
+// or shot:
+randomEmail(8, 4, 2);
+// 8p0bjoua@fcsa.gr
+
+// defined domain
+randomEmail({
+  domain: "test.com",
+});
+// or shot:
+randomEmail("test.com");
+// efnmo1r5@test.com
 ```
 
+Options:
+| Name | Type| Description|
+| ------------------------ | ---- |------------ |
+|prefixLength|[RandexLength](#randexlength) | Length of email prefix (chars before `@`). Default: [6, 10] |
+|hightDomainLength|[RandexLength](#randexlength) | Length of hight domain part (example: test.<b>com</b>). Default: [1,6] |
+|lowDomainLength|[RandexLength](#randexlength) | Length of low domain part (example: <b>test</b>.com). Default: [4,2] |
+|domain| `string`| Defined domain. |
+
 ## randomName
 
 Randoms a name of the person, city, place, restaurant, ect.
@@ -203,7 +271,7 @@ randomName("french", 10);
 Options:
 | Name | Type| Description|
 | ------------------------ | ---- |------------ |
-|length|[RandexLength](#randexlength) | Length of chars. Default: min - 2, max - 10 chars|
+|length|[RandexLength](#randexlength) | Length of chars. Default: [2,10] |
 |alphabet|[RandexAlphabet](#randexalphabet) | Defined alphabet. Default: `english` |
 
 ## randomFullName
@@ -221,8 +289,8 @@ randomFullName();
 Options:
 | Name | Type| Description|
 | ------------------------ | ---- |------------ |
-|firstLength|[RandexLength](#randexlength) | First name length of chars. Default: min - 2, max - 10 chars |
-|secondLength|[RandexLength](#randexlength) | Second name length of chars. Default: min - 2, max - 10 chars |
+|firstLength|[RandexLength](#randexlength) | First name length of chars. Default: [2, 10] |
+|secondLength|[RandexLength](#randexlength) | Second name length of chars. Default: [2,10] |
 |alphabet|[RandexAlphabet](#randexalphabet) | Defined alphabet. Default: `english` |
 
 ## Customization

package/lib/basic/set.d.ts

@@ -1,5 +1,11 @@
 import { RandexSet, RandexLength } from "../interfaces";
 export declare class RandexSetUtil {
+    static readonly defaultFileNameLength: RandexLength;
+    static readonly defaultExtensionLength: RandexLength;
+    static readonly fileNameExtraChars = "";
+    static readonly defaultEmailPrefixLength: RandexLength;
+    static readonly defaultHightDomainEmailLength: RandexLength;
+    static readonly defaultLowDomainEmailLength: RandexLength;
     private static toSingleRange;
     private static toAlphabetCase;
     private static toAlphabetRange;

package/lib/basic/set.js

@@ -94,6 +94,12 @@ var RandexSetUtil = /** @class */ (function () {
         }
         return result;
     };
+    RandexSetUtil.defaultFileNameLength = [3, 10];
+    RandexSetUtil.defaultExtensionLength = [2, 5];
+    RandexSetUtil.fileNameExtraChars = ""; //"-_.";
+    RandexSetUtil.defaultEmailPrefixLength = [6, 10];
+    RandexSetUtil.defaultHightDomainEmailLength = [1, 6];
+    RandexSetUtil.defaultLowDomainEmailLength = [2, 4];
     return RandexSetUtil;
 }());
 exports.RandexSetUtil = RandexSetUtil;

package/lib/custom/email.d.ts

@@ -1 +1,16 @@
-export declare function randomEmail(): string;
+import { RandexLength } from "../interfaces";
+interface BasicEmailOptions {
+    prefixLength?: RandexLength;
+}
+interface DomainLengthEmailOptions {
+    hightDomainLength?: RandexLength;
+    lowDomainLength?: RandexLength;
+}
+interface DomainEmailOptions {
+    domain?: string;
+}
+export type RandexEmailOptions = BasicEmailOptions & (DomainLengthEmailOptions | DomainEmailOptions);
+export declare function randomEmail(options?: RandexEmailOptions): any;
+export declare function randomEmail(prefixLength: RandexLength, lowDomainLength?: RandexLength, hightDomainLength?: RandexLength): any;
+export declare function randomEmail(domain: string): any;
+export {};

package/lib/custom/email.js

@@ -2,14 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.randomEmail = void 0;
 var basic_1 = require("../basic");
-function randomEmail() {
-    return ((0, basic_1.random)(["english", "l"], [[["english", "l"], "number"], 10], ["english", "l"]) +
-        "@" +
-        (0, basic_1.random)(["english", "l"], [["english", "l"], "-", [0, 5]], ["english", "l"]) +
-        "." +
-        (0, basic_1.random)([
-            ["english", "l"],
-            [2, 4],
-        ]));
+var set_1 = require("../basic/set");
+var type_1 = require("../basic/type");
+function randomEmail(p1, p2, p3) {
+    var prefixLength = set_1.RandexSetUtil.defaultEmailPrefixLength;
+    var hightDomainLength = set_1.RandexSetUtil.defaultHightDomainEmailLength;
+    var lowDomainLength = set_1.RandexSetUtil.defaultLowDomainEmailLength;
+    var domain = "";
+    if (type_1.RandexTypeParser.isLength(p1)) {
+        prefixLength = p1;
+        if (type_1.RandexTypeParser.isLength(p2)) {
+            lowDomainLength = p2;
+        }
+        if (type_1.RandexTypeParser.isLength(p3)) {
+            hightDomainLength = p3;
+        }
+    }
+    else if (typeof p1 === "string") {
+        domain = p1;
+    }
+    else if (typeof p1 === "object") {
+        if (p1.prefixLength) {
+            prefixLength = p1.prefixLength;
+        }
+        if (p1.hightDomainLength) {
+            hightDomainLength = p1.hightDomainLength;
+        }
+        if (p1.lowDomainLength) {
+            lowDomainLength = p1.lowDomainLength;
+        }
+        if (p1.domain) {
+            domain = p1.domain;
+        }
+    }
+    if (!domain) {
+        domain = (0, basic_1.random)([["english", "l"], lowDomainLength]) + "." + (0, basic_1.random)([["english", "l"], hightDomainLength]);
+    }
+    return (0, basic_1.random)([[["english", "l"], "number"], prefixLength]) + "@" + domain;
 }
 exports.randomEmail = randomEmail;

package/lib/custom/filename.d.ts

@@ -1,4 +1,16 @@
-export interface RandomFileNameOptions {
+import { RandexLength } from "../interfaces";
+interface BasicFileNameOptions {
+    fileNameLength?: RandexLength;
+}
+interface ExtensionLengthFileNameOptions {
+    extensionLength?: RandexLength;
+}
+interface ExtensionFileNameOptions {
     extension?: string;
 }
-export declare function randomFileName(options?: RandomFileNameOptions): string;
+export type RandexFileNameOptions = BasicFileNameOptions & (ExtensionFileNameOptions | ExtensionLengthFileNameOptions);
+export declare function randomFileName(options?: RandexFileNameOptions): any;
+export declare function randomFileName(fileNameLength: RandexLength, extensionLength?: RandexLength): any;
+export declare function randomFileName(fileNameLength: RandexLength, extension: string): any;
+export declare function randomFileName(extension: string): any;
+export {};

package/lib/custom/filename.js

@@ -2,16 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.randomFileName = void 0;
 var basic_1 = require("../basic");
-function randomFileName(options) {
-    var extension = (options || {}).extension;
-    return ((0, basic_1.random)([["english", "number"], "_.", [5, 10]]) +
+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 extensionLength = set_1.RandexSetUtil.defaultExtensionLength;
+    var extension = "";
+    if (type_1.RandexTypeParser.isLength(p1)) {
+        fileNameLength = p1;
+        if (type_1.RandexTypeParser.isLength(p2)) {
+            extensionLength = p2;
+        }
+        else if (typeof p2 === "string") {
+            extension = p2;
+        }
+    }
+    else if (typeof p1 === "string") {
+        extension = p1;
+    }
+    else if (typeof p1 === "object") {
+        if (p1.fileNameLength) {
+            fileNameLength = p1.fileNameLength;
+        }
+        if (p1.extensionLength) {
+            extensionLength = p1.extensionLength;
+        }
+        if (p1.extension) {
+            extension = p1.extension;
+        }
+    }
+    if (!extension) {
+        extension = (0, basic_1.random)([["english", "l"], extensionLength]);
+    }
+    return ((0, basic_1.random)([["english", "number"], set_1.RandexSetUtil.fileNameExtraChars, fileNameLength]) +
         (0, basic_1.random)(["english", "number"]) +
         "." +
-        (extension
-            ? extension
-            : (0, basic_1.random)([
-                ["english", "l"],
-                [2, 5],
-            ])));
+        (extension ? extension.replace(/^\./, "") : (0, basic_1.random)([["english", "l"], extensionLength])));
 }
 exports.randomFileName = randomFileName;

package/lib/test/email.test.js

@@ -1,12 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var set_1 = require("../basic/set");
 var email_1 = require("../custom/email");
 var test_util_1 = require("./test-util");
+var r = set_1.RandexSetUtil;
+function splitEmail(email) {
+    var _a = email.split("@"), prefix = _a[0], domain = _a[1];
+    var _b = domain.split("."), lowDomain = _b[0], hightDomain = _b[1];
+    return [prefix, domain, lowDomain, hightDomain];
+}
+function testEmail(options) {
+    var email = options.email, _a = options.prefixLength, prefixLength = _a === void 0 ? r.defaultEmailPrefixLength : _a, _b = options.hightDomainLength, hightDomainLength = _b === void 0 ? r.defaultHightDomainEmailLength : _b, _c = options.lowDomainLength, lowDomainLength = _c === void 0 ? r.defaultLowDomainEmailLength : _c, emailDomain = options.domain;
+    var _d = splitEmail(email), prefix = _d[0], domain = _d[1], lowDomain = _d[2], hightDomain = _d[3];
+    // // last char only english
+    test_util_1.TestUtil.testInSet(prefix, [["english", "l"], "number"], prefixLength);
+    if (emailDomain) {
+        expect(emailDomain).toBe(domain);
+    }
+    else {
+        test_util_1.TestUtil.testInSet(lowDomain, ["english"], lowDomainLength);
+        test_util_1.TestUtil.testInSet(hightDomain, ["english"], hightDomainLength);
+    }
+}
 describe("randomEmail", function () {
     it("simple", function () {
-        for (var i = 0; i < 100; i++) {
-            var value = (0, email_1.randomEmail)();
-            expect(test_util_1.TestUtil.isEmailValid(value)).toBeTruthy();
-        }
+        test_util_1.TestUtil.loop(function () {
+            var email = (0, email_1.randomEmail)();
+            testEmail({ email: email });
+        });
+    });
+    it("options: prefixLength", function () {
+        var prefixLength = [10, 15];
+        test_util_1.TestUtil.loop(function () {
+            var email = (0, email_1.randomEmail)({ prefixLength: prefixLength });
+            testEmail({ email: email, prefixLength: prefixLength });
+            email = (0, email_1.randomEmail)(prefixLength);
+            testEmail({ email: email, prefixLength: prefixLength });
+        });
+    });
+    it("options: hightDomainLength, lowDomainLength", function () {
+        var hightDomainLength = 8;
+        var lowDomainLength = 12;
+        test_util_1.TestUtil.loop(function () {
+            var email = (0, email_1.randomEmail)({ hightDomainLength: hightDomainLength, lowDomainLength: lowDomainLength });
+            testEmail({ email: email, hightDomainLength: hightDomainLength, lowDomainLength: lowDomainLength });
+            email = (0, email_1.randomEmail)(r.defaultEmailPrefixLength, lowDomainLength, hightDomainLength);
+            testEmail({ email: email, hightDomainLength: hightDomainLength, lowDomainLength: lowDomainLength, prefixLength: r.defaultEmailPrefixLength });
+        });
+    });
+    it("options: domain", function () {
+        var domain = "delta.com";
+        test_util_1.TestUtil.loop(function () {
+            var email = (0, email_1.randomEmail)({ domain: domain });
+            testEmail({ email: email, domain: domain });
+            email = (0, email_1.randomEmail)(domain);
+            testEmail({ email: email, domain: domain });
+        });
     });
 });

package/lib/test/filename.test.js

@@ -1,12 +1,66 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var set_1 = require("../basic/set");
 var filename_1 = require("../custom/filename");
 var test_util_1 = require("./test-util");
+var r = set_1.RandexSetUtil;
+function splitFileName(fullFileName) {
+    var matches = fullFileName.match(/\.[a-z]+$/);
+    var extension = (matches === null || matches === void 0 ? void 0 : matches[0]) || "";
+    var fileName = fullFileName.replace(extension, "");
+    extension = extension.replace(/^\./, "");
+    return [fileName, extension];
+}
+function testFileName(options) {
+    var fullFileName = options.fullFileName, _a = options.fileNameLength, fileNameLength = _a === void 0 ? r.defaultFileNameLength : _a, _b = options.extensionLength, extensionLength = _b === void 0 ? r.defaultExtensionLength : _b, extension = options.extension;
+    var _c = splitFileName(fullFileName), fileName = _c[0], fileExtension = _c[1];
+    // last char only english
+    test_util_1.TestUtil.testInSet(fileName[fileName.length - 1], ["english", "number"], 1);
+    test_util_1.TestUtil.testInSetRange(fileName, ["english", "number"], r.fileNameExtraChars, fileNameLength);
+    if (extension) {
+        expect(extension).toBe(fileExtension);
+    }
+    else {
+        test_util_1.TestUtil.testInSet(fileExtension, "english", extensionLength);
+    }
+}
 describe("randomFileName", function () {
     it("simple", function () {
-        for (var i = 0; i < 100; i++) {
-            var value = (0, filename_1.randomFileName)();
-            expect(test_util_1.TestUtil.isFileNameValid(value)).toBeTruthy();
-        }
+        test_util_1.TestUtil.loop(function () {
+            var fullFileName = (0, filename_1.randomFileName)();
+            testFileName({ fullFileName: fullFileName });
+        });
+    });
+    it("params: fileNameLength", function () {
+        var fileNameLength = [10, 15];
+        test_util_1.TestUtil.loop(function () {
+            var fullFileName = (0, filename_1.randomFileName)({ fileNameLength: fileNameLength });
+            testFileName({ fullFileName: fullFileName, fileNameLength: fileNameLength });
+            fullFileName = (0, filename_1.randomFileName)(fileNameLength);
+            testFileName({ fullFileName: fullFileName, fileNameLength: fileNameLength });
+        });
+    });
+    it("params: extensionLength", function () {
+        var extensionLength = [10, 15];
+        test_util_1.TestUtil.loop(function () {
+            var fullFileName = (0, filename_1.randomFileName)({ extensionLength: extensionLength });
+            testFileName({ fullFileName: fullFileName, extensionLength: extensionLength });
+            fullFileName = (0, filename_1.randomFileName)(r.defaultFileNameLength, extensionLength);
+            testFileName({ fullFileName: fullFileName, fileNameLength: r.defaultFileNameLength, extensionLength: extensionLength });
+        });
+    });
+    it("params: extension", function () {
+        var fileNameLength = [10, 15];
+        var extension = "xml";
+        test_util_1.TestUtil.loop(function () {
+            var fullFileName = (0, filename_1.randomFileName)({ extension: extension });
+            testFileName({ fullFileName: fullFileName, extension: extension });
+            fullFileName = (0, filename_1.randomFileName)(extension);
+            testFileName({ fullFileName: fullFileName, extension: extension });
+            fullFileName = (0, filename_1.randomFileName)("." + extension);
+            testFileName({ fullFileName: fullFileName, extension: extension });
+            fullFileName = (0, filename_1.randomFileName)(fileNameLength, extension);
+            testFileName({ fullFileName: fullFileName, fileNameLength: fileNameLength, extension: extension });
+        });
     });
 });

package/lib/test/fullname.test.js

@@ -4,9 +4,9 @@ var custom_1 = require("../custom");
 var test_util_1 = require("./test-util");
 describe("randomFullName", function () {
     it("simple", function () {
-        for (var i = 0; i < 100; i++) {
+        test_util_1.TestUtil.loop(function () {
             var value = (0, custom_1.randomFullName)();
             expect(test_util_1.TestUtil.isFullNameValid(value)).toBeTruthy();
-        }
+        });
     });
 });

package/lib/test/markdown.test.js

@@ -62,9 +62,21 @@ describe("markdown", function () {
         expect(value.length).toBe(4);
     });
     it("randomFileName", function () {
-        var value = (0, custom_1.randomFileName)({
+        var value = (0, custom_1.randomFileName)();
+        value = (0, custom_1.randomFileName)({
             extension: "txt",
         });
+        value = (0, custom_1.randomFileName)("txt");
+        value = (0, custom_1.randomFileName)({
+            fileNameLength: [7, 10],
+            extensionLength: 5,
+        });
+        value = (0, custom_1.randomFileName)([7, 10], 5);
+        value = (0, custom_1.randomFileName)({
+            fileNameLength: 8,
+            extension: "xml",
+        });
+        value = (0, custom_1.randomFileName)(8, "xml");
         expect(value).toBeTruthy();
     });
     it("randomUsername", function () {
@@ -73,6 +85,20 @@ describe("markdown", function () {
     });
     it("randomEmail", function () {
         var value = (0, custom_1.randomEmail)();
+        value = (0, custom_1.randomEmail)({
+            prefixLength: 8,
+        });
+        value = (0, custom_1.randomEmail)(8);
+        value = (0, custom_1.randomEmail)({
+            prefixLength: 8,
+            lowDomainLength: 4,
+            hightDomainLength: 2,
+        });
+        value = (0, custom_1.randomEmail)(8, 4, 2);
+        value = (0, custom_1.randomEmail)({
+            domain: "test.com",
+        });
+        value = (0, custom_1.randomEmail)("test.com");
         expect(value).toBeTruthy();
     });
     it("randomName", function () {

package/lib/test/name.test.js

@@ -4,10 +4,10 @@ var name_1 = require("../custom/name");
 var test_util_1 = require("./test-util");
 describe("randomName", function () {
     it("simple", function () {
-        for (var i = 0; i < 100; i++) {
+        test_util_1.TestUtil.loop(function () {
             var value = (0, name_1.randomName)();
             expect(test_util_1.TestUtil.isNameValid(value)).toBeTruthy();
-        }
+        });
     });
     it("options: length", function () {
         var value = (0, name_1.randomName)({ length: 5 });

package/lib/test/random.test.js

@@ -39,7 +39,7 @@ describe("random", function () {
         expect(value.length).toBe(1);
     });
     it("alphabet: upper", function () {
-        for (var i = 0; i < 100; i++) {
+        test_util_1.TestUtil.loop(function () {
             var value = (0, basic_1.random)(["english", "u"]);
             expect(test_util_1.TestUtil.isUpperCharValid(value, 1)).toBeTruthy();
             value = (0, basic_1.random)([
@@ -47,10 +47,10 @@ describe("random", function () {
                 [1, 3],
             ]);
             expect(test_util_1.TestUtil.isUpperCharValid(value, [1, 3])).toBeTruthy();
-        }
+        });
     });
     it("alphabet: lower", function () {
-        for (var i = 0; i < 100; i++) {
+        test_util_1.TestUtil.loop(function () {
             var value = (0, basic_1.random)(["english", "l"]);
             expect(test_util_1.TestUtil.isLowerCharValid(value, 1)).toBeTruthy();
             value = (0, basic_1.random)([
@@ -58,6 +58,6 @@ describe("random", function () {
                 [1, 3],
             ]);
             expect(test_util_1.TestUtil.isLowerCharValid(value, [1, 3])).toBeTruthy();
-        }
+        });
     });
 });

package/lib/test/test-util.d.ts

@@ -1,11 +1,13 @@
 import { RandexLength, RandexSet } from "../interfaces";
 export declare class TestUtil {
     static testIn(value: string, length: RandexLength | undefined, action: () => void): void;
+    static loop(action: (index: number) => void): void;
     static testInSet(value: string, set: RandexSet, length?: RandexLength): void;
+    static testInSetRange(value: string, set: RandexSet, range: string, length?: RandexLength): void;
     static testInRange(value: string, range: string, length?: RandexLength): void;
     static testInBoth(value: string, set: RandexSet, range: string, length?: RandexLength): void;
     static inRange(value: string, range: string): boolean;
-    static inSet(value: string, set: RandexSet): boolean;
+    static inSet(value: string, set: RandexSet, range?: string): boolean;
     static inBoth(value: string, set: RandexSet, range: string): boolean;
     static isEmailValid(email: string): RegExpMatchArray | null;
     static isUsernameValid(email: string): RegExpMatchArray | null;

package/lib/test/test-util.js

@@ -19,12 +19,23 @@ var TestUtil = /** @class */ (function () {
             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 () {
@@ -45,9 +56,9 @@ var TestUtil = /** @class */ (function () {
         }
         return value.length > 0;
     };
-    TestUtil.inSet = function (value, set) {
-        var range = set_1.RandexSetUtil.toRange(set);
-        return TestUtil.inRange(value, range);
+    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;

package/lib/test/username.test.js

@@ -4,10 +4,10 @@ var username_1 = require("../custom/username");
 var test_util_1 = require("./test-util");
 describe("randomEmail", function () {
     it("simple", function () {
-        for (var i = 0; i < 100; i++) {
+        test_util_1.TestUtil.loop(function () {
             var value = (0, username_1.randomUsername)();
             expect(test_util_1.TestUtil.isUsernameValid(value)).toBeTruthy();
-        }
+        });
     });
     it("options", function () {
         var value = (0, username_1.randomUsername)({ length: 5 });

package/package.json

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