tone 15.5.60 → 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/source/oscillator/Oscillator.test.ts

@@ -9,6 +9,7 @@ import { Offline } from "../../../test/helper/Offline.js";
 import { OscillatorTests } from "../../../test/helper/OscillatorTests.js";
 import { OutputAudio } from "../../../test/helper/OutputAudio.js";
 import { SourceTests } from "../../../test/helper/SourceTests.js";
+import { OfflineContext } from "../../core/context/OfflineContext.js";
 import { Signal } from "../../signal/Signal.js";
 import { Oscillator } from "./Oscillator.js";
 import { ToneOscillatorType } from "./OscillatorInterface.js";
@@ -111,14 +112,103 @@ describe("Oscillator", () => {
 				}
 			});
 		});
+	});
+
+	context("Periodic Wave Cache", () => {
+		beforeEach(() => {
+			// @ts-ignore
+			Oscillator._periodicWaveCache = [];
+		});
 
 		it("can go past the cache max size of 100", () => {
 			const osc = new Oscillator();
 			for (let i = 0; i < 110; i++) {
 				osc.phase = i;
 			}
+			// @ts-ignore
+			expect(Oscillator._periodicWaveCache.length).to.equal(100);
 			osc.dispose();
 		});
+
+		it("caches periodic waves by sample rate", () => {
+			const createWave = sinon.spy(
+				OfflineContext.prototype,
+				"createPeriodicWave"
+			);
+			const context44k = new OfflineContext(1, 0.01, 44100);
+			const context48k = new OfflineContext(1, 0.01, 48000);
+
+			const osc1 = new Oscillator({
+				context: context44k,
+				phase: 90,
+			});
+			const osc2 = new Oscillator({
+				context: context44k,
+				phase: 90,
+			});
+			expect(createWave).to.have.been.calledOnce;
+
+			const osc3 = new Oscillator({
+				context: context48k,
+				phase: 90,
+			});
+			expect(createWave).to.have.been.calledTwice;
+
+			const osc4 = new Oscillator({
+				context: context48k,
+				phase: 90,
+			});
+			expect(createWave).to.have.been.calledTwice;
+
+			osc1.dispose();
+			osc2.dispose();
+			osc3.dispose();
+			osc4.dispose();
+			context44k.dispose();
+			context48k.dispose();
+		});
+
+		it("caches custom waveforms by sample rate", () => {
+			const createWave = sinon.spy(
+				OfflineContext.prototype,
+				"createPeriodicWave"
+			);
+			const context44k = new OfflineContext(1, 0.01, 44100);
+			const context48k = new OfflineContext(1, 0.01, 48000);
+
+			const osc1 = new Oscillator({
+				context: context44k,
+				partials: [1, 2, 3],
+				type: "custom",
+			});
+			const osc2 = new Oscillator({
+				context: context44k,
+				partials: [1, 2, 3],
+				type: "custom",
+			});
+			expect(createWave).to.have.been.calledOnce;
+
+			const osc3 = new Oscillator({
+				context: context48k,
+				partials: [1, 2, 3],
+				type: "custom",
+			});
+			expect(createWave).to.have.been.calledTwice;
+
+			const osc4 = new Oscillator({
+				context: context48k,
+				partials: [1, 2, 3],
+				type: "custom",
+			});
+			expect(createWave).to.have.been.calledTwice;
+
+			osc1.dispose();
+			osc2.dispose();
+			osc3.dispose();
+			osc4.dispose();
+			context44k.dispose();
+			context48k.dispose();
+		});
 	});
 
 	context("Type", () => {

package/Tone/source/oscillator/Oscillator.ts

@@ -230,6 +230,7 @@ export class Oscillator
 		phase: number;
 		type: string;
 		partialCount: number;
+		sampleRate: number;
 		real: Float32Array;
 		imag: Float32Array;
 		wave: PeriodicWave;
@@ -252,6 +253,7 @@ export class Oscillator
 			const oscProps = Oscillator._periodicWaveCache.find(
 				(description) => {
 					return (
+						description.sampleRate === this.context.sampleRate &&
 						description.phase === this._phase &&
 						deepEquals(description.partials, this._partials)
 					);
@@ -262,6 +264,7 @@ export class Oscillator
 			const oscProps = Oscillator._periodicWaveCache.find(
 				(description) => {
 					return (
+						description.sampleRate === this.context.sampleRate &&
 						description.type === this._type &&
 						description.phase === this._phase
 					);
@@ -315,6 +318,7 @@ export class Oscillator
 					partialCount: this._partialCount,
 					partials: this._partials,
 					phase: this._phase,
+					sampleRate: this.context.sampleRate,
 					real,
 					type: this._type,
 					wave: this._wave,

package/Tone/version.ts

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