Skip to content

fix: nested query keys containing literal bracket pairs #6

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
codefix-patchflow wants to merge 1 commit into
base: patchflow-red-qs-493
Choose a base branch
from
Open

fix: nested query keys containing literal bracket pairs #6

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
45 changes: 39 additions & 6 deletions lib/parse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,31 @@ var parseObject = function (chain, val, options, valuesParsed) {
return leaf;
};

var findSegment = function findSegment(key, start) {
var index = key.indexOf('[', start);
if (index === -1) {
return null;
}

var depth = 0;
for (var i = index; i < key.length; ++i) {
var currentChar = key.charAt(i);
if (currentChar === '[') {
depth += 1;
} else if (currentChar === ']') {
depth -= 1;
if (depth === 0) {
return {
index: index,
text: key.slice(index, i + 1)
};
}
}
}

return null;
};

var splitKeyIntoSegments = function splitKeyIntoSegments(givenKey, options) {
var key = options.allowDots ? givenKey.replace(/\.([^.[]+)/g, '[$1]') : givenKey;

Expand All @@ -227,10 +252,15 @@ var splitKeyIntoSegments = function splitKeyIntoSegments(givenKey, options) {
return [key];
}

var brackets = /(\[[^[\]]*])/;
var child = /(\[[^[\]]*])/g;
var segment = findSegment(key, 0);
var firstBracket = key.indexOf('[');
if (!segment && firstBracket > 0 && key.indexOf(']', firstBracket) > -1) {
segment = {
index: firstBracket,
text: key.slice(firstBracket)
};
}

var segment = brackets.exec(key);
var parent = segment ? key.slice(0, segment.index) : key;

var keys = [];
Expand All @@ -246,17 +276,20 @@ var splitKeyIntoSegments = function splitKeyIntoSegments(givenKey, options) {
}

var i = 0;
while ((segment = child.exec(key)) !== null && i < options.depth) {
while (segment && i < options.depth) {
i += 1;

var segmentContent = segment[1].slice(1, -1);
var isBracketedSegment = segment.text.charAt(0) === '['
&& segment.text.charAt(segment.text.length - 1) === ']';
var segmentContent = isBracketedSegment ? segment.text.slice(1, -1) : segment.text;
if (!options.plainObjects && has.call(Object.prototype, segmentContent)) {
if (!options.allowPrototypes) {
return;
}
}

keys[keys.length] = segment[1];
keys[keys.length] = segment.text;
segment = findSegment(key, segment.index + segment.text.length);
}

if (segment) {
Expand Down
Loading