jspsych 7.3.2 → 7.3.3

package/README.md

@@ -48,9 +48,15 @@ See the [contributing to jsPsych](https://www.jspsych.org/latest/developers/cont
 
 ## Citation
 
-If you use this library in academic work, please cite the [paper that describes jsPsych](http://link.springer.com/article/10.3758%2Fs13428-014-0458-y):
+If you use this library in academic work, the preferred citation is:
 
-de Leeuw, J.R. (2015). jsPsych: A JavaScript library for creating behavioral experiments in a Web browser. *Behavior Research Methods*, _47_(1), 1-12. doi:10.3758/s13428-014-0458-y
+de Leeuw, J.R., Gilbert, R.A., & Luchterhandt, B. (2023). jsPsych: Enabling an open-source collaborative ecosystem of behavioral experiments. *Journal of Open Source Software*, *8*(85), 5351, [https://joss.theoj.org/papers/10.21105/joss.05351](https://joss.theoj.org/papers/10.21105/joss.05351).
+
+This paper is an updated description of jsPsych and includes all current core team members. It replaces the earlier paper that described jsPsych:
+
+de Leeuw, J.R. (2015). jsPsych: A JavaScript library for creating behavioral experiments in a Web browser. *Behavior Research Methods*, _47_(1), 1-12. doi:[10.3758/s13428-014-0458-y](http://link.springer.com/article/10.3758%2Fs13428-014-0458-y)
+
+Citations help us demonstrate that this library is used and valued, which allows us to continue working on it.
 
 ## Contributors
 
@@ -59,4 +65,4 @@ The project is currently managed by the core team of Josh de Leeuw ([@jodeleeuw]
 
 jsPsych was created by [Josh de Leeuw](http://www.twitter.com/joshdeleeuw).
 
-We're also grateful for the generous support from a [Mozilla Open Source Support award](https://www.mozilla.org/en-US/moss/), which funded development of the library from 2020-2021.
+We're also grateful for the generous support from a [Mozilla Open Source Support award](https://www.mozilla.org/en-US/moss/), which funded development of the library from 2020-2022.

package/dist/index.browser.js

@@ -70,7 +70,7 @@ var jsPsychModule = (function (exports) {
     	return self;
     };
 
-    var version = "7.3.2";
+    var version = "7.3.3";
 
     class MigrationError extends Error {
         constructor(message = "The global `jsPsych` variable is no longer available in jsPsych v7.") {
@@ -134,12 +134,45 @@ var jsPsychModule = (function (exports) {
         else {
             return obj;
         }
+    }
+    /**
+     * Merges two objects, recursively.
+     * @param obj1 Object to merge
+     * @param obj2 Object to merge
+     */
+    function deepMerge(obj1, obj2) {
+        let merged = {};
+        for (const key in obj1) {
+            if (obj1.hasOwnProperty(key)) {
+                if (typeof obj1[key] === "object" && obj2.hasOwnProperty(key)) {
+                    merged[key] = deepMerge(obj1[key], obj2[key]);
+                }
+                else {
+                    merged[key] = obj1[key];
+                }
+            }
+        }
+        for (const key in obj2) {
+            if (obj2.hasOwnProperty(key)) {
+                if (!merged.hasOwnProperty(key)) {
+                    merged[key] = obj2[key];
+                }
+                else if (typeof obj2[key] === "object") {
+                    merged[key] = deepMerge(merged[key], obj2[key]);
+                }
+                else {
+                    merged[key] = obj2[key];
+                }
+            }
+        }
+        return merged;
     }
 
     var utils = /*#__PURE__*/Object.freeze({
         __proto__: null,
         unique: unique,
-        deepCopy: deepCopy
+        deepCopy: deepCopy,
+        deepMerge: deepMerge
     });
 
     class DataColumn {
@@ -1105,8 +1138,12 @@ var jsPsychModule = (function (exports) {
     }
 
     class SimulationAPI {
+        constructor(getDisplayContainerElement, setJsPsychTimeout) {
+            this.getDisplayContainerElement = getDisplayContainerElement;
+            this.setJsPsychTimeout = setJsPsychTimeout;
+        }
         dispatchEvent(event) {
-            document.body.dispatchEvent(event);
+            this.getDisplayContainerElement().dispatchEvent(event);
         }
         /**
          * Dispatches a `keydown` event for the specified key
@@ -1129,7 +1166,7 @@ var jsPsychModule = (function (exports) {
          */
         pressKey(key, delay = 0) {
             if (delay > 0) {
-                setTimeout(() => {
+                this.setJsPsychTimeout(() => {
                     this.keyDown(key);
                     this.keyUp(key);
                 }, delay);
@@ -1146,7 +1183,7 @@ var jsPsychModule = (function (exports) {
          */
         clickTarget(target, delay = 0) {
             if (delay > 0) {
-                setTimeout(() => {
+                this.setJsPsychTimeout(() => {
                     target.dispatchEvent(new MouseEvent("mousedown", { bubbles: true }));
                     target.dispatchEvent(new MouseEvent("mouseup", { bubbles: true }));
                     target.dispatchEvent(new MouseEvent("click", { bubbles: true }));
@@ -1166,7 +1203,7 @@ var jsPsychModule = (function (exports) {
          */
         fillTextInput(target, text, delay = 0) {
             if (delay > 0) {
-                setTimeout(() => {
+                this.setJsPsychTimeout(() => {
                     target.value = text;
                 }, delay);
             }
@@ -1275,15 +1312,27 @@ var jsPsychModule = (function (exports) {
         }
     }
 
+    /**
+     * A class that provides a wrapper around the global setTimeout and clearTimeout functions.
+     */
     class TimeoutAPI {
         constructor() {
             this.timeout_handlers = [];
         }
+        /**
+         * Calls a function after a specified delay, in milliseconds.
+         * @param callback The function to call after the delay.
+         * @param delay The number of milliseconds to wait before calling the function.
+         * @returns A handle that can be used to clear the timeout with clearTimeout.
+         */
         setTimeout(callback, delay) {
             const handle = window.setTimeout(callback, delay);
             this.timeout_handlers.push(handle);
             return handle;
         }
+        /**
+         * Clears all timeouts that have been created with setTimeout.
+         */
         clearAllTimeouts() {
             for (const handler of this.timeout_handlers) {
                 clearTimeout(handler);
@@ -1294,13 +1343,12 @@ var jsPsychModule = (function (exports) {
 
     function createJointPluginAPIObject(jsPsych) {
         const settings = jsPsych.getInitSettings();
-        return Object.assign({}, ...[
-            new KeyboardListenerAPI(jsPsych.getDisplayContainerElement, settings.case_sensitive_responses, settings.minimum_valid_rt),
-            new TimeoutAPI(),
-            new MediaAPI(settings.use_webaudio, jsPsych.webaudio_context),
-            new HardwareAPI(),
-            new SimulationAPI(),
-        ].map((object) => autoBind(object)));
+        const keyboardListenerAPI = autoBind(new KeyboardListenerAPI(jsPsych.getDisplayContainerElement, settings.case_sensitive_responses, settings.minimum_valid_rt));
+        const timeoutAPI = autoBind(new TimeoutAPI());
+        const mediaAPI = autoBind(new MediaAPI(settings.use_webaudio, jsPsych.webaudio_context));
+        const hardwareAPI = autoBind(new HardwareAPI());
+        const simulationAPI = autoBind(new SimulationAPI(jsPsych.getDisplayContainerElement, timeoutAPI.setTimeout));
+        return Object.assign({}, ...[keyboardListenerAPI, timeoutAPI, mediaAPI, hardwareAPI, simulationAPI]);
     }
 
     var wordList = [
@@ -3055,13 +3103,14 @@ var jsPsychModule = (function (exports) {
                 }
             };
             let trial_complete;
+            let trial_sim_opts;
+            let trial_sim_opts_merged;
             if (!this.simulation_mode) {
                 trial_complete = trial.type.trial(this.DOM_target, trial, load_callback);
             }
             if (this.simulation_mode) {
                 // check if the trial supports simulation
                 if (trial.type.simulate) {
-                    let trial_sim_opts;
                     if (!trial.simulation_options) {
                         trial_sim_opts = this.simulation_options.default;
                     }
@@ -3083,13 +3132,16 @@ var jsPsychModule = (function (exports) {
                             trial_sim_opts = trial.simulation_options;
                         }
                     }
-                    trial_sim_opts = this.utils.deepCopy(trial_sim_opts);
-                    trial_sim_opts = this.replaceFunctionsWithValues(trial_sim_opts, null);
-                    if ((trial_sim_opts === null || trial_sim_opts === void 0 ? void 0 : trial_sim_opts.simulate) === false) {
+                    // merge in default options that aren't overriden by the trial's simulation_options
+                    // including nested parameters in the simulation_options
+                    trial_sim_opts_merged = this.utils.deepMerge(this.simulation_options.default, trial_sim_opts);
+                    trial_sim_opts_merged = this.utils.deepCopy(trial_sim_opts_merged);
+                    trial_sim_opts_merged = this.replaceFunctionsWithValues(trial_sim_opts_merged, null);
+                    if ((trial_sim_opts_merged === null || trial_sim_opts_merged === void 0 ? void 0 : trial_sim_opts_merged.simulate) === false) {
                         trial_complete = trial.type.trial(this.DOM_target, trial, load_callback);
                     }
                     else {
-                        trial_complete = trial.type.simulate(trial, (trial_sim_opts === null || trial_sim_opts === void 0 ? void 0 : trial_sim_opts.mode) || this.simulation_mode, trial_sim_opts, load_callback);
+                        trial_complete = trial.type.simulate(trial, (trial_sim_opts_merged === null || trial_sim_opts_merged === void 0 ? void 0 : trial_sim_opts_merged.mode) || this.simulation_mode, trial_sim_opts_merged, load_callback);
                     }
                 }
                 else {
@@ -3099,8 +3151,11 @@ var jsPsychModule = (function (exports) {
             }
             // see if trial_complete is a Promise by looking for .then() function
             const is_promise = trial_complete && typeof trial_complete.then == "function";
-            // in simulation mode we let the simulate function call the load_callback always.
-            if (!is_promise && !this.simulation_mode) {
+            // in simulation mode we let the simulate function call the load_callback always,
+            // so we don't need to call it here. however, if we are in simulation mode but not simulating
+            // this particular trial we need to call it.
+            if (!is_promise &&
+                (!this.simulation_mode || (this.simulation_mode && (trial_sim_opts_merged === null || trial_sim_opts_merged === void 0 ? void 0 : trial_sim_opts_merged.simulate) === false))) {
                 load_callback();
             }
             // done with callbacks