Skip to content
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

fix: refactor path templates to simplify regexes #1079

Merged
merged 1 commit into from
Aug 6, 2021
Merged

fix: refactor path templates to simplify regexes #1079

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
88 changes: 42 additions & 46 deletions src/pathTemplate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,26 +72,34 @@ export class PathTemplate {
);
} else {
let segment = this.segments[index];
const variable = segment.match(/(?<={)[$0-9a-zA-Z_]+(?==.*})/g) || [];
const matches = segment.match(/\{[$0-9a-zA-Z_]+=.*?\}/g);
if (!matches) {
throw new Error(
`Error processing path template segment ${segment}`
);
}
const variables = matches.map(str =>
str.replace(/^\{/, '').replace(/=.*/, '')
);
if (segment.includes('**')) {
bindings[variable[0]] = pathSegments[0] + '/' + pathSegments[1];
bindings[variables[0]] = pathSegments[0] + '/' + pathSegments[1];
pathSegments = pathSegments.slice(2);
} else {
// atomic resource
if (variable.length === 1) {
bindings[variable[0]] = pathSegments[0];
if (variables.length === 1) {
bindings[variables[0]] = pathSegments[0];
} else {
// non-slash resource
// segment: {blurb_id=*}.{legacy_user=*} to match pathSegments: ['bar.user2']
// split the match pathSegments[0] -> value: ['bar', 'user2']
// compare the length of two arrays, and compare array items
const value = pathSegments[0].split(/[-_.~]/);
if (value.length !== variable!.length) {
if (value.length !== variables.length) {
throw new Error(
`segment ${segment} does not match ${pathSegments[0]}`
);
}
for (const v of variable) {
for (const v of variables) {
bindings[v] = value[0];
segment = segment.replace(`{${v}=*}`, `${value[0]}`);
value.shift();
Expand Down Expand Up @@ -173,6 +181,7 @@ export class PathTemplate {
let index = 0;
let wildCardCount = 0;
const segments: string[] = [];
let matches: RegExpMatchArray | null;
pathSegments.forEach(segment => {
// * or ** -> segments.push('{$0=*}');
// -> bindings['$0'] = '*'
Expand All @@ -181,52 +190,39 @@ export class PathTemplate {
segments.push(`{$${index}=${segment}}`);
index = index + 1;
if (segment === '**') {
wildCardCount = wildCardCount + 1;
++wildCardCount;
}
}
// {project}~{location} -> {project=*}~{location=*}
else if (
segment.match(
/(?<={)[0-9a-zA-Z-.~_]+(?:}[-._~]?{)[0-9a-zA-Z-.~_]+(?=})/
)
) {
// [project, location]
const variable = segment.match(/(?<=\{).*?(?=(?:=.*?)?\})/g) || [];
for (const v of variable) {
this.bindings[v] = '*';
segment = segment.replace(v, v + '=*');
} else if ((matches = segment.match(/\{[0-9a-zA-Z-.~_]+(?:=.*?)?\}/g))) {
for (const subsegment of matches) {
const pairMatch = subsegment.match(
/^\{([0-9a-zA-Z-.~_]+)(?:=(.*?))?\}$/
);
if (!pairMatch) {
throw new Error(
`Cannot process path template segment ${subsegment}`
);
}
const key = pairMatch[1];
let value = pairMatch[2];
if (!value) {
value = '*';
segment = segment.replace(key, key + '=*');
this.bindings[key] = value;
} else if (value === '*') {
this.bindings[key] = value;
} else if (value === '**') {
++wildCardCount;
this.bindings[key] = value;
}
}
segments.push(segment);
}
// {project} / {project=*} -> segments.push('{project=*}');
// -> bindings['project'] = '*'
else if (segment.match(/(?<={)[0-9a-zA-Z-.~_]+(?=(=\*)?})/)) {
const variable = segment.match(/(?<={)[0-9a-zA-Z-.~_]+(?=(=\*)?})/);
this.bindings[variable![0]] = '*';
segments.push(`{${variable![0]}=*}`);
}
// {project=**} -> segments.push('{project=**}');
// -> bindings['project'] = '**'
else if (segment.match(/(?<={)[0-9a-zA-Z-.~_]+(?=(=\*\*)})/)) {
const variable = segment.match(/(?<={)[0-9a-zA-Z-.~_]+(?=(=\*\*)})/);
this.bindings[variable![0]] = '**';
segments.push(`{${variable![0]}=**}`);
wildCardCount = wildCardCount + 1;
}
// {hello=/what} -> segments.push('{hello=/what}');
// -> no binding in this case
else if (segment.match(/(?<={)[0-9a-zA-Z-.~_]+=[^*]+(?=})/)) {
segments.push(segment);
}
// helloazAZ09-.~_what -> segments.push('helloazAZ09-.~_what');
// -> no binding in this case
else if (segment.match(/[0-9a-zA-Z-.~_]+/)) {
} else if (segment.match(/[0-9a-zA-Z-.~_]+/)) {
segments.push(segment);
}
if (wildCardCount > 1) {
throw new TypeError('Can not have more than one wildcard.');
}
});
if (wildCardCount > 1) {
throw new TypeError('Can not have more than one wildcard.');
}
return segments;
}
}
Expand Down