chore: import validator functions individually (#3274)

faker-js · Nov 21, 2024 · 56acea3 · 56acea3
1 parent 3e1f26c
commit 56acea3
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 76 deletions.
diff --git a/test/modules/commerce.spec.ts b/test/modules/commerce.spec.ts
@@ -1,4 +1,4 @@
-import validator from 'validator';
+import { isISBN } from 'validator';
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
 import { seededTests } from '../support/seeded-runs';
@@ -204,7 +204,7 @@ describe('commerce', () => {
             isbn,
             'The expected match should be ISBN-13 with hyphens'
           ).toMatch(/^978-[01]-[\d-]{9}-\d$/);
-          expect(isbn).toSatisfy((isbn: string) => validator.isISBN(isbn, 13));
+          expect(isbn).toSatisfy((isbn: string) => isISBN(isbn, 13));
         });
 
         it('should return ISBN-10 with hyphen separators when passing variant 10 as argument', () => {
@@ -214,7 +214,7 @@ describe('commerce', () => {
             isbn,
             'The expected match should be ISBN-10 with hyphens'
           ).toMatch(/^[01]-[\d-]{9}-[\dX]$/);
-          expect(isbn).toSatisfy((isbn: string) => validator.isISBN(isbn, 10));
+          expect(isbn).toSatisfy((isbn: string) => isISBN(isbn, 10));
         });
 
         it('should return ISBN-13 with hyphen separators when passing variant 13 as argument', () => {
@@ -224,7 +224,7 @@ describe('commerce', () => {
             isbn,
             'The expected match should be ISBN-13 with hyphens'
           ).toMatch(/^978-[01]-[\d-]{9}-\d$/);
-          expect(isbn).toSatisfy((isbn: string) => validator.isISBN(isbn, 13));
+          expect(isbn).toSatisfy((isbn: string) => isISBN(isbn, 13));
         });
 
         it('should return ISBN-10 with space separators when passing variant 10 and space separators as argument', () => {
@@ -234,7 +234,7 @@ describe('commerce', () => {
             isbn,
             'The expected match should be ISBN-10 with space separators'
           ).toMatch(/^[01] [\d ]{9} [\dX]$/);
-          expect(isbn).toSatisfy((isbn: string) => validator.isISBN(isbn, 10));
+          expect(isbn).toSatisfy((isbn: string) => isISBN(isbn, 10));
         });
 
         it('should return ISBN-13 with space separators when passing space separators as argument', () => {
@@ -244,7 +244,7 @@ describe('commerce', () => {
             isbn,
             'The expected match should be ISBN-13 with space separators'
           ).toMatch(/^978 [01] [\d ]{9} \d$/);
-          expect(isbn).toSatisfy((isbn: string) => validator.isISBN(isbn, 13));
+          expect(isbn).toSatisfy((isbn: string) => isISBN(isbn, 13));
         });
       });
     }

diff --git a/test/modules/finance-iban.spec.ts b/test/modules/finance-iban.spec.ts
@@ -1,4 +1,4 @@
-import validator from 'validator';
+import { isIBAN } from 'validator';
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
 import { prettyPrintIban } from '../../src/modules/finance';
@@ -17,7 +17,7 @@ describe('finance_iban', () => {
       });
 
       expect(actual).toMatch(new RegExp(`^${country}`));
-      expect(actual).toSatisfy(validator.isIBAN);
+      expect(actual).toSatisfy(isIBAN);
     });
   });
 
@@ -41,7 +41,7 @@ describe('finance_iban', () => {
             countryCode: 'GE',
           });
 
-          expect(iban).toSatisfy(validator.isIBAN);
+          expect(iban).toSatisfy(isIBAN);
 
           const ibanFormatted = prettyPrintIban(iban);
           const bban = iban.substring(4) + iban.substring(0, 4);
@@ -104,7 +104,7 @@ describe('finance_iban', () => {
             countryCode: 'PK',
           });
 
-          expect(iban).toSatisfy(validator.isIBAN);
+          expect(iban).toSatisfy(isIBAN);
 
           const ibanFormated = prettyPrintIban(iban);
           const bban = iban.substring(4) + iban.substring(0, 4);
@@ -173,7 +173,7 @@ describe('finance_iban', () => {
             countryCode: 'TR',
           });
 
-          expect(iban).toSatisfy(validator.isIBAN);
+          expect(iban).toSatisfy(isIBAN);
 
           const ibanFormated = prettyPrintIban(iban);
           const bban = iban.substring(4) + iban.substring(0, 4);
@@ -246,7 +246,7 @@ describe('finance_iban', () => {
             countryCode: 'AZ',
           });
 
-          expect(iban).toSatisfy(validator.isIBAN);
+          expect(iban).toSatisfy(isIBAN);
 
           const ibanFormated = prettyPrintIban(iban);
           const bban = iban.substring(4) + iban.substring(0, 4);
@@ -308,7 +308,7 @@ describe('finance_iban', () => {
             countryCode: 'CR',
           });
 
-          expect(iban).toSatisfy(validator.isIBAN);
+          expect(iban).toSatisfy(isIBAN);
 
           const ibanFormated = prettyPrintIban(iban);
           const bban = iban.substring(4) + iban.substring(0, 4);
@@ -360,7 +360,7 @@ describe('finance_iban', () => {
           });
           const ibanFormated = prettyPrintIban(iban);
 
-          expect(iban).toSatisfy(validator.isIBAN);
+          expect(iban).toSatisfy(isIBAN);
 
           expect(
             28,

diff --git a/test/modules/git.spec.ts b/test/modules/git.spec.ts
@@ -1,4 +1,4 @@
-import validator from 'validator';
+import { isEmail, isHexadecimal, isSlug } from 'validator';
 import { describe, expect, it } from 'vitest';
 import { faker } from '../../src';
 import { seededTests } from '../support/seeded-runs';
@@ -13,7 +13,7 @@ function isValidCommitAuthor(email: string): boolean {
   // that contain unquoted characters like . output by Git so we need
   // to quote the display name
   const quotedEmail = email.replace(/^(.*) </, '"$1" <');
-  return validator.isEmail(quotedEmail, {
+  return isEmail(quotedEmail, {
     require_display_name: true,
   });
 }
@@ -49,7 +49,7 @@ describe('git', () => {
 
           expect(branch).toBeTruthy();
           expect(branch).toBeTypeOf('string');
-          expect(branch).toSatisfy(validator.isSlug);
+          expect(branch).toSatisfy(isSlug);
         });
       });
 
@@ -145,7 +145,7 @@ describe('git', () => {
 
           expect(commitSha).toBeTruthy();
           expect(commitSha).toBeTypeOf('string');
-          expect(commitSha).toSatisfy(validator.isHexadecimal);
+          expect(commitSha).toSatisfy(isHexadecimal);
           expect(commitSha).toHaveLength(40);
         });
 
@@ -159,7 +159,7 @@ describe('git', () => {
 
             expect(commitSha).toBeTruthy();
             expect(commitSha).toBeTypeOf('string');
-            expect(commitSha).toSatisfy(validator.isHexadecimal);
+            expect(commitSha).toSatisfy(isHexadecimal);
             expect(commitSha).toHaveLength(length);
           }
         );