objection 3.1.5 → 3.3.0

package/lib/queryBuilder/operations/eager/WhereInEagerOperation.js

@@ -15,7 +15,6 @@ class WhereInEagerOperation extends EagerOperation {
     super(name, opt);
 
     this.relationsToFetch = [];
-    this.omitProps = [];
   }
 
   batchSize(knex) {
@@ -41,7 +40,7 @@ class WhereInEagerOperation extends EagerOperation {
   onBuild(builder) {
     const relationsToFetch = findRelationsToFetch(
       builder.modelClass(),
-      this.buildFinalExpression(),
+      this.buildFinalExpression(builder),
     );
 
     const { selectionsToAdd, selectedProps } = findRelationPropsToSelect(builder, relationsToFetch);
@@ -50,8 +49,15 @@ class WhereInEagerOperation extends EagerOperation {
       builder.select(selectionsToAdd);
     }
 
+    // Omit the implicitly selected columns from the result once the relations
+    // have been fetched.
+    if (!builder.internalOptions().keepImplicitJoinProps) {
+      for (const prop of selectedProps) {
+        builder.addInternalSelection(prop);
+      }
+    }
+
     this.relationsToFetch = relationsToFetch;
-    this.omitProps = selectedProps;
   }
 
   async onAfter2(builder, result) {
@@ -74,22 +80,6 @@ class WhereInEagerOperation extends EagerOperation {
       { concurrency: modelClass.getConcurrency(builder.unsafeKnex()) },
     );
 
-    const intOpt = builder.internalOptions();
-
-    if (!this.omitProps.length || intOpt.keepImplicitJoinProps) {
-      return result;
-    }
-
-    // Now that relations have been fetched for `models` we can omit the
-    // columns that were implicitly selected by this class.
-    for (let i = 0, l = result.length; i < l; ++i) {
-      const model = result[i];
-
-      for (let c = 0, lc = this.omitProps.length; c < lc; ++c) {
-        modelClass.omitImpl(model, this.omitProps[c]);
-      }
-    }
-
     return result;
   }
 
@@ -204,7 +194,6 @@ class WhereInEagerOperation extends EagerOperation {
     const clone = super.clone();
 
     clone.relationsToFetch = this.relationsToFetch.slice();
-    clone.omitProps = this.omitProps.slice();
 
     return clone;
   }

package/lib/queryBuilder/operations/jsonApi/WhereJsonHasPostgresOperation.js

@@ -7,7 +7,7 @@ class WhereJsonHasPostgresOperation extends ObjectionToKnexConvertingOperation {
   onBuildKnex(knexBuilder, builder) {
     const args = this.getKnexArgs(builder);
 
-    const sql = jsonApi.whereJsonFieldRightStringArrayOnLeftQuery(
+    const rawArgs = jsonApi.whereJsonFieldRightStringArrayOnLeftQuery(
       builder.knex(),
       args[0],
       this.opt.operator,
@@ -15,9 +15,9 @@ class WhereJsonHasPostgresOperation extends ObjectionToKnexConvertingOperation {
     );
 
     if (this.opt.bool === 'or') {
-      knexBuilder = knexBuilder.orWhereRaw(sql);
+      knexBuilder = knexBuilder.orWhereRaw(...rawArgs);
     } else {
-      knexBuilder = knexBuilder.whereRaw(sql);
+      knexBuilder = knexBuilder.whereRaw(...rawArgs);
     }
 
     return knexBuilder;

package/lib/queryBuilder/operations/jsonApi/WhereJsonNotObjectPostgresOperation.js

@@ -18,7 +18,7 @@ class WhereJsonNotObjectPostgresOperation extends ObjectionToKnexConvertingOpera
         'not',
       );
 
-      builder.orWhereRaw(jsonApi.whereJsonFieldQuery(knex, fieldExpression, 'IS', null));
+      builder.orWhereRaw(...jsonApi.whereJsonFieldQuery(knex, fieldExpression, 'IS', null));
     };
 
     if (this.opt.bool === 'or') {

package/lib/queryBuilder/operations/jsonApi/postgresJsonApi.js

@@ -2,6 +2,7 @@
 
 const parser = require('../../../utils/parseFieldExpression');
 const { asArray, isObject, isString } = require('../../../utils/objectUtils');
+const { isKnexRaw, isKnexQueryBuilder } = require('../../../utils/knexUtils');
 
 /**
  * @typedef {String} FieldExpression
@@ -38,16 +39,24 @@ const { asArray, isObject, isString } = require('../../../utils/objectUtils');
  * 4. Keys containing square brackets and quotes
  *    `objectColumn:['Double."Quote".[]']` and `objectColumn:["Sinlge.'Quote'.[]"]`
  *    Column `{ "Double.\"Quote\".[]" : "I was referred",  "Single.'Quote'.[]" : "Mee too!" }`
+ * 5. Empty keys `objectColumn:[""]` or `objectColumn:['']` Column `{ "" : "I was referred" }`
  * 99. Keys containing dots, square brackets, single quotes and double quotes in one json key is
  *     not currently supported
  */
 
+// Returns the SQL and bindings of a field expression. The column is passed as an
+// identifier binding (`??`), so that knex's `wrapIdentifier` (e.g. used by
+// `knexSnakeCaseMappers()`) is applied to it.
 function parseFieldExpression(expression, extractAsText) {
   let parsed = parser.parseFieldExpression(expression);
-  let jsonRefs = parsed.access.map((it) => it.ref).join(',');
+  let bindings = [parsed.columnName];
+  // Reference the bare column when there is no json path, so that Postgres can
+  // use indexes on it. `#>> '{}'` is still needed to extract the value as text.
+  if (parsed.access.length === 0 && !extractAsText) {
+    return ['??', bindings];
+  }
   let extractor = extractAsText ? '#>>' : '#>';
-  let middleQuotedColumnName = parsed.columnName.split('.').join('"."');
-  return `"${middleQuotedColumnName}"${extractor}'{${jsonRefs}}'`;
+  return [`??${extractor}${parser.toPostgresJsonPathLiteral(parsed.access)}`, bindings];
 }
 
 function whereJsonbRefOnLeftJsonbValOrRefOnRight(
@@ -72,36 +81,36 @@ function whereJsonbRefOnLeftJsonbValOrRefOnRightRawQueryParams(
   jsonObjectOrFieldExpression,
   queryPrefix,
 ) {
-  let fieldReference = parseFieldExpression(fieldExpression);
+  let [fieldReference, bindings] = parseFieldExpression(fieldExpression);
+  let [rightHandSql, rightHandBindings] = rightHandExpression(jsonObjectOrFieldExpression);
+  let query = ['(', fieldReference, ')::jsonb', operator, rightHandSql];
+
+  if (queryPrefix) {
+    query.unshift(queryPrefix);
+  }
+
+  return [query.join(' '), [...bindings, ...rightHandBindings]];
+}
 
+function rightHandExpression(jsonObjectOrFieldExpression) {
   if (isString(jsonObjectOrFieldExpression)) {
-    let rightHandReference = parseFieldExpression(jsonObjectOrFieldExpression);
-    let refRefQuery = [
-      '(',
-      fieldReference,
-      ')::jsonb',
-      operator,
-      '(',
-      rightHandReference,
-      ')::jsonb',
-    ];
-    if (queryPrefix) {
-      refRefQuery.unshift(queryPrefix);
-    }
-    return [refRefQuery.join(' ')];
+    let [rightHandReference, bindings] = parseFieldExpression(jsonObjectOrFieldExpression);
+    return [`( ${rightHandReference} )::jsonb`, bindings];
+  } else if (
+    isKnexRaw(jsonObjectOrFieldExpression) ||
+    isKnexQueryBuilder(jsonObjectOrFieldExpression)
+  ) {
+    // ref(), val(), raw() and subqueries, already converted to knex by the operation.
+    return ['( ? )::jsonb', [jsonObjectOrFieldExpression]];
   } else if (isObject(jsonObjectOrFieldExpression)) {
-    let refValQuery = ['(', fieldReference, ')::jsonb', operator, '?::jsonb'];
-    if (queryPrefix) {
-      refValQuery.unshift(queryPrefix);
-    }
-    return [refValQuery.join(' '), JSON.stringify(jsonObjectOrFieldExpression)];
+    return ['?::jsonb', [JSON.stringify(jsonObjectOrFieldExpression)]];
   }
 
   throw new Error('Invalid right hand expression.');
 }
 
 function whereJsonFieldRightStringArrayOnLeftQuery(knex, fieldExpression, operator, keys) {
-  let fieldReference = parseFieldExpression(fieldExpression);
+  let [fieldReference, bindings] = parseFieldExpression(fieldExpression);
   keys = asArray(keys);
 
   let questionMarksArray = keys.map((key) => {
@@ -111,19 +120,19 @@ function whereJsonFieldRightStringArrayOnLeftQuery(knex, fieldExpression, operat
     return '?';
   });
 
-  let rawSqlTemplateString = 'array[' + questionMarksArray.join(',') + ']';
-  let rightHandExpression = knex.raw(rawSqlTemplateString, keys);
-
-  return `${fieldReference} ${operator.replace('?', '\\?')} ${rightHandExpression}`;
+  return [
+    `${fieldReference} ${operator.replace('?', '\\?')} array[${questionMarksArray.join(',')}]`,
+    [...bindings, ...keys],
+  ];
 }
 
 function whereJsonFieldQuery(knex, fieldExpression, operator, value) {
-  let fieldReference = parseFieldExpression(fieldExpression, true);
+  let [fieldReference, bindings] = parseFieldExpression(fieldExpression, true);
   let normalizedOperator = normalizeOperator(knex, operator);
 
   // json type comparison takes json type in string format
   let cast;
-  let escapedValue = knex.raw(' ?', [value]);
+  let valuePlaceholder = '?';
   let type = typeof value;
 
   if (type === 'number') {
@@ -134,12 +143,16 @@ function whereJsonFieldQuery(knex, fieldExpression, operator, value) {
     cast = '::TEXT';
   } else if (value === null) {
     cast = '::TEXT';
-    escapedValue = 'NULL';
+    valuePlaceholder = 'NULL';
   } else {
     throw new Error('Value must be string, number, boolean or null.');
   }
 
-  return `(${fieldReference})${cast} ${normalizedOperator} ${escapedValue}`;
+  // Bind the value so that `?` in it isn't read as a binding placeholder.
+  return [
+    `(${fieldReference})${cast} ${normalizedOperator} ${valuePlaceholder}`,
+    value === null ? bindings : [...bindings, value],
+  ];
 }
 
 function normalizeOperator(knex, operator) {

package/lib/queryBuilder/operations/select/Selection.js

@@ -1,14 +1,21 @@
 'use strict';
 
-const { isString, isObject } = require('../../../utils/objectUtils');
+const { isString, isObject, isPlainObject } = require('../../../utils/objectUtils');
+const { isKnexQueryBuilder, isKnexRaw } = require('../../../utils/knexUtils');
 
 const ALIAS_REGEX = /\s+as\s+/i;
 
+// Matches an alias at the end of a raw sql string: `as "alias"`, `as \`alias\``,
+// `as [alias]`, `as ??`, `as :name:` or `as alias`.
+const RAW_ALIAS_REGEX =
+  /\s+as\s+(?:"([^"]+)"|`([^`]+)`|\[([^\]]+)\]|(\?\?)|:(\w+):|([a-z_][\w$]*))\s*$/i;
+
 class Selection {
   constructor(table, column, alias) {
     this.table = table;
     this.column = column;
     this.alias = alias;
+    this.keepsSelectAll = false;
   }
 
   get name() {
@@ -23,6 +30,12 @@ class Selection {
         return createSelectionFromReference(selection);
       } else if (selection.isObjectionRawBuilder) {
         return createSelectionFromRaw(selection);
+      } else if (selection.isObjectionQueryBuilderBase) {
+        return createSelectionFromQueryBuilder(selection);
+      } else if (isKnexQueryBuilder(selection)) {
+        return createSelectionFromAlias(selection._single.as);
+      } else if (isKnexRaw(selection)) {
+        return createSelectionFromAlias(parseRawAlias(selection.sql, selection.bindings));
       } else {
         return null;
       }
@@ -50,10 +63,11 @@ class Selection {
     if (selectionInBuilder.column === '*') {
       if (selectionInBuilder.table) {
         if (selectionToTest.column === '*') {
-          return selectionToTest.table === selectionInBuilder.table;
+          return isSameTable(builder, selectionToTest.table, selectionInBuilder.table);
         } else {
           return (
-            selectionToTest.table === null || selectionToTest.table === selectionInBuilder.table
+            selectionToTest.table === null ||
+            isSameTable(builder, selectionToTest.table, selectionInBuilder.table)
           );
         }
       } else {
@@ -67,7 +81,8 @@ class Selection {
       } else {
         return (
           selectionToTest.column === selectionInBuilder.column &&
-          (selectionToTest.table === null || selectionToTest.table === selectionInBuilderTable)
+          (selectionToTest.table === null ||
+            isSameTable(builder, selectionToTest.table, selectionInBuilderTable))
         );
       }
     }
@@ -82,6 +97,36 @@ Object.defineProperties(Selection.prototype, {
   },
 });
 
+// Table names that only differ in a way that knex's `wrapIdentifier` mapping
+// (for example `knexSnakeCaseMappers()`) cancels out refer to the same table:
+// `dataExtension` and `data_extension` both end up as `data_extension`.
+function isSameTable(builder, table1, table2) {
+  if (table1 === table2) {
+    return true;
+  } else if (!table1 || !table2) {
+    return false;
+  }
+
+  const knex = builder.unsafeKnex();
+  const wrapIdentifier = knex && knex.client && knex.client.config.wrapIdentifier;
+
+  if (!wrapIdentifier) {
+    return false;
+  }
+
+  const mapTable = (table) =>
+    table
+      .split('.')
+      .map((part) => wrapIdentifier(part, identity))
+      .join('.');
+
+  return mapTable(table1) === mapTable(table2);
+}
+
+function identity(value) {
+  return value;
+}
+
 function createSelectionFromReference(ref) {
   return new Selection(ref.tableName, ref.column, ref.alias);
 }
@@ -89,6 +134,52 @@ function createSelectionFromReference(ref) {
 function createSelectionFromRaw(raw) {
   if (raw.alias) {
     return new Selection(null, null, raw.alias);
+  } else {
+    return createSelectionFromAlias(parseRawAlias(raw._sql, raw._args));
+  }
+}
+
+function parseRawAlias(sql, bindings) {
+  const match = isString(sql) && RAW_ALIAS_REGEX.exec(sql);
+
+  if (!match) {
+    return null;
+  }
+
+  const [, doubleQuoted, backQuoted, bracketQuoted, binding, namedBinding, unquoted] = match;
+
+  if (binding) {
+    return Array.isArray(bindings) ? bindings[bindings.length - 1] : null;
+  } else if (namedBinding) {
+    if (Array.isArray(bindings) && bindings.length === 1) {
+      // `raw(sql, { name: value })` of objection.
+      bindings = bindings[0];
+    }
+
+    return isPlainObject(bindings) ? bindings[namedBinding] : null;
+  } else if (unquoted) {
+    // Some databases, like postgres, fold unquoted identifiers to lower case
+    // and others don't, so only lower case ones can be used reliably.
+    return unquoted === unquoted.toLowerCase() ? unquoted : null;
+  } else {
+    return doubleQuoted || backQuoted || bracketQuoted;
+  }
+}
+
+// Subqueries aliased using `as()` select a column with the alias as name.
+function createSelectionFromQueryBuilder(builder) {
+  const asOperation = builder.findLastOperation('as');
+  return createSelectionFromAlias(asOperation && asOperation.args[0]);
+}
+
+function createSelectionFromAlias(alias) {
+  if (isString(alias)) {
+    const selection = new Selection(null, null, alias);
+    // These selections weren't recognized in the past. To not change which
+    // other columns `withGraphJoined` selects, they don't count as explicit
+    // selections when deciding whether all columns are selected.
+    selection.keepsSelectAll = true;
+    return selection;
   } else {
     return null;
   }

package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeMsSqlOperation.js

@@ -26,6 +26,12 @@ class WhereInCompositeMsSqlOperation extends ObjectionToKnexConvertingOperation
   }
 
   buildComposite(knex, knexBuilder, columns, values) {
+    if (Array.isArray(values) && values.length === 0) {
+      // knex turns an empty `whereIn` into `1 = 0` and an empty `whereNotIn`
+      // into `1 = 1`.
+      return this.whereIn(knexBuilder, columns, []);
+    }
+
     const helperColumns = columns.map((_, index) => getTempColumn(index));
 
     if (Array.isArray(values)) {

package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeOperation.js

@@ -48,7 +48,11 @@ function buildCompositeArgs(knex, columns, values) {
 }
 
 function buildCompositeValueArgs(columns, values) {
-  if (!Array.isArray(values[0])) {
+  if (values.length === 0) {
+    // knex turns an empty `whereIn` into `1 = 0` and an empty `whereNotIn`
+    // into `1 = 1`.
+    return [columns, []];
+  } else if (!Array.isArray(values[0])) {
     return [columns, [values]];
   } else {
     return [columns, values];

package/lib/queryBuilder/operations/whereInComposite/WhereInCompositeSqliteOperation.js

@@ -54,6 +54,15 @@ function buildCompositeArgs(columns, values) {
     throw new Error(`sqlite doesn't support multi-column where in clauses`);
   }
 
+  if (values.length === 0) {
+    // knex turns an empty `whereIn` into `1 = 0` and an empty `whereNotIn`
+    // into `1 = 1`.
+    return {
+      method: 'whereIn',
+      args: [columns, []],
+    };
+  }
+
   // Sqlite doesn't support the `where in` syntax for multiple columns but
   // we can emulate it using grouped `or` clauses.
   return {

package/lib/queryBuilder/parsers/jsonFieldExpressionParser.js

@@ -166,10 +166,10 @@ function peg$parse(input, options) {
     peg$c4 = peg$literalExpectation('[', false),
     peg$c5 = '"',
     peg$c6 = peg$literalExpectation('"', false),
-    peg$c7 = "'",
-    peg$c8 = peg$literalExpectation("'", false),
-    peg$c9 = ']',
-    peg$c10 = peg$literalExpectation(']', false),
+    peg$c7 = ']',
+    peg$c8 = peg$literalExpectation(']', false),
+    peg$c9 = "'",
+    peg$c10 = peg$literalExpectation("'", false),
     peg$c11 = function (key) {
       return { type: 'object', ref: Array.isArray(key) ? key[1] : key };
     },
@@ -415,7 +415,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebracketStringRef() {
-    var s0, s1, s2, s3, s4, s5;
+    var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 91) {
@@ -451,8 +451,31 @@ function peg$parse(input, options) {
             }
           }
           if (s5 !== peg$FAILED) {
-            s3 = [s3, s4, s5];
-            s2 = s3;
+            s6 = peg$currPos;
+            peg$silentFails++;
+            if (input.charCodeAt(peg$currPos) === 93) {
+              s7 = peg$c7;
+              peg$currPos++;
+            } else {
+              s7 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$c8);
+              }
+            }
+            peg$silentFails--;
+            if (s7 !== peg$FAILED) {
+              peg$currPos = s6;
+              s6 = void 0;
+            } else {
+              s6 = peg$FAILED;
+            }
+            if (s6 !== peg$FAILED) {
+              s3 = [s3, s4, s5, s6];
+              s2 = s3;
+            } else {
+              peg$currPos = s2;
+              s2 = peg$FAILED;
+            }
           } else {
             peg$currPos = s2;
             s2 = peg$FAILED;
@@ -468,29 +491,52 @@ function peg$parse(input, options) {
       if (s2 === peg$FAILED) {
         s2 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 39) {
-          s3 = peg$c7;
+          s3 = peg$c9;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$c8);
+            peg$fail(peg$c10);
           }
         }
         if (s3 !== peg$FAILED) {
           s4 = peg$parsestringWithoutSingleQuotes();
           if (s4 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 39) {
-              s5 = peg$c7;
+              s5 = peg$c9;
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$c8);
+                peg$fail(peg$c10);
               }
             }
             if (s5 !== peg$FAILED) {
-              s3 = [s3, s4, s5];
-              s2 = s3;
+              s6 = peg$currPos;
+              peg$silentFails++;
+              if (input.charCodeAt(peg$currPos) === 93) {
+                s7 = peg$c7;
+                peg$currPos++;
+              } else {
+                s7 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$c8);
+                }
+              }
+              peg$silentFails--;
+              if (s7 !== peg$FAILED) {
+                peg$currPos = s6;
+                s6 = void 0;
+              } else {
+                s6 = peg$FAILED;
+              }
+              if (s6 !== peg$FAILED) {
+                s3 = [s3, s4, s5, s6];
+                s2 = s3;
+              } else {
+                peg$currPos = s2;
+                s2 = peg$FAILED;
+              }
             } else {
               peg$currPos = s2;
               s2 = peg$FAILED;
@@ -509,12 +555,12 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 93) {
-          s3 = peg$c9;
+          s3 = peg$c7;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$c10);
+            peg$fail(peg$c8);
           }
         }
         if (s3 !== peg$FAILED) {
@@ -554,12 +600,12 @@ function peg$parse(input, options) {
       s2 = peg$parseinteger();
       if (s2 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 93) {
-          s3 = peg$c9;
+          s3 = peg$c7;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$c10);
+            peg$fail(peg$c8);
           }
         }
         if (s3 !== peg$FAILED) {
@@ -719,21 +765,17 @@ function peg$parse(input, options) {
         peg$fail(peg$c22);
       }
     }
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        if (peg$c21.test(input.charAt(peg$currPos))) {
-          s2 = input.charAt(peg$currPos);
-          peg$currPos++;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) {
-            peg$fail(peg$c22);
-          }
+    while (s2 !== peg$FAILED) {
+      s1.push(s2);
+      if (peg$c21.test(input.charAt(peg$currPos))) {
+        s2 = input.charAt(peg$currPos);
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$c22);
         }
       }
-    } else {
-      s1 = peg$FAILED;
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
@@ -758,21 +800,17 @@ function peg$parse(input, options) {
         peg$fail(peg$c24);
       }
     }
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        if (peg$c23.test(input.charAt(peg$currPos))) {
-          s2 = input.charAt(peg$currPos);
-          peg$currPos++;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) {
-            peg$fail(peg$c24);
-          }
+    while (s2 !== peg$FAILED) {
+      s1.push(s2);
+      if (peg$c23.test(input.charAt(peg$currPos))) {
+        s2 = input.charAt(peg$currPos);
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$c24);
         }
       }
-    } else {
-      s1 = peg$FAILED;
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;

package/lib/queryBuilder/parsers/jsonFieldExpressionParser.pegjs

@@ -31,6 +31,7 @@
  * 4. Keys containing square brackets and quotes
  *    `objectColumn:['Double."Quote".[]']` and `objectColumn:["Sinlge.'Quote'.[]"]`
  *    Column `{ "Double.\"Quote\".[]" : "I was referred",  "Sinlge.'Quote'.[]" : "Mee too!" }`
+ * 5. Empty keys `objectColumn:[""]` or `objectColumn:['']` Column `{ "" : "I was referred" }`
  * 99. Keys containing dots, square brackets, single quotes and double quotes in one json key is
  *     not currently supported
  *
@@ -60,8 +61,8 @@ start =
 bracketStringRef =
   '['
       key:(
-       '"' stringWithoutDoubleQuotes '"' /
-       "'" stringWithoutSingleQuotes "'" /
+       '"' stringWithoutDoubleQuotes '"' &']' /
+       "'" stringWithoutSingleQuotes "'" &']' /
        stringWithoutSquareBrackets
       )
   ']'
@@ -86,10 +87,10 @@ stringWithoutColon =
   chars:([^:])+ { return chars.join(""); }
 
 stringWithoutDoubleQuotes =
-  chars:([^"])+ { return chars.join(""); }
+  chars:([^"])* { return chars.join(""); }
 
 stringWithoutSingleQuotes =
-  chars:([^'])+ { return chars.join(""); }
+  chars:([^'])* { return chars.join(""); }
 
 stringWithoutSquareBracketsOrDots =
   chars:([^.\x5D\x5B])+ { return chars.join(""); }