jspsych 7.2.3 → 7.3.1

package/dist/index.cjs

@@ -71,7 +71,7 @@ var autoBind = (self, {include, exclude} = {}) => {
 	return self;
 };
 
-var version = "7.2.3";
+var version = "7.3.1";
 
 class MigrationError extends Error {
     constructor(message = "The global `jsPsych` variable is no longer available in jsPsych v7.") {
@@ -843,8 +843,13 @@ class MediaAPI {
         this.img_cache = {};
         this.preloadMap = new Map();
         this.microphone_recorder = null;
+        this.camera_stream = null;
+        this.camera_recorder = null;
     }
     getVideoBuffer(videoID) {
+        if (videoID.startsWith("blob:")) {
+            this.video_buffers[videoID] = videoID;
+        }
         return this.video_buffers[videoID];
     }
     initAudio() {
@@ -899,15 +904,15 @@ class MediaAPI {
                     callback_error({ source: source, error: e });
                 });
             };
-            request.onerror = function (e) {
+            request.onerror = (e) => {
                 let err = e;
-                if (this.status == 404) {
+                if (request.status == 404) {
                     err = "404";
                 }
                 callback_error({ source: source, error: err });
             };
-            request.onloadend = function (e) {
-                if (this.status == 404) {
+            request.onloadend = (e) => {
+                if (request.status == 404) {
                     callback_error({ source: source, error: "404" });
                 }
             };
@@ -964,20 +969,21 @@ class MediaAPI {
             callback_complete();
             return;
         }
-        for (var i = 0; i < images.length; i++) {
-            var img = new Image();
-            img.onload = function () {
+        for (let i = 0; i < images.length; i++) {
+            const img = new Image();
+            const src = images[i];
+            img.onload = () => {
                 n_loaded++;
-                callback_load(img.src);
+                callback_load(src);
                 if (n_loaded === images.length) {
                     callback_complete();
                 }
             };
-            img.onerror = function (e) {
-                callback_error({ source: img.src, error: e });
+            img.onerror = (e) => {
+                callback_error({ source: src, error: e });
             };
-            img.src = images[i];
-            this.img_cache[images[i]] = img;
+            img.src = src;
+            this.img_cache[src] = img;
             this.preload_requests.push(img);
         }
     }
@@ -995,9 +1001,9 @@ class MediaAPI {
             const request = new XMLHttpRequest();
             request.open("GET", video, true);
             request.responseType = "blob";
-            request.onload = function () {
-                if (this.status === 200 || this.status === 0) {
-                    const videoBlob = this.response;
+            request.onload = () => {
+                if (request.status === 200 || request.status === 0) {
+                    const videoBlob = request.response;
                     video_buffers[video] = URL.createObjectURL(videoBlob); // IE10+
                     n_loaded++;
                     callback_load(video);
@@ -1006,15 +1012,15 @@ class MediaAPI {
                     }
                 }
             };
-            request.onerror = function (e) {
+            request.onerror = (e) => {
                 let err = e;
-                if (this.status == 404) {
+                if (request.status == 404) {
                     err = "404";
                 }
                 callback_error({ source: video, error: err });
             };
-            request.onloadend = function (e) {
-                if (this.status == 404) {
+            request.onloadend = (e) => {
+                if (request.status == 404) {
                     callback_error({ source: video, error: "404" });
                 }
             };
@@ -1086,6 +1092,17 @@ class MediaAPI {
     getMicrophoneRecorder() {
         return this.microphone_recorder;
     }
+    initializeCameraRecorder(stream, opts) {
+        this.camera_stream = stream;
+        const recorder = new MediaRecorder(stream, opts);
+        this.camera_recorder = recorder;
+    }
+    getCameraStream() {
+        return this.camera_stream;
+    }
+    getCameraRecorder() {
+        return this.camera_recorder;
+    }
 }
 
 class SimulationAPI {
@@ -1860,7 +1877,8 @@ function shuffleNoRepeats(arr, equalityTest) {
             // test to make sure the new neighbor isn't equal to the old one
             while (equalityTest(random_shuffle[i + 1], random_shuffle[random_pick]) ||
                 equalityTest(random_shuffle[i + 1], random_shuffle[random_pick + 1]) ||
-                equalityTest(random_shuffle[i + 1], random_shuffle[random_pick - 1])) {
+                equalityTest(random_shuffle[i + 1], random_shuffle[random_pick - 1]) ||
+                equalityTest(random_shuffle[i], random_shuffle[random_pick])) {
                 random_pick = Math.floor(Math.random() * (random_shuffle.length - 2)) + 1;
             }
             const new_neighbor = random_shuffle[random_pick];
@@ -2410,7 +2428,11 @@ class TimelineNode {
     // recursive downward search for active trial to extract timeline variable
     timelineVariable(variable_name) {
         if (typeof this.timeline_parameters == "undefined") {
-            return this.findTimelineVariable(variable_name);
+            const val = this.findTimelineVariable(variable_name);
+            if (typeof val === "undefined") {
+                console.warn("Timeline variable " + variable_name + " not found.");
+            }
+            return val;
         }
         else {
             // if progress.current_location is -1, then the timeline variable is being evaluated
@@ -2425,7 +2447,11 @@ class TimelineNode {
                 loc = loc - 1;
             }
             // now find the variable
-            return this.timeline_parameters.timeline[loc].timelineVariable(variable_name);
+            const val = this.timeline_parameters.timeline[loc].timelineVariable(variable_name);
+            if (typeof val === "undefined") {
+                console.warn("Timeline variable " + variable_name + " not found.");
+            }
+            return val;
         }
     }
     // recursively get all the timeline variables for this trial
@@ -2703,6 +2729,7 @@ class JsPsych {
         return this.DOM_container;
     }
     finishTrial(data = {}) {
+        var _a;
         if (this.current_trial_finished) {
             return;
         }
@@ -2743,46 +2770,58 @@ class JsPsych {
             }
         }
         // handle extension callbacks
-        if (Array.isArray(current_trial.extensions)) {
-            for (const extension of current_trial.extensions) {
-                const ext_data_values = this.extensions[extension.type.info.name].on_finish(extension.params);
-                Object.assign(trial_data_values, ext_data_values);
+        const extensionCallbackResults = ((_a = current_trial.extensions) !== null && _a !== void 0 ? _a : []).map((extension) => this.extensions[extension.type.info.name].on_finish(extension.params));
+        const onExtensionCallbacksFinished = () => {
+            // about to execute lots of callbacks, so switch context.
+            this.internal.call_immediate = true;
+            // handle callback at plugin level
+            if (typeof current_trial.on_finish === "function") {
+                current_trial.on_finish(trial_data_values);
+            }
+            // handle callback at whole-experiment level
+            this.opts.on_trial_finish(trial_data_values);
+            // after the above callbacks are complete, then the data should be finalized
+            // for this trial. call the on_data_update handler, passing in the same
+            // data object that just went through the trial's finish handlers.
+            this.opts.on_data_update(trial_data_values);
+            // done with callbacks
+            this.internal.call_immediate = false;
+            // wait for iti
+            if (this.simulation_mode === "data-only") {
+                this.nextTrial();
             }
-        }
-        // about to execute lots of callbacks, so switch context.
-        this.internal.call_immediate = true;
-        // handle callback at plugin level
-        if (typeof current_trial.on_finish === "function") {
-            current_trial.on_finish(trial_data_values);
-        }
-        // handle callback at whole-experiment level
-        this.opts.on_trial_finish(trial_data_values);
-        // after the above callbacks are complete, then the data should be finalized
-        // for this trial. call the on_data_update handler, passing in the same
-        // data object that just went through the trial's finish handlers.
-        this.opts.on_data_update(trial_data_values);
-        // done with callbacks
-        this.internal.call_immediate = false;
-        // wait for iti
-        if (this.simulation_mode === "data-only") {
-            this.nextTrial();
-        }
-        else if (typeof current_trial.post_trial_gap === null ||
-            typeof current_trial.post_trial_gap === "undefined") {
-            if (this.opts.default_iti > 0) {
-                setTimeout(this.nextTrial, this.opts.default_iti);
+            else if (typeof current_trial.post_trial_gap === null ||
+                typeof current_trial.post_trial_gap === "undefined") {
+                if (this.opts.default_iti > 0) {
+                    setTimeout(this.nextTrial, this.opts.default_iti);
+                }
+                else {
+                    this.nextTrial();
+                }
             }
             else {
-                this.nextTrial();
+                if (current_trial.post_trial_gap > 0) {
+                    setTimeout(this.nextTrial, current_trial.post_trial_gap);
+                }
+                else {
+                    this.nextTrial();
+                }
             }
+        };
+        // Strictly using Promise.resolve to turn all values into promises would be cleaner here, but it
+        // would require user test code to make the event loop tick after every simulated key press even
+        // if there are no async `on_finish` methods. Hence, in order to avoid a breaking change, we
+        // only rely on the event loop if at least one `on_finish` method returns a promise.
+        if (extensionCallbackResults.some((result) => typeof result.then === "function")) {
+            Promise.all(extensionCallbackResults.map((result) => Promise.resolve(result).then((ext_data_values) => {
+                Object.assign(trial_data_values, ext_data_values);
+            }))).then(onExtensionCallbacksFinished);
         }
         else {
-            if (current_trial.post_trial_gap > 0) {
-                setTimeout(this.nextTrial, current_trial.post_trial_gap);
-            }
-            else {
-                this.nextTrial();
+            for (const values of extensionCallbackResults) {
+                Object.assign(trial_data_values, values);
             }
+            onExtensionCallbacksFinished();
         }
     }
     endExperiment(end_message = "", data = {}) {
@@ -3070,16 +3109,16 @@ class JsPsych {
     }
     evaluateTimelineVariables(trial) {
         for (const key of Object.keys(trial)) {
-            // timeline variables on the root level
             if (typeof trial[key] === "object" &&
                 trial[key] !== null &&
                 typeof trial[key].timelineVariablePlaceholder !== "undefined") {
-                /*trial[key].toString().replace(/\s/g, "") ==
-                  "function(){returntimeline.timelineVariable(varname);}"
-              )*/ trial[key] = trial[key].timelineVariableFunction();
+                trial[key] = trial[key].timelineVariableFunction();
             }
             // timeline variables that are nested in objects
-            if (typeof trial[key] === "object" && trial[key] !== null) {
+            if (typeof trial[key] === "object" &&
+                trial[key] !== null &&
+                key !== "timeline" &&
+                key !== "timeline_variables") {
                 this.evaluateTimelineVariables(trial[key]);
             }
         }
@@ -3122,9 +3161,11 @@ class JsPsych {
         else if (typeof obj === "object") {
             if (info === null || !info.nested) {
                 for (const key of Object.keys(obj)) {
-                    if (key === "type") {
+                    if (key === "type" || key === "timeline" || key === "timeline_variables") {
                         // Ignore the object's `type` field because it contains a plugin and we do not want to
-                        // call plugin functions
+                        // call plugin functions. Also ignore `timeline` and `timeline_variables` because they
+                        // are used in the `trials` parameter of the preload plugin and we don't want to actually
+                        // evaluate those in that context.
                         continue;
                     }
                     obj[key] = this.replaceFunctionsWithValues(obj[key], null);