feat(forms): Validator.pattern accepts a RegExp #12323
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DzmitryShylovich
force-pushed
the
feature/10150
branch
from
91a460c
to
a459f16
Compare
| @@ -7,6 +7,7 @@ | |||
| */ | |||
|
|
|||
| import {OpaqueToken} from '@angular/core'; | |||
| import {isString} from '@angular/facade/src/lang'; | |||
There was a problem hiding this comment.
Please don't use facades, we are in the process of removing them
| return (control: AbstractControl): {[key: string]: any} => { | ||
| if (isEmptyInputValue(control.value)) { | ||
| return null; // don't validate empty values to allow optional controls | ||
| } | ||
| const regex = new RegExp(`^${pattern}$`); | ||
| const regex: RegExp = isString(pattern) ? new RegExp(`^${pattern}$`) : <RegExp>pattern; |
There was a problem hiding this comment.
Is the type necessary in const regex: RegExp?
DzmitryShylovich
force-pushed
the
feature/10150
branch
5 times, most recently
from
02cd004
to
eb04c19
Compare
vicb
reviewed
Oct 16, 2016
| return (control: AbstractControl): {[key: string]: any} => { | ||
| if (isEmptyInputValue(control.value)) { | ||
| return null; // don't validate empty values to allow optional controls | ||
| } | ||
| const regex = new RegExp(`^${pattern}$`); | ||
| const regex = typeof pattern === 'string' ? new RegExp(`^${pattern}$`) : <RegExp>pattern; |
There was a problem hiding this comment.
<RegExp> should not be needed
There was a problem hiding this comment.
tsc complains (at least in ide)
vicb
reviewed
Oct 16, 2016
| const value: string = control.value; | ||
| return regex.test(value) ? | ||
| return regex && regex.test(value) ? |
There was a problem hiding this comment.
not sure of the !regex case ?
Should it rather returns an empty ValidatorFn ? (_) => null
vicb
added
pr_state: LGTM
action: cleanup
DzmitryShylovich
force-pushed
the
feature/10150
branch
from
f7b92de
to
f8ea777
Compare
vicb
reviewed
Oct 16, 2016
|
|
||
| it('should error on failure to match string', () => { | ||
| expect(Validators.pattern('[a-zA-Z ]*')(new FormControl('aaa0'))).toEqual({ | ||
| 'pattern': {'requiredPattern': '^[a-zA-Z ]*$', 'actualValue': 'aaa0'} | ||
| 'pattern': {'requiredPattern': '/^[a-zA-Z ]*$/', 'actualValue': 'aaa0'} |
There was a problem hiding this comment.
Could you please remove this breaking change ? (we would have to delay the PR until 3.0). Thanks
DzmitryShylovich
force-pushed
the
feature/10150
branch
2 times, most recently
from
f26e4ab
to
58231d4
Compare
kara
added
action: merge
arkon
reviewed
Oct 17, 2016
| const value: string = control.value; | ||
| return regex.test(value) ? | ||
| null : | ||
| {'pattern': {'requiredPattern': `^${pattern}$`, 'actualValue': value}}; | ||
| {'pattern': {'requiredPattern': `${regexStr}`, 'actualValue': value}}; |
DzmitryShylovich
force-pushed
the
feature/10150
branch
from
58231d4
to
b893bb8
Compare
DzmitryShylovich
force-pushed
the
feature/10150
branch
from
b893bb8
to
6206799
Compare
btrigueiro
pushed a commit
to btrigueiro/angular
that referenced
this pull request
Oct 21, 2016
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #10150