@medipass/utils 11.80.5 → 11.80.6-chore-remove-acn-instances.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/abn.d.ts +0 -1
- package/abn.js +0 -40
- package/i18n/translations.js +1 -1
- package/package.json +2 -2
- package/validate-form.d.ts +1 -3
- package/validate-form.js +1 -20
package/abn.d.ts
CHANGED
package/abn.js
CHANGED
|
@@ -3,17 +3,11 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
var ABN_LENGTH = 11;
|
|
6
|
-
var ACN_LENGTH = 9;
|
|
7
6
|
var normaliseAbn = function normaliseAbn(abn) {
|
|
8
7
|
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
|
|
9
8
|
|
|
10
9
|
if (trimmedABN.length === ABN_LENGTH) {
|
|
11
10
|
return trimmedABN.substring(0, 2) + ' ' + trimmedABN.substring(2, 5) + ' ' + trimmedABN.substring(5, 8) + ' ' + trimmedABN.substring(8);
|
|
12
|
-
} //The input is an ACN, in which case the format should be 999 999 999
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
if (trimmedABN.length === ACN_LENGTH) {
|
|
16
|
-
return trimmedABN.substring(0, 3) + ' ' + trimmedABN.substring(3, 6) + ' ' + trimmedABN.substring(6);
|
|
17
11
|
}
|
|
18
12
|
|
|
19
13
|
return abn;
|
|
@@ -53,40 +47,6 @@ var isValidAbn = function isValidAbn(abn) {
|
|
|
53
47
|
return false;
|
|
54
48
|
}
|
|
55
49
|
};
|
|
56
|
-
var isValidAcn = function isValidAcn(acn) {
|
|
57
|
-
var VALID_ACN_LENGTH = 9; // strip whitespace from value
|
|
58
|
-
|
|
59
|
-
acn = String(acn).replace(/\s+/g, '');
|
|
60
|
-
|
|
61
|
-
if (acn.length === VALID_ACN_LENGTH) {
|
|
62
|
-
var weights = [8, 7, 6, 5, 4, 3, 2, 1];
|
|
63
|
-
var acnArray = [];
|
|
64
|
-
|
|
65
|
-
for (var i = 0; i < acn.length; i++) {
|
|
66
|
-
acnArray[i] = parseInt(acn.charAt(i));
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
var acnSum = 0; // sum the digits 1-8
|
|
70
|
-
|
|
71
|
-
for (var _i3 = 0; _i3 < weights.length; _i3++) {
|
|
72
|
-
acnSum = acnSum + acnArray[_i3] * weights[_i3];
|
|
73
|
-
} // divide by 10 and take remainder
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
var remainder = acnSum % 10; // complement the remainder to 10
|
|
77
|
-
|
|
78
|
-
var complement = 10 - remainder; // if the complement equals 10, set it to 0
|
|
79
|
-
|
|
80
|
-
if (complement === 10) {
|
|
81
|
-
complement = 0;
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
return acnArray[8] === complement;
|
|
85
|
-
} else {
|
|
86
|
-
return false;
|
|
87
|
-
}
|
|
88
|
-
};
|
|
89
50
|
|
|
90
51
|
exports.isValidAbn = isValidAbn;
|
|
91
|
-
exports.isValidAcn = isValidAcn;
|
|
92
52
|
exports.normaliseAbn = normaliseAbn;
|
package/i18n/translations.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@medipass/utils",
|
|
3
|
-
"version": "11.80.
|
|
3
|
+
"version": "11.80.6-chore-remove-acn-instances.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "index.d.ts",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"rimraf": "^2.6.2",
|
|
53
53
|
"typescript": "4.8.4"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "e451a9770091f194522df9fc3cf224d482917c56"
|
|
56
56
|
}
|
package/validate-form.d.ts
CHANGED
|
@@ -59,8 +59,6 @@ export declare const hasSpaceAfterHyphen: (value: any) => "Name cannot have a sp
|
|
|
59
59
|
export declare const hasSpaceBeforeHyphen: (value: any) => "Name cannot have a space before a hyphen (-)" | undefined;
|
|
60
60
|
export declare const hasSpaceAfterApostrophe: (value: any) => "Name cannot have a space after an apostrophe (')" | undefined;
|
|
61
61
|
export declare const hasSpaceBeforeApostrophe: (value: any) => "Name cannot have a space before an apostrophe (')" | undefined;
|
|
62
|
-
export declare const isValidAbn: (value: string) => "
|
|
63
|
-
export declare const isValidAcn: (value: string) => "Invalid ACN" | undefined;
|
|
64
|
-
export declare const isValidAbnOrAcn: (value: string) => "Invalid ABN or ACN" | undefined;
|
|
62
|
+
export declare const isValidAbn: (value: string) => "Please enter a valid 11 digit ABN" | undefined;
|
|
65
63
|
declare const combineValidators: (...fns: any[]) => (value: any) => any;
|
|
66
64
|
export default combineValidators;
|
package/validate-form.js
CHANGED
|
@@ -383,24 +383,7 @@ var isValidAbn = function isValidAbn(value) {
|
|
|
383
383
|
var isValid = abn.isValidAbn(value);
|
|
384
384
|
|
|
385
385
|
if (isValid) return undefined;
|
|
386
|
-
return '
|
|
387
|
-
};
|
|
388
|
-
var isValidAcn = function isValidAcn(value) {
|
|
389
|
-
var isValid = abn.isValidAcn(value);
|
|
390
|
-
|
|
391
|
-
if (isValid) return undefined;
|
|
392
|
-
return 'Invalid ACN';
|
|
393
|
-
};
|
|
394
|
-
var isValidAbnOrAcn = function isValidAbnOrAcn(value) {
|
|
395
|
-
if (abn.isValidAbn(value)) {
|
|
396
|
-
return undefined;
|
|
397
|
-
}
|
|
398
|
-
|
|
399
|
-
if (abn.isValidAcn(value)) {
|
|
400
|
-
return undefined;
|
|
401
|
-
}
|
|
402
|
-
|
|
403
|
-
return 'Invalid ABN or ACN';
|
|
386
|
+
return 'Please enter a valid 11 digit ABN';
|
|
404
387
|
};
|
|
405
388
|
|
|
406
389
|
var combineValidators = // @ts-expect-error TS(7019): Rest parameter 'fns' implicitly has an 'any[]' typ... Remove this comment to see the full error message
|
|
@@ -456,8 +439,6 @@ exports.isNumber = isNumber;
|
|
|
456
439
|
exports.isRequired = isRequired;
|
|
457
440
|
exports.isSameValueAsField = isSameValueAsField;
|
|
458
441
|
exports.isValidAbn = isValidAbn;
|
|
459
|
-
exports.isValidAbnOrAcn = isValidAbnOrAcn;
|
|
460
|
-
exports.isValidAcn = isValidAcn;
|
|
461
442
|
exports.isValidBankAccountName = isValidBankAccountName;
|
|
462
443
|
exports.isValidDOB = isValidDOB;
|
|
463
444
|
exports.isValidDate = isValidDate;
|