pxt-core 7.5.14 → 7.5.15

package/built/pxt.js

@@ -153626,9 +153626,19 @@ var pxsim;
         let _mute = false; //mute audio
         // for playing WAV
         let audio;
+        const channels = [];
+        // All other nodes get connected to this node which is connected to the actual
+        // destination. Used for muting
+        let destination;
         function context() {
-            if (!_context)
+            if (!_context) {
                 _context = freshContext();
+                if (_context) {
+                    destination = _context.createGain();
+                    destination.connect(_context.destination);
+                    destination.gain.setValueAtTime(1, 0);
+                }
+            }
             return _context;
         }
         function freshContext() {
@@ -153645,8 +153655,13 @@ var pxsim;
         }
         function mute(mute) {
             _mute = mute;
-            stopAll();
             const ctx = context();
+            if (mute) {
+                destination.gain.setTargetAtTime(0, ctx.currentTime, 0.015);
+            }
+            else {
+                destination.gain.setTargetAtTime(1, ctx.currentTime, 0.015);
+            }
             if (!mute && ctx && ctx.state === "suspended")
                 ctx.resume();
         }
@@ -153840,9 +153855,8 @@ var pxsim;
                 node.playbackRate.value = hz / (context().sampleRate / 1024);
             return node;
         }
-        const channels = [];
         class Channel {
-            mute() {
+            disconnectNodes() {
                 if (this.gain)
                     disconnectVca(this.gain, this.generator);
                 else if (this.generator) {
@@ -153856,7 +153870,7 @@ var pxsim;
                 const idx = channels.indexOf(this);
                 if (idx >= 0)
                     channels.splice(idx, 1);
-                this.mute();
+                this.disconnectNodes();
             }
         }
         let instrStopId = 1;
@@ -153890,7 +153904,7 @@ var pxsim;
             /** Square waves are perceved as much louder than other sounds, so scale it down a bit to make it less jarring **/
             const scaleVol = (n, isSqWave) => (n / 1024) / 4 * (isSqWave ? .5 : 1);
             const finish = () => {
-                ch.mute();
+                ch.disconnectNodes();
                 timeOff = 0;
                 currWave = -1;
                 currFreq = -1;
@@ -153918,7 +153932,7 @@ var pxsim;
                             return loopAsync();
                         });
                     }
-                    ch.generator = _mute ? null : getGenerator(soundWaveIdx, freq);
+                    ch.generator = getGenerator(soundWaveIdx, freq);
                     if (!ch.generator)
                         return pxsim.U.delay(duration);
                     currWave = soundWaveIdx;
@@ -153940,7 +153954,7 @@ var pxsim;
                         }
                     }
                     ch.generator.connect(ch.gain);
-                    ch.gain.connect(ctx.destination);
+                    ch.gain.connect(destination);
                     ch.generator.start();
                 }
                 idx += 12;
@@ -153973,7 +153987,7 @@ var pxsim;
                     _vca.gain.value = 0;
                     _vco.type = 'triangle';
                     _vco.connect(_vca);
-                    _vca.connect(ctx.destination);
+                    _vca.connect(destination);
                     _vco.start(0);
                 }
                 setCurrentToneGain(gain);
@@ -153989,7 +154003,7 @@ var pxsim;
         AudioContextManager.tone = tone;
         function setCurrentToneGain(gain) {
             if (_vca === null || _vca === void 0 ? void 0 : _vca.gain) {
-                _vca.gain.setTargetAtTime(_mute ? 0 : gain, _context.currentTime, 0.015);
+                _vca.gain.setTargetAtTime(gain, _context.currentTime, 0.015);
             }
         }
         AudioContextManager.setCurrentToneGain = setCurrentToneGain;
@@ -154026,13 +154040,30 @@ var pxsim;
                 let nodes = [];
                 let nextTime = context().currentTime;
                 let allScheduled = false;
+                const channel = new Channel();
+                channel.gain = context().createGain();
+                channel.gain.gain.value = 0;
+                channel.gain.gain.setValueAtTime(volume, context().currentTime);
+                channel.gain.connect(destination);
+                if (channels.length > 5)
+                    channels[0].remove();
+                channels.push(channel);
+                const checkCancel = () => {
+                    if (isCancelled && isCancelled() || !channel.gain) {
+                        if (resolve)
+                            resolve();
+                        resolve = undefined;
+                        channel.remove();
+                        return true;
+                    }
+                    return false;
+                };
                 // Every time we pull a buffer, schedule a node in the future to play it.
                 // Scheduling the nodes ahead of time sounds much smoother than trying to
                 // do it when the previous node completes (which sounds SUPER choppy in
                 // FireFox).
                 function playNext() {
-                    const cancelled = isCancelled && isCancelled();
-                    while (!allScheduled && nodes.length < MAX_SCHEDULED_BUFFER_NODES && !cancelled) {
+                    while (!allScheduled && nodes.length < MAX_SCHEDULED_BUFFER_NODES && !checkCancel()) {
                         const data = pull();
                         if (!data || !data.length) {
                             allScheduled = true;
@@ -154048,6 +154079,8 @@ var pxsim;
                     }
                 }
                 function play(data) {
+                    if (checkCancel())
+                        return;
                     const buff = context().createBuffer(1, data.length, sampleRate);
                     if (buff.copyToChannel) {
                         buff.copyToChannel(data, 0);
@@ -154070,15 +154103,6 @@ var pxsim;
                     newNode.start(nextTime);
                     nextTime += buff.duration;
                 }
-                const channel = new Channel();
-                channel.gain = context().createGain();
-                channel.gain.gain.value = 0;
-                if (!_mute)
-                    channel.gain.gain.setValueAtTime(volume, context().currentTime);
-                channel.gain.connect(context().destination);
-                if (channels.length > 5)
-                    channels[0].remove();
-                channels.push(channel);
                 playNext();
             });
         }
@@ -155103,18 +155127,62 @@ var pxsim;
                     result = "0" + result;
                 return result;
             }
-            let soundPromise;
+            let playing = false;
+            let soundQueue;
+            let cancellationToken = {
+                cancelled: false
+            };
             function __playSoundExpression(notes, waitTillDone) {
+                if (!soundQueue)
+                    soundQueue = [];
                 const cb = pxsim.getResume();
-                if (!soundPromise)
-                    soundPromise = Promise.resolve();
-                soundPromise = soundPromise.then(() => playSoundExpressionAsync(notes));
+                const soundPromise = new Promise((resolve, reject) => {
+                    soundQueue.push({
+                        notes,
+                        onFinished: resolve,
+                        onCancelled: reject
+                    });
+                });
+                if (!playing) {
+                    playNextSoundAsync();
+                }
                 if (!waitTillDone)
                     cb();
                 else
-                    soundPromise = soundPromise.then(cb);
+                    soundPromise.then(cb);
             }
             music.__playSoundExpression = __playSoundExpression;
+            async function playNextSoundAsync() {
+                if (soundQueue.length) {
+                    playing = true;
+                    const sound = soundQueue.shift();
+                    let currentToken = cancellationToken;
+                    try {
+                        await playSoundExpressionAsync(sound.notes, () => currentToken.cancelled);
+                        if (currentToken.cancelled) {
+                            sound.onCancelled();
+                        }
+                        else {
+                            sound.onFinished();
+                        }
+                    }
+                    catch (_a) {
+                        sound.onCancelled();
+                    }
+                    playNextSoundAsync();
+                }
+                else {
+                    playing = false;
+                }
+            }
+            function clearSoundQueue() {
+                soundQueue = [];
+                cancellationToken.cancelled = true;
+                cancellationToken = {
+                    cancelled: false
+                };
+            }
+            music.clearSoundQueue = clearSoundQueue;
             function playSoundExpressionAsync(notes, isCancelled, onPull) {
                 const synth = new music.SoundEmojiSynthesizer(0);
                 const soundEffects = parseSoundEffects(notes);
@@ -155146,6 +155214,7 @@ var pxsim;
             }
             music.playSoundExpressionAsync = playSoundExpressionAsync;
             function __stopSoundExpressions() {
+                clearSoundQueue();
                 pxsim.AudioContextManager.stopAll();
             }
             music.__stopSoundExpressions = __stopSoundExpressions;

package/built/pxtblockly.js

@@ -7828,6 +7828,7 @@ var pxt;
                         return;
                     }
                 }
+                const hasInput = (name) => { var _a; return (_a = block.inputList) === null || _a === void 0 ? void 0 : _a.some(i => i.name === name); };
                 inputs.forEach(inputParts => {
                     const fields = [];
                     let inputName;
@@ -7976,12 +7977,19 @@ var pxt;
                     });
                     let input;
                     if (inputName) {
+                        // Don't add duplicate inputs
+                        if (hasInput(inputName))
+                            return;
                         input = block.appendValueInput(inputName);
                         input.setAlign(Blockly.ALIGN_LEFT);
                     }
                     else if (expanded) {
                         const prefix = hasParameter ? blocks_4.optionalInputWithFieldPrefix : blocks_4.optionalDummyInputPrefix;
-                        input = block.appendDummyInput(prefix + (anonIndex++));
+                        inputName = prefix + (anonIndex++);
+                        // Don't add duplicate inputs
+                        if (hasInput(inputName))
+                            return;
+                        input = block.appendDummyInput(inputName);
                     }
                     else {
                         input = block.appendDummyInput();
@@ -15149,6 +15157,7 @@ var pxtblockly;
     class FieldSoundEffect extends pxtblockly.FieldBase {
         constructor() {
             super(...arguments);
+            this.registeredChangeListener = false;
             this.onWorkspaceChange = (ev) => {
                 if (ev.type !== Blockly.Events.CHANGE)
                     return;
@@ -15178,10 +15187,19 @@ var pxtblockly;
             if (!this.options.effectFieldName)
                 this.options.effectFieldName = "effect";
             this.redrawPreview();
-            this.sourceBlock_.workspace.addChangeListener(this.onWorkspaceChange);
+            if (this.sourceBlock_.workspace) {
+                this.workspace = this.sourceBlock_.workspace;
+                if (!this.sourceBlock_.isShadow() && !this.sourceBlock_.isInsertionMarker()) {
+                    this.registeredChangeListener = true;
+                    this.workspace.addChangeListener(this.onWorkspaceChange);
+                }
+            }
         }
         onDispose() {
-            this.sourceBlock_.workspace.removeChangeListener(this.onWorkspaceChange);
+            if (this.workspace && this.registeredChangeListener) {
+                this.workspace.removeChangeListener(this.onWorkspaceChange);
+                this.registeredChangeListener = false;
+            }
         }
         onValueChanged(newValue) {
             return newValue;
@@ -15347,7 +15365,7 @@ var pxtblockly;
         render_() {
             super.render_();
             this.size_.height = TOTAL_HEIGHT + Y_PADDING * 2;
-            this.size_.width = TOTAL_WIDTH;
+            this.size_.width = TOTAL_WIDTH + X_PADDING;
         }
         updateSiblingBlocks(sound) {
             this.setNumberInputValue(this.options.durationInputName, sound.duration);

package/built/pxtblocks.d.ts

@@ -1145,6 +1145,8 @@ declare namespace pxtblockly {
     class FieldSoundEffect extends FieldBase<FieldSoundEffectParams> {
         protected mostRecentValue: pxt.assets.Sound;
         protected drawnSound: pxt.assets.Sound;
+        protected workspace: Blockly.Workspace;
+        protected registeredChangeListener: boolean;
         protected onInit(): void;
         protected onDispose(): void;
         protected onValueChanged(newValue: string): string;

package/built/pxtblocks.js

@@ -4266,6 +4266,7 @@ var pxt;
                         return;
                     }
                 }
+                const hasInput = (name) => { var _a; return (_a = block.inputList) === null || _a === void 0 ? void 0 : _a.some(i => i.name === name); };
                 inputs.forEach(inputParts => {
                     const fields = [];
                     let inputName;
@@ -4414,12 +4415,19 @@ var pxt;
                     });
                     let input;
                     if (inputName) {
+                        // Don't add duplicate inputs
+                        if (hasInput(inputName))
+                            return;
                         input = block.appendValueInput(inputName);
                         input.setAlign(Blockly.ALIGN_LEFT);
                     }
                     else if (expanded) {
                         const prefix = hasParameter ? blocks_4.optionalInputWithFieldPrefix : blocks_4.optionalDummyInputPrefix;
-                        input = block.appendDummyInput(prefix + (anonIndex++));
+                        inputName = prefix + (anonIndex++);
+                        // Don't add duplicate inputs
+                        if (hasInput(inputName))
+                            return;
+                        input = block.appendDummyInput(inputName);
                     }
                     else {
                         input = block.appendDummyInput();
@@ -11587,6 +11595,7 @@ var pxtblockly;
     class FieldSoundEffect extends pxtblockly.FieldBase {
         constructor() {
             super(...arguments);
+            this.registeredChangeListener = false;
             this.onWorkspaceChange = (ev) => {
                 if (ev.type !== Blockly.Events.CHANGE)
                     return;
@@ -11616,10 +11625,19 @@ var pxtblockly;
             if (!this.options.effectFieldName)
                 this.options.effectFieldName = "effect";
             this.redrawPreview();
-            this.sourceBlock_.workspace.addChangeListener(this.onWorkspaceChange);
+            if (this.sourceBlock_.workspace) {
+                this.workspace = this.sourceBlock_.workspace;
+                if (!this.sourceBlock_.isShadow() && !this.sourceBlock_.isInsertionMarker()) {
+                    this.registeredChangeListener = true;
+                    this.workspace.addChangeListener(this.onWorkspaceChange);
+                }
+            }
         }
         onDispose() {
-            this.sourceBlock_.workspace.removeChangeListener(this.onWorkspaceChange);
+            if (this.workspace && this.registeredChangeListener) {
+                this.workspace.removeChangeListener(this.onWorkspaceChange);
+                this.registeredChangeListener = false;
+            }
         }
         onValueChanged(newValue) {
             return newValue;
@@ -11785,7 +11803,7 @@ var pxtblockly;
         render_() {
             super.render_();
             this.size_.height = TOTAL_HEIGHT + Y_PADDING * 2;
-            this.size_.width = TOTAL_WIDTH;
+            this.size_.width = TOTAL_WIDTH + X_PADDING;
         }
         updateSiblingBlocks(sound) {
             this.setNumberInputValue(this.options.durationInputName, sound.duration);

package/built/pxtsim.d.ts

@@ -1728,6 +1728,7 @@ declare namespace pxsim.codal.music {
         protected getValue(offset: number, length: number): number;
     }
     function __playSoundExpression(notes: string, waitTillDone: boolean): void;
+    function clearSoundQueue(): void;
     function playSoundExpressionAsync(notes: string, isCancelled?: () => boolean, onPull?: (freq: number, volume: number) => void): Promise<void>;
     function __stopSoundExpressions(): void;
     interface TonePrint {

package/built/pxtsim.js

@@ -6973,9 +6973,19 @@ var pxsim;
         let _mute = false; //mute audio
         // for playing WAV
         let audio;
+        const channels = [];
+        // All other nodes get connected to this node which is connected to the actual
+        // destination. Used for muting
+        let destination;
         function context() {
-            if (!_context)
+            if (!_context) {
                 _context = freshContext();
+                if (_context) {
+                    destination = _context.createGain();
+                    destination.connect(_context.destination);
+                    destination.gain.setValueAtTime(1, 0);
+                }
+            }
             return _context;
         }
         function freshContext() {
@@ -6992,8 +7002,13 @@ var pxsim;
         }
         function mute(mute) {
             _mute = mute;
-            stopAll();
             const ctx = context();
+            if (mute) {
+                destination.gain.setTargetAtTime(0, ctx.currentTime, 0.015);
+            }
+            else {
+                destination.gain.setTargetAtTime(1, ctx.currentTime, 0.015);
+            }
             if (!mute && ctx && ctx.state === "suspended")
                 ctx.resume();
         }
@@ -7187,9 +7202,8 @@ var pxsim;
                 node.playbackRate.value = hz / (context().sampleRate / 1024);
             return node;
         }
-        const channels = [];
         class Channel {
-            mute() {
+            disconnectNodes() {
                 if (this.gain)
                     disconnectVca(this.gain, this.generator);
                 else if (this.generator) {
@@ -7203,7 +7217,7 @@ var pxsim;
                 const idx = channels.indexOf(this);
                 if (idx >= 0)
                     channels.splice(idx, 1);
-                this.mute();
+                this.disconnectNodes();
             }
         }
         let instrStopId = 1;
@@ -7237,7 +7251,7 @@ var pxsim;
             /** Square waves are perceved as much louder than other sounds, so scale it down a bit to make it less jarring **/
             const scaleVol = (n, isSqWave) => (n / 1024) / 4 * (isSqWave ? .5 : 1);
             const finish = () => {
-                ch.mute();
+                ch.disconnectNodes();
                 timeOff = 0;
                 currWave = -1;
                 currFreq = -1;
@@ -7265,7 +7279,7 @@ var pxsim;
                             return loopAsync();
                         });
                     }
-                    ch.generator = _mute ? null : getGenerator(soundWaveIdx, freq);
+                    ch.generator = getGenerator(soundWaveIdx, freq);
                     if (!ch.generator)
                         return pxsim.U.delay(duration);
                     currWave = soundWaveIdx;
@@ -7287,7 +7301,7 @@ var pxsim;
                         }
                     }
                     ch.generator.connect(ch.gain);
-                    ch.gain.connect(ctx.destination);
+                    ch.gain.connect(destination);
                     ch.generator.start();
                 }
                 idx += 12;
@@ -7320,7 +7334,7 @@ var pxsim;
                     _vca.gain.value = 0;
                     _vco.type = 'triangle';
                     _vco.connect(_vca);
-                    _vca.connect(ctx.destination);
+                    _vca.connect(destination);
                     _vco.start(0);
                 }
                 setCurrentToneGain(gain);
@@ -7336,7 +7350,7 @@ var pxsim;
         AudioContextManager.tone = tone;
         function setCurrentToneGain(gain) {
             if (_vca === null || _vca === void 0 ? void 0 : _vca.gain) {
-                _vca.gain.setTargetAtTime(_mute ? 0 : gain, _context.currentTime, 0.015);
+                _vca.gain.setTargetAtTime(gain, _context.currentTime, 0.015);
             }
         }
         AudioContextManager.setCurrentToneGain = setCurrentToneGain;
@@ -7373,13 +7387,30 @@ var pxsim;
                 let nodes = [];
                 let nextTime = context().currentTime;
                 let allScheduled = false;
+                const channel = new Channel();
+                channel.gain = context().createGain();
+                channel.gain.gain.value = 0;
+                channel.gain.gain.setValueAtTime(volume, context().currentTime);
+                channel.gain.connect(destination);
+                if (channels.length > 5)
+                    channels[0].remove();
+                channels.push(channel);
+                const checkCancel = () => {
+                    if (isCancelled && isCancelled() || !channel.gain) {
+                        if (resolve)
+                            resolve();
+                        resolve = undefined;
+                        channel.remove();
+                        return true;
+                    }
+                    return false;
+                };
                 // Every time we pull a buffer, schedule a node in the future to play it.
                 // Scheduling the nodes ahead of time sounds much smoother than trying to
                 // do it when the previous node completes (which sounds SUPER choppy in
                 // FireFox).
                 function playNext() {
-                    const cancelled = isCancelled && isCancelled();
-                    while (!allScheduled && nodes.length < MAX_SCHEDULED_BUFFER_NODES && !cancelled) {
+                    while (!allScheduled && nodes.length < MAX_SCHEDULED_BUFFER_NODES && !checkCancel()) {
                         const data = pull();
                         if (!data || !data.length) {
                             allScheduled = true;
@@ -7395,6 +7426,8 @@ var pxsim;
                     }
                 }
                 function play(data) {
+                    if (checkCancel())
+                        return;
                     const buff = context().createBuffer(1, data.length, sampleRate);
                     if (buff.copyToChannel) {
                         buff.copyToChannel(data, 0);
@@ -7417,15 +7450,6 @@ var pxsim;
                     newNode.start(nextTime);
                     nextTime += buff.duration;
                 }
-                const channel = new Channel();
-                channel.gain = context().createGain();
-                channel.gain.gain.value = 0;
-                if (!_mute)
-                    channel.gain.gain.setValueAtTime(volume, context().currentTime);
-                channel.gain.connect(context().destination);
-                if (channels.length > 5)
-                    channels[0].remove();
-                channels.push(channel);
                 playNext();
             });
         }
@@ -8450,18 +8474,62 @@ var pxsim;
                     result = "0" + result;
                 return result;
             }
-            let soundPromise;
+            let playing = false;
+            let soundQueue;
+            let cancellationToken = {
+                cancelled: false
+            };
             function __playSoundExpression(notes, waitTillDone) {
+                if (!soundQueue)
+                    soundQueue = [];
                 const cb = pxsim.getResume();
-                if (!soundPromise)
-                    soundPromise = Promise.resolve();
-                soundPromise = soundPromise.then(() => playSoundExpressionAsync(notes));
+                const soundPromise = new Promise((resolve, reject) => {
+                    soundQueue.push({
+                        notes,
+                        onFinished: resolve,
+                        onCancelled: reject
+                    });
+                });
+                if (!playing) {
+                    playNextSoundAsync();
+                }
                 if (!waitTillDone)
                     cb();
                 else
-                    soundPromise = soundPromise.then(cb);
+                    soundPromise.then(cb);
             }
             music.__playSoundExpression = __playSoundExpression;
+            async function playNextSoundAsync() {
+                if (soundQueue.length) {
+                    playing = true;
+                    const sound = soundQueue.shift();
+                    let currentToken = cancellationToken;
+                    try {
+                        await playSoundExpressionAsync(sound.notes, () => currentToken.cancelled);
+                        if (currentToken.cancelled) {
+                            sound.onCancelled();
+                        }
+                        else {
+                            sound.onFinished();
+                        }
+                    }
+                    catch (_a) {
+                        sound.onCancelled();
+                    }
+                    playNextSoundAsync();
+                }
+                else {
+                    playing = false;
+                }
+            }
+            function clearSoundQueue() {
+                soundQueue = [];
+                cancellationToken.cancelled = true;
+                cancellationToken = {
+                    cancelled: false
+                };
+            }
+            music.clearSoundQueue = clearSoundQueue;
             function playSoundExpressionAsync(notes, isCancelled, onPull) {
                 const synth = new music.SoundEmojiSynthesizer(0);
                 const soundEffects = parseSoundEffects(notes);
@@ -8493,6 +8561,7 @@ var pxsim;
             }
             music.playSoundExpressionAsync = playSoundExpressionAsync;
             function __stopSoundExpressions() {
+                clearSoundQueue();
                 pxsim.AudioContextManager.stopAll();
             }
             music.__stopSoundExpressions = __stopSoundExpressions;