randex 0.6.0 → 0.8.0

package/README.md

@@ -23,6 +23,11 @@ Functions:
 - [randomName](#randomname)
 - [randomFullName](#randomfullname)
 
+Deeps:
+
+- [Customization](#customization)
+- [Types](#types)
+
 ## random
 
 Basic function for construct random thing.
@@ -35,6 +40,8 @@ random({
   set: "english",
   length: 3,
 });
+// or short:
+random(["english", 3]);
 // EFd
 
 // 3 lower english chars
@@ -42,6 +49,8 @@ random({
   set: ["english", "lower"],
   length: 3,
 });
+// or short:
+random([["english", "lower"], 3]);
 // yhl
 
 // min 1 and max 3 english chars
@@ -49,6 +58,8 @@ random({
   set: "english",
   length: [1, 3],
 });
+// or short:
+random(["english", [1, 3]]);
 // eR
 
 // 3 number chars
@@ -56,6 +67,8 @@ random({
   set: "number",
   length: 3,
 });
+// or short:
+random(["number", 3]);
 // 643
 
 // 3 chars from custom range
@@ -70,6 +83,9 @@ random({
   set: ["english", "number"],
   length: 3,
 });
+// or short:
+random([["english", "number"], 3]);
+// x4d
 
 // 4 chars: 2 english and 2 english or number
 random(
@@ -82,6 +98,8 @@ random(
     length: 2,
   }
 );
+// or short:
+random(["english", 2], [["english", "number"], 2]);
 // Kb3b
 ```
 
@@ -99,27 +117,46 @@ Randoms file name.
 ```ts
 import { randomFileName } from "randex";
 
+// default
 randomFileName({
   extension: "txt",
 });
-
 // td1TX31eOB.txt
-```
 
-Equals to:
+// defined extension
+randomFileName({
+  extension: "txt",
+});
+// or short:
+randomFileName("txt");
+// HkmOjqHC6.txt
 
-```ts
-random([["english", "number"], "_.", [5, 10]]) +
-  random(["english", "number"]) +
-  "." +
-  (extension
-    ? extension
-    : random([
-        ["english", "l"],
-        [2, 5],
-      ]));
+// 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.
@@ -127,64 +164,73 @@ Randoms username.
 ```ts
 import { randomUsername } from "randex";
 
-// default (min - 6, max - 10 chars)
+// default
 randomUsername();
 // icvv81d1j
 
 // with length 5 chars
 randomUsername({ length: 5 });
+// or short:
+randomUsername(5);
 // okmle
 
 // with 2 min and 5 max chars
 randomName({ length: [2, 5] });
+// or short:
+randomUsername([2, 5]);
 // lkhs
-
-```
-
-Equals to:
-
-```ts
-random(
-  ["english", "l"],
-  [
-    [["english", "l"], "number"],
-    [5, 10],
-  ]
-);
 ```
 
 Options:
 | Name | Type| Description|
 | ------------------------ | ---- |------------ |
-|length|[RandexLength](#randexlength) | Length of chars |
-
+|length|[RandexLength](#randexlength) | Length of chars. Default: [6,10] |
 
 ## randomEmail
 
-Randoms username.
+Randoms an email.
 
 ```ts
 import { randomEmail } from "randex";
 
-
+// default
 randomEmail();
 // stv4ox27sevt@mqsyin.fil
 
-```
-
-Equals to:
+// 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
 
-```ts
-random(["english", "l"], [[["english", "l"], "number"], 10], ["english", "l"]) +
-  "@" +
-  random(["english", "l"], [["english", "l"], "-", [0, 5]], ["english", "l"]) +
-  "." +
-  random([
-    ["english", "l"],
-    [2, 4],
-  ]);
+// 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
 
@@ -193,40 +239,40 @@ Randoms a name of the person, city, place, restaurant, ect.
 ```ts
 import { randomName } from "randex";
 
-// default (min - 2, max - 10 chars)
+// default
 randomName();
 // Ijb
 
-// name from french alphabet
-randomName({ alphabet: "french" });
-// Dbïœ
-
 // with length 5 chars
 randomName({ length: 5 });
+// or short:
+randomName(5);
 // Okmpj
 
 // with 2 min and 5 max chars
 randomName({ length: [2, 5] });
+// or short:
+randomName([2, 5]);
 // Wslg
-```
 
-Equals to:
+// name from french alphabet
+randomName({ alphabet: "french" });
+// or short:
+randomName("french");
+// Dbïœ
 
-```ts
-random(
-  ["english", "u"],
-  [
-    ["english", "l"],
-    [1, 10],
-  ]
-);
+// name from french alphabet with length
+randomName({ alphabet: "french", length: 10 });
+// or short:
+randomName("french", 10);
+// Rsîrjhjôôw
 ```
 
 Options:
 | Name | Type| Description|
 | ------------------------ | ---- |------------ |
-|length|[RandexLength](#randexlength) | Length of chars |
-|alphabet|[RandexAlphabet](#randexalphabet) | Defined alphabet |
+|length|[RandexLength](#randexlength) | Length of chars. Default: [2,10] |
+|alphabet|[RandexAlphabet](#randexalphabet) | Defined alphabet. Default: `english` |
 
 ## randomFullName
 
@@ -235,6 +281,7 @@ Randoms a full name of the person.
 ```ts
 import { randomFullName } from "randex";
 
+// default
 randomFullName();
 // Eqaa Bfmotnq
 ```
@@ -242,9 +289,84 @@ randomFullName();
 Options:
 | Name | Type| Description|
 | ------------------------ | ---- |------------ |
-|firstLength|[RandexLength](#randexlength) | First name length of chars |
-|secondLength|[RandexLength](#randexlength) | Second name length of chars |
-|alphabet|[RandexAlphabet](#randexalphabet) | Defined alphabet |
+|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
+
+[random](#random) function is very flexible, there are many custom functions can be created.
+
+There are examples how to create custom function for most common cases:
+
+<b>randomFileName</b>
+
+```ts
+random([["english", "number"], "_.", [5, 10]]) +
+  random(["english", "number"]) +
+  "." +
+  random([
+    ["english", "l"],
+    [2, 5],
+  ]);
+```
+
+<b>randomUsername</b>
+
+```ts
+random(
+  ["english", "l"],
+  [
+    [["english", "l"], "number"],
+    [5, 10],
+  ]
+);
+```
+
+<b>randomEmail</b>
+
+```ts
+random(["english", "l"], [[["english", "l"], "number"], 10], ["english", "l"]) +
+  "@" +
+  random(["english", "l"], [["english", "l"], "-", [0, 5]], ["english", "l"]) +
+  "." +
+  random([
+    ["english", "l"],
+    [2, 4],
+  ]);
+```
+
+<b>randomName</b>
+
+```ts
+random(
+  ["english", "u"],
+  [
+    ["english", "l"],
+    [1, 10],
+  ]
+);
+```
+
+<b>randomFullName</b>
+
+```ts
+random(
+  ["english", "u"],
+  [
+    ["english", "l"],
+    [1, 10],
+  ]
+) +
+  " " +
+  random(
+    ["english", "u"],
+    [
+      ["english", "l"],
+      [1, 10],
+    ]
+  );
+```
 
 ## Types
 
@@ -256,6 +378,16 @@ Possible types:
 
 `[number, number]`: an array of min and max length.
 
+Example:
+
+```ts
+random({ set: "bit", length: 5 });
+random({ set: "bit", length: [5, 10] });
+// or short:
+random(["bit", 5]);
+random(["bit", [5, 10]]);
+```
+
 ## RandexSet
 
 Possible types:
@@ -264,20 +396,56 @@ Possible types:
 
 `[string, string]`: the first item is - [RandexAlphabet](#randexalphabet), the second item is - [RandexCase](#randexcase)
 
+Example:
+
+```ts
+random({ set: "bit" });
+random({ set: "spanish" });
+random({ set: ["spanish", "lower"] });
+// or short:
+random("bit");
+random("spanish");
+random(["spanish", "l"]);
+```
+
 ## RandexAlphabet
 
 An alphabet of chars
 
 `string` values: `english`, `french`, `spanish`, `russian`.
 
+Example:
+
+```ts
+random({ set: "spanish" });
+// or short:
+random("spanish");
+```
+
 ## RandexKit
 
 A kit of chars
 
 `string` values: `hex`, `symbol`, `number`, `binary`.
 
+Example:
+
+```ts
+random({ set: "hex" });
+// or short:
+random("hex");
+```
+
 ## RandexCase
 
 A case of alphabet
 
 `string` values: `upper`, `u`,`lower`, `l`.
+
+Example:
+
+```ts
+random({ set: ["spanish", "lower"] });
+// or short:
+random(["spanish", "l"]);
+```

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/basic/type.d.ts

@@ -3,7 +3,7 @@ export declare class RandexTypeParser {
     private static inRange;
     private static inLiteral;
     static inCase(value: string): value is RandexCase;
-    static inAlphabet(value: string): value is RandexAlphabet;
+    static inAlphabet(value: any): value is RandexAlphabet;
     static inSet(value: string): value is RandexSingleSet;
     static isLength(value: any): value is RandexLength;
     static isSetSingle(value: any): value is RandexItemSet;

package/lib/basic/type.js

@@ -13,14 +13,15 @@ var RandexTypeParser = /** @class */ (function () {
         for (var _i = 1; _i < arguments.length; _i++) {
             expects[_i - 1] = arguments[_i];
         }
-        return !!expects.find(function (x) { return x === value; });
+        return typeof value === "string" && !!expects.find(function (x) { return x === value; });
     };
     RandexTypeParser.inCase = function (value) {
         return RandexTypeParser.inLiteral(value, "default", "lower", "upper", "l", "u");
     };
     RandexTypeParser.inAlphabet = function (value) {
-        return RandexTypeParser.inLiteral(value, "english", "french", "spanish", // "german",
-        "russian");
+        return (typeof value === "string" &&
+            RandexTypeParser.inLiteral(value, "english", "french", "spanish", // "german",
+            "russian"));
     };
     RandexTypeParser.inSet = function (value) {
         return RandexTypeParser.inAlphabet(value) || RandexTypeParser.inLiteral(value, "hex", "symbol", "number", "binary");

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/custom/fullname.d.ts

@@ -0,0 +1,11 @@
+import { RandexAlphabet, RandexLength } from "../interfaces";
+export interface RandexFullNameOptions {
+    alphabet?: RandexAlphabet;
+    firstLength?: RandexLength;
+    secondLength?: RandexLength;
+}
+export declare function randomFullName(options?: RandexFullNameOptions): any;
+export declare function randomFullName(length: RandexLength): any;
+export declare function randomFullName(alphabet?: RandexAlphabet): any;
+export declare function randomFullName(alphabet: RandexAlphabet, length: RandexLength): any;
+export declare function randomFullName(alphabet: RandexAlphabet, firstLength: RandexLength, secondLength: RandexLength): any;

package/lib/custom/fullname.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.randomFullName = void 0;
+var type_1 = require("../basic/type");
+var name_1 = require("./name");
+function randomFullName(p1, p2, p3) {
+    var firstLength = 0;
+    var secondLength = 0;
+    var alphabet = "english";
+    if (type_1.RandexTypeParser.isLength(p1)) {
+        firstLength = secondLength = p1;
+    }
+    else if (type_1.RandexTypeParser.inAlphabet(p1)) {
+        alphabet = p1;
+        if (type_1.RandexTypeParser.isLength(p2)) {
+            firstLength = secondLength = p2;
+        }
+        if (type_1.RandexTypeParser.isLength(p3)) {
+            secondLength = p3;
+        }
+    }
+    else if (typeof p1 === "object") {
+        if (p1.alphabet) {
+            alphabet = p1.alphabet;
+        }
+        if (p1.firstLength) {
+            firstLength = p1.firstLength;
+        }
+        if (p1.secondLength) {
+            secondLength = p1.secondLength;
+        }
+    }
+    return (0, name_1.randomName)({ length: firstLength, alphabet: alphabet }) + " " + (0, name_1.randomName)({ length: secondLength, alphabet: alphabet });
+}
+exports.randomFullName = randomFullName;

package/lib/custom/index.d.ts

@@ -2,3 +2,4 @@ export * from "./email";
 export * from "./filename";
 export * from "./name";
 export * from "./username";
+export * from "./fullname";

package/lib/custom/index.js

@@ -18,3 +18,4 @@ __exportStar(require("./email"), exports);
 __exportStar(require("./filename"), exports);
 __exportStar(require("./name"), exports);
 __exportStar(require("./username"), exports);
+__exportStar(require("./fullname"), exports);

package/lib/custom/name.d.ts

@@ -1,12 +1,9 @@
 import { RandexAlphabet, RandexLength } from "../interfaces";
 export interface RandexNameOptions {
-    length?: RandexLength;
-    alphabet?: RandexAlphabet;
-}
-export interface RandexFullNameOptions {
-    firstLength?: RandexLength;
-    secondLength?: RandexLength;
     alphabet?: RandexAlphabet;
+    length?: RandexLength;
 }
-export declare function randomName(options?: RandexNameOptions): string;
-export declare function randomFullName(options?: RandexFullNameOptions): string;
+export declare function randomName(options?: RandexNameOptions): any;
+export declare function randomName(length: RandexLength): any;
+export declare function randomName(alphabet?: RandexAlphabet): any;
+export declare function randomName(alphabet: RandexAlphabet, length: RandexLength): any;

package/lib/custom/name.js

@@ -1,16 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomFullName = exports.randomName = void 0;
+exports.randomName = void 0;
 var basic_1 = require("../basic");
 var set_1 = require("../basic/set");
-function randomName(options) {
-    var _a = options || {}, length = _a.length, _b = _a.alphabet, alphabet = _b === void 0 ? "english" : _b;
+var type_1 = require("../basic/type");
+function randomName(p1, p2) {
+    var length = 0;
+    var alphabet = "english";
+    if (type_1.RandexTypeParser.isLength(p1)) {
+        length = p1;
+    }
+    else if (type_1.RandexTypeParser.inAlphabet(p1)) {
+        alphabet = p1;
+        if (type_1.RandexTypeParser.isLength(p2)) {
+            length = p2;
+        }
+    }
+    else if (typeof p1 === "object") {
+        if (p1.alphabet) {
+            alphabet = p1.alphabet;
+        }
+        if (p1.length) {
+            length = p1.length;
+        }
+    }
     var currentLength = set_1.RandexSetUtil.getLength(1, length, [1, 9]);
     return (0, basic_1.random)([alphabet, "u"], [[alphabet, "l"], currentLength]);
 }
 exports.randomName = randomName;
-function randomFullName(options) {
-    var _a = options || {}, firstLength = _a.firstLength, secondLength = _a.secondLength, alphabet = _a.alphabet;
-    return randomName({ length: firstLength, alphabet: alphabet }) + " " + randomName({ length: secondLength, alphabet: alphabet });
-}
-exports.randomFullName = randomFullName;

package/lib/custom/username.d.ts

@@ -2,4 +2,4 @@ import { RandexLength } from "../interfaces";
 export interface RandexUsernameOptions {
     length?: RandexLength;
 }
-export declare function randomUsername(options?: RandexUsernameOptions): string;
+export declare function randomUsername(options?: RandexUsernameOptions | RandexLength): string;

package/lib/custom/username.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.randomUsername = void 0;
 var basic_1 = require("../basic");
 var set_1 = require("../basic/set");
+var type_1 = require("../basic/type");
 function randomUsername(options) {
-    var length = (options || {}).length;
+    var length = type_1.RandexTypeParser.isLength(options) ? options : options === null || options === void 0 ? void 0 : options.length;
     var currentLength = set_1.RandexSetUtil.getLength(1, length, [6, 10]);
     return (0, basic_1.random)(["english", "l"], [[["english", "l"], "number"], currentLength]);
 }

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

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var name_1 = require("../custom/name");
+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++) {
-            var value = (0, name_1.randomFullName)();
+        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

@@ -9,31 +9,47 @@ describe("markdown", function () {
             length: 3,
         });
         expect(value.length).toBe(3);
+        value = (0, basic_1.random)(["english", 3]);
+        expect(value.length).toBe(3);
+        //
         value = (0, basic_1.random)({
             set: ["english", "lower"],
             length: 3,
         });
         expect(value.length).toBe(3);
+        value = (0, basic_1.random)([["english", "lower"], 3]);
+        expect(value.length).toBe(3);
+        //
         value = (0, basic_1.random)({
             set: "english",
             length: [1, 3],
         });
         expect(value.length).toBeLessThanOrEqual(3);
+        value = (0, basic_1.random)(["english", [1, 3]]);
+        expect(value.length).toBeLessThanOrEqual(3);
+        //
         value = (0, basic_1.random)({
             set: "number",
             length: 3,
         });
         expect(value.length).toBe(3);
+        value = (0, basic_1.random)(["number", 3]);
+        expect(value.length).toBe(3);
+        //
         value = (0, basic_1.random)({
             range: "abc123",
             length: 3,
         });
         expect(value.length).toBe(3);
+        //
         value = (0, basic_1.random)({
             set: ["english", "number"],
             length: 3,
         });
         expect(value.length).toBe(3);
+        value = (0, basic_1.random)([["english", "number"], 3]);
+        expect(value.length).toBe(3);
+        //
         value = (0, basic_1.random)({
             set: "english",
             length: 2,
@@ -42,11 +58,25 @@ describe("markdown", function () {
             length: 2,
         });
         expect(value.length).toBe(4);
+        value = (0, basic_1.random)(["english", 2], [["english", "number"], 2]);
+        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 () {
@@ -55,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,17 +4,31 @@ 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", function () {
-        var value1 = (0, name_1.randomName)({ length: 5 });
-        expect(value1.length).toBe(5);
-        var value2 = (0, name_1.randomName)({ length: [5, 5] });
-        expect(value2.length).toBe(5);
-        var value3 = (0, name_1.randomName)({ length: [1, 5] });
-        expect(test_util_1.TestUtil.inNumberRange(value3.length, [1, 5])).toBeTruthy();
+    it("options: length", function () {
+        var value = (0, name_1.randomName)({ length: 5 });
+        expect(value.length).toBe(5);
+        value = (0, name_1.randomName)(5);
+        expect(value.length).toBe(5);
+        //
+        value = (0, name_1.randomName)({ length: [5, 5] });
+        expect(value.length).toBe(5);
+        value = (0, name_1.randomName)([5, 5]);
+        expect(value.length).toBe(5);
+        //
+        value = (0, name_1.randomName)({ length: [1, 5] });
+        expect(test_util_1.TestUtil.inNumberRange(value.length, [1, 5])).toBeTruthy();
+        value = (0, name_1.randomName)([1, 5]);
+        expect(test_util_1.TestUtil.inNumberRange(value.length, [1, 5])).toBeTruthy();
+    });
+    it("options: alphabet", function () {
+        var value = (0, name_1.randomName)({ alphabet: "russian", length: 5 });
+        expect(value.length).toBe(5);
+        value = (0, name_1.randomName)("french", 10);
+        expect(value.length).toBe(10);
     });
 });

package/lib/test/random.test.js

@@ -32,8 +32,14 @@ describe("random", function () {
         inSet("english", [1, 3]);
         inSet("english", [0, 1]);
     });
+    it("length: alphabet", function () {
+        var value = (0, basic_1.random)("english");
+        expect(value.length).toBe(1);
+        value = (0, basic_1.random)(["english", "l"]);
+        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)([
@@ -41,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)([
@@ -52,6 +58,6 @@ describe("random", function () {
                 [1, 3],
             ]);
             expect(test_util_1.TestUtil.isLowerCharValid(value, [1, 3])).toBeTruthy();
-        }
+        });
     });
 });

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

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

package/lib/test/set-util.test.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var set_1 = require("../basic/set");
+var defaultLength = [1, 10];
+function getLength(reservedChars, length, resultLength) {
+    var result = set_1.RandexSetUtil.getLength(reservedChars, length, defaultLength);
+    if (typeof resultLength === "number") {
+        expect(result).toBe(resultLength);
+    }
+    else {
+        expect(result).toMatchObject(resultLength);
+    }
+}
+describe("RandexSetUtil", function () {
+    describe("getLength", function () {
+        it("single", function () {
+            getLength(0, 2, 2);
+            getLength(1, 3, 2);
+            getLength(0, undefined, defaultLength);
+            getLength(5, 3, defaultLength);
+        });
+        it("array", function () {
+            getLength(0, [1, 2], [1, 2]);
+            getLength(1, [2, 3], [1, 2]);
+            getLength(3, [1, 5], defaultLength);
+        });
+    });
+});

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,17 +4,25 @@ 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 value1 = (0, username_1.randomUsername)({ length: 5 });
-        expect(value1.length).toBe(5);
-        var value2 = (0, username_1.randomUsername)({ length: [5, 5] });
-        expect(value2.length).toBe(5);
-        var value3 = (0, username_1.randomUsername)({ length: [1, 5] });
-        expect(test_util_1.TestUtil.inNumberRange(value3.length, [1, 5])).toBeTruthy();
+        var value = (0, username_1.randomUsername)({ length: 5 });
+        expect(value.length).toBe(5);
+        value = (0, username_1.randomUsername)(5);
+        expect(value.length).toBe(5);
+        //
+        value = (0, username_1.randomUsername)({ length: [5, 5] });
+        expect(value.length).toBe(5);
+        value = (0, username_1.randomUsername)([5, 5]);
+        expect(value.length).toBe(5);
+        //
+        value = (0, username_1.randomUsername)({ length: [1, 5] });
+        expect(test_util_1.TestUtil.inNumberRange(value.length, [1, 5])).toBeTruthy();
+        value = (0, username_1.randomUsername)([1, 5]);
+        expect(test_util_1.TestUtil.inNumberRange(value.length, [1, 5])).toBeTruthy();
     });
 });

package/package.json

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