Website

README.md

@@ -1,4 +1,3 @@
-
 # Joist
 
 **Sponsored by:**

package.json

@@ -1,13 +1,14 @@
 {
   "name": "joist",
-  "version": "4.0.0-next.41",
+  "version": "4.0.0-next.42",
   "description": "",
   "type": "module",
-  "author": "",
+  "author": "deebloo",
   "license": "MIT",
   "workspaces": [
     "packages/**",
-    "integration/**"
+    "integration/**",
+    "website"
   ],
   "scripts": {
     "prepare": "husky"

packages/di/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joist/di",
-  "version": "4.0.0-next.40",
+  "version": "4.0.0-next.42",
   "type": "module",
   "main": "./target/lib.js",
   "module": "./target/lib.js",

packages/di/src/lib/dom-injector.test.ts

@@ -1,4 +1,5 @@
 import { assert } from 'chai';
+
 import { DOMInjector } from './dom-injector.js';
 import { INJECTOR_CTX } from './context/injector.js';
 import { Injector } from './injector.js';
@@ -29,20 +30,23 @@ describe('DOMInjector', () => {
   it('should send request looking for other injector contexts', () => {
     const parent = new Injector();
     const injector = new DOMInjector();
-
-    const cb = (e: any) => {
-      if (e.context === INJECTOR_CTX) {
-        e.callback(parent);
-      }
-    };
-
-    document.body.addEventListener('context-request', cb);
+    const controller = new AbortController();
+
+    document.body.addEventListener(
+      'context-request',
+      (e: any) => {
+        if (e.context === INJECTOR_CTX) {
+          e.callback(parent);
+        }
+      },
+      { signal: controller.signal }
+    );
 
     injector.attach(document.body);
 
     assert.equal(injector.parent, parent);
 
     injector.detach();
-    document.body.removeEventListener('context-request', cb);
+    controller.abort();
   });
 });

packages/di/src/lib/dom-injector.ts

@@ -1,35 +1,39 @@
-import { ContextRequestEvent } from './context/protocol.js';
+import { ContextRequestEvent, UnknownContext } from './context/protocol.js';
 import { INJECTOR_CTX } from './context/injector.js';
 import { Injector } from './injector.js';
 
 export class DOMInjector extends Injector {
-  #contextCallback = (e: ContextRequestEvent<{ __context__: unknown }>) => {
-    if (e.context === INJECTOR_CTX) {
-      if (e.target !== this.#element) {
-        e.stopPropagation();
-
-        e.callback(this);
-      }
-    }
-  };
-
   #element: HTMLElement | null = null;
+  #controller: AbortController | null = null;
 
   attach(element: HTMLElement): void {
     this.#element = element;
+    this.#controller = new AbortController();
 
-    this.#element.addEventListener('context-request', this.#contextCallback);
+    this.#element.addEventListener(
+      'context-request',
+      (e: ContextRequestEvent<UnknownContext>) => {
+        if (e.context === INJECTOR_CTX) {
+          if (e.target !== this.#element) {
+            e.stopPropagation();
+
+            e.callback(this);
+          }
+        }
+      },
+      { signal: this.#controller.signal }
+    );
 
     this.#element.dispatchEvent(
       new ContextRequestEvent(INJECTOR_CTX, (parent) => {
-        this.setParent(parent);
+        this.parent = parent;
       })
     );
   }
 
   detach(): void {
-    if (this.#element) {
-      this.#element.removeEventListener('context-request', this.#contextCallback);
+    if (this.#controller) {
+      this.#controller.abort();
     }
   }
 }