Fix cubesters implementation of some blocks

Author: Miyo Sho

src/blocks/scratch3_json.js

@@ -85,7 +85,7 @@ class Scratch3JSONBlocks {
     mergeObject (args) {
         args.OBJ1 = Cast.toObject(args.OBJ1);
         args.OBJ2 = Cast.toObject(args.OBJ2);
-        return {...args.OBJ1, ...args.OBJ2};
+        return Object.fromEntries(Object.entries(args.OBJ1).concat(Object.entries(args.OBJ2)));
     }
 
     hasKey (args) {
@@ -151,7 +151,7 @@ class Scratch3JSONBlocks {
     mergeArray (args) {
         args.ARR1 = Cast.toArray(args.ARR1);
         args.ARR2 = Cast.toArray(args.ARR2);
-        return [...args.ARR1, ...args.ARR2];
+        return args.ARR1.concat(args.ARR2);
     }
 
     hasItem (args) {

src/compiler/jsexecute.js

@@ -20,9 +20,24 @@ const globalState = {
 let baseRuntime = '';
 const runtimeFunctions = {};
 
-/** Null coalshing function */
+/**
+ * Null coalescing just incase it's not supported by the browser.
+ * @param {any} n
+ * @param {any} v
+ * @returns {!any}
+ */
 baseRuntime += `const nullCoalsh = (n, v) => ((n === null || n === (void 0)) ? v : n);`;
 
+/**
+ * Merges 2 objects. (use this to get around spread overflow)
+ * @param {object} a
+ * @param {object} b
+ * @returns {object}
+ */
+runtimeFunctions.mergeObjects = `const mergeObjects = (a, b) => {
+  return Object.fromEntries(Object.entries(a).concat(Object.entries(b)));
+};`;
+
 /**
  * Determine whether the current tick is likely stuck.
  * This implements similar functionality to the warp timer found in Scratch.

src/compiler/jsgen.js

@@ -34,7 +34,6 @@ const stringify = (object, type) => {
         if (type === 'array' && !Array.isArray(object)) return '[]';
         if (type === 'object' && Array.isArray(object)) return '{}';
     }
-    console.log(object, type);
     return ((typeof object === 'string') ? object : JSON.stringify(object ?? (
         type === 'object' ? (new Object()) : (new Array())
     )));
@@ -536,11 +535,11 @@ class JSGenerator {
         case 'json.valueOfKey':
             return new TypedInput(`(${this.descendInput(node.object).asObject()}[${this.descendInput(node.key).asString()}] ?? "")`, TYPE_STRING);
         case 'json.setKey':
-            return new TypedInput(`(object = {...${this.descendInput(node.object).asObject()}}, object[${this.descendInput(node.key).asString()}] = ${this.descendInput(node.value).asUnknown()}, object)`, TYPE_OBJECT);
+            return new TypedInput(`(object = Object.assign({}, ${this.descendInput(node.object).asObject()}), object[${this.descendInput(node.key).asString()}] = ${this.descendInput(node.value).asUnknown()}, object)`, TYPE_OBJECT);
         case 'json.deleteKey':
-            return new TypedInput(`(object = {...${this.descendInput(node.object).asObject()}}, delete object[${this.descendInput(node.key).asString()}], object)`, TYPE_OBJECT);
+            return new TypedInput(`(object = Object.assign({}, ${this.descendInput(node.object).asObject()}), delete object[${this.descendInput(node.key).asString()}], object)`, TYPE_OBJECT);
         case 'json.mergeObject':
-            return new TypedInput(`{...${this.descendInput(node.object1).asObject()}, ...${this.descendInput(node.object2).asObject()}}`, TYPE_OBJECT);
+            return new TypedInput(`mergeObjects(${this.descendInput(node.object1).asObject()}, ${this.descendInput(node.object2).asObject()})`, TYPE_OBJECT);
         case 'json.hasKey':
             return new TypedInput(`${this.descendInput(node.object).asObject()}.hasOwnProperty(${this.descendInput(node.key).asString()})`, TYPE_BOOLEAN);
         case 'json.newArray':
@@ -552,15 +551,15 @@ class JSGenerator {
         case 'json.indexOfValue':
             return new TypedInput(`(${this.descendInput(node.array).asArray()}.indexOf(${this.descendInput(node.value).asUnknown()}) !== -1 ? ${this.descendInput(node.array).asArray()}.indexOf(${this.descendInput(node.value).asUnknown()}) : "")`, TYPE_NUMBER);
         case 'json.addItem':
-            return new TypedInput(`(array = [...${this.descendInput(node.array).asArray()}], array.push(${this.descendInput(node.item).asUnknown()}), array)`, TYPE_ARRAY);
+            return new TypedInput(`(array = ${this.descendInput(node.array).asArray()}.slice(0), array.push(${this.descendInput(node.item).asUnknown()}), array)`, TYPE_ARRAY);
         case 'json.replaceIndex':
             return new TypedInput(`(${this.descendInput(node.index).asNumber()} >= 0 && ${this.descendInput(node.index).asNumber()} < ${this.descendInput(node.array).asArray()}.length ? (array = [...${this.descendInput(node.array).asArray()}], array[${this.descendInput(node.index).asNumber()}] = ${this.descendInput(node.item).asUnknown()}, array) : new Array())`, TYPE_ARRAY);
         case 'json.deleteIndex':
             return new TypedInput(`(${this.descendInput(node.index).asNumber()} >= 0 && ${this.descendInput(node.index).asNumber()} < ${this.descendInput(node.array).asArray()}.length ? (array = [...${this.descendInput(node.array).asArray()}], array.splice(${this.descendInput(node.index).asNumber()}, 1), array) : new Array())`, TYPE_ARRAY);
         case 'json.deleteAllOccurrences':
             return new TypedInput(`${this.descendInput(node.array).asArray()}.filter((item) => item !== ${this.descendInput(node.item).asString()})`, TYPE_ARRAY);
         case 'json.mergeArray':
-            return new TypedInput(`[...${this.descendInput(node.array1).asArray()}, ...${this.descendInput(node.array2).asArray()}]`, TYPE_ARRAY);
+            return new TypedInput(`${this.descendInput(node.array1).asArray()}.concat(${this.descendInput(node.array2).asArray()})`, TYPE_ARRAY);
         case 'json.hasItem':
             return new TypedInput(`${this.descendInput(node.array).asArray()}.includes(${this.descendInput(node.item).asUnknown()})`, TYPE_BOOLEAN);