@newskit-render/validation 1.8.1 → 1.9.0-alpha.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/README.md +14 -0
- package/dist/cjs/utils.js +10 -2
- package/dist/cjs/utils.js.map +1 -1
- package/dist/esm/utils.js +10 -2
- package/dist/esm/utils.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -6,6 +6,7 @@ A package for adding validation to my account.
|
|
|
6
6
|
|
|
7
7
|
import initializeYupSchema, {
|
|
8
8
|
OverrideYupSchemaType,
|
|
9
|
+
ValidationFieldNames,
|
|
9
10
|
} from '@newskit-render/validation'
|
|
10
11
|
|
|
11
12
|
` import \* as yup from 'yup'`
|
|
@@ -19,11 +20,24 @@ const nameValidation = yup.object().shape({
|
|
|
19
20
|
})
|
|
20
21
|
```
|
|
21
22
|
|
|
23
|
+
/_ Example of required fields override _/
|
|
24
|
+
|
|
25
|
+
```
|
|
26
|
+
const requiredFieldsOverride = [
|
|
27
|
+
ValidationFieldNames.firstName,
|
|
28
|
+
ValidationFieldNames.line1,
|
|
29
|
+
ValidationFieldNames.mobile,
|
|
30
|
+
]
|
|
31
|
+
```
|
|
32
|
+
|
|
22
33
|
/_ Pass your override schema to here, so it's delegated accordingly _/
|
|
23
34
|
|
|
24
35
|
```
|
|
25
36
|
const overrideYupSchema: OverrideYupSchemaType = {
|
|
26
37
|
name: nameValidation,
|
|
38
|
+
options: {
|
|
39
|
+
overrideRequiredFields: requiredFieldsOverride
|
|
40
|
+
}
|
|
27
41
|
}
|
|
28
42
|
```
|
|
29
43
|
|
package/dist/cjs/utils.js
CHANGED
|
@@ -43,12 +43,20 @@ var getValidation = function (requiredFields) {
|
|
|
43
43
|
return function (_a) {
|
|
44
44
|
var validationFieldName = _a.validationFieldName, requiredMessage = _a.requiredMessage, formatMessage = _a.formatMessage, regex = _a.regex, isPhone = _a.isPhone, excludeEmptyString = _a.excludeEmptyString;
|
|
45
45
|
var validation = yup.string();
|
|
46
|
-
|
|
46
|
+
var isRequired = requiredFields.includes(validationFieldName);
|
|
47
|
+
if (isRequired) {
|
|
47
48
|
validation = validation.required(requiredMessage);
|
|
48
49
|
}
|
|
49
|
-
if (isPhone) {
|
|
50
|
+
if (isPhone && isRequired) {
|
|
50
51
|
validation = validation.phone(undefined, true, formatMessage);
|
|
51
52
|
}
|
|
53
|
+
else if (isPhone && !isRequired) {
|
|
54
|
+
validation = validation.test('test-phone', formatMessage || '', function (value) {
|
|
55
|
+
if (value)
|
|
56
|
+
return yup.string().phone(undefined, true).isValidSync(value);
|
|
57
|
+
return true;
|
|
58
|
+
});
|
|
59
|
+
}
|
|
52
60
|
else if (regex) {
|
|
53
61
|
validation = validation.matches(regex, {
|
|
54
62
|
message: formatMessage,
|
package/dist/cjs/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA0B;AAC1B,iCAIgB;AAChB,6CAmBsB;AAET,QAAA,qBAAqB,GAAG;IACnC,4BAAoB,CAAC,SAAS;IAC9B,4BAAoB,CAAC,QAAQ;IAC7B,4BAAoB,CAAC,MAAM;IAC3B,4BAAoB,CAAC,WAAW;IAChC,4BAAoB,CAAC,OAAO;IAC5B,4BAAoB,CAAC,KAAK;IAC1B,4BAAoB,CAAC,IAAI;IACzB,4BAAoB,CAAC,QAAQ;IAC7B,4BAAoB,CAAC,KAAK;IAC1B,4BAAoB,CAAC,kBAAkB;CACxC,CAAA;AAEM,IAAM,aAAa,GACxB,UAAC,cAAsC;IACvC,OAAA,UAAC,EAOe;YANd,mBAAmB,yBAAA,EACnB,eAAe,qBAAA,EACf,aAAa,mBAAA,EACb,KAAK,WAAA,EACL,OAAO,aAAA,EACP,kBAAkB,wBAAA;QAElB,IAAI,UAAU,GAAG,GAAG,CAAC,MAAM,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/utils.js
CHANGED
|
@@ -17,12 +17,20 @@ export var getValidation = function (requiredFields) {
|
|
|
17
17
|
return function (_a) {
|
|
18
18
|
var validationFieldName = _a.validationFieldName, requiredMessage = _a.requiredMessage, formatMessage = _a.formatMessage, regex = _a.regex, isPhone = _a.isPhone, excludeEmptyString = _a.excludeEmptyString;
|
|
19
19
|
var validation = yup.string();
|
|
20
|
-
|
|
20
|
+
var isRequired = requiredFields.includes(validationFieldName);
|
|
21
|
+
if (isRequired) {
|
|
21
22
|
validation = validation.required(requiredMessage);
|
|
22
23
|
}
|
|
23
|
-
if (isPhone) {
|
|
24
|
+
if (isPhone && isRequired) {
|
|
24
25
|
validation = validation.phone(undefined, true, formatMessage);
|
|
25
26
|
}
|
|
27
|
+
else if (isPhone && !isRequired) {
|
|
28
|
+
validation = validation.test('test-phone', formatMessage || '', function (value) {
|
|
29
|
+
if (value)
|
|
30
|
+
return yup.string().phone(undefined, true).isValidSync(value);
|
|
31
|
+
return true;
|
|
32
|
+
});
|
|
33
|
+
}
|
|
26
34
|
else if (regex) {
|
|
27
35
|
validation = validation.matches(regex, {
|
|
28
36
|
message: formatMessage,
|
package/dist/esm/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,EAEL,oBAAoB,GAErB,MAAM,SAAS,CAAA;AAChB,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,+BAA+B,EAC/B,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,4BAA4B,EAC5B,eAAe,EACf,mBAAmB,EACnB,uBAAuB,EACvB,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,eAAe,CAAA;AAEtB,MAAM,CAAC,IAAM,qBAAqB,GAAG;IACnC,oBAAoB,CAAC,SAAS;IAC9B,oBAAoB,CAAC,QAAQ;IAC7B,oBAAoB,CAAC,MAAM;IAC3B,oBAAoB,CAAC,WAAW;IAChC,oBAAoB,CAAC,OAAO;IAC5B,oBAAoB,CAAC,KAAK;IAC1B,oBAAoB,CAAC,IAAI;IACzB,oBAAoB,CAAC,QAAQ;IAC7B,oBAAoB,CAAC,KAAK;IAC1B,oBAAoB,CAAC,kBAAkB;CACxC,CAAA;AAED,MAAM,CAAC,IAAM,aAAa,GACxB,UAAC,cAAsC;IACvC,OAAA,UAAC,EAOe;YANd,mBAAmB,yBAAA,EACnB,eAAe,qBAAA,EACf,aAAa,mBAAA,EACb,KAAK,WAAA,EACL,OAAO,aAAA,EACP,kBAAkB,wBAAA;QAElB,IAAI,UAAU,GAAG,GAAG,CAAC,MAAM,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
|