@medipass/utils 11.72.0 → 11.73.1-chore-remove-is-mobile-number-lib.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [11.73.0](https://github.com/medipass/web-medicules/compare/@medipass/utils@11.72.0...@medipass/utils@11.73.0) (2022-11-04)
+
+
+### Features
+
+* **web-sdk, utils:** abr resource and abn validators ([#704](https://github.com/medipass/web-medicules/issues/704)) ([531b969](https://github.com/medipass/web-medicules/commit/531b969))
+
+
+
+
+
 # [11.72.0](https://github.com/medipass/web-medicules/compare/@medipass/utils@11.71.0...@medipass/utils@11.72.0) (2022-10-30)
 
 

package/abn.js

@@ -0,0 +1,89 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var ABN_LENGTH = 11;
+var ACN_LENGTH = 9;
+var normaliseAbn = function normaliseAbn(abn) {
+  var trimmedABN = abn == null ? void 0 : abn.replace(/\s/g, ''); // The input is an ABN, in which case the format should be 99 999 999 999
+
+  if (trimmedABN.length === ABN_LENGTH) {
+    return trimmedABN.substring(0, 2) + ' ' + trimmedABN.substring(2, 5) + ' ' + trimmedABN.substring(5, 8) + ' ' + trimmedABN.substring(8);
+  } //The input is an ACN, in which case the format should be 999 999 999
+
+
+  if (trimmedABN.length === ACN_LENGTH) {
+    return trimmedABN.substring(0, 3) + ' ' + trimmedABN.substring(3, 6) + ' ' + trimmedABN.substring(6);
+  }
+
+  return abn;
+};
+var isValidAbn = function isValidAbn(abn) {
+  var VALID_ABN_LENGTH = 11; // strip whitespace from value
+
+  abn = String(abn).replace(/\s+/g, '');
+
+  if (abn.length === VALID_ABN_LENGTH) {
+    var weights = [10, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19];
+    var abnArray = [];
+
+    for (var i = 0; i < abn.length; i++) {
+      abnArray[i] = abn.charAt(i);
+    } // subtract 1 from the left-most digit
+
+
+    abnArray[0] -= 1; // multiply each of the digits by its weighting factor
+
+    for (var _i = 0; _i < abnArray.length; _i++) {
+      abnArray[_i] *= weights[_i];
+    } // sum all the digits
+
+
+    var abnSum = 0;
+
+    for (var _i2 = 0; _i2 < abnArray.length; _i2++) {
+      abnSum += abnArray[_i2];
+    }
+
+    return abnSum % 89 === 0;
+  } else {
+    return false;
+  }
+};
+var isValidAcn = function isValidAcn(acn) {
+  var VALID_ACN_LENGTH = 9; // strip whitespace from value
+
+  acn = String(acn).replace(/\s+/g, '');
+
+  if (acn.length === VALID_ACN_LENGTH) {
+    var weights = [8, 7, 6, 5, 4, 3, 2, 1];
+    var acnArray = [];
+
+    for (var i = 0; i < acn.length; i++) {
+      acnArray[i] = parseInt(acn.charAt(i));
+    }
+
+    var acnSum = 0; // sum the digits 1-8
+
+    for (var _i3 = 0; _i3 < weights.length; _i3++) {
+      acnSum = acnSum + acnArray[_i3] * weights[_i3];
+    } // divide by 10 and take remainder
+
+
+    var remainder = acnSum % 10; // complement the remainder to 10
+
+    var complement = 10 - remainder; // if the complement equals 10, set it to 0
+
+    if (complement === 10) {
+      complement = 0;
+    }
+
+    return acnArray[8] === complement;
+  } else {
+    return false;
+  }
+};
+
+exports.isValidAbn = isValidAbn;
+exports.isValidAcn = isValidAcn;
+exports.normaliseAbn = normaliseAbn;

package/build-validation-schema.js

@@ -6,7 +6,10 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var _defineProperty = _interopDefault(require('@babel/runtime/helpers/defineProperty'));
 var yup = require('yup');
-var isMobileNumber = _interopDefault(require('is-mobile-number'));
+require('core-js/es6/promise');
+require('core-js/es6/set');
+require('google-libphonenumber');
+var validate = require('./validate.js');
 var _get = _interopDefault(require('lodash/get'));
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -992,7 +995,7 @@ var FIELD_VALIDATORS = {
       type: 'test',
       message: 'Please enter a valid Australian mobile number',
       fn: function fn(value) {
-        return value ? isMobileNumber(value, 'AU') : true;
+        return value ? validate.isMobileNumber(value, 'AU') : true;
       }
     }]
   },

package/index.js

@@ -8,6 +8,7 @@ require('@babel/runtime/helpers/defineProperty');
 require('yup');
 require('core-js/es6/promise');
 require('core-js/es6/set');
+require('google-libphonenumber');
 var validate = require('./validate.js');
 require('@babel/runtime/regenerator');
 require('@babel/runtime/helpers/asyncToGenerator');

package/lib/__tests__/abn.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/abn.d.ts

@@ -0,0 +1,3 @@
+export declare const normaliseAbn: (abn: string) => string;
+export declare const isValidAbn: (abn: string) => boolean;
+export declare const isValidAcn: (acn: string) => boolean;

package/lib/build-validation-schema.d.ts

@@ -42,7 +42,7 @@ export declare const FIELD_VALIDATORS: {
         } | {
             type: string;
             message: string;
-            fn: (value: any) => any;
+            fn: (value: any) => boolean;
         })[];
     };
     password: {

package/lib/index.d.ts

@@ -42,6 +42,7 @@ declare const _default: {
         isNumber: (number: any) => Promise<boolean>;
         isStringLength: (length: any, value: any) => Promise<boolean>;
         isUrl: (value: any) => Promise<boolean>;
+        isMobileNumber: (phoneNumber: string, countryCode: string) => boolean;
     };
 };
 export default _default;

package/lib/validate-form.d.ts

@@ -41,5 +41,8 @@ export declare const hasSpaceAfterHyphen: (value: any) => string;
 export declare const hasSpaceBeforeHyphen: (value: any) => string;
 export declare const hasSpaceAfterApostrophe: (value: any) => string;
 export declare const hasSpaceBeforeApostrophe: (value: any) => string;
+export declare const isValidAbn: (value: string) => string;
+export declare const isValidAcn: (value: string) => string;
+export declare const isValidAbnOrAcn: (value: string) => string;
 declare const combineValidators: (...fns: any[]) => (value: any) => any;
 export default combineValidators;

package/lib/validate.d.ts

@@ -5,11 +5,13 @@ export declare const isEmail: (email: any) => Promise<boolean>;
 export declare const isNumber: (number: any) => Promise<boolean>;
 export declare const isStringLength: (length: any, value: any) => Promise<boolean>;
 export declare const isUrl: (value: any) => Promise<boolean>;
-declare const _default: {
+export declare const isMobileNumber: (phoneNumber: string, countryCode: string) => boolean;
+declare const validate: {
     isEmail: (email: any) => Promise<boolean>;
     isNotEmpty: (value: any) => Promise<boolean>;
     isNumber: (number: any) => Promise<boolean>;
     isStringLength: (length: any, value: any) => Promise<boolean>;
     isUrl: (value: any) => Promise<boolean>;
+    isMobileNumber: (phoneNumber: string, countryCode: string) => boolean;
 };
-export default _default;
+export default validate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medipass/utils",
-  "version": "11.72.0",
+  "version": "11.73.1-chore-remove-is-mobile-number-lib.0",
   "description": "",
   "main": "index.js",
   "module": "index.js",
@@ -31,8 +31,8 @@
     "enzyme-adapter-react-16": "1.15.6",
     "enzyme-to-json": "3.3.4",
     "escape-html": "1.0.3",
+    "google-libphonenumber": "3.2.31",
     "i18next": "19.6.3",
-    "is-mobile-number": "1.0.3",
     "lodash": "4.17.21",
     "masked": "1.1.0",
     "moment": "2.22.2",
@@ -51,5 +51,5 @@
     "rimraf": "^2.6.2",
     "typescript": "4.8.4"
   },
-  "gitHead": "6bd756261aacc641c65a4f7f82033fd02f21e432"
+  "gitHead": "159a88b238d9695e6915e18c6f9cf9ec5d19004f"
 }

package/validate-form.js

@@ -7,10 +7,10 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 require('yup');
 require('core-js/es6/promise');
 require('core-js/es6/set');
+require('google-libphonenumber');
 var validate = require('./validate.js');
 var _regeneratorRuntime = _interopDefault(require('@babel/runtime/regenerator'));
 var _asyncToGenerator = _interopDefault(require('@babel/runtime/helpers/asyncToGenerator'));
-var isMobileNumber = _interopDefault(require('is-mobile-number'));
 var _isArray = _interopDefault(require('lodash/isArray'));
 var _get = _interopDefault(require('lodash/get'));
 var format = _interopDefault(require('date-fns/format'));
@@ -18,6 +18,7 @@ var isBefore = _interopDefault(require('date-fns/isBefore'));
 var isFuture = _interopDefault(require('date-fns/isFuture'));
 var isValid = _interopDefault(require('date-fns/isValid'));
 var parse = _interopDefault(require('date-fns/parse'));
+var abn = require('./abn.js');
 
 var isRequired = function isRequired(value) {
   return !value || value.trim && !value.trim() || _isArray(value) && value.length === 0 ? 'This field is required' : undefined;
@@ -152,7 +153,7 @@ var isValidEmail = function isValidEmail(value) {
   return !value || /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]+$/i.test(value) ? undefined : 'Please enter a valid email';
 };
 var isValidMobile = function isValidMobile(value) {
-  return !value || isMobileNumber(value, 'AU') ? undefined : 'Please enter a valid mobile number';
+  return !value || validate.isMobileNumber(value, 'AU') ? undefined : 'Please enter a valid mobile number';
 };
 var isValidDatePatterns = function isValidDatePatterns(_ref2) {
   var day = _ref2.day,
@@ -331,6 +332,29 @@ var hasSpaceAfterApostrophe = function hasSpaceAfterApostrophe(value) {
 var hasSpaceBeforeApostrophe = function hasSpaceBeforeApostrophe(value) {
   return value && /(\s['])/.test(value) ? "Name cannot have a space before an apostrophe (')" : undefined;
 };
+var isValidAbn = function isValidAbn(value) {
+  var isValid = abn.isValidAbn(value);
+
+  if (isValid) return undefined;
+  return 'Invalid ABN';
+};
+var isValidAcn = function isValidAcn(value) {
+  var isValid = abn.isValidAcn(value);
+
+  if (isValid) return undefined;
+  return 'Invalid ACN';
+};
+var isValidAbnOrAcn = function isValidAbnOrAcn(value) {
+  if (abn.isValidAbn(value)) {
+    return undefined;
+  }
+
+  if (abn.isValidAcn(value)) {
+    return undefined;
+  }
+
+  return 'Invalid ABN or ACN';
+};
 
 var combineValidators = function combineValidators() {
   for (var _len = arguments.length, fns = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -376,6 +400,9 @@ exports.isMoreThanThreeYears = isMoreThanThreeYears;
 exports.isNumber = isNumber;
 exports.isRequired = isRequired;
 exports.isSameValueAsField = isSameValueAsField;
+exports.isValidAbn = isValidAbn;
+exports.isValidAbnOrAcn = isValidAbnOrAcn;
+exports.isValidAcn = isValidAcn;
 exports.isValidBankAccountName = isValidBankAccountName;
 exports.isValidDOB = isValidDOB;
 exports.isValidDate = isValidDate;

package/validate.js

@@ -2,9 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
 var yup = require('yup');
 require('core-js/es6/promise');
 require('core-js/es6/set');
+var googleLibPhoneNumber = _interopDefault(require('google-libphonenumber'));
 
 var isNotEmpty = function isNotEmpty(value) {
   return yup.mixed().required().isValid(value);
@@ -21,16 +24,36 @@ var isStringLength = function isStringLength(length, value) {
 var isUrl = function isUrl(value) {
   return yup.string().url().isValid(value);
 };
+var phoneUtil = googleLibPhoneNumber.PhoneNumberUtil.getInstance();
+var phoneType = googleLibPhoneNumber.PhoneNumberType;
+var isMobileNumber = function isMobileNumber(phoneNumber, countryCode) {
+  if (!countryCode) {
+    throw new Error('`countryCode` not given.');
+  }
+
+  if (!phoneNumber) {
+    return false;
+  }
+
+  try {
+    var parsedPhoneNumber = phoneUtil.parse(phoneNumber, countryCode);
+    return phoneUtil.getNumberType(parsedPhoneNumber) === phoneType.MOBILE;
+  } catch (err) {
+    return false;
+  }
+};
 var validate = {
   isEmail: isEmail,
   isNotEmpty: isNotEmpty,
   isNumber: isNumber,
   isStringLength: isStringLength,
-  isUrl: isUrl
+  isUrl: isUrl,
+  isMobileNumber: isMobileNumber
 };
 
 exports.default = validate;
 exports.isEmail = isEmail;
+exports.isMobileNumber = isMobileNumber;
 exports.isNotEmpty = isNotEmpty;
 exports.isNumber = isNumber;
 exports.isStringLength = isStringLength;

package/lib/normalise-abn.d.ts

@@ -1,2 +0,0 @@
-declare const _default: (abn: any) => any;
-export default _default;

package/normalise-abn.js

@@ -1,22 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var ABN_LENGTH = 11;
-var ACN_LENGTH = 9;
-var normaliseAbn = (function (abn) {
-  var trimmedABN = abn && abn.replace(/\s/g, ''); // The input is an ABN, in which case the format should be 99 999 999 999
-
-  if (trimmedABN.length === ABN_LENGTH) {
-    return trimmedABN.substring(0, 2) + ' ' + trimmedABN.substring(2, 5) + ' ' + trimmedABN.substring(5, 8) + ' ' + trimmedABN.substring(8);
-  } //The input is an ACN, in which case the format should be 999 999 999
-
-
-  if (trimmedABN.length === ACN_LENGTH) {
-    return trimmedABN.substring(0, 3) + ' ' + trimmedABN.substring(3, 6) + ' ' + trimmedABN.substring(6);
-  }
-
-  return abn;
-});
-
-exports.default = normaliseAbn;