pxt-core 13.0.5 → 13.0.6

package/built/pxt.js

@@ -106143,6 +106143,9 @@ var pxt;
         diff_1.compute = compute;
         function computeFormattedDiff(fileA, fileB, options = {}) {
             const diff = compute(fileA, fileB, options);
+            if (!diff) {
+                return null;
+            }
             if (options.context == Infinity || options.full) {
                 return diff.map(formatEdit);
             }
@@ -150553,7 +150556,11 @@ var pxt;
                 else {
                     let [exp, sup] = emitExp(s.body);
                     stmts = stmts.concat(sup);
-                    stmts.concat(exp);
+                    stmts = stmts.concat(exp);
+                    const retType = tc.getTypeAtLocation(s.body);
+                    if (retType && !hasTypeFlag(retType, ts.TypeFlags.Void)) {
+                        stmts = expWrap("return ", stmts);
+                    }
                 }
                 if (stmts.length) {
                     // global or nonlocal declerations
@@ -157934,8 +157941,6 @@ var pxsim;
             this._runOptions = {};
             this.state = SimulatorState.Unloaded;
             this._allowedOrigins = [];
-            // BEGIN TEMPORARY: jacdac simulator
-            this.newJacdacSimulator = false;
             this.frameCleanupTimeout = undefined;
             this.debuggerSeq = 1;
             this.debuggerResolvers = {};
@@ -158145,7 +158150,6 @@ var pxsim;
         setSingleSimulator() {
             this.singleSimulator = true;
         }
-        // END TEMPORARY: jacdac simulator
         postMessage(msg, source, frameID) {
             var _a;
             if (this.hwdbg) {
@@ -158159,8 +158163,14 @@ var pxsim;
             let isDeferrableBroadcastMessage = false;
             const broadcastmsg = msg;
             if (source && (broadcastmsg === null || broadcastmsg === void 0 ? void 0 : broadcastmsg.broadcast)) {
+                const mkcdFrames = frames.filter(frame => !frame.dataset[FRAME_DATA_MESSAGE_CHANNEL]);
+                const messageChannel = msg.type === "messagepacket" && msg.channel;
                 // include index of the source iframe
                 broadcastmsg.srcFrameIndex = this.simFrames().findIndex((item) => item.contentWindow === source);
+                const sourceFrame = broadcastmsg.srcFrameIndex >= 0 ? this.simFrames()[broadcastmsg.srcFrameIndex] : undefined;
+                // jacdac messages from a board sim other than first should be dropped
+                if (broadcastmsg.srcFrameIndex > 0 && mkcdFrames.find(f => f === sourceFrame) && messageChannel === "jacdac")
+                    return;
                 // if the editor is hosted in a multi-editor setting
                 // don't start extra frames
                 const single = !!((_a = this._currentRuntime) === null || _a === void 0 ? void 0 : _a.single);
@@ -158184,7 +158194,6 @@ var pxsim;
                         // start second simulator
                     }
                     else if (!single) {
-                        const messageChannel = msg.type === "messagepacket" && msg.channel;
                         const messageSimulator = messageChannel &&
                             this.options.messageSimulators &&
                             this.options.messageSimulators[messageChannel];
@@ -158210,10 +158219,6 @@ var pxsim;
                         if (simulatorExtension) {
                             // find a frame already running that simulator
                             let messageFrame = frames.find(frame => frame.dataset[FRAME_DATA_MESSAGE_CHANNEL] === messageChannel);
-                            // BEGIN TEMPORARY: jacdac simulator
-                            if (messageChannel === "jacdac/pxt-jacdac")
-                                this.newJacdacSimulator = true;
-                            // END TEMPORARY: jacdac simulator
                             // not found, spin a new one
                             if (!messageFrame) {
                                 const url = new URL(simulatorExtension.url);
@@ -158234,13 +158239,11 @@ var pxsim;
                             let messageFrame = frames.find(frame => frame.dataset[FRAME_DATA_MESSAGE_CHANNEL] === messageChannel);
                             // not found, spin a new one
                             if (!messageFrame) {
-                                if (messageChannel !== "jacdac" || !this.newJacdacSimulator) { // TEMPORARY: jacdac simulator
-                                    const useLocalHost = pxsim.U.isLocalHost() && /localhostmessagesims=1/i.test(window.location.href);
-                                    const url = ((useLocalHost && messageSimulator.localHostUrl) || messageSimulator.url)
-                                        .replace("$PARENT_ORIGIN$", encodeURIComponent(this.options.parentOrigin || ""))
-                                        .replace("$LANGUAGE$", encodeURIComponent(this.options.userLanguage));
-                                    startSimulatorExtension(url, messageSimulator.permanent, messageSimulator.aspectRatio);
-                                }
+                                const useLocalHost = pxsim.U.isLocalHost() && /localhostmessagesims=1/i.test(window.location.href);
+                                const url = ((useLocalHost && messageSimulator.localHostUrl) || messageSimulator.url)
+                                    .replace("$PARENT_ORIGIN$", encodeURIComponent(this.options.parentOrigin || ""))
+                                    .replace("$LANGUAGE$", encodeURIComponent(this.options.userLanguage));
+                                startSimulatorExtension(url, messageSimulator.permanent, messageSimulator.aspectRatio);
                             }
                             // not running the curren run, restart
                             else if (messageFrame.dataset['runid'] != this.runId) {
@@ -158250,7 +158253,6 @@ var pxsim;
                         else {
                             isDeferrableBroadcastMessage = true;
                             // start secondary frame if needed
-                            const mkcdFrames = frames.filter(frame => !frame.dataset[FRAME_DATA_MESSAGE_CHANNEL]);
                             if (!messageChannel &&
                                 (mkcdFrames.length == 0 || mkcdFrames.length == 1 && !this.singleSimulator)) {
                                 // messageChannel is set to false whenever msg.type !== "messagepacket"
@@ -158275,6 +158277,10 @@ var pxsim;
                 // same frame as source
                 if (source && frame.contentWindow == source)
                     continue;
+                // if jacdac message, don't send to other (board) simulator frames
+                if (i > 0 && !frame.dataset[FRAME_DATA_MESSAGE_CHANNEL] &&
+                    msg.type === "messagepacket" && msg.channel === "jacdac")
+                    continue;
                 // frame not in DOM
                 if (!frame.contentWindow)
                     continue;

package/built/pxtlib.js

@@ -8422,6 +8422,9 @@ var pxt;
         diff_1.compute = compute;
         function computeFormattedDiff(fileA, fileB, options = {}) {
             const diff = compute(fileA, fileB, options);
+            if (!diff) {
+                return null;
+            }
             if (options.context == Infinity || options.full) {
                 return diff.map(formatEdit);
             }

package/built/pxtpy.js

@@ -5747,7 +5747,11 @@ var pxt;
                 else {
                     let [exp, sup] = emitExp(s.body);
                     stmts = stmts.concat(sup);
-                    stmts.concat(exp);
+                    stmts = stmts.concat(exp);
+                    const retType = tc.getTypeAtLocation(s.body);
+                    if (retType && !hasTypeFlag(retType, ts.TypeFlags.Void)) {
+                        stmts = expWrap("return ", stmts);
+                    }
                 }
                 if (stmts.length) {
                     // global or nonlocal declerations

package/built/pxtsim.d.ts

@@ -1474,7 +1474,6 @@ declare namespace pxsim {
         private simFrames;
         private getSimUrl;
         setSingleSimulator(): void;
-        newJacdacSimulator: boolean;
         postMessage(msg: pxsim.SimulatorMessage, source?: Window, frameID?: string): void;
         protected deferredMessages: [HTMLIFrameElement, SimulatorMessage][];
         protected postDeferrableMessage(frame: HTMLIFrameElement, msg: SimulatorMessage): void;

package/built/pxtsim.js

@@ -6440,8 +6440,6 @@ var pxsim;
             this._runOptions = {};
             this.state = SimulatorState.Unloaded;
             this._allowedOrigins = [];
-            // BEGIN TEMPORARY: jacdac simulator
-            this.newJacdacSimulator = false;
             this.frameCleanupTimeout = undefined;
             this.debuggerSeq = 1;
             this.debuggerResolvers = {};
@@ -6651,7 +6649,6 @@ var pxsim;
         setSingleSimulator() {
             this.singleSimulator = true;
         }
-        // END TEMPORARY: jacdac simulator
         postMessage(msg, source, frameID) {
             var _a;
             if (this.hwdbg) {
@@ -6665,8 +6662,14 @@ var pxsim;
             let isDeferrableBroadcastMessage = false;
             const broadcastmsg = msg;
             if (source && (broadcastmsg === null || broadcastmsg === void 0 ? void 0 : broadcastmsg.broadcast)) {
+                const mkcdFrames = frames.filter(frame => !frame.dataset[FRAME_DATA_MESSAGE_CHANNEL]);
+                const messageChannel = msg.type === "messagepacket" && msg.channel;
                 // include index of the source iframe
                 broadcastmsg.srcFrameIndex = this.simFrames().findIndex((item) => item.contentWindow === source);
+                const sourceFrame = broadcastmsg.srcFrameIndex >= 0 ? this.simFrames()[broadcastmsg.srcFrameIndex] : undefined;
+                // jacdac messages from a board sim other than first should be dropped
+                if (broadcastmsg.srcFrameIndex > 0 && mkcdFrames.find(f => f === sourceFrame) && messageChannel === "jacdac")
+                    return;
                 // if the editor is hosted in a multi-editor setting
                 // don't start extra frames
                 const single = !!((_a = this._currentRuntime) === null || _a === void 0 ? void 0 : _a.single);
@@ -6690,7 +6693,6 @@ var pxsim;
                         // start second simulator
                     }
                     else if (!single) {
-                        const messageChannel = msg.type === "messagepacket" && msg.channel;
                         const messageSimulator = messageChannel &&
                             this.options.messageSimulators &&
                             this.options.messageSimulators[messageChannel];
@@ -6716,10 +6718,6 @@ var pxsim;
                         if (simulatorExtension) {
                             // find a frame already running that simulator
                             let messageFrame = frames.find(frame => frame.dataset[FRAME_DATA_MESSAGE_CHANNEL] === messageChannel);
-                            // BEGIN TEMPORARY: jacdac simulator
-                            if (messageChannel === "jacdac/pxt-jacdac")
-                                this.newJacdacSimulator = true;
-                            // END TEMPORARY: jacdac simulator
                             // not found, spin a new one
                             if (!messageFrame) {
                                 const url = new URL(simulatorExtension.url);
@@ -6740,13 +6738,11 @@ var pxsim;
                             let messageFrame = frames.find(frame => frame.dataset[FRAME_DATA_MESSAGE_CHANNEL] === messageChannel);
                             // not found, spin a new one
                             if (!messageFrame) {
-                                if (messageChannel !== "jacdac" || !this.newJacdacSimulator) { // TEMPORARY: jacdac simulator
-                                    const useLocalHost = pxsim.U.isLocalHost() && /localhostmessagesims=1/i.test(window.location.href);
-                                    const url = ((useLocalHost && messageSimulator.localHostUrl) || messageSimulator.url)
-                                        .replace("$PARENT_ORIGIN$", encodeURIComponent(this.options.parentOrigin || ""))
-                                        .replace("$LANGUAGE$", encodeURIComponent(this.options.userLanguage));
-                                    startSimulatorExtension(url, messageSimulator.permanent, messageSimulator.aspectRatio);
-                                }
+                                const useLocalHost = pxsim.U.isLocalHost() && /localhostmessagesims=1/i.test(window.location.href);
+                                const url = ((useLocalHost && messageSimulator.localHostUrl) || messageSimulator.url)
+                                    .replace("$PARENT_ORIGIN$", encodeURIComponent(this.options.parentOrigin || ""))
+                                    .replace("$LANGUAGE$", encodeURIComponent(this.options.userLanguage));
+                                startSimulatorExtension(url, messageSimulator.permanent, messageSimulator.aspectRatio);
                             }
                             // not running the curren run, restart
                             else if (messageFrame.dataset['runid'] != this.runId) {
@@ -6756,7 +6752,6 @@ var pxsim;
                         else {
                             isDeferrableBroadcastMessage = true;
                             // start secondary frame if needed
-                            const mkcdFrames = frames.filter(frame => !frame.dataset[FRAME_DATA_MESSAGE_CHANNEL]);
                             if (!messageChannel &&
                                 (mkcdFrames.length == 0 || mkcdFrames.length == 1 && !this.singleSimulator)) {
                                 // messageChannel is set to false whenever msg.type !== "messagepacket"
@@ -6781,6 +6776,10 @@ var pxsim;
                 // same frame as source
                 if (source && frame.contentWindow == source)
                     continue;
+                // if jacdac message, don't send to other (board) simulator frames
+                if (i > 0 && !frame.dataset[FRAME_DATA_MESSAGE_CHANNEL] &&
+                    msg.type === "messagepacket" && msg.channel === "jacdac")
+                    continue;
                 // frame not in DOM
                 if (!frame.contentWindow)
                     continue;