tone 15.5.20 → 15.5.21

package/Tone/core/Global.test.ts

@@ -0,0 +1,19 @@
+import { expect } from "chai";
+
+import { Context } from "./context/Context.js";
+import { getContext, setContext } from "./Global.js";
+
+describe("Global", () => {
+	it("can setContext with disposeOld = true", () => {
+		const origContext = getContext();
+		const toneContext = new Context();
+
+		setContext(toneContext);
+		expect(getContext()).to.equal(toneContext);
+
+		setContext(origContext, true);
+
+		expect(getContext()).to.equal(origContext);
+		expect(toneContext.disposed).to.be.true;
+	});
+});

package/Tone/core/Global.ts

@@ -1,39 +1,18 @@
 import { version } from "../version.js";
-import {
-	AnyAudioContext,
-	hasAudioContext,
-	theWindow,
-} from "./context/AudioContext.js";
+import { AnyAudioContext, theWindow } from "./context/AudioContext.js";
 import { BaseContext } from "./context/BaseContext.js";
 import { Context } from "./context/Context.js";
-import { DummyContext } from "./context/DummyContext.js";
+import {
+	getContext,
+	setContext as _setContext,
+} from "./context/GlobalContext.js";
 import { OfflineContext } from "./context/OfflineContext.js";
 import {
 	isAudioContext,
 	isOfflineAudioContext,
 } from "./util/AdvancedTypeCheck.js";
 
-/**
- * This dummy context is used to avoid throwing immediate errors when importing in Node.js
- */
-const dummyContext = new DummyContext();
-
-/**
- * The global audio context which is getable and assignable through
- * getContext and setContext
- */
-let globalContext: BaseContext = dummyContext;
-
-/**
- * Returns the default system-wide {@link Context}
- * @category Core
- */
-export function getContext(): BaseContext {
-	if (globalContext === dummyContext && hasAudioContext) {
-		setContext(new Context());
-	}
-	return globalContext;
-}
+export { getContext };
 
 /**
  * Set the default audio context
@@ -46,15 +25,15 @@ export function setContext(
 	disposeOld = false
 ): void {
 	if (disposeOld) {
-		globalContext.dispose();
+		getContext().dispose();
 	}
 
 	if (isAudioContext(context)) {
-		globalContext = new Context(context);
+		_setContext(new Context(context));
 	} else if (isOfflineAudioContext(context)) {
-		globalContext = new OfflineContext(context);
+		_setContext(new OfflineContext(context));
 	} else {
-		globalContext = context;
+		_setContext(context);
 	}
 }
 
@@ -72,7 +51,7 @@ export function setContext(
  * @category Core
  */
 export function start(): Promise<void> {
-	return globalContext.resume();
+	return getContext().resume();
 }
 
 /**

package/Tone/core/context/GlobalContext.ts

@@ -0,0 +1,34 @@
+import { hasAudioContext } from "./AudioContext.js";
+import { BaseContext } from "./BaseContext.js";
+import { Context } from "./Context.js";
+import { DummyContext } from "./DummyContext.js";
+
+/**
+ * This dummy context is used to avoid throwing immediate errors when importing in Node.js
+ */
+export const dummyContext: BaseContext = new DummyContext();
+
+/**
+ * The global audio context which is getable and assignable through
+ * getContext and setContext
+ */
+let globalContext: BaseContext = dummyContext;
+
+/**
+ * Returns the default system-wide {@link Context}.
+ * Auto-initializes a real Context in browser environments.
+ */
+export function getContext(): BaseContext {
+	if (globalContext === dummyContext && hasAudioContext) {
+		globalContext = new Context();
+	}
+	return globalContext;
+}
+
+/**
+ * Set the global context directly. Unlike the richer `setContext` in Global.ts,
+ * this only accepts a {@link BaseContext} — no native AudioContext wrapping.
+ */
+export function setContext(context: BaseContext): void {
+	globalContext = context;
+}

package/Tone/core/context/OfflineContext.ts

@@ -1,8 +1,8 @@
 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 { getContext, setContext } from "./GlobalContext.js";
 import { ToneAudioBuffer } from "./ToneAudioBuffer.js";
 
 /**

package/Tone/core/context/ToneAudioBuffer.ts

@@ -1,10 +1,10 @@
-import { getContext } from "../Global.js";
 import { Tone } from "../Tone.js";
 import { Samples, Seconds } from "../type/Units.js";
 import { assert } from "../util/Debug.js";
 import { optionsFromArguments } from "../util/Defaults.js";
 import { noOp } from "../util/Interface.js";
 import { isArray, isNumber, isString } from "../util/TypeCheck.js";
+import { getContext } from "./GlobalContext.js";
 
 interface ToneAudioBufferOptions {
 	url?: string | AudioBuffer | ToneAudioBuffer;

package/Tone/version.ts

@@ -1 +1 @@
-export const version: string = "15.5.20";
+export const version: string = "15.5.21";