tone 15.5.61 → 15.5.62

package/Tone/core/context/ToneAudioBuffer.test.ts

@@ -103,6 +103,29 @@ describe("ToneAudioBuffer", () => {
 			});
 		});
 
+		it("preserves the onload of an unloaded buffer it wraps", async () => {
+			let originalCalled = false;
+			const inner = new ToneAudioBuffer({
+				onload(): void {
+					originalCalled = true;
+				},
+				url: testFile,
+			});
+			let outerCalled = false;
+			const outer = new ToneAudioBuffer({
+				onload(): void {
+					outerCalled = true;
+				},
+				url: inner,
+			});
+			await ToneAudioBuffer.loaded();
+			expect(originalCalled).to.equal(true);
+			expect(outerCalled).to.equal(true);
+			expect(outer.get()).to.equal(inner.get());
+			inner.dispose();
+			outer.dispose();
+		});
+
 		it("takes Tone.ToneAudioBuffer in the set method", (done) => {
 			const buffer = new ToneAudioBuffer({
 				url: testFile,

package/Tone/core/context/ToneAudioBuffer.ts

@@ -99,8 +99,11 @@ export class ToneAudioBuffer extends Tone {
 			if (buffer.loaded) {
 				this._buffer = buffer.get();
 			} else {
-				// otherwise when its loaded, invoke it's callback
+				// Chain so a wrapper does not replace the buffer's own onload.
+				// An early note constructs that wrapper before the fetch finishes.
+				const previousOnload = buffer.onload;
 				buffer.onload = () => {
+					previousOnload.call(buffer, buffer);
 					this.set(buffer);
 					this.onload(this);
 				};

package/Tone/instrument/Sampler.test.ts

@@ -160,6 +160,25 @@ describe("Sampler", () => {
 			);
 		});
 
+		it("invokes onload when triggerAttack runs before the buffer loads", async () => {
+			let loaded = false;
+			const sampler = new Sampler({
+				onload(): void {
+					loaded = true;
+				},
+				urls: {
+					A4: "./test/audio/sine.wav",
+				},
+			});
+			expect(() => {
+				sampler.triggerAttack("A4");
+			}).throws(Error, /not loaded/);
+			await ToneAudioBuffer.loaded();
+			expect(loaded).to.be.true;
+			expect(sampler.loaded).to.be.true;
+			sampler.dispose();
+		});
+
 		it("can pass in a callback and baseUrl", (done) => {
 			const sampler = new Sampler(
 				{

package/Tone/version.ts

@@ -1 +1 @@
-export const version: string = "15.5.61";
+export const version: string = "15.5.62";