- Enhancement: support double-quoted bracket notation

awlayton · Jun 24, 2021 · b17e953 · b17e953
1 parent a037ff6
commit b17e953
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 15 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 2,7 @@
 
 ## ?
 
 - Enhancement: support double-quoted bracket notation
 - npm: Update devDeps.
 
 ## 5.0.7 (2021-04-12)

diff --git a/badges/tests-badge.svg b/badges/tests-badge.svg
diff --git a/dist/index-browser-esm.js b/dist/index-browser-esm.js
@@ -963,11 963,11 @@ JSONPath.toPathArray = function (expr) {
  .replace(/['\[](\??\((?:[\0-\t\x0B\f\x0E-\u2027\u202A-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*?\))['\]]/g, function ($0, $1) {
  return '[#'   (subx.push($1) - 1)   ']';
  }) // Escape periods and tildes within properties
- .replace(/\['((?:(?!['\]])[\s\S])*)'\]/g, function ($0, prop) {
  .replace(/\[["']((?:(?!['\]])[\s\S])*)["']\]/g, function ($0, prop) {
  return "['"   prop.replace(/\./g, '%@%').replace(/~/g, '%%@@%%')   "']";
  }) // Properties operator
  .replace(/~/g, ';~;') // Split by property boundaries
- .replace(/'?\.'?(?!(?:(?!\[)[\s\S])*\])|\['?/g, ';') // Reinsert periods within properties
  .replace(/["']?\.["']?(?!(?:(?!\[)[\s\S])*\])|\[["']?/g, ';') // Reinsert periods within properties
  .replace(/%@%/g, '.') // Reinsert tildes within properties
  .replace(/%%@@%%/g, '~') // Parent
  .replace(/(?:;)?(\^ )(?:;)?/g, function ($0, ups) {

diff --git a/dist/index-browser-esm.min.js b/dist/index-browser-esm.min.js
diff --git a/dist/index-browser-esm.min.js.map b/dist/index-browser-esm.min.js.map
diff --git a/dist/index-browser-umd.js b/dist/index-browser-umd.js
@@ -969,11 969,11 @@
  .replace(/['\[](\??\((?:[\0-\t\x0B\f\x0E-\u2027\u202A-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*?\))['\]]/g, function ($0, $1) {
  return '[#'   (subx.push($1) - 1)   ']';
  }) // Escape periods and tildes within properties
- .replace(/\['((?:(?!['\]])[\s\S])*)'\]/g, function ($0, prop) {
  .replace(/\[["']((?:(?!['\]])[\s\S])*)["']\]/g, function ($0, prop) {
  return "['"   prop.replace(/\./g, '%@%').replace(/~/g, '%%@@%%')   "']";
  }) // Properties operator
  .replace(/~/g, ';~;') // Split by property boundaries
- .replace(/'?\.'?(?!(?:(?!\[)[\s\S])*\])|\['?/g, ';') // Reinsert periods within properties
  .replace(/["']?\.["']?(?!(?:(?!\[)[\s\S])*\])|\[["']?/g, ';') // Reinsert periods within properties
  .replace(/%@%/g, '.') // Reinsert tildes within properties
  .replace(/%%@@%%/g, '~') // Parent
  .replace(/(?:;)?(\^ )(?:;)?/g, function ($0, ups) {

diff --git a/dist/index-browser-umd.min.js b/dist/index-browser-umd.min.js
diff --git a/dist/index-browser-umd.min.js.map b/dist/index-browser-umd.min.js.map
diff --git a/dist/index-node-cjs.js b/dist/index-node-cjs.js
@@ -710,11 710,11 @@ JSONPath.toPathArray = function (expr) {
  .replace(/[['](\??\(.*?\))[\]']/gu, function ($0, $1) {
  return '[#'   (subx.push($1) - 1)   ']';
  }) // Escape periods and tildes within properties
- .replace(/\['([^'\]]*)'\]/gu, function ($0, prop) {
  .replace(/\[['"]([^'\]]*)['"]\]/gu, function ($0, prop) {
  return "['"   prop.replace(/\./gu, '%@%').replace(/~/gu, '%%@@%%')   "']";
  }) // Properties operator
  .replace(/~/gu, ';~;') // Split by property boundaries
- .replace(/'?\.'?(?![^[]*\])|\['?/gu, ';') // Reinsert periods within properties
  .replace(/['"]?\.['"]?(?![^[]*\])|\[['"]?/gu, ';') // Reinsert periods within properties
  .replace(/%@%/gu, '.') // Reinsert tildes within properties
  .replace(/%%@@%%/gu, '~') // Parent
  .replace(/(?:;)?(\^ )(?:;)?/gu, function ($0, ups) {

diff --git a/dist/index-node-esm.mjs b/dist/index-node-esm.mjs
@@ -702,11 702,11 @@ JSONPath.toPathArray = function (expr) {
  .replace(/[['](\??\(.*?\))[\]']/gu, function ($0, $1) {
  return '[#'   (subx.push($1) - 1)   ']';
  }) // Escape periods and tildes within properties
- .replace(/\['([^'\]]*)'\]/gu, function ($0, prop) {
  .replace(/\[['"]([^'\]]*)['"]\]/gu, function ($0, prop) {
  return "['"   prop.replace(/\./gu, '%@%').replace(/~/gu, '%%@@%%')   "']";
  }) // Properties operator
  .replace(/~/gu, ';~;') // Split by property boundaries
- .replace(/'?\.'?(?![^[]*\])|\['?/gu, ';') // Reinsert periods within properties
  .replace(/['"]?\.['"]?(?![^[]*\])|\[['"]?/gu, ';') // Reinsert periods within properties
  .replace(/%@%/gu, '.') // Reinsert tildes within properties
  .replace(/%%@@%%/gu, '~') // Parent
  .replace(/(?:;)?(\^ )(?:;)?/gu, function ($0, ups) {

diff --git a/src/jsonpath.js b/src/jsonpath.js
@@ -669,7 669,7 @@ JSONPath.toPathArray = function (expr) {
  return '[#'   (subx.push($1) - 1)   ']';
  })
  // Escape periods and tildes within properties
- .replace(/\['([^'\]]*)'\]/gu, function ($0, prop) {
  .replace(/\[['"]([^'\]]*)['"]\]/gu, function ($0, prop) {
  return "['"   prop
  .replace(/\./gu, '%@%')
  .replace(/~/gu, '%%@@%%')  
@@ -678,7 678,7 @@ JSONPath.toPathArray = function (expr) {
  // Properties operator
  .replace(/~/gu, ';~;')
  // Split by property boundaries
- .replace(/'?\.'?(?![^[]*\])|\['?/gu, ';')
  .replace(/['"]?\.['"]?(?![^[]*\])|\[['"]?/gu, ';')
  // Reinsert periods within properties
  .replace(/%@%/gu, '.')
  // Reinsert tildes within properties

diff --git a/test/test.path_expressions.js b/test/test.path_expressions.js
@@ -52,6 52,13 @@ describe('JSONPath - Path expressions', function () {
  assert.deepEqual(result, expected);
  });
 
  it('bracket notation (double quoted)', () => {
  const books = json.store.book;
  const expected = [books[0].author, books[1].author, books[2].author, books[3].author];
  const result = jsonpath({json, path: '$["store"]["book"][*]["author"]'});
  assert.deepEqual(result, expected);
  });
 
  it('bracket notation without quotes', () => {
  const books = json.store.book;
  const expected = [books[0].author, books[1].author, books[2].author, books[3].author];