fix(urlMatcherFactory): fix configuring a parameter type by name in a… #2296
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
| @@ -917,10 +921,15 @@ function $UrlMatcherFactory() { | |||
| } | |||
|
|
|||
| function getType(config, urlType, location) { | |||
| if (config.type && urlType) throw new Error("Param '"+id+"' has two type configurations."); | |||
| if (config.type && urlType && config.type !== urlType) throw new Error("Param '"+id+"' has two type configurations."); | |||
There was a problem hiding this comment.
whops, missed that. I will fix and force push
christopherthielen
force-pushed
the
issue2294
branch
from
9803883 to
6bfd4d6
Compare
| @@ -122,7 +122,11 @@ function UrlMatcher(pattern, config, parentMatcher) { | |||
| cfg = config.params[id]; | |||
| segment = pattern.substring(last, m.index); | |||
| regexp = isSearch ? m[4] : m[4] || (m[1] == '*' ? '.*' : null); | |||
| type = $$UMFP.type(regexp || "string") || inherit($$UMFP.type("string"), { pattern: new RegExp(regexp, config.caseInsensitive ? 'i' : undefined) }); | |||
There was a problem hiding this comment.
defer applying the default path/query param type of "string" until the getType function.
There was a problem hiding this comment.
Yes this was the bit that was setting things as type string for me. I didn't fully understand all the code so I tried to confine my changes to getType as to limit impact.
| }); | ||
|
|
||
| it("should throw an error if a param type is declared twice", function () { | ||
| try { |
There was a problem hiding this comment.
Don't you want expect(...).toThrow(...)?
… params block closes #2294
christopherthielen
force-pushed
the
issue2294
branch
from
6bfd4d6 to
e401024
Compare
|
This looks 👍 to me, and should translate 1:1 onto the params branch. |
christopherthielen
added a commit
that referenced
this pull request
Oct 9, 2015
fix(urlMatcherFactory): fix configuring a parameter type by name in a…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
… params block
closes #2294