fix json_index_of_value (and a double evaluation in it)

Author: CST1229

src/compiler/irgen.js

@@ -357,8 +357,8 @@ class ScriptTreeGenerator {
                 array: this.descendInputOfBlock(block, 'ARR').toType(InputType.ARRAY)
             });
         case 'json_index_of_value':
-            return new IntermediateInput(InputOpcode.JSON_INDEX_OF_VALUE, InputType.NUMBER, {
-                value: this.descendInputOfBlock(block, 'VALUE').toType(InputType.ANY),
+            return new IntermediateInput(InputOpcode.JSON_INDEX_OF_VALUE, InputType.NUMBER_WHOLE | InputType.STRING_NAN, {
+                value: this.descendInputOfBlock(block, 'VALUE'),
                 array: this.descendInputOfBlock(block, 'ARR').toType(InputType.ARRAY)
             });
         case 'json_add_item':

src/compiler/jsexecute.js

@@ -40,6 +40,18 @@ runtimeFunctions.mergeObjects = `const mergeObjects = (a, b) => {
   return Object.fromEntries(Object.entries(a).concat(Object.entries(b)));
 };`;
 
+/**
+ * Find the 0-indexed index of an item in an array.
+ * @param {Array<*>} array The array.
+ * @param {*} item The item to search for
+ * @returns {number | string} The 0-indexed index of the item in the list, otherwise empty string
+ */
+runtimeFunctions.arrayIndexOf = `const arrayIndexOf = (array, item) => {
+    const index = array.indexOf(item);
+    if (index === -1) return "";
+    return index;
+}`;
+
 /**
  * Determine whether the current tick is likely stuck.
  * This implements similar functionality to the warp timer found in Scratch.

src/compiler/jsgen.js

@@ -287,7 +287,7 @@ class JSGenerator {
         case InputOpcode.JSON_VALUE_OF_INDEX:
             return `(${this.descendInput(node.array)}[${this.descendInput(node.index)}] ?? "")`;
         case InputOpcode.JSON_INDEX_OF_VALUE:
-            return `(${this.descendInput(node.array)}.indexOf(${this.descendInput(node.value)}) !== -1 ? ${this.descendInput(node.array)}.indexOf(${this.descendInput(node.value)}) : "")`;
+            return `arrayIndexOf(${this.descendInput(node.array)}, ${this.descendInput(node.value)})`;
         case InputOpcode.JSON_ADD_ITEM:
             return `(array = ${this.descendInput(node.array)}.slice(0), array.push(${this.descendInput(node.item)}), array)`;
         case InputOpcode.JSON_REPLACE_INDEX: