@rxap/forms 13.0.7 → 13.1.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/esm2020/lib/validators/index.mjs +6 -2
- package/esm2020/lib/validators/is-port.mjs +19 -0
- package/esm2020/lib/validators/is-uuid.mjs +19 -0
- package/fesm2015/rxap-forms.mjs +40 -2
- package/fesm2015/rxap-forms.mjs.map +1 -1
- package/fesm2020/rxap-forms.mjs +40 -2
- package/fesm2020/rxap-forms.mjs.map +1 -1
- package/lib/validators/index.d.ts +4 -0
- package/lib/validators/is-port.d.ts +4 -0
- package/lib/validators/is-uuid.d.ts +5 -0
- package/package.json +2 -2
|
@@ -11,6 +11,8 @@ import { IsPhoneNumber } from './is-phone-number';
|
|
|
11
11
|
import { IsEmail } from './is-email';
|
|
12
12
|
import { IsUrl } from './is-url';
|
|
13
13
|
import { IsIP } from './is-ip';
|
|
14
|
+
import { IsPort } from './is-port';
|
|
15
|
+
import { IsUUID } from './is-uuid';
|
|
14
16
|
export const RxapValidators = {
|
|
15
17
|
IsNumber,
|
|
16
18
|
IsBoolean,
|
|
@@ -24,6 +26,8 @@ export const RxapValidators = {
|
|
|
24
26
|
IsPhoneNumber,
|
|
25
27
|
IsEmail,
|
|
26
28
|
IsUrl,
|
|
27
|
-
IsIP
|
|
29
|
+
IsIP,
|
|
30
|
+
IsPort,
|
|
31
|
+
IsUUID,
|
|
28
32
|
};
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9saWJzL2Zvcm1zL3NyYy9saWIvdmFsaWRhdG9ycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxJQUFJLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNwRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDdkMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN2QyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ2pDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDbkMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNuQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDekMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDckMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUNqQyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQy9CLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDbkMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUVuQyxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUc7SUFDNUIsUUFBUTtJQUNSLFNBQVM7SUFDVCxPQUFPO0lBQ1AsTUFBTTtJQUNOLE1BQU07SUFDTixLQUFLO0lBQ0wsUUFBUTtJQUNSLFFBQVE7SUFDUixTQUFTO0lBQ1QsYUFBYTtJQUNiLE9BQU87SUFDUCxLQUFLO0lBQ0wsSUFBSTtJQUNKLE1BQU07SUFDTixNQUFNO0NBQ1AsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IF9Jc051bWJlciBhcyBJc051bWJlciB9IGZyb20gJy4vaXMtbnVtYmVyJztcbmltcG9ydCB7IElzQm9vbGVhbiB9IGZyb20gJy4vaXMtYm9vbGVhbic7XG5pbXBvcnQgeyBJc09iamVjdCB9IGZyb20gJy4vaXMtb2JqZWN0JztcbmltcG9ydCB7IElzU3RyaW5nIH0gZnJvbSAnLi9pcy1zdHJpbmcnO1xuaW1wb3J0IHsgSXNJbnQgfSBmcm9tICcuL2lzLWludCc7XG5pbXBvcnQgeyBJc0VudW0gfSBmcm9tICcuL2lzLWVudW0nO1xuaW1wb3J0IHsgSXNEYXRlIH0gZnJvbSAnLi9pcy1kYXRlJztcbmltcG9ydCB7IElzQXJyYXkgfSBmcm9tICcuL2lzLWFycmF5JztcbmltcG9ydCB7IElzQ29tcGxleCB9IGZyb20gJy4vaXMtY29tcGxleCc7XG5pbXBvcnQgeyBJc1Bob25lTnVtYmVyIH0gZnJvbSAnLi9pcy1waG9uZS1udW1iZXInO1xuaW1wb3J0IHsgSXNFbWFpbCB9IGZyb20gJy4vaXMtZW1haWwnO1xuaW1wb3J0IHsgSXNVcmwgfSBmcm9tICcuL2lzLXVybCc7XG5pbXBvcnQgeyBJc0lQIH0gZnJvbSAnLi9pcy1pcCc7XG5pbXBvcnQgeyBJc1BvcnQgfSBmcm9tICcuL2lzLXBvcnQnO1xuaW1wb3J0IHsgSXNVVUlEIH0gZnJvbSAnLi9pcy11dWlkJztcblxuZXhwb3J0IGNvbnN0IFJ4YXBWYWxpZGF0b3JzID0ge1xuICBJc051bWJlcixcbiAgSXNCb29sZWFuLFxuICBJc0FycmF5LFxuICBJc0RhdGUsXG4gIElzRW51bSxcbiAgSXNJbnQsXG4gIElzT2JqZWN0LFxuICBJc1N0cmluZyxcbiAgSXNDb21wbGV4LFxuICBJc1Bob25lTnVtYmVyLFxuICBJc0VtYWlsLFxuICBJc1VybCxcbiAgSXNJUCxcbiAgSXNQb3J0LFxuICBJc1VVSUQsXG59O1xuIl19
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { isPort } from '@rxap/validator';
|
|
2
|
+
export function IsPort({ message } = {}) {
|
|
3
|
+
return (control) => {
|
|
4
|
+
if (control.value === null) {
|
|
5
|
+
return null;
|
|
6
|
+
}
|
|
7
|
+
if (!(typeof control.value === 'string' && isPort(control.value))) {
|
|
8
|
+
return {
|
|
9
|
+
isPort: {
|
|
10
|
+
expected: `A valid port number between 1 and 65535`,
|
|
11
|
+
actual: control.value,
|
|
12
|
+
message
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
return null;
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXMtcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvZm9ybXMvc3JjL2xpYi92YWxpZGF0b3JzL2lzLXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXpDLE1BQU0sVUFBVSxNQUFNLENBQUMsRUFBRSxPQUFPLEtBQTJCLEVBQUU7SUFDM0QsT0FBTyxDQUFDLE9BQXdCLEVBQTJCLEVBQUU7UUFDM0QsSUFBSSxPQUFPLENBQUMsS0FBSyxLQUFLLElBQUksRUFBRTtZQUMxQixPQUFPLElBQUksQ0FBQztTQUNiO1FBQ0QsSUFBSSxDQUFDLENBQUMsT0FBTyxPQUFPLENBQUMsS0FBSyxLQUFLLFFBQVEsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7WUFDakUsT0FBTztnQkFDTCxNQUFNLEVBQUU7b0JBQ04sUUFBUSxFQUFFLHlDQUF5QztvQkFDbkQsTUFBTSxFQUFJLE9BQU8sQ0FBQyxLQUFLO29CQUN2QixPQUFPO2lCQUNSO2FBQ0YsQ0FBQztTQUNIO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDLENBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgQWJzdHJhY3RDb250cm9sLFxuICBWYWxpZGF0aW9uRXJyb3JzXG59IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IGlzUG9ydCB9IGZyb20gJ0ByeGFwL3ZhbGlkYXRvcic7XG5cbmV4cG9ydCBmdW5jdGlvbiBJc1BvcnQoeyBtZXNzYWdlIH06IHsgbWVzc2FnZT86IHN0cmluZyB9ID0ge30pIHtcbiAgcmV0dXJuIChjb250cm9sOiBBYnN0cmFjdENvbnRyb2wpOiBWYWxpZGF0aW9uRXJyb3JzIHwgbnVsbCA9PiB7XG4gICAgaWYgKGNvbnRyb2wudmFsdWUgPT09IG51bGwpIHtcbiAgICAgIHJldHVybiBudWxsO1xuICAgIH1cbiAgICBpZiAoISh0eXBlb2YgY29udHJvbC52YWx1ZSA9PT0gJ3N0cmluZycgJiYgaXNQb3J0KGNvbnRyb2wudmFsdWUpKSkge1xuICAgICAgcmV0dXJuIHtcbiAgICAgICAgaXNQb3J0OiB7XG4gICAgICAgICAgZXhwZWN0ZWQ6IGBBIHZhbGlkIHBvcnQgbnVtYmVyIGJldHdlZW4gMSBhbmQgNjU1MzVgLFxuICAgICAgICAgIGFjdHVhbDogICBjb250cm9sLnZhbHVlLFxuICAgICAgICAgIG1lc3NhZ2VcbiAgICAgICAgfVxuICAgICAgfTtcbiAgICB9XG4gICAgcmV0dXJuIG51bGw7XG4gIH07XG59XG4iXX0=
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { isUUID } from '@rxap/validator';
|
|
2
|
+
export function IsUUID({ message, version = 'all' } = {}) {
|
|
3
|
+
return (control) => {
|
|
4
|
+
if (control.value === null) {
|
|
5
|
+
return null;
|
|
6
|
+
}
|
|
7
|
+
if (!(typeof control.value === 'string' && isUUID(control.value, version))) {
|
|
8
|
+
return {
|
|
9
|
+
isUuid: {
|
|
10
|
+
expected: version === 'all' ? `A valid uuid` : `A valid uuid version ${version}`,
|
|
11
|
+
actual: control.value,
|
|
12
|
+
message
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
return null;
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXMtdXVpZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvZm9ybXMvc3JjL2xpYi92YWxpZGF0b3JzL2lzLXV1aWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXpDLE1BQU0sVUFBVSxNQUFNLENBQUMsRUFBRSxPQUFPLEVBQUUsT0FBTyxHQUFHLEtBQUssS0FBNkMsRUFBRTtJQUM5RixPQUFPLENBQUMsT0FBd0IsRUFBMkIsRUFBRTtRQUMzRCxJQUFJLE9BQU8sQ0FBQyxLQUFLLEtBQUssSUFBSSxFQUFFO1lBQzFCLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFDRCxJQUFJLENBQUMsQ0FBQyxPQUFPLE9BQU8sQ0FBQyxLQUFLLEtBQUssUUFBUSxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDLEVBQUU7WUFDMUUsT0FBTztnQkFDTCxNQUFNLEVBQUU7b0JBQ04sUUFBUSxFQUFFLE9BQU8sS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsd0JBQXdCLE9BQU8sRUFBRTtvQkFDaEYsTUFBTSxFQUFJLE9BQU8sQ0FBQyxLQUFLO29CQUN2QixPQUFPO2lCQUNSO2FBQ0YsQ0FBQztTQUNIO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDLENBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgQWJzdHJhY3RDb250cm9sLFxuICBWYWxpZGF0aW9uRXJyb3JzXG59IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IGlzVVVJRCB9IGZyb20gJ0ByeGFwL3ZhbGlkYXRvcic7XG5cbmV4cG9ydCBmdW5jdGlvbiBJc1VVSUQoeyBtZXNzYWdlLCB2ZXJzaW9uID0gJ2FsbCcgfTogeyBtZXNzYWdlPzogc3RyaW5nLCB2ZXJzaW9uPzogc3RyaW5nIH0gPSB7fSkge1xuICByZXR1cm4gKGNvbnRyb2w6IEFic3RyYWN0Q29udHJvbCk6IFZhbGlkYXRpb25FcnJvcnMgfCBudWxsID0+IHtcbiAgICBpZiAoY29udHJvbC52YWx1ZSA9PT0gbnVsbCkge1xuICAgICAgcmV0dXJuIG51bGw7XG4gICAgfVxuICAgIGlmICghKHR5cGVvZiBjb250cm9sLnZhbHVlID09PSAnc3RyaW5nJyAmJiBpc1VVSUQoY29udHJvbC52YWx1ZSwgdmVyc2lvbikpKSB7XG4gICAgICByZXR1cm4ge1xuICAgICAgICBpc1V1aWQ6IHtcbiAgICAgICAgICBleHBlY3RlZDogdmVyc2lvbiA9PT0gJ2FsbCcgPyBgQSB2YWxpZCB1dWlkYCA6IGBBIHZhbGlkIHV1aWQgdmVyc2lvbiAke3ZlcnNpb259YCxcbiAgICAgICAgICBhY3R1YWw6ICAgY29udHJvbC52YWx1ZSxcbiAgICAgICAgICBtZXNzYWdlXG4gICAgICAgIH1cbiAgICAgIH07XG4gICAgfVxuICAgIHJldHVybiBudWxsO1xuICB9O1xufVxuIl19
|
package/fesm2015/rxap-forms.mjs
CHANGED
|
@@ -14,7 +14,7 @@ import { ToggleSubject } from '@rxap/utilities/rxjs';
|
|
|
14
14
|
import * as i2$1 from '@angular/router';
|
|
15
15
|
import { Router } from '@angular/router';
|
|
16
16
|
import { ConfirmClick } from '@rxap/directives';
|
|
17
|
-
import { isMobilePhone, isEmail, isURL, isIP } from '@rxap/validator';
|
|
17
|
+
import { isMobilePhone, isEmail, isURL, isIP, isPort, isUUID } from '@rxap/validator';
|
|
18
18
|
|
|
19
19
|
function getControlValue(control) {
|
|
20
20
|
if (control.getRawValue) {
|
|
@@ -2750,6 +2750,42 @@ function IsIP({ message, version } = {}) {
|
|
|
2750
2750
|
};
|
|
2751
2751
|
}
|
|
2752
2752
|
|
|
2753
|
+
function IsPort({ message } = {}) {
|
|
2754
|
+
return (control) => {
|
|
2755
|
+
if (control.value === null) {
|
|
2756
|
+
return null;
|
|
2757
|
+
}
|
|
2758
|
+
if (!(typeof control.value === 'string' && isPort(control.value))) {
|
|
2759
|
+
return {
|
|
2760
|
+
isPort: {
|
|
2761
|
+
expected: `A valid port number between 1 and 65535`,
|
|
2762
|
+
actual: control.value,
|
|
2763
|
+
message
|
|
2764
|
+
}
|
|
2765
|
+
};
|
|
2766
|
+
}
|
|
2767
|
+
return null;
|
|
2768
|
+
};
|
|
2769
|
+
}
|
|
2770
|
+
|
|
2771
|
+
function IsUUID({ message, version = 'all' } = {}) {
|
|
2772
|
+
return (control) => {
|
|
2773
|
+
if (control.value === null) {
|
|
2774
|
+
return null;
|
|
2775
|
+
}
|
|
2776
|
+
if (!(typeof control.value === 'string' && isUUID(control.value, version))) {
|
|
2777
|
+
return {
|
|
2778
|
+
isUuid: {
|
|
2779
|
+
expected: version === 'all' ? `A valid uuid` : `A valid uuid version ${version}`,
|
|
2780
|
+
actual: control.value,
|
|
2781
|
+
message
|
|
2782
|
+
}
|
|
2783
|
+
};
|
|
2784
|
+
}
|
|
2785
|
+
return null;
|
|
2786
|
+
};
|
|
2787
|
+
}
|
|
2788
|
+
|
|
2753
2789
|
const RxapValidators = {
|
|
2754
2790
|
IsNumber: _IsNumber,
|
|
2755
2791
|
IsBoolean,
|
|
@@ -2763,7 +2799,9 @@ const RxapValidators = {
|
|
|
2763
2799
|
IsPhoneNumber,
|
|
2764
2800
|
IsEmail,
|
|
2765
2801
|
IsUrl,
|
|
2766
|
-
IsIP
|
|
2802
|
+
IsIP,
|
|
2803
|
+
IsPort,
|
|
2804
|
+
IsUUID,
|
|
2767
2805
|
};
|
|
2768
2806
|
|
|
2769
2807
|
// endregion
|