combine block

PenguinMod · Jan 3, 2024 · aa52bb8 · aa52bb8
1 parent 7938311
commit aa52bb8
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/src/extensions/jg_json/index.js b/src/extensions/jg_json/index.js
@@ -180,6 +180,21 @@ class JgJSONBlocks {
                     },
                     text: 'json [json] has key [key] ?'
                 },
+                {
+                    opcode: 'json_combine',
+                    blockType: BlockType.REPORTER,
+                    arguments: {
+                        one: {
+                            type: ArgumentType.STRING,
+                            defaultValue: "{}"
+                        },
+                        two: {
+                            type: ArgumentType.STRING,
+                            defaultValue: "{}"
+                        }
+                    },
+                    text: 'combine json [one] and json [two]'
+                },
                 {
                     blockType: BlockType.LABEL,
                     text: "Arrays"
@@ -797,6 +812,13 @@ class JgJSONBlocks {
     json_array_validate (args) {
         return validateArray(args.array).isValid;
     }
+
+    json_combine (args) {
+        const one = validateJSON(args.one).object;
+        const two = validateJSON(args.two).object;
+
+        return JSON.stringify(Object.assign(one, two));
+    }
 }
 
 module.exports = JgJSONBlocks;