Fix for rounded rectangle property parsing

The code now tests if the object being used as a Point2D contains only x and y. If so, then we move to the next item; otherwise, we continue to use the current object for other properties that we’re lookin for.

Author: Kevin Lindsey

dist/index-esm.js

@@ -3355,8 +3355,11 @@ function parsePoint(names, args) {
         }
       } else if (itemType === "object") {
         if ("x" in item && "y" in item) {
-          result = new Point2D(item.x, item.y);
-          args.shift();
+          result = new Point2D(item.x, item.y); // eslint-disable-next-line compat/compat
+
+          if (Object.keys(item).length === 2) {
+            args.shift();
+          }
         } else {
           var _iterator3 = _createForOfIteratorHelper(names),
               _step3;

dist/index-esm.min.js

@@ -3361,8 +3361,11 @@
           }
         } else if (itemType === "object") {
           if ("x" in item && "y" in item) {
-            result = new Point2D(item.x, item.y);
-            args.shift();
+            result = new Point2D(item.x, item.y); // eslint-disable-next-line compat/compat
+
+            if (Object.keys(item).length === 2) {
+              args.shift();
+            }
           } else {
             var _iterator3 = _createForOfIteratorHelper(names),
                 _step3;

dist/index-esm.min.js.map

@@ -128,7 +128,10 @@ export function parsePoint(names, args) {
         else if (itemType === "object") {
             if ("x" in item && "y" in item) {
                 result = new Point2D(item.x, item.y);
-                args.shift();
+                // eslint-disable-next-line compat/compat
+                if (Object.keys(item).length === 2) {
+                    args.shift();
+                }
             }
             else {
                 for (const props of names) {

dist/index-umd.js

@@ -183,4 +183,43 @@ describe("Shapes API", () => {
             }
         });
     });
+    describe("Rounded Rectangle", () => {
+        it("Rounded Rectangle - Object 1", () => {
+            let rr = {
+                x: 10, y: 20,
+                width: 30, height: 40,
+                rx: 3, ry: 4
+            };
+            try {
+                let shape = ShapeInfo.rectangle(rr);
+
+                for (let arg of shape.args) {
+                    // TODO: check segments
+                }
+
+            }
+            catch (e) {
+                assert.fail("Unable to parse object: " + JSON.stringify(rr));
+            }
+        });
+        it("Rounded Rectangle - Object 2", () => {
+            let rr = {
+                x: 10, y: 20,
+                w: 30, h: 40,
+                rx: 3, ry: 4
+            };
+            try {
+                let shape = ShapeInfo.rectangle(rr);
+
+                for (let arg of shape.args) {
+                    // TODO: check segments
+                }
+
+            }
+            catch (e) {
+                assert.fail("Unable to parse object: " + JSON.stringify(rr));
+            }
+
+        });
+    });
 });