Skip to content

Feature: accept regular expression matching #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Feature: accept regular expression matching #227

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8bb0168
feat: regular expression acceptance
mingard Aug 8, 2017
68780ea
chore: revert to return
mingard Aug 8, 2017
ba55f00
chore: remove console log
mingard Aug 8, 2017
3570c75
fix: remove regex end
mingard Aug 8, 2017
73a2071
fix: handle existing mismatch
mingard Aug 8, 2017
c901b04
fix: remove problematic watch method
mingard Aug 14, 2017
9c1bbba
chore: remove package lock
mingard Aug 14, 2017
b2edc70
feat: postinstall in adition to prerelease
mingard Aug 14, 2017
30f21d3
chore: remove postinstall
mingard Aug 14, 2017
27b08c9
chore: change script to run with local npm install
mingard Aug 14, 2017
279d540
chore: remove prepare
mingard Aug 14, 2017
a0aaddc
Merge branch 'master' into feature/regex-parsing
mingard Sep 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

const EMPTY = {};

export function assign(obj, props) {
Expand Down Expand Up @@ -26,11 +25,18 @@ export function exec(url, route, opts=EMPTY) {
let max = Math.max(url.length, route.length);
for (let i=0; i<max; i++) {
if (route[i] && route[i].charAt(0)===':') {
let param = route[i].replace(/(^\:|[+*?]+$)/g, ''),
flags = (route[i].match(/[+*?]+$/) || EMPTY)[0] || '',
let param = route[i].replace(/(^\:|[+*?]+)/g, '').replace(/\[.*\]/g, ''),
flags = (route[i].match(/[+*?]+/) || EMPTY)[0] || '',
regexMatch = route[i].match(/\[(.*)\]/),
regex = ((regexMatch || EMPTY).length === 2) ? regexMatch[1] : '',
plus = ~flags.indexOf('+'),
star = ~flags.indexOf('*'),
val = url[i] || '';

if (regex && !val.match(regex) && (flags.indexOf('?')<0 || val != '')) {
ret = false;
break;
}
if (!val && !star && (flags.indexOf('?')<0 || plus)) {
ret = false;
break;
Expand Down