pxt-core 13.1.5 → 13.1.6

package/built/backendutils.d.ts

@@ -131,6 +131,7 @@ declare namespace pxt.docs {
         parse?: (src: string, options?: any) => string;
     }
     export function htmlQuote(s: string): string;
+    export function normalizeStaticMarkdown(markdown: string): string;
     export function html2Quote(s: string): string;
     export interface BreadcrumbEntry {
         name: string;

package/built/backendutils.js

@@ -509,6 +509,35 @@ var pxt;
             return s;
         }
         docs.htmlQuote = htmlQuote;
+        function normalizeStaticMarkdown(markdown) {
+            const lines = markdown.split(/\r?\n/);
+            let codeFenceMarker = "";
+            for (let i = 0; i < lines.length; i++) {
+                const fenceMatch = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(lines[i]);
+                if (fenceMatch) {
+                    const marker = fenceMatch[1];
+                    const trailingText = fenceMatch[2];
+                    const closesCodeFence = !!codeFenceMarker
+                        && marker[0] === codeFenceMarker[0]
+                        && marker.length >= codeFenceMarker.length
+                        && !trailingText.trim();
+                    if (closesCodeFence) {
+                        codeFenceMarker = "";
+                    }
+                    else if (!codeFenceMarker) {
+                        codeFenceMarker = marker;
+                    }
+                    continue;
+                }
+                if (!codeFenceMarker && /^ {0,3}<br\s*\/?>\s*$/i.test(lines[i])) {
+                    // Marked treats a standalone break as inline content, which can extend a
+                    // preceding table or keep the following Markdown in the same paragraph.
+                    lines[i] = "\n<p><br/></p>\n";
+                }
+            }
+            return lines.join("\n");
+        }
+        docs.normalizeStaticMarkdown = normalizeStaticMarkdown;
         // the input already should be HTML-quoted but we want to make sure, and also quote quotes
         function html2Quote(s) {
             if (!s)
@@ -1023,7 +1052,7 @@ ${opts.repo.name.replace(/^pxt-/, '')}=github:${opts.repo.fullName}#${opts.repo.
 \`\`\`
 `;
             //Uses the CmdLink definitions to replace links to YouTube and Vimeo (limited at the moment)
-            markdown = markdown.replace(/^\s*https?:\/\/(\S+)\s*$/mg, (f, lnk) => {
+            markdown = markdown.replace(/^[ \t]*https?:\/\/(\S+)[ \t]*\r?$/mg, (f, lnk) => {
                 for (let ent of links) {
                     let m = ent.rx.exec(lnk);
                     if (m) {

package/built/cli.js

@@ -41,7 +41,7 @@ pxt.docs.requireDOMSanitizer = () => {
         const existing = baseAllowedAttrs[tag] || [];
         return Array.from(new Set([...existing, "class", ...otherAttributes]));
     };
-    const options = Object.assign(Object.assign({}, defaults), { allowedTags: [...allowedTags, "img"], allowedAttributes: Object.assign(Object.assign({}, baseAllowedAttrs), { code: mergeClassAttribute("code"), pre: mergeClassAttribute("pre"), div: mergeClassAttribute("div", "data-youtube", "title") }) });
+    const options = Object.assign(Object.assign({}, defaults), { allowedTags: [...allowedTags, "img"], allowedAttributes: Object.assign(Object.assign({}, baseAllowedAttrs), { code: mergeClassAttribute("code"), pre: mergeClassAttribute("pre"), div: mergeClassAttribute("div", "data-youtube", "title"), img: mergeClassAttribute("img") }) });
     return (html) => sanitizeHtml(html, options);
 };
 let forceCloudBuild = process.env["KS_FORCE_CLOUD"] !== "no";
@@ -2690,7 +2690,7 @@ function renderDocs(builtPackaged, localDir) {
                     nodeutil.writeFileSync(outputFile, patchedMd, { encoding: "utf8" });
                     html = pxt.docs.renderMarkdown({
                         template: docsTemplate,
-                        markdown: patchedMd,
+                        markdown: pxt.docs.normalizeStaticMarkdown(patchedMd),
                         theme: pxt.appTarget.appTheme,
                         filepath: path.join("docs", pathUnderDocs),
                     });

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);
             }
@@ -106820,6 +106823,35 @@ var pxt;
             return s;
         }
         docs.htmlQuote = htmlQuote;
+        function normalizeStaticMarkdown(markdown) {
+            const lines = markdown.split(/\r?\n/);
+            let codeFenceMarker = "";
+            for (let i = 0; i < lines.length; i++) {
+                const fenceMatch = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(lines[i]);
+                if (fenceMatch) {
+                    const marker = fenceMatch[1];
+                    const trailingText = fenceMatch[2];
+                    const closesCodeFence = !!codeFenceMarker
+                        && marker[0] === codeFenceMarker[0]
+                        && marker.length >= codeFenceMarker.length
+                        && !trailingText.trim();
+                    if (closesCodeFence) {
+                        codeFenceMarker = "";
+                    }
+                    else if (!codeFenceMarker) {
+                        codeFenceMarker = marker;
+                    }
+                    continue;
+                }
+                if (!codeFenceMarker && /^ {0,3}<br\s*\/?>\s*$/i.test(lines[i])) {
+                    // Marked treats a standalone break as inline content, which can extend a
+                    // preceding table or keep the following Markdown in the same paragraph.
+                    lines[i] = "\n<p><br/></p>\n";
+                }
+            }
+            return lines.join("\n");
+        }
+        docs.normalizeStaticMarkdown = normalizeStaticMarkdown;
         // the input already should be HTML-quoted but we want to make sure, and also quote quotes
         function html2Quote(s) {
             if (!s)
@@ -107334,7 +107366,7 @@ ${opts.repo.name.replace(/^pxt-/, '')}=github:${opts.repo.fullName}#${opts.repo.
 \`\`\`
 `;
             //Uses the CmdLink definitions to replace links to YouTube and Vimeo (limited at the moment)
-            markdown = markdown.replace(/^\s*https?:\/\/(\S+)\s*$/mg, (f, lnk) => {
+            markdown = markdown.replace(/^[ \t]*https?:\/\/(\S+)[ \t]*\r?$/mg, (f, lnk) => {
                 for (let ent of links) {
                     let m = ent.rx.exec(lnk);
                     if (m) {
@@ -118852,7 +118884,7 @@ var pxt;
                 this.needsRebuild = true;
             }
         }
-        pushUndo() {
+        pushUndo(protectedAssetId) {
             if (this.undoStack.length && this.committedState.revision === this.state.revision)
                 return;
             this.redoStack = [];
@@ -118866,7 +118898,7 @@ var pxt;
                 entry.assetDiffs[type] = this.state.assets[type].diff(this.committedState.assets[type]);
             }
             this.committedState = this.cloneState();
-            this.cleanupTemporaryAssets();
+            this.cleanupTemporaryAssets(protectedAssetId);
         }
         revision() {
             return this.state.revision;
@@ -119448,9 +119480,9 @@ var pxt;
             }
             return assets;
         }
-        cleanupTemporaryAssets() {
+        cleanupTemporaryAssets(protectedAssetId) {
             const images = this.getAssetCollection("image" /* AssetType.Image */);
-            const orphaned = images.getSnapshot(image => { var _a; return !image.meta.displayName && !((_a = image.meta.blockIDs) === null || _a === void 0 ? void 0 : _a.length); });
+            const orphaned = images.getSnapshot(image => { var _a; return image.id !== protectedAssetId && !image.meta.displayName && !((_a = image.meta.blockIDs) === null || _a === void 0 ? void 0 : _a.length); });
             for (const image of orphaned) {
                 images.removeByID(image.id);
             }
@@ -119735,22 +119767,22 @@ var pxt;
         return new pxt.sprite.TilemapData(tilemap, tileset, layers);
     }
     function cloneAsset(asset, includeEditorData = false) {
-        asset.meta = Object.assign({}, asset.meta);
-        if (asset.meta.temporaryInfo) {
-            asset.meta.temporaryInfo = Object.assign({}, asset.meta.temporaryInfo);
+        const meta = Object.assign({}, asset.meta);
+        if (meta.temporaryInfo) {
+            meta.temporaryInfo = Object.assign({}, meta.temporaryInfo);
         }
         switch (asset.type) {
             case "tile" /* AssetType.Tile */:
             case "image" /* AssetType.Image */:
-                return Object.assign(Object.assign({}, asset), { bitmap: cloneBitmap(asset.bitmap) });
+                return Object.assign(Object.assign({}, asset), { meta, bitmap: cloneBitmap(asset.bitmap) });
             case "animation" /* AssetType.Animation */:
-                return Object.assign(Object.assign({}, asset), { frames: asset.frames.map(frame => cloneBitmap(frame)) });
+                return Object.assign(Object.assign({}, asset), { meta, frames: asset.frames.map(frame => cloneBitmap(frame)) });
             case "tilemap" /* AssetType.Tilemap */:
-                return Object.assign(Object.assign({}, asset), { data: asset.data.cloneData(includeEditorData) });
+                return Object.assign(Object.assign({}, asset), { meta, data: asset.data.cloneData(includeEditorData) });
             case "song" /* AssetType.Song */:
-                return Object.assign(Object.assign({}, asset), { song: pxt.assets.music.cloneSong(asset.song) });
+                return Object.assign(Object.assign({}, asset), { meta, song: pxt.assets.music.cloneSong(asset.song) });
             case "json" /* AssetType.Json */:
-                return Object.assign(Object.assign({}, asset), { data: pxt.U.clone(asset.data) });
+                return Object.assign(Object.assign({}, asset), { meta, data: pxt.U.clone(asset.data) });
         }
     }
     pxt.cloneAsset = cloneAsset;
@@ -150526,7 +150558,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
@@ -157907,8 +157943,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 = {};
@@ -158118,7 +158152,6 @@ var pxsim;
         setSingleSimulator() {
             this.singleSimulator = true;
         }
-        // END TEMPORARY: jacdac simulator
         postMessage(msg, source, frameID) {
             var _a;
             if (this.hwdbg) {
@@ -158132,8 +158165,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);
@@ -158157,7 +158196,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];
@@ -158183,10 +158221,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);
@@ -158207,13 +158241,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) {
@@ -158223,7 +158255,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"
@@ -158248,6 +158279,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;
@@ -164204,7 +164239,7 @@ pxt.docs.requireDOMSanitizer = () => {
         const existing = baseAllowedAttrs[tag] || [];
         return Array.from(new Set([...existing, "class", ...otherAttributes]));
     };
-    const options = Object.assign(Object.assign({}, defaults), { allowedTags: [...allowedTags, "img"], allowedAttributes: Object.assign(Object.assign({}, baseAllowedAttrs), { code: mergeClassAttribute("code"), pre: mergeClassAttribute("pre"), div: mergeClassAttribute("div", "data-youtube", "title") }) });
+    const options = Object.assign(Object.assign({}, defaults), { allowedTags: [...allowedTags, "img"], allowedAttributes: Object.assign(Object.assign({}, baseAllowedAttrs), { code: mergeClassAttribute("code"), pre: mergeClassAttribute("pre"), div: mergeClassAttribute("div", "data-youtube", "title"), img: mergeClassAttribute("img") }) });
     return (html) => sanitizeHtml(html, options);
 };
 let forceCloudBuild = process.env["KS_FORCE_CLOUD"] !== "no";
@@ -166853,7 +166888,7 @@ function renderDocs(builtPackaged, localDir) {
                     nodeutil.writeFileSync(outputFile, patchedMd, { encoding: "utf8" });
                     html = pxt.docs.renderMarkdown({
                         template: docsTemplate,
-                        markdown: patchedMd,
+                        markdown: pxt.docs.normalizeStaticMarkdown(patchedMd),
                         theme: pxt.appTarget.appTheme,
                         filepath: path.join("docs", pathUnderDocs),
                     });

package/built/pxtblocks/fields/field_colour.d.ts

@@ -80,6 +80,7 @@ export declare class FieldColorNumber extends FieldGridDropdown implements Field
      * @returns Height and width.
      */
     getSize(): Blockly.utils.Size;
+    getScaledBBox(): Blockly.utils.Rect;
     /**
      * Updates the colour of the block to reflect whether this is a full
      * block field or not.

package/built/pxtblocks/fields/field_musiceditor.d.ts

@@ -12,5 +12,6 @@ export declare class FieldMusicEditor extends FieldAssetEditor<FieldMusicEditorO
     protected parseFieldOptions(opts: FieldMusicEditorOptions): ParsedFieldMusicEditorOptions;
     protected redrawPreview(): void;
     protected previewWidth(): number;
+    protected shouldInflateAsset(): boolean;
 }
 export {};

package/built/pxtblocks/fields/field_piano_roll.d.ts

@@ -20,5 +20,6 @@ export declare class FieldPianoRoll extends FieldMusicEditor {
     protected onEditorClose(newValue: pxt.Asset): void;
     protected syncTempoField(bpm: number): void;
     protected getTempoField(): Blockly.Field;
+    protected shouldInflateAsset(): boolean;
 }
 export {};

package/built/pxtlib.d.ts

@@ -1267,6 +1267,7 @@ declare namespace pxt.docs {
         parse?: (src: string, options?: any) => string;
     }
     export function htmlQuote(s: string): string;
+    export function normalizeStaticMarkdown(markdown: string): string;
     export function html2Quote(s: string): string;
     export interface BreadcrumbEntry {
         name: string;
@@ -3140,7 +3141,7 @@ declare namespace pxt {
         protected cloneState(): AssetSnapshot;
         undo(): void;
         redo(): void;
-        pushUndo(): void;
+        pushUndo(protectedAssetId?: string): void;
         revision(): number;
         encodeTilemap(tilemap: sprite.TilemapData, id: string): JRes;
         forceUpdate(): void;
@@ -3254,7 +3255,7 @@ declare namespace pxt {
         protected generateNewIDInternal(type: AssetType, varPrefix: string, namespaceString?: string): string;
         protected onChange(): void;
         protected readImages(allJRes: Map<JRes>, isProjectFile?: boolean): (Tile | ProjectImage | Animation | Song | JsonAsset)[];
-        protected cleanupTemporaryAssets(): void;
+        protected cleanupTemporaryAssets(protectedAssetId?: string): void;
         protected getAssetCollection(type: AssetType.Animation, gallery?: boolean): AssetCollection<Animation>;
         protected getAssetCollection(type: AssetType.Image, gallery?: boolean): AssetCollection<ProjectImage>;
         protected getAssetCollection(type: AssetType.Song, gallery?: boolean): AssetCollection<Song>;

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);
             }
@@ -9099,6 +9102,35 @@ var pxt;
             return s;
         }
         docs.htmlQuote = htmlQuote;
+        function normalizeStaticMarkdown(markdown) {
+            const lines = markdown.split(/\r?\n/);
+            let codeFenceMarker = "";
+            for (let i = 0; i < lines.length; i++) {
+                const fenceMatch = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(lines[i]);
+                if (fenceMatch) {
+                    const marker = fenceMatch[1];
+                    const trailingText = fenceMatch[2];
+                    const closesCodeFence = !!codeFenceMarker
+                        && marker[0] === codeFenceMarker[0]
+                        && marker.length >= codeFenceMarker.length
+                        && !trailingText.trim();
+                    if (closesCodeFence) {
+                        codeFenceMarker = "";
+                    }
+                    else if (!codeFenceMarker) {
+                        codeFenceMarker = marker;
+                    }
+                    continue;
+                }
+                if (!codeFenceMarker && /^ {0,3}<br\s*\/?>\s*$/i.test(lines[i])) {
+                    // Marked treats a standalone break as inline content, which can extend a
+                    // preceding table or keep the following Markdown in the same paragraph.
+                    lines[i] = "\n<p><br/></p>\n";
+                }
+            }
+            return lines.join("\n");
+        }
+        docs.normalizeStaticMarkdown = normalizeStaticMarkdown;
         // the input already should be HTML-quoted but we want to make sure, and also quote quotes
         function html2Quote(s) {
             if (!s)
@@ -9613,7 +9645,7 @@ ${opts.repo.name.replace(/^pxt-/, '')}=github:${opts.repo.fullName}#${opts.repo.
 \`\`\`
 `;
             //Uses the CmdLink definitions to replace links to YouTube and Vimeo (limited at the moment)
-            markdown = markdown.replace(/^\s*https?:\/\/(\S+)\s*$/mg, (f, lnk) => {
+            markdown = markdown.replace(/^[ \t]*https?:\/\/(\S+)[ \t]*\r?$/mg, (f, lnk) => {
                 for (let ent of links) {
                     let m = ent.rx.exec(lnk);
                     if (m) {
@@ -21131,7 +21163,7 @@ var pxt;
                 this.needsRebuild = true;
             }
         }
-        pushUndo() {
+        pushUndo(protectedAssetId) {
             if (this.undoStack.length && this.committedState.revision === this.state.revision)
                 return;
             this.redoStack = [];
@@ -21145,7 +21177,7 @@ var pxt;
                 entry.assetDiffs[type] = this.state.assets[type].diff(this.committedState.assets[type]);
             }
             this.committedState = this.cloneState();
-            this.cleanupTemporaryAssets();
+            this.cleanupTemporaryAssets(protectedAssetId);
         }
         revision() {
             return this.state.revision;
@@ -21727,9 +21759,9 @@ var pxt;
             }
             return assets;
         }
-        cleanupTemporaryAssets() {
+        cleanupTemporaryAssets(protectedAssetId) {
             const images = this.getAssetCollection("image" /* AssetType.Image */);
-            const orphaned = images.getSnapshot(image => { var _a; return !image.meta.displayName && !((_a = image.meta.blockIDs) === null || _a === void 0 ? void 0 : _a.length); });
+            const orphaned = images.getSnapshot(image => { var _a; return image.id !== protectedAssetId && !image.meta.displayName && !((_a = image.meta.blockIDs) === null || _a === void 0 ? void 0 : _a.length); });
             for (const image of orphaned) {
                 images.removeByID(image.id);
             }
@@ -22014,22 +22046,22 @@ var pxt;
         return new pxt.sprite.TilemapData(tilemap, tileset, layers);
     }
     function cloneAsset(asset, includeEditorData = false) {
-        asset.meta = Object.assign({}, asset.meta);
-        if (asset.meta.temporaryInfo) {
-            asset.meta.temporaryInfo = Object.assign({}, asset.meta.temporaryInfo);
+        const meta = Object.assign({}, asset.meta);
+        if (meta.temporaryInfo) {
+            meta.temporaryInfo = Object.assign({}, meta.temporaryInfo);
         }
         switch (asset.type) {
             case "tile" /* AssetType.Tile */:
             case "image" /* AssetType.Image */:
-                return Object.assign(Object.assign({}, asset), { bitmap: cloneBitmap(asset.bitmap) });
+                return Object.assign(Object.assign({}, asset), { meta, bitmap: cloneBitmap(asset.bitmap) });
             case "animation" /* AssetType.Animation */:
-                return Object.assign(Object.assign({}, asset), { frames: asset.frames.map(frame => cloneBitmap(frame)) });
+                return Object.assign(Object.assign({}, asset), { meta, frames: asset.frames.map(frame => cloneBitmap(frame)) });
             case "tilemap" /* AssetType.Tilemap */:
-                return Object.assign(Object.assign({}, asset), { data: asset.data.cloneData(includeEditorData) });
+                return Object.assign(Object.assign({}, asset), { meta, data: asset.data.cloneData(includeEditorData) });
             case "song" /* AssetType.Song */:
-                return Object.assign(Object.assign({}, asset), { song: pxt.assets.music.cloneSong(asset.song) });
+                return Object.assign(Object.assign({}, asset), { meta, song: pxt.assets.music.cloneSong(asset.song) });
             case "json" /* AssetType.Json */:
-                return Object.assign(Object.assign({}, asset), { data: pxt.U.clone(asset.data) });
+                return Object.assign(Object.assign({}, asset), { meta, data: pxt.U.clone(asset.data) });
         }
     }
     pxt.cloneAsset = cloneAsset;

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;