pxt-core 8.5.8 → 8.5.10

package/built/pxt.js

@@ -103491,7 +103491,7 @@ var pxt;
         const DEV_BACKEND_PROD = "https://www.makecode.com";
         const DEV_BACKEND_STAGING = "https://staging.pxt.io";
         const DEV_BACKEND_LOCALHOST = "http://localhost:8080";
-        cloud.DEV_BACKEND = DEV_BACKEND_PROD;
+        cloud.DEV_BACKEND = DEV_BACKEND_STAGING;
         function devBackendType() {
             if (cloud.DEV_BACKEND === DEV_BACKEND_PROD)
                 return "prod";
@@ -111404,6 +111404,13 @@ var pxt;
 (function (pxt) {
     var multiplayer;
     (function (multiplayer) {
+        let MultiplayerDevBackendType;
+        (function (MultiplayerDevBackendType) {
+            MultiplayerDevBackendType[MultiplayerDevBackendType["PROD"] = 0] = "PROD";
+            MultiplayerDevBackendType[MultiplayerDevBackendType["STAGING"] = 1] = "STAGING";
+            MultiplayerDevBackendType[MultiplayerDevBackendType["LOCAL"] = 2] = "LOCAL";
+        })(MultiplayerDevBackendType || (MultiplayerDevBackendType = {}));
+        let MULTIPLAYER_DEV_BACKEND_TYPE = MultiplayerDevBackendType.STAGING;
         multiplayer.SHORT_LINKS = {
             PROD: "https://aka.ms/a9",
             PROD_BETA: "https://aka.ms/a9b",
@@ -111413,12 +111420,12 @@ var pxt;
         };
         multiplayer.SHORT_LINK = () => {
             if (pxt.BrowserUtils.isLocalHostDev()) {
-                switch (pxt.cloud.devBackendType()) {
-                    case "prod":
+                switch (MULTIPLAYER_DEV_BACKEND_TYPE) {
+                    case MultiplayerDevBackendType.PROD:
                         return multiplayer.SHORT_LINKS.PROD_BETA;
-                    case "staging":
+                    case MultiplayerDevBackendType.STAGING:
                         return multiplayer.SHORT_LINKS.STAGING_BETA;
-                    case "localhost":
+                    case MultiplayerDevBackendType.LOCAL:
                         return multiplayer.SHORT_LINKS.LOCAL;
                 }
             }
@@ -111685,7 +111692,7 @@ var pxt;
              *     notes byte length
              *     ...note events
              *
-             * instrument(27 bytes)
+             * instrument(28 bytes)
              *     0 waveform
              *     1 amp attack
              *     3 amp decay
@@ -111701,6 +111708,7 @@ var pxt;
              *     22 amp lfo amp
              *     24 pitch lfo freq
              *     25 pitch lfo amp
+             *     27 octave
              *
              * drum(5 + 7 * steps bytes)
              *     0 steps
@@ -111720,6 +111728,12 @@ var pxt;
              *     4 polyphony
              *     5...notes(1 byte each)
              *
+             * note (1 byte)
+             *     lower six bits = note - (instrumentOctave - 2) * 12
+             *     upper two bits are the enharmonic spelling:
+             *          0 = normal
+             *          1 = flat
+             *          2 = sharp
              */
             function encodeSong(song) {
                 const encodedTracks = song.tracks
@@ -111774,6 +111788,7 @@ var pxt;
                 set16BitNumber(out, 22, ((_g = instrument.ampLFO) === null || _g === void 0 ? void 0 : _g.amplitude) || 0);
                 out[24] = ((_h = instrument.pitchLFO) === null || _h === void 0 ? void 0 : _h.frequency) || 0;
                 set16BitNumber(out, 25, ((_j = instrument.pitchLFO) === null || _j === void 0 ? void 0 : _j.amplitude) || 0);
+                out[27] = instrument.octave;
                 return out;
             }
             function decodeInstrument(buf, offset) {
@@ -111800,7 +111815,8 @@ var pxt;
                     pitchLFO: {
                         frequency: buf[offset + 24],
                         amplitude: get16BitNumber(buf, 25)
-                    }
+                    },
+                    octave: buf[offset + 27]
                 };
             }
             function decodeTrack(buf, offset) {
@@ -111840,27 +111856,54 @@ var pxt;
                 }
                 return res;
             }
-            function encodeNoteEvent(event) {
+            function encodeNoteEvent(event, instrumentOctave, isDrumTrack) {
                 const out = new Uint8Array(5 + event.notes.length);
                 set16BitNumber(out, 0, event.startTick);
                 set16BitNumber(out, 2, event.endTick);
                 out[4] = event.notes.length;
                 for (let i = 0; i < event.notes.length; i++) {
-                    out[5 + i] = event.notes[i];
+                    out[5 + i] = encodeNote(event.notes[i], instrumentOctave, isDrumTrack);
                 }
                 return out;
             }
-            function decodeNoteEvent(buf, offset) {
+            function decodeNoteEvent(buf, offset, instrumentOctave, isDrumTrack) {
                 const res = {
                     startTick: get16BitNumber(buf, offset),
                     endTick: get16BitNumber(buf, offset + 2),
                     notes: []
                 };
                 for (let i = 0; i < buf[offset + 4]; i++) {
-                    res.notes.push(buf[offset + 5 + i]);
+                    res.notes.push(decodeNote(buf[offset + 5 + i], instrumentOctave, isDrumTrack));
                 }
                 return res;
             }
+            function encodeNote(note, instrumentOctave, isDrumTrack) {
+                if (isDrumTrack) {
+                    return note.note;
+                }
+                let flags = 0;
+                if (note.enharmonicSpelling === "flat") {
+                    flags = 1;
+                }
+                else if (note.enharmonicSpelling === "sharp") {
+                    flags = 2;
+                }
+                return (note.note - (instrumentOctave - 2) * 12) | (flags << 6);
+            }
+            function decodeNote(note, instrumentOctave, isDrumTrack) {
+                const flags = note >> 6;
+                const result = {
+                    note: isDrumTrack ? note : ((note & 0x3f) + (instrumentOctave - 2) * 12),
+                    enharmonicSpelling: "normal"
+                };
+                if (flags === 1) {
+                    result.enharmonicSpelling = "flat";
+                }
+                else if (flags === 2) {
+                    result.enharmonicSpelling = "sharp";
+                }
+                return result;
+            }
             function encodeTrack(track) {
                 if (track.drums)
                     return encodeDrumTrack(track);
@@ -111868,7 +111911,7 @@ var pxt;
             }
             function encodeMelodicTrack(track) {
                 const encodedInstrument = encodeInstrument(track.instrument);
-                const encodedNotes = track.notes.map(encodeNoteEvent);
+                const encodedNotes = track.notes.map(note => encodeNoteEvent(note, track.instrument.octave, false));
                 const noteLength = encodedNotes.reduce((d, c) => c.length + d, 0);
                 const out = new Uint8Array(6 + encodedInstrument.length + noteLength);
                 out[0] = track.id;
@@ -111895,7 +111938,7 @@ var pxt;
                 const noteLength = get16BitNumber(buf, noteStart);
                 let currentOffset = noteStart + 2;
                 while (currentOffset < noteStart + 2 + noteLength) {
-                    res.notes.push(decodeNoteEvent(buf, currentOffset));
+                    res.notes.push(decodeNoteEvent(buf, currentOffset, res.instrument.octave, false));
                     currentOffset += 5 + res.notes[res.notes.length - 1].notes.length;
                 }
                 return [res, currentOffset];
@@ -111903,7 +111946,7 @@ var pxt;
             function encodeDrumTrack(track) {
                 const encodedDrums = track.drums.map(encodeDrumInstrument);
                 const drumLength = encodedDrums.reduce((d, c) => c.length + d, 0);
-                const encodedNotes = track.notes.map(encodeNoteEvent);
+                const encodedNotes = track.notes.map(note => encodeNoteEvent(note, 0, true));
                 const noteLength = encodedNotes.reduce((d, c) => c.length + d, 0);
                 const out = new Uint8Array(6 + drumLength + noteLength);
                 out[0] = track.id;
@@ -111938,7 +111981,7 @@ var pxt;
                 const noteLength = get16BitNumber(buf, currentOffset);
                 currentOffset += 2;
                 while (currentOffset < offset + 4 + drumByteLength + noteLength) {
-                    res.notes.push(decodeNoteEvent(buf, currentOffset));
+                    res.notes.push(decodeNoteEvent(buf, currentOffset, 0, true));
                     currentOffset += 5 + res.notes[res.notes.length - 1].notes.length;
                 }
                 return [res, currentOffset];
@@ -112005,6 +112048,27 @@ var pxt;
                     tracks: [
                         {
                             id: 0,
+                            name: lf("Dog"),
+                            notes: [],
+                            iconURI: "/static/music-editor/dog.png",
+                            instrument: {
+                                waveform: 1,
+                                octave: 4,
+                                ampEnvelope: {
+                                    attack: 10,
+                                    decay: 100,
+                                    sustain: 500,
+                                    release: 100,
+                                    amplitude: 1024
+                                },
+                                pitchLFO: {
+                                    frequency: 5,
+                                    amplitude: 0
+                                }
+                            }
+                        },
+                        {
+                            id: 1,
                             name: lf("Duck"),
                             notes: [],
                             iconURI: "/static/music-editor/duck.png",
@@ -112036,7 +112100,7 @@ var pxt;
                             }
                         },
                         {
-                            id: 1,
+                            id: 2,
                             name: lf("Cat"),
                             notes: [],
                             iconURI: "/static/music-editor/cat.png",
@@ -112063,27 +112127,6 @@ var pxt;
                                 }
                             }
                         },
-                        {
-                            id: 2,
-                            name: lf("Dog"),
-                            notes: [],
-                            iconURI: "/static/music-editor/dog.png",
-                            instrument: {
-                                waveform: 1,
-                                octave: 4,
-                                ampEnvelope: {
-                                    attack: 10,
-                                    decay: 100,
-                                    sustain: 500,
-                                    release: 100,
-                                    amplitude: 1024
-                                },
-                                pitchLFO: {
-                                    frequency: 5,
-                                    amplitude: 0
-                                }
-                            }
-                        },
                         {
                             id: 3,
                             name: lf("Fish"),
@@ -117267,6 +117310,7 @@ var pxt;
                 const isProject = dep.id === "this";
                 const images = this.readImages(dep.parseJRes(), isProject);
                 for (const image of images) {
+                    image.meta.package = dep.id;
                     if (image.type === "tile" /* AssetType.Tile */) {
                         if (isProject) {
                             this.state.tiles.add(image);
@@ -117308,7 +117352,8 @@ var pxt;
                     id: tm.id,
                     meta: {
                         // For tilemaps, use the id as the display name for backwards compat
-                        displayName: tm.displayName || tm.id
+                        displayName: tm.displayName || tm.id,
+                        package: pack.id
                     },
                     data: decodeTilemap(tm, id => this.resolveTile(id))
                 });

package/built/pxtblockly.js

@@ -17365,7 +17365,7 @@ var pxtblockly;
                 if (col > cellsShown)
                     break;
                 for (const note of noteEvent.notes) {
-                    const row = 12 - (note % 12);
+                    const row = 12 - (note.note % 12);
                     if (row > notesShown)
                         continue;
                     context.fillStyle = colors[trackColors[track.id || song.tracks.indexOf(track)]];

package/built/pxtblocks.js

@@ -13803,7 +13803,7 @@ var pxtblockly;
                 if (col > cellsShown)
                     break;
                 for (const note of noteEvent.notes) {
-                    const row = 12 - (note % 12);
+                    const row = 12 - (note.note % 12);
                     if (row > notesShown)
                         continue;
                     context.fillStyle = colors[trackColors[track.id || song.tracks.indexOf(track)]];

package/built/pxtlib.d.ts

@@ -1829,10 +1829,14 @@ declare namespace pxt.assets.music {
         notes: NoteEvent[];
     }
     interface NoteEvent {
-        notes: number[];
+        notes: Note[];
         startTick: number;
         endTick: number;
     }
+    interface Note {
+        note: number;
+        enharmonicSpelling: "normal" | "flat" | "sharp";
+    }
     interface DrumSoundStep {
         waveform: number;
         frequency: number;
@@ -2713,6 +2717,7 @@ declare namespace pxt {
         tags?: string[];
         blockIDs?: string[];
         temporaryInfo?: TemporaryAssetInfo;
+        package?: string;
     }
     export interface TemporaryAssetInfo {
         blockId: string;

package/built/pxtlib.js

@@ -5805,7 +5805,7 @@ var pxt;
         const DEV_BACKEND_PROD = "https://www.makecode.com";
         const DEV_BACKEND_STAGING = "https://staging.pxt.io";
         const DEV_BACKEND_LOCALHOST = "http://localhost:8080";
-        cloud.DEV_BACKEND = DEV_BACKEND_PROD;
+        cloud.DEV_BACKEND = DEV_BACKEND_STAGING;
         function devBackendType() {
             if (cloud.DEV_BACKEND === DEV_BACKEND_PROD)
                 return "prod";
@@ -13718,6 +13718,13 @@ var pxt;
 (function (pxt) {
     var multiplayer;
     (function (multiplayer) {
+        let MultiplayerDevBackendType;
+        (function (MultiplayerDevBackendType) {
+            MultiplayerDevBackendType[MultiplayerDevBackendType["PROD"] = 0] = "PROD";
+            MultiplayerDevBackendType[MultiplayerDevBackendType["STAGING"] = 1] = "STAGING";
+            MultiplayerDevBackendType[MultiplayerDevBackendType["LOCAL"] = 2] = "LOCAL";
+        })(MultiplayerDevBackendType || (MultiplayerDevBackendType = {}));
+        let MULTIPLAYER_DEV_BACKEND_TYPE = MultiplayerDevBackendType.STAGING;
         multiplayer.SHORT_LINKS = {
             PROD: "https://aka.ms/a9",
             PROD_BETA: "https://aka.ms/a9b",
@@ -13727,12 +13734,12 @@ var pxt;
         };
         multiplayer.SHORT_LINK = () => {
             if (pxt.BrowserUtils.isLocalHostDev()) {
-                switch (pxt.cloud.devBackendType()) {
-                    case "prod":
+                switch (MULTIPLAYER_DEV_BACKEND_TYPE) {
+                    case MultiplayerDevBackendType.PROD:
                         return multiplayer.SHORT_LINKS.PROD_BETA;
-                    case "staging":
+                    case MultiplayerDevBackendType.STAGING:
                         return multiplayer.SHORT_LINKS.STAGING_BETA;
-                    case "localhost":
+                    case MultiplayerDevBackendType.LOCAL:
                         return multiplayer.SHORT_LINKS.LOCAL;
                 }
             }
@@ -13999,7 +14006,7 @@ var pxt;
              *     notes byte length
              *     ...note events
              *
-             * instrument(27 bytes)
+             * instrument(28 bytes)
              *     0 waveform
              *     1 amp attack
              *     3 amp decay
@@ -14015,6 +14022,7 @@ var pxt;
              *     22 amp lfo amp
              *     24 pitch lfo freq
              *     25 pitch lfo amp
+             *     27 octave
              *
              * drum(5 + 7 * steps bytes)
              *     0 steps
@@ -14034,6 +14042,12 @@ var pxt;
              *     4 polyphony
              *     5...notes(1 byte each)
              *
+             * note (1 byte)
+             *     lower six bits = note - (instrumentOctave - 2) * 12
+             *     upper two bits are the enharmonic spelling:
+             *          0 = normal
+             *          1 = flat
+             *          2 = sharp
              */
             function encodeSong(song) {
                 const encodedTracks = song.tracks
@@ -14088,6 +14102,7 @@ var pxt;
                 set16BitNumber(out, 22, ((_g = instrument.ampLFO) === null || _g === void 0 ? void 0 : _g.amplitude) || 0);
                 out[24] = ((_h = instrument.pitchLFO) === null || _h === void 0 ? void 0 : _h.frequency) || 0;
                 set16BitNumber(out, 25, ((_j = instrument.pitchLFO) === null || _j === void 0 ? void 0 : _j.amplitude) || 0);
+                out[27] = instrument.octave;
                 return out;
             }
             function decodeInstrument(buf, offset) {
@@ -14114,7 +14129,8 @@ var pxt;
                     pitchLFO: {
                         frequency: buf[offset + 24],
                         amplitude: get16BitNumber(buf, 25)
-                    }
+                    },
+                    octave: buf[offset + 27]
                 };
             }
             function decodeTrack(buf, offset) {
@@ -14154,27 +14170,54 @@ var pxt;
                 }
                 return res;
             }
-            function encodeNoteEvent(event) {
+            function encodeNoteEvent(event, instrumentOctave, isDrumTrack) {
                 const out = new Uint8Array(5 + event.notes.length);
                 set16BitNumber(out, 0, event.startTick);
                 set16BitNumber(out, 2, event.endTick);
                 out[4] = event.notes.length;
                 for (let i = 0; i < event.notes.length; i++) {
-                    out[5 + i] = event.notes[i];
+                    out[5 + i] = encodeNote(event.notes[i], instrumentOctave, isDrumTrack);
                 }
                 return out;
             }
-            function decodeNoteEvent(buf, offset) {
+            function decodeNoteEvent(buf, offset, instrumentOctave, isDrumTrack) {
                 const res = {
                     startTick: get16BitNumber(buf, offset),
                     endTick: get16BitNumber(buf, offset + 2),
                     notes: []
                 };
                 for (let i = 0; i < buf[offset + 4]; i++) {
-                    res.notes.push(buf[offset + 5 + i]);
+                    res.notes.push(decodeNote(buf[offset + 5 + i], instrumentOctave, isDrumTrack));
                 }
                 return res;
             }
+            function encodeNote(note, instrumentOctave, isDrumTrack) {
+                if (isDrumTrack) {
+                    return note.note;
+                }
+                let flags = 0;
+                if (note.enharmonicSpelling === "flat") {
+                    flags = 1;
+                }
+                else if (note.enharmonicSpelling === "sharp") {
+                    flags = 2;
+                }
+                return (note.note - (instrumentOctave - 2) * 12) | (flags << 6);
+            }
+            function decodeNote(note, instrumentOctave, isDrumTrack) {
+                const flags = note >> 6;
+                const result = {
+                    note: isDrumTrack ? note : ((note & 0x3f) + (instrumentOctave - 2) * 12),
+                    enharmonicSpelling: "normal"
+                };
+                if (flags === 1) {
+                    result.enharmonicSpelling = "flat";
+                }
+                else if (flags === 2) {
+                    result.enharmonicSpelling = "sharp";
+                }
+                return result;
+            }
             function encodeTrack(track) {
                 if (track.drums)
                     return encodeDrumTrack(track);
@@ -14182,7 +14225,7 @@ var pxt;
             }
             function encodeMelodicTrack(track) {
                 const encodedInstrument = encodeInstrument(track.instrument);
-                const encodedNotes = track.notes.map(encodeNoteEvent);
+                const encodedNotes = track.notes.map(note => encodeNoteEvent(note, track.instrument.octave, false));
                 const noteLength = encodedNotes.reduce((d, c) => c.length + d, 0);
                 const out = new Uint8Array(6 + encodedInstrument.length + noteLength);
                 out[0] = track.id;
@@ -14209,7 +14252,7 @@ var pxt;
                 const noteLength = get16BitNumber(buf, noteStart);
                 let currentOffset = noteStart + 2;
                 while (currentOffset < noteStart + 2 + noteLength) {
-                    res.notes.push(decodeNoteEvent(buf, currentOffset));
+                    res.notes.push(decodeNoteEvent(buf, currentOffset, res.instrument.octave, false));
                     currentOffset += 5 + res.notes[res.notes.length - 1].notes.length;
                 }
                 return [res, currentOffset];
@@ -14217,7 +14260,7 @@ var pxt;
             function encodeDrumTrack(track) {
                 const encodedDrums = track.drums.map(encodeDrumInstrument);
                 const drumLength = encodedDrums.reduce((d, c) => c.length + d, 0);
-                const encodedNotes = track.notes.map(encodeNoteEvent);
+                const encodedNotes = track.notes.map(note => encodeNoteEvent(note, 0, true));
                 const noteLength = encodedNotes.reduce((d, c) => c.length + d, 0);
                 const out = new Uint8Array(6 + drumLength + noteLength);
                 out[0] = track.id;
@@ -14252,7 +14295,7 @@ var pxt;
                 const noteLength = get16BitNumber(buf, currentOffset);
                 currentOffset += 2;
                 while (currentOffset < offset + 4 + drumByteLength + noteLength) {
-                    res.notes.push(decodeNoteEvent(buf, currentOffset));
+                    res.notes.push(decodeNoteEvent(buf, currentOffset, 0, true));
                     currentOffset += 5 + res.notes[res.notes.length - 1].notes.length;
                 }
                 return [res, currentOffset];
@@ -14319,6 +14362,27 @@ var pxt;
                     tracks: [
                         {
                             id: 0,
+                            name: lf("Dog"),
+                            notes: [],
+                            iconURI: "/static/music-editor/dog.png",
+                            instrument: {
+                                waveform: 1,
+                                octave: 4,
+                                ampEnvelope: {
+                                    attack: 10,
+                                    decay: 100,
+                                    sustain: 500,
+                                    release: 100,
+                                    amplitude: 1024
+                                },
+                                pitchLFO: {
+                                    frequency: 5,
+                                    amplitude: 0
+                                }
+                            }
+                        },
+                        {
+                            id: 1,
                             name: lf("Duck"),
                             notes: [],
                             iconURI: "/static/music-editor/duck.png",
@@ -14350,7 +14414,7 @@ var pxt;
                             }
                         },
                         {
-                            id: 1,
+                            id: 2,
                             name: lf("Cat"),
                             notes: [],
                             iconURI: "/static/music-editor/cat.png",
@@ -14377,27 +14441,6 @@ var pxt;
                                 }
                             }
                         },
-                        {
-                            id: 2,
-                            name: lf("Dog"),
-                            notes: [],
-                            iconURI: "/static/music-editor/dog.png",
-                            instrument: {
-                                waveform: 1,
-                                octave: 4,
-                                ampEnvelope: {
-                                    attack: 10,
-                                    decay: 100,
-                                    sustain: 500,
-                                    release: 100,
-                                    amplitude: 1024
-                                },
-                                pitchLFO: {
-                                    frequency: 5,
-                                    amplitude: 0
-                                }
-                            }
-                        },
                         {
                             id: 3,
                             name: lf("Fish"),
@@ -19581,6 +19624,7 @@ var pxt;
                 const isProject = dep.id === "this";
                 const images = this.readImages(dep.parseJRes(), isProject);
                 for (const image of images) {
+                    image.meta.package = dep.id;
                     if (image.type === "tile" /* AssetType.Tile */) {
                         if (isProject) {
                             this.state.tiles.add(image);
@@ -19622,7 +19666,8 @@ var pxt;
                     id: tm.id,
                     meta: {
                         // For tilemaps, use the id as the display name for backwards compat
-                        displayName: tm.displayName || tm.id
+                        displayName: tm.displayName || tm.id,
+                        package: pack.id
                     },
                     data: decodeTilemap(tm, id => this.resolveTile(id))
                 });