feat(number): move methods to new module (#1122)

Co-authored-by: ST-DDT <[email protected]>
Co-authored-by: Eric Cheng <[email protected]>
Co-authored-by: Leyla Jähnig <[email protected]>
Co-authored-by: Shinigami92 <[email protected]>

2 files changed, 38 insertions, 46 deletions

diff --git a/src/modules/internet/index.ts b/src/modules/internet/index.ts
index 60e3ac55..a32045d9 100644
--- a/src/modules/internet/index.ts
+++ b/src/modules/internet/index.ts
@@ -46,7 +46,7 @@ export class InternetModule {
    * @since 2.0.1
    */
   avatar(): string {
-    return `https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/${this.faker.datatype.number(
+    return `https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/${this.faker.number.int(
       1249
     )}.jpg`;
   }
@@ -140,9 +140,9 @@ export class InternetModule {
     let result: string;
     firstName = firstName || this.faker.person.firstName();
     lastName = lastName || this.faker.person.lastName();
-    switch (this.faker.datatype.number(2)) {
+    switch (this.faker.number.int(2)) {
       case 0:
-        result = `${firstName}${this.faker.datatype.number(99)}`;
+        result = `${firstName}${this.faker.number.int(99)}`;
         break;
       case 1:
         result =
@@ -152,7 +152,7 @@ export class InternetModule {
         result = `${firstName}${this.faker.helpers.arrayElement([
           '.',
           '_',
-        ])}${lastName}${this.faker.datatype.number(99)}`;
+        ])}${lastName}${this.faker.number.int(99)}`;
         break;
     }
     result = result.toString().replace(/'/g, '');
@@ -319,7 +319,7 @@ export class InternetModule {
    */
   ipv4(): string {
     const randNum = () => {
-      return this.faker.datatype.number(255).toFixed(0);
+      return this.faker.number.int(255).toFixed(0);
     };
 
     const result: string[] = [];
@@ -380,7 +380,7 @@ export class InternetModule {
    * @since 5.4.0
    */
   port(): number {
-    return this.faker.datatype.number({ min: 0, max: 65535 });
+    return this.faker.number.int(65535);
   }
 
   /**
@@ -418,7 +418,7 @@ export class InternetModule {
     blueBase: number = 0
   ): string {
     const colorFromBase = (base: number): string =>
-      Math.floor((this.faker.datatype.number(256) + base) / 2)
+      Math.floor((this.faker.number.int(256) + base) / 2)
         .toString(16)
         .padStart(2, '0');
 
@@ -451,7 +451,7 @@ export class InternetModule {
     }
 
     for (i = 0; i < 12; i++) {
-      mac += this.faker.datatype.number(15).toString(16);
+      mac += this.faker.number.hex(15);
       if (i % 2 === 1 && i !== 11) {
         mac += validSep;
       }
@@ -506,7 +506,7 @@ export class InternetModule {
           pattern = consonant;
         }
       }
-      const n = this.faker.datatype.number(94) + 33;
+      const n = this.faker.number.int(94) + 33;
       let char = String.fromCharCode(n);
       if (memorable) {
         char = char.toLowerCase();
diff --git a/src/modules/internet/user-agent.ts b/src/modules/internet/user-agent.ts
index 972b2574..005e31e6 100644
--- a/src/modules/internet/user-agent.ts
+++ b/src/modules/internet/user-agent.ts
@@ -58,7 +58,7 @@ export function generate(faker: Faker): string {
     obj: T
   ): keyof T => {
     //returns a random key from the passed object; keys are weighted by the decimal probability in their value
-    const rand = faker.datatype.number({ min: 0, max: 100 }) / 100;
+    const rand = faker.number.int(100) / 100;
     let min = 0;
     let max = 0;
     let return_val: string;
@@ -217,7 +217,7 @@ export function generate(faker: Faker): string {
     //generate a random revision
     //dots = 2 returns .x.y where x & y are between 0 and 9
     for (let x = 0; x < dots; x++) {
-      return_val += `.${faker.datatype.number({ min: 0, max: 9 })}`;
+      return_val += `.${faker.string.numeric({ allowLeadingZeros: true })}`;
     }
     return return_val;
   };
@@ -225,53 +225,51 @@ export function generate(faker: Faker): string {
   const version_string = {
     net() {
       return [
-        faker.datatype.number({ min: 1, max: 4 }),
-        faker.datatype.number({ min: 0, max: 9 }),
-        faker.datatype.number({ min: 10000, max: 99999 }),
-        faker.datatype.number({ min: 0, max: 9 }),
+        faker.number.int({ min: 1, max: 4 }),
+        faker.number.int(9),
+        faker.number.int({ min: 10000, max: 99999 }),
+        faker.number.int(9),
       ].join('.');
     },
     nt() {
-      return [
-        faker.datatype.number({ min: 5, max: 6 }),
-        faker.datatype.number({ min: 0, max: 3 }),
-      ].join('.');
+      return [faker.number.int({ min: 5, max: 6 }), faker.number.int(3)].join(
+        '.'
+      );
     },
     ie() {
-      return faker.datatype.number({ min: 7, max: 11 });
+      return faker.number.int({ min: 7, max: 11 });
     },
     trident() {
-      return [
-        faker.datatype.number({ min: 3, max: 7 }),
-        faker.datatype.number({ min: 0, max: 1 }),
-      ].join('.');
+      return [faker.number.int({ min: 3, max: 7 }), faker.number.int(1)].join(
+        '.'
+      );
     },
     osx(delim?: string) {
       return [
         10,
-        faker.datatype.number({ min: 5, max: 10 }),
-        faker.datatype.number({ min: 0, max: 9 }),
+        faker.number.int({ min: 5, max: 10 }),
+        faker.number.int(9),
       ].join(delim || '.');
     },
     chrome() {
       return [
-        faker.datatype.number({ min: 13, max: 39 }),
+        faker.number.int({ min: 13, max: 39 }),
         0,
-        faker.datatype.number({ min: 800, max: 899 }),
+        faker.number.int({ min: 800, max: 899 }),
         0,
       ].join('.');
     },
     presto() {
-      return `2.9.${faker.datatype.number({ min: 160, max: 190 })}`;
+      return `2.9.${faker.number.int({ min: 160, max: 190 })}`;
     },
     presto2() {
-      return `${faker.datatype.number({ min: 10, max: 12 })}.00`;
+      return `${faker.number.int({ min: 10, max: 12 })}.00`;
     },
     safari() {
       return [
-        faker.datatype.number({ min: 531, max: 538 }),
-        faker.datatype.number({ min: 0, max: 2 }),
-        faker.datatype.number({ min: 0, max: 2 }),
+        faker.number.int({ min: 531, max: 538 }),
+        faker.number.int(2),
+        faker.number.int(2),
       ].join('.');
     },
   };
@@ -279,7 +277,7 @@ export function generate(faker: Faker): string {
   const browserMap = {
     firefox(arch: OS): string {
       //https://developer.mozilla.org/en-US/docs/Gecko_user_agent_string_reference
-      const firefox_ver = `${faker.datatype.number({
+      const firefox_ver = `${faker.number.int({
           min: 5,
           max: 15,
         })}${randomRevision(2)}`,
@@ -303,7 +301,7 @@ export function generate(faker: Faker): string {
 
       if (ver >= 11) {
         //http://msdn.microsoft.com/en-us/library/ie/hh869301(v=vs.85).aspx
-        return `Mozilla/5.0 (Windows NT 6.${faker.datatype.number({
+        return `Mozilla/5.0 (Windows NT 6.${faker.number.int({
           min: 1,
           max: 3,
         })}; Trident/7.0; ${
@@ -327,29 +325,23 @@ export function generate(faker: Faker): string {
             ? `(X11; Linux ${randomProc(arch)}; U; ${randomLang()}${presto_ver}`
             : `(Macintosh; Intel Mac OS X ${version_string.osx()} U; ${randomLang()} Presto/${version_string.presto()} Version/${version_string.presto2()})`;
 
-      return `Opera/${faker.datatype.number({
+      return `Opera/${faker.number.int({
         min: 9,
         max: 14,
-      })}.${faker.datatype.number({
-        min: 0,
-        max: 99,
-      })} ${os_ver}`;
+      })}.${faker.number.int(99)} ${os_ver}`;
     },
 
     safari(arch: OS): string {
       const safari = version_string.safari(),
-        ver = `${faker.datatype.number({
+        ver = `${faker.number.int({
           min: 4,
           max: 7,
-        })}.${faker.datatype.number({
-          min: 0,
-          max: 1,
-        })}.${faker.datatype.number({ min: 0, max: 10 })}`,
+        })}.${faker.number.int(1)}.${faker.number.int(10)}`,
         os_ver =
           arch === 'mac'
             ? `(Macintosh; ${randomProc('mac')} Mac OS X ${version_string.osx(
                 '_'
-              )} rv:${faker.datatype.number({
+              )} rv:${faker.number.int({
                 min: 2,
                 max: 6,
               })}.0; ${randomLang()}) `