feat: Remove model._unstable_context

packages/anywidget/src/widget.js

@@ -105,12 +105,11 @@ let setup_marker = Symbol("anywidget.setup");
 /**
  * @param {AnyWidgetModule} widget
  * @param {import("@jupyter-widgets/base").DOMWidgetModel} model
- * @param {Record<string, any>} context
  * @returns {Promise<() => Promise<void>>}
  */
-async function run_setup(widget, model, context) {
+async function run_setup(widget, model) {
 	let cleanup = await widget._unstable_setup?.({
-		model: model_proxy(model, context, setup_marker),
+		model: model_proxy(model, setup_marker),
 	});
 	return async () => {
 		// Call any cleanup logic defined by the previous module.
@@ -122,23 +121,17 @@ async function run_setup(widget, model, context) {
 
 		// Remove all event listeners added by the user-defined setup.
 		model.off(null, null, setup_marker);
-
-		// Clear the mutable context
-		for (let k of Object.keys(context)) {
-			delete context[k];
-		}
 	};
 }
 
 /**
  * @param {AnyWidgetModule} widget
  * @param {import("@jupyter-widgets/base").DOMWidgetView} view
- * @param {Record<string, any>} context
  * @returns {Promise<() => Promise<void>>}
  */
-async function run_render(widget, view, context) {
+async function run_render(widget, view) {
 	let cleanup = await widget.render?.({
-		model: model_proxy(view.model, context, view),
+		model: model_proxy(view.model, view),
 		el: view.el,
 	});
 
@@ -162,8 +155,7 @@ async function run_render(widget, view, context) {
 
 /**
  * @param {import("@jupyter-widgets/base").DOMWidgetModel} model
- * @param {Record<string, any>} shared_mutable_model_context
- * @param {unknown} backbone_context
+ * @param {unknown} context
  * @return {import("@anywidget/types").AnyModel}
  *
  * Prunes the view down to the minimum context necessary for rendering.
@@ -175,21 +167,20 @@ async function run_render(widget, view, context) {
  * user-defined setup and render functions can modify context
  * to the model.
  */
-function model_proxy(model, shared_mutable_model_context, backbone_context) {
+function model_proxy(model, context) {
 	return {
 		get: model.get.bind(model),
 		set: model.set.bind(model),
 		save_changes: model.save_changes.bind(model),
 		send: model.send.bind(model),
 		// @ts-expect-error
 		on(name, callback) {
-			model.on(name, callback, backbone_context);
+			model.on(name, callback, context);
 		},
 		off(name, callback) {
-			model.off(name, callback, backbone_context);
+			model.off(name, callback, context);
 		},
 		widget_manager: model.widget_manager,
-		_unstable_context: shared_mutable_model_context,
 	};
 }
 
@@ -232,31 +223,19 @@ export default function ({ DOMWidgetModel, DOMWidgetView }) {
 				let widget = await this._widget_promise;
 
 				await this._anywidget_setup_cleanup();
-				this._anywidget_setup_cleanup = await run_setup(
-					widget,
-					this,
-					this._shared_mutable_model_context,
-				);
+				this._anywidget_setup_cleanup = await run_setup(widget, this);
 
 				let views = /** @type {unknown} */ (Object.values(this.views ?? {}));
 
 				for await (let view of /** @type {Promise<AnyView>[]} */ (views)) {
 					await view._anywidget_render_cleanup();
-					view._anywidget_render_cleanup = await run_render(
-						widget,
-						view,
-						this._shared_mutable_model_context,
-					);
+					view._anywidget_render_cleanup = await run_render(widget, view);
 				}
 			});
 
 			this._widget_promise = load_esm(this.get("_esm"))
 				.then(async (widget) => {
-					this._anywidget_setup_cleanup = await run_setup(
-						widget,
-						this,
-						this._shared_mutable_model_context,
-					);
+					this._anywidget_setup_cleanup = await run_setup(widget, this);
 					return widget;
 				});
 		}
@@ -305,11 +284,7 @@ export default function ({ DOMWidgetModel, DOMWidgetView }) {
 				console.warn("[anywidget] widget not loaded.");
 				return;
 			}
-			this._anywidget_render_cleanup = await run_render(
-				widget,
-				this,
-				model._shared_mutable_model_context,
-			);
+			this._anywidget_render_cleanup = await run_render(widget, this);
 		}
 
 		/** @type {() => Promise<void>} */

packages/types/index.ts

@@ -13,10 +13,7 @@ type EventHandler = (...args: any[]) => void;
  */
 type LiteralUnion<T, U = string> = T | (U & {});
 
-export interface AnyModel<
-	T extends ObjectHash = ObjectHash,
-	U extends ObjectHash = ObjectHash,
-> {
+export interface AnyModel<T extends ObjectHash = ObjectHash> {
 	get<K extends keyof T>(key: K): T[K];
 	set<K extends keyof T>(key: K, value: T[K]): void;
 	off<K extends keyof T>(
@@ -44,34 +41,21 @@ export interface AnyModel<
 		buffers?: ArrayBuffer[] | ArrayBufferView[],
 	): void;
 	widget_manager: IWidgetManager;
-	_unstable_context: U;
 }
 
-export interface RenderProps<
-	T extends ObjectHash = ObjectHash,
-	U extends ObjectHash = ObjectHash,
-> {
-	model: AnyModel<T, U>;
+export interface RenderProps<T extends ObjectHash = ObjectHash> {
+	model: AnyModel<T>;
 	el: HTMLElement;
 }
 
-export interface Render<
-	T extends ObjectHash = ObjectHash,
-	U extends ObjectHash = ObjectHash,
-> {
-	(props: RenderProps<T, U>): Awaitable<void | (() => Awaitable<void>)>;
+export interface Render<T extends ObjectHash = ObjectHash> {
+	(props: RenderProps<T>): Awaitable<void | (() => Awaitable<void>)>;
 }
 
-export interface SetupProps<
-	T extends ObjectHash = ObjectHash,
-	U extends ObjectHash = ObjectHash,
-> {
-	model: AnyModel<T, U>;
+export interface SetupProps<T extends ObjectHash = ObjectHash> {
+	model: AnyModel<T>;
 }
 
-export interface Setup<
-	T extends ObjectHash = ObjectHash,
-	U extends ObjectHash = ObjectHash,
-> {
-	(props: SetupProps<T, U>): Awaitable<void | (() => Awaitable<void>)>;
+export interface Setup<T extends ObjectHash = ObjectHash> {
+	(props: SetupProps<T>): Awaitable<void | (() => Awaitable<void>)>;
 }