fix: Fix parse when the last value of an implied AQF object/array is falsey

Closes #556.

Author: dmaccormack

src/JsonURL.js

@@ -1109,8 +1109,8 @@ class ValueStack extends Array {
    * Pop an object key/value off the stack and assign the value in a target.
    * @returns the target
    */
-  popObjectValue(options, value) {
-    value = value || this.pop();
+  popObjectValue(options) {
+    let value = this.pop();
     let key = this.pop();
     let target = this[this.length - 1];
 
@@ -1128,8 +1128,8 @@ class ValueStack extends Array {
    * Pop a value off the stack and append it to a target.
    * @returns the target
    */
-  popArrayValue(options, value) {
-    value = value || this.pop();
+  popArrayValue(options) {
+    let value = this.pop();
     let target = this[this.length - 1];
 
     if (value !== null || !options.isPresentAndTrue("ignoreNullArrayMembers")) {
@@ -1455,7 +1455,8 @@ function parse(text, offsetOrOpt, endOrOpt, options, limits) {
         }
         if (chars.done()) {
           if (stateStack.depth() === 0 && options.impliedArray) {
-            return valueStack.popArrayValue(options, lv);
+            valueStack.push(lv);
+            return valueStack.popArrayValue(options);
           }
           throw new SyntaxError(Err.fmt(Err.MSG_STILLOPEN, end));
         }
@@ -1530,7 +1531,8 @@ function parse(text, offsetOrOpt, endOrOpt, options, limits) {
         }
         if (chars.done()) {
           if (stateStack.depth() === 0 && options.impliedObject) {
-            return valueStack.popObjectValue(options, lv);
+            valueStack.push(lv);
+            return valueStack.popObjectValue(options);
           }
           throw new SyntaxError(Err.fmt(Err.MSG_STILLOPEN, end));
         }

test/issue556.test.js

@@ -1,30 +1,41 @@
-import { JsonURL } from "../src/JsonURL.js";
+/*
+  MIT License
+
+  Copyright (c) 2022 Leonard Crestez, David MacCormack
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
 
-test("aqf implied array e empty", function () {
-    expect(JsonURL.parse("e,!e", { AQF: true, impliedArray: [] })).toStrictEqual(
-        ["e", ""])
-})
-test("aqf implied array empty e", function () {
-    expect(JsonURL.parse("!e,e", { AQF: true, impliedArray: [] })).toStrictEqual(["", "e"]);
-})
-test("aqf explicit array e empty", function () {
-    expect(JsonURL.parse("(e,!e)", { AQF: true })).toStrictEqual(
-        ["e", ""]);
-})
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+import { JsonURL } from "../src/JsonURL.js";
 
-test("aqf implied dict e:empty", function () {
-    expect(JsonURL.parse("e:!e", { AQF: true, impliedObject: {} })).toStrictEqual(
-        { "e": "" });
-})
-test("aqf explicit dict e:empty", function () {
-    expect(JsonURL.parse("(e:!e)", { AQF: true })).toStrictEqual(
-        { "e": "" });
-})
-test("aqf implied dict empty:e", function () {
-    expect(JsonURL.parse("!e:e", { AQF: true, impliedObject: {} })).toStrictEqual(
-        { "": "e" })
-})
-test("aqf implied dict e:empty a:b", function () {
-    expect(JsonURL.parse("e:!e,a:b", { AQF: true, impliedObject: {} })).toStrictEqual(
-        { "e": "", "a": "b" });
-})
+test.each([
+  ["e,!e", { AQF: true, impliedArray: [] }, ["e", ""]],
+  ["e,false", { AQF: true, impliedArray: [] }, ["e", false]],
+  ["!e,e", { AQF: true, impliedArray: [] }, ["", "e"]],
+  ["e:!e", { AQF: true, impliedObject: {} }, { e: "" }],
+  ["e:false", { AQF: true, impliedObject: {} }, { e: false }],
+  ["!e:e", { AQF: true, impliedObject: {} }, { "": "e" }],
+  ["e:!e,a:b", { AQF: true, impliedObject: {} }, { e: "", a: "b" }],
+  ["(e,!e)", { AQF: true }, ["e", ""]],
+  ["(e,false)", { AQF: true }, ["e", false]],
+  ["(e:!e)", { AQF: true }, { e: "" }],
+  ["(e:false)", { AQF: true }, { e: false }],
+])("JsonURL.parse(%p, %p)", (text, options, expected) => {
+  expect(JsonURL.parse(text, options)).toStrictEqual(expected);
+});