@defra-fish/business-rules-lib 1.49.0-rc.7 → 1.49.0-rc.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/business-rules-lib",
-  "version": "1.49.0-rc.7",
+  "version": "1.49.0-rc.9",
   "description": "Shared business rules for the rod licensing digital services",
   "type": "module",
   "engines": {
@@ -37,5 +37,5 @@
     "moment": "^2.29.1",
     "uuid": "^8.3.2"
   },
-  "gitHead": "a933cacf4f8f557e16ff0d0ee9d8b001723e292c"
+  "gitHead": "1e15ad727b21fcf5bae53fbc6a7f06059a42289d"
 }

package/src/validators/__tests__/contact.validators.spec.js

@@ -145,7 +145,7 @@ describe('contact validators', () => {
       'ᴹᶦᶜʰᵃᵉˡ',
       '𖢑𖥣𖥐𖦙𖧥𖠢ꛚ',
       'ℳ𝒾𝒸𝒽𝒶ℯ𝓁',
-      '𝙼𝚒𝚌𝚑𝚊𝚎𝚕'
+      '𝙼𝚒𝚌𝚑𝚊𝚎𝚕 '
     ])('prohibits a string with non-standard characters: %s', async c => {
       await expect(contactValidation.createFirstNameValidator(Joi).validateAsync(c)).rejects.toThrow()
     })
@@ -461,22 +461,6 @@ describe('contact validators', () => {
         '"value" length must be less than or equal to 100 characters long'
       )
     })
-
-    it.each([
-      'Bond👏 Street',
-      '🅑ⓞ🅝ⓓ ⓢⓣⓡⓔⓔⓣ',
-      'Ｂｏｎｄ Ｓｔｒｅｅｔ',
-      'ᴮᵒⁿᵈ ˢᵗʳᵉᵉᵗ',
-      'B̲o̲n̲d̲ ̲S̲t̲r̲e̲e̲t̲',
-      'B̸o̸n̸d̸ ̸S̸t̸r̸e̸e̸t̸',
-      '🅑🅞🅝🅓 🅢🅣🅡🅔🅔🅣',
-      'B𝑜𝓷d S𝓉𝓇𝑒𝑒𝓉',
-      'もＢ囗ｏ几ｎ问ｄ  丂Ｓ匕ｔ尺ｒ乇ｅモｅ匕ｔ',
-      'B⃠o⃠n⃠d⃠ S⃠t⃠r⃠e⃠e⃠t⃠',
-      '𝐁𝐨𝐧𝐝 𝐒𝐭𝐫𝐞𝐞𝐭'
-    ])('prohibits a string with non-standard characters: %s', async c => {
-      await expect(contactValidation.createStreetValidator(Joi).validateAsync(c)).rejects.toThrow()
-    })
   })
 
   describe('localityValidator', () => {
@@ -493,20 +477,6 @@ describe('contact validators', () => {
         '"value" length must be less than or equal to 100 characters long'
       )
     })
-
-    it.each([
-      'M̲a̲y̲f̲a̲i̲r̲',
-      'M̸a̸y̸f̸a̸i̸r̸',
-      'Ｍａｙｆａｉｒ',
-      'ᴹᵃʸᶠᵃⁱʳ',
-      '🅜🅐🅨🅕🅐🅘🅡',
-      '🅜ⓐ🅨ⓕⓐⓘⓡ',
-      '爪Ｍ丹ａﾘｙ乍ｆ丹ａ工ｉ尺ｒ',
-      'M⃠a⃠y⃠f⃠a⃠i⃠r⃠',
-      '𝐌𝐚𝐲𝐟𝐚𝐢𝐫'
-    ])('prohibits a string with non-standard characters: %s', async c => {
-      await expect(contactValidation.createLocalityValidator(Joi).validateAsync(c)).rejects.toThrow()
-    })
   })
 
   describe('townValidator', () => {

package/src/validators/contact.validators.js

@@ -79,9 +79,9 @@ const createDateStringValidator = joi =>
   })
 
 const allowedUnicodeBlocks = '\\u0000-\\u024F'
-const forbiddenCharsRegex = new RegExp(`[^${allowedUnicodeBlocks}\\s'’()-]`, 'gu')
-const forbiddenEmailRegex = new RegExp(`[^A-Za-z0-9\\s'’@._${allowedUnicodeBlocks}]`, 'gu')
-const forbiddenCharsNumbersRegex = new RegExp(`[^A-Za-z0-9\\s${allowedUnicodeBlocks}]`, 'gu')
+const forbiddenCharsRegex = new RegExp(`[^${allowedUnicodeBlocks}\\s'’()-]`, 'u')
+const forbiddenEmailRegex = new RegExp(`[^A-Za-z0-9\\s'’@._${allowedUnicodeBlocks}]`, 'u')
+const forbiddenCharsNumbersRegex = new RegExp(`[^A-Za-z0-9\\s${allowedUnicodeBlocks}]`, 'u')
 const forbiddenMobileRegex = /[^+()0-9\-.\s]+/g
 
 /**
@@ -136,15 +136,7 @@ export const createPremisesValidator = joi =>
  * @param {Joi.Root} joi the joi validator used by the consuming project
  * @returns {Joi.StringSchema}
  */
-export const createStreetValidator = joi =>
-  checkCopyPasteValidator(joi, forbiddenCharsRegex)
-    .string()
-    .allowable()
-    .trim()
-    .max(100)
-    .external(toTitleCase())
-    .empty('')
-    .example('Example Street')
+export const createStreetValidator = joi => joi.string().trim().max(100).external(toTitleCase()).empty('').example('Example Street')
 
 /**
  * Create a validator to check a contact's address locality
@@ -152,15 +144,7 @@ export const createStreetValidator = joi =>
  * @param {Joi.Root} joi the joi validator used by the consuming project
  * @returns {Joi.StringSchema}
  */
-export const createLocalityValidator = joi =>
-  checkCopyPasteValidator(joi, forbiddenCharsRegex)
-    .string()
-    .allowable()
-    .trim()
-    .max(100)
-    .external(toTitleCase())
-    .empty('')
-    .example('Near Sample')
+export const createLocalityValidator = joi => joi.string().trim().max(100).external(toTitleCase()).empty('').example('Near Sample')
 
 /**
  * Create a validator to check a contact's address town