refactor(anywidget): Clean up HMR internals

Author: manzt

packages/anywidget/src/widget.js

@@ -324,10 +324,10 @@ class Runtime {
 	/** @type {import('solid-js').Resource<Result<AnyWidget & { url: string }>>} */
 	// @ts-expect-error - Set synchronously in constructor.
 	#widget_result;
-	/** @type {Promise<void>} */
-	ready;
 	/** @type {AbortSignal} */
 	#signal;
+	/** @type {Promise<void>} */
+	ready;
 
 	/**
 	 * @param {base.DOMWidgetModel} model
@@ -361,9 +361,9 @@ class Runtime {
 			});
 			/** @type {void | (() => Awaitable<void>)} */
 			let cleanup;
-			this.#widget_result = solid.createResource(esm, async (update) => {
-				await safe_cleanup(cleanup, "initialize");
+			[this.#widget_result] = solid.createResource(esm, async (update) => {
 				try {
+					await safe_cleanup(cleanup, "esm update");
 					model.off(null, null, INITIALIZE_MARKER);
 					let widget = await load_widget(update, model.get("_anywidget_id"));
 					resolvers.resolve();
@@ -378,9 +378,9 @@ class Runtime {
 				} catch (e) {
 					return error(e);
 				}
-			})[0];
-			return () => {
-				cleanup?.();
+			});
+			return async () => {
+				await safe_cleanup(cleanup, "esm update");
 				model.off("change:_css");
 				model.off("change:_esm");
 				dispose();
@@ -401,10 +401,10 @@ class Runtime {
 		let dispose = solid.createRoot((dispose) => {
 			/** @type {void | (() => Awaitable<void>)} */
 			let cleanup;
-			let resource = solid.createResource(
+			let [resource] = solid.createResource(
 				this.#widget_result,
 				async (widget_result) => {
-					cleanup?.();
+					await safe_cleanup(cleanup, "dispose view");
 					// Clear all previous event listeners from this hook.
 					model.off(null, null, view);
 					view.$el.empty();
@@ -425,15 +425,15 @@ class Runtime {
 						throw_anywidget_error(e);
 					}
 				},
-			)[0];
+			);
 			solid.createEffect(() => {
 				if (resource.error) {
 					// TODO: Show error in the view?
 				}
 			});
-			return () => {
+			return async () => {
+				await safe_cleanup(cleanup, "dispose view");
 				dispose();
-				cleanup?.();
 			};
 		});
 	}
@@ -463,20 +463,16 @@ export default function ({ DOMWidgetModel, DOMWidgetView }) {
 		initialize(...args) {
 			super.initialize(...args);
 			let controller = new AbortController();
-			let runtime = new Runtime(this, { signal: controller.signal });
 			this.once("destroy", () => {
-				try {
-					controller.abort("[anywidget] Runtime destroyed.");
-				} finally {
-					RUNTIMES.delete(this);
-				}
+				controller.abort("[anywidget] Runtime destroyed.");
+				RUNTIMES.delete(this);
 			});
-			RUNTIMES.set(this, runtime);
+			RUNTIMES.set(this, new Runtime(this, { signal: controller.signal }));
 		}
 
 		/** @param {Parameters<InstanceType<DOMWidgetModel>["_handle_comm_msg"]>} msg */
 		async _handle_comm_msg(...msg) {
-			const runtime = RUNTIMES.get(this);
+			let runtime = RUNTIMES.get(this);
 			await runtime?.ready;
 			return super._handle_comm_msg(...msg);
 		}