1 files changed, 18 insertions, 29 deletions

diff --git a/src/modules/system/index.ts b/src/modules/system/index.ts
index 12bb25ba..4bf28aff 100644
--- a/src/modules/system/index.ts
+++ b/src/modules/system/index.ts
@@ -228,9 +228,9 @@ export class SystemModule {
    */
   semver(): string {
     return [
-      this.faker.datatype.number(9),
-      this.faker.datatype.number(9),
-      this.faker.datatype.number(9),
+      this.faker.number.int(9),
+      this.faker.number.int(9),
+      this.faker.number.int(9),
     ].join('.');
   }
 
@@ -262,35 +262,24 @@ export class SystemModule {
 
     let suffix: string;
     let prefix = '';
+    const digit = () => this.faker.string.numeric({ allowLeadingZeros: true });
     switch (interfaceSchema) {
       case 'index':
-        suffix = this.faker.datatype.number(9).toString();
+        suffix = digit();
         break;
       case 'slot':
-        suffix = `${this.faker.datatype.number(9)}${
-          this.faker.helpers.maybe(() => `f${this.faker.datatype.number(9)}`) ??
-          ''
-        }${
-          this.faker.helpers.maybe(() => `d${this.faker.datatype.number(9)}`) ??
-          ''
-        }`;
+        suffix = `${digit()}${
+          this.faker.helpers.maybe(() => `f${digit()}`) ?? ''
+        }${this.faker.helpers.maybe(() => `d${digit()}`) ?? ''}`;
         break;
       case 'mac':
         suffix = this.faker.internet.mac('');
         break;
       case 'pci':
-        prefix =
-          this.faker.helpers.maybe(() => `P${this.faker.datatype.number(9)}`) ??
-          '';
-        suffix = `${this.faker.datatype.number(9)}s${this.faker.datatype.number(
-          9
-        )}${
-          this.faker.helpers.maybe(() => `f${this.faker.datatype.number(9)}`) ??
-          ''
-        }${
-          this.faker.helpers.maybe(() => `d${this.faker.datatype.number(9)}`) ??
-          ''
-        }`;
+        prefix = this.faker.helpers.maybe(() => `P${digit()}`) ?? '';
+        suffix = `${digit()}s${digit()}${
+          this.faker.helpers.maybe(() => `f${digit()}`) ?? ''
+        }${this.faker.helpers.maybe(() => `d${digit()}`) ?? ''}`;
         break;
     }
 
@@ -322,17 +311,17 @@ export class SystemModule {
     const { includeYear = false, includeNonStandard = false } = options;
 
     // create the arrays to hold the available values for each component of the expression
-    const minutes = [this.faker.datatype.number({ min: 0, max: 59 }), '*'];
-    const hours = [this.faker.datatype.number({ min: 0, max: 23 }), '*'];
-    const days = [this.faker.datatype.number({ min: 1, max: 31 }), '*', '?'];
-    const months = [this.faker.datatype.number({ min: 1, max: 12 }), '*'];
+    const minutes = [this.faker.number.int(59), '*'];
+    const hours = [this.faker.number.int(23), '*'];
+    const days = [this.faker.number.int({ min: 1, max: 31 }), '*', '?'];
+    const months = [this.faker.number.int({ min: 1, max: 12 }), '*'];
     const daysOfWeek = [
-      this.faker.datatype.number({ min: 0, max: 6 }),
+      this.faker.number.int(6),
       this.faker.helpers.arrayElement(CRON_DAY_OF_WEEK),
       '*',
       '?',
     ];
-    const years = [this.faker.datatype.number({ min: 1970, max: 2099 }), '*'];
+    const years = [this.faker.number.int({ min: 1970, max: 2099 }), '*'];
 
     const minute = this.faker.helpers.arrayElement(minutes);
     const hour = this.faker.helpers.arrayElement(hours);