tone 15.5.15 → 15.5.17

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

@@ -1,3 +1,5 @@
+import "../clock/Transport.js";
+
 import { expect } from "chai";
 
 import { TestAudioBuffer } from "../../../test/helper/compare/TestAudioBuffer.js";
@@ -58,4 +60,22 @@ describe("Offline", () => {
 		const testBuff = new TestAudioBuffer(buffer.get() as AudioBuffer);
 		expect(testBuff.getTimeOfFirstSound()).to.be.closeTo(0.05, 0.0001);
 	});
+
+	it("nodes created in transport scheduleRepeat callbacks use the offline context", async () => {
+		// Addresses #781
+		// When transport callbacks fire during offline rendering, any nodes
+		// created inside them must use the offline context.
+		const buffer = await Offline(
+			({ transport }) => {
+				transport.scheduleRepeat((time) => {
+					new ToneOscillatorNode().toDestination().start(time);
+				}, 0.1);
+				transport.start(0);
+			},
+			0.5,
+			1
+		);
+		const testBuff = new TestAudioBuffer(buffer.get() as AudioBuffer);
+		expect(testBuff.isSilent()).to.equal(false);
+	});
 });

package/Tone/core/context/OfflineContext.ts

@@ -1,5 +1,6 @@
 import { createOfflineAudioContext } from "../context/AudioContext.js";
 import { Context } from "../context/Context.js";
+import { getContext, setContext } from "../Global.js";
 import { Seconds } from "../type/Units.js";
 import { isOfflineAudioContext } from "../util/AdvancedTypeCheck.js";
 import { ToneAudioBuffer } from "./ToneAudioBuffer.js";
@@ -83,8 +84,12 @@ export class OfflineContext extends Context {
 	private async _renderClock(asynchronous: boolean): Promise<void> {
 		let index = 0;
 		while (this._duration - this._currentTime >= 0) {
-			// invoke all the callbacks on that time
+			// temporarily set this offline context as the global default
+			// so that any nodes created inside tick callbacks use this context
+			const previousContext = getContext();
+			setContext(this);
 			this.emit("tick");
+			setContext(previousContext);
 
 			// increment the clock in block-sized chunks
 			this._currentTime += 128 / this.sampleRate;

package/Tone/core/type/TransportTime.test.ts

@@ -131,6 +131,22 @@ describe("TransportTimeClass", () => {
 				});
 			}, 0.6);
 		});
+
+		it("returns transport time (not AudioContext time)", () => {
+			// Address #401
+			return Offline((context) => {
+				const transport = context.transport;
+				transport.start(0.1);
+				return atTime(0.69, () => {
+					expect(
+						new TransportTimeClass(context, "@4n").valueOf()
+					).to.be.closeTo(1.0, 0.01);
+					expect(
+						new TransportTimeClass(context, "@1m").valueOf()
+					).to.be.closeTo(2.0, 0.01);
+				});
+			}, 0.7);
+		});
 	});
 
 	context("Operators", () => {

package/Tone/core/type/TransportTime.ts

@@ -1,7 +1,7 @@
 import { getContext } from "../Global.js";
 import { Seconds, Ticks } from "../type/Units.js";
 import { TimeClass } from "./Time.js";
-import { TimeBaseUnit, TimeValue } from "./TimeBase.js";
+import { TimeBaseUnit, TimeExpression, TimeValue } from "./TimeBase.js";
 
 /**
  * TransportTime is a time along the Transport's
@@ -21,6 +21,26 @@ export class TransportTimeClass<
 	protected _now(): Type {
 		return this.context.transport.seconds as Type;
 	}
+
+	protected _getExpressions(): TimeExpression<Type> {
+		const expressions = super._getExpressions();
+		// Override the quantize ("@") handler so that it returns Transport time
+		// instead of AudioContext time.
+		expressions.quantize = {
+			method: (capture: string): Type => {
+				const quantTo = new TimeClass(this.context, capture).valueOf();
+				const nextSubdivisionAudioTime =
+					this.context.transport.nextSubdivision(quantTo);
+				return this._secondsToUnits(
+					this.context.transport.getSecondsAtTime(
+						nextSubdivisionAudioTime
+					)
+				);
+			},
+			regexp: /^@(.+)/,
+		};
+		return expressions;
+	}
 }
 
 /**

package/Tone/version.ts

@@ -1 +1 @@
-export const version: string = "15.5.15";
+export const version: string = "15.5.17";