randex 0.5.0 → 0.6.0

package/README.md

@@ -127,9 +127,18 @@ Randoms username.
 ```ts
 import { randomUsername } from "randex";
 
+// default (min - 6, max - 10 chars)
 randomUsername();
-
 // icvv81d1j
+
+// with length 5 chars
+randomUsername({ length: 5 });
+// okmle
+
+// with 2 min and 5 max chars
+randomName({ length: [2, 5] });
+// lkhs
+
 ```
 
 Equals to:
@@ -144,6 +153,12 @@ random(
 );
 ```
 
+Options:
+| Name | Type| Description|
+| ------------------------ | ---- |------------ |
+|length|[RandexLength](#randexlength) | Length of chars |
+
+
 ## randomEmail
 
 Randoms username.
@@ -151,9 +166,10 @@ Randoms username.
 ```ts
 import { randomEmail } from "randex";
 
-randomEmail();
 
+randomEmail();
 // stv4ox27sevt@mqsyin.fil
+
 ```
 
 Equals to:
@@ -169,6 +185,7 @@ random(["english", "l"], [[["english", "l"], "number"], 10], ["english", "l"]) +
   ]);
 ```
 
+
 ## randomName
 
 Randoms a name of the person, city, place, restaurant, ect.
@@ -184,11 +201,11 @@ randomName();
 randomName({ alphabet: "french" });
 // Dbïœ
 
-// name with length 5 chars
+// with length 5 chars
 randomName({ length: 5 });
 // Okmpj
 
-// name with 2 min and 5 max chars
+// with 2 min and 5 max chars
 randomName({ length: [2, 5] });
 // Wslg
 ```

package/lib/basic/index.js

@@ -62,7 +62,7 @@ function toRangeOptions(options) {
         fullRange += range;
     }
     if (set) {
-        fullRange += set_1.RtSetUtil.toRange(set);
+        fullRange += set_1.RandexSetUtil.toRange(set);
     }
     return {
         range: fullRange,

package/lib/basic/set.d.ts

@@ -1,7 +1,8 @@
-import { RandexSet } from "../interfaces";
-export declare class RtSetUtil {
+import { RandexSet, RandexLength } from "../interfaces";
+export declare class RandexSetUtil {
     private static toSingleRange;
     private static toAlphabetCase;
     private static toAlphabetRange;
     static toRange(set: RandexSet): string;
+    static getLength(reservedChars: number, length: RandexLength | undefined, defaultLength: RandexLength): RandexLength;
 }

package/lib/basic/set.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RtSetUtil = void 0;
+exports.RandexSetUtil = void 0;
 var type_1 = require("./type");
 var hex = "0123456789ABCDEFabcdef";
 var symbol = '[-!$%^&*()_+|~=`{}[]:";<>?,./]' + "'";
@@ -14,15 +14,15 @@ var spanishLower = "abcdefghijklmnopqrstuvwxyzñ";
 var spanishUpper = "ABCDEFGHIJKLMNOPQRSTUVWXYZÑ";
 var russianLower = "абвгдеёжзийклмнопрстуфхцчшщъыьэюя";
 var russianUpper = "АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ";
-var RtSetUtil = /** @class */ (function () {
-    function RtSetUtil() {
+var RandexSetUtil = /** @class */ (function () {
+    function RandexSetUtil() {
     }
-    RtSetUtil.toSingleRange = function (itemSet) {
+    RandexSetUtil.toSingleRange = function (itemSet) {
         if (Array.isArray(itemSet)) {
-            return RtSetUtil.toAlphabetRange(itemSet);
+            return RandexSetUtil.toAlphabetRange(itemSet);
         }
         else if (type_1.RandexTypeParser.inAlphabet(itemSet)) {
-            return RtSetUtil.toAlphabetRange([itemSet, "default"]);
+            return RandexSetUtil.toAlphabetRange([itemSet, "default"]);
         }
         switch (itemSet) {
             case "hex":
@@ -37,7 +37,7 @@ var RtSetUtil = /** @class */ (function () {
                 return "";
         }
     };
-    RtSetUtil.toAlphabetCase = function (cas, lowerWord, upperWord) {
+    RandexSetUtil.toAlphabetCase = function (cas, lowerWord, upperWord) {
         switch (cas) {
             case "lower":
             case "l":
@@ -49,31 +49,51 @@ var RtSetUtil = /** @class */ (function () {
                 return lowerWord + upperWord;
         }
     };
-    RtSetUtil.toAlphabetRange = function (set) {
+    RandexSetUtil.toAlphabetRange = function (set) {
         var alphabet = set[0], aCase = set[1];
         switch (alphabet) {
             case "english":
-                return RtSetUtil.toAlphabetCase(aCase, englishLower, englishUpper);
+                return RandexSetUtil.toAlphabetCase(aCase, englishLower, englishUpper);
             case "french":
-                return RtSetUtil.toAlphabetCase(aCase, frenchLower, frenchUpper);
+                return RandexSetUtil.toAlphabetCase(aCase, frenchLower, frenchUpper);
             case "spanish":
-                return RtSetUtil.toAlphabetCase(aCase, spanishLower, spanishUpper);
+                return RandexSetUtil.toAlphabetCase(aCase, spanishLower, spanishUpper);
             // case "german":
             //   return RtSetUtil.toAlphabetCase(aCase, englishLower, englishUpper);
             case "russian":
-                return RtSetUtil.toAlphabetCase(aCase, russianLower, russianUpper);
+                return RandexSetUtil.toAlphabetCase(aCase, russianLower, russianUpper);
         }
     };
-    RtSetUtil.toRange = function (set) {
+    RandexSetUtil.toRange = function (set) {
         var result = "";
         if (type_1.RandexTypeParser.isSetSingle(set)) {
-            result += RtSetUtil.toSingleRange(set);
+            result += RandexSetUtil.toSingleRange(set);
         }
         else if (type_1.RandexTypeParser.isSet(set)) {
-            result += set.map(RtSetUtil.toSingleRange).join("");
+            result += set.map(RandexSetUtil.toSingleRange).join("");
         }
         return result;
     };
-    return RtSetUtil;
+    RandexSetUtil.getLength = function (reservedChars, length, defaultLength) {
+        var result = defaultLength;
+        if (typeof length === "number" && length > reservedChars) {
+            result = length - reservedChars;
+        }
+        else if (Array.isArray(length)) {
+            var min = length[0], max = length[1];
+            var dMin = min - reservedChars;
+            var dMax = max - reservedChars;
+            if (dMin >= 0 && dMax >= 0) {
+                if (dMin < dMax) {
+                    return [dMin, dMax];
+                }
+                else if (dMin === dMax) {
+                    return dMin;
+                }
+            }
+        }
+        return result;
+    };
+    return RandexSetUtil;
 }());
-exports.RtSetUtil = RtSetUtil;
+exports.RandexSetUtil = RandexSetUtil;

package/lib/custom/name.js

@@ -2,29 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.randomFullName = exports.randomName = void 0;
 var basic_1 = require("../basic");
-function getLength(reservedChars, length, defaultLength) {
-    var result = defaultLength;
-    if (typeof length === "number" && length > reservedChars) {
-        result = length - reservedChars;
-    }
-    else if (Array.isArray(length)) {
-        var min = length[0], max = length[1];
-        var dMin = min - reservedChars;
-        var dMax = max - reservedChars;
-        if (dMin >= 0 && dMax >= 0) {
-            if (dMin < dMax) {
-                return [dMin, dMax];
-            }
-            else if (dMin === dMax) {
-                return dMin;
-            }
-        }
-    }
-    return result;
-}
+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 currentLength = getLength(1, length, [1, 9]);
+    var currentLength = set_1.RandexSetUtil.getLength(1, length, [1, 9]);
     return (0, basic_1.random)([alphabet, "u"], [[alphabet, "l"], currentLength]);
 }
 exports.randomName = randomName;

package/lib/custom/username.d.ts

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

package/lib/custom/username.js

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

package/lib/test/test-util.js

@@ -46,11 +46,11 @@ var TestUtil = /** @class */ (function () {
         return value.length > 0;
     };
     TestUtil.inSet = function (value, set) {
-        var range = set_1.RtSetUtil.toRange(set);
+        var range = set_1.RandexSetUtil.toRange(set);
         return TestUtil.inRange(value, range);
     };
     TestUtil.inBoth = function (value, set, range) {
-        var fullRange = set_1.RtSetUtil.toRange(set) + range;
+        var fullRange = set_1.RandexSetUtil.toRange(set) + range;
         return TestUtil.inRange(value, fullRange);
     };
     TestUtil.isEmailValid = function (email) {

package/lib/test/username.test.js

@@ -9,4 +9,12 @@ describe("randomEmail", function () {
             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();
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "randex",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -26,15 +26,12 @@
     "ts-jest": "^24.1.0",
     "typescript": "^4.2.4"
   },
-  "dependencies": {
-    "reflect-metadata": "^0.2.1"
-  },
   "keywords": [
     "random",
     "random filename",
     "random email",
     "random username",
-    "random full name",
+    "random name",
     "random string"
   ]
 }