@joist/di 3.0.6 → 3.0.8-next.0

package/README.md

@@ -7,7 +7,7 @@ Allows you to inject services into other class instances (including custom eleme
 #### Installation:
 
 ```BASH
-npm i @joist/di@rc
+npm i @joist/di
 ```
 
 #### Example:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joist/di",
-  "version": "3.0.6",
+  "version": "3.0.8-next.0",
   "type": "module",
   "main": "./target/lib.js",
   "module": "./target/lib.js",
@@ -13,6 +13,7 @@
     }
   },
   "files": [
+    "src",
     "target"
   ],
   "sideEffects": false,
@@ -62,6 +63,5 @@
         "build"
       ]
     }
-  },
-  "gitHead": "e6e36105708633b45a0585b066a89f07a7ac78cb"
+  }
 }

package/src/lib/environment.test.ts

@@ -0,0 +1,30 @@
+import { expect, fixture, html } from '@open-wc/testing';
+
+import { Injector } from './injector.js';
+import { environment, clearEnvironment } from './environment.js';
+import { injectable } from './injectable.js';
+import { inject } from './inject.js';
+
+describe('environment', () => {
+  afterEach(clearEnvironment);
+
+  it('should create a global Injector instance', () => {
+    expect(environment()).to.be.instanceOf(Injector);
+  });
+
+  it('should use the root injector when creating services', async () => {
+    @injectable
+    class MyService { }
+
+    @injectable
+    class MyElement extends HTMLElement {
+      my = inject(MyService);
+    }
+
+    customElements.define('env-1', MyElement);
+
+    const el = await fixture<MyElement>(html`<env-1></env-1>`);
+
+    expect(el.my()).to.equal(environment().get(MyService));
+  });
+});

package/src/lib/environment.ts

@@ -0,0 +1,21 @@
+import { Injector } from './injector.js';
+import { Provider } from './provider.js';
+
+let rootInjector: Injector;
+
+export function environment(): Injector {
+  if (!rootInjector) {
+    rootInjector = new Injector();
+  }
+
+  return rootInjector;
+}
+
+export function defineEnvironment(providers: Provider<any>[]) {
+  environment().providers = providers;
+}
+
+export function clearEnvironment(): void {
+  rootInjector.providers = [];
+  rootInjector.clear();
+}

package/src/lib/inject.test.ts

@@ -0,0 +1,71 @@
+import { expect } from '@open-wc/testing';
+
+import { inject } from './inject.js';
+import { injectable } from './injectable.js';
+import { Injector } from './injector.js';
+
+describe('inject', () => {
+  it('should work', () => {
+    class HelloService { }
+
+    @injectable
+    class HelloWorld extends HTMLElement {
+      hello = inject(HelloService);
+    }
+
+    customElements.define('inject-1', HelloWorld);
+
+    expect(new HelloWorld().hello()).to.be.instanceOf(HelloService);
+  });
+
+  it('should throw error if called in constructor', () => {
+    class FooService {
+      value = '1';
+    }
+
+    @injectable
+    class BarService {
+      foo = inject(FooService);
+
+      constructor() {
+        this.foo();
+      }
+    }
+
+    const parent = new Injector();
+
+    try {
+      parent.get(BarService);
+
+      throw new Error('Should not succeed');
+    } catch (err) {
+      const error = err as Error;
+
+      expect(error.message).to.equal(
+        `BarService is either not injectable or a service is being called in the constructor. \n Either add the @injectable to your class or use the onInject callback method.`
+      );
+    }
+  });
+
+  it('should use the calling injector as parent', () => {
+    class FooService {
+      value = '1';
+    }
+
+    @injectable
+    class BarService {
+      foo = inject(FooService);
+    }
+
+    const parent = new Injector([
+      {
+        provide: FooService,
+        use: class extends FooService {
+          value = '100';
+        },
+      },
+    ]);
+
+    expect(parent.get(BarService).foo().value).to.equal('100');
+  });
+});

package/src/lib/inject.ts

@@ -0,0 +1,23 @@
+import { ProviderToken } from './provider.js';
+import { Injectable } from './injector.js';
+import { INJECTABLES } from './injectable.js';
+
+export type Injected<T> = () => T;
+
+export function inject<This extends Injectable, T extends object>(
+  token: ProviderToken<T>
+): Injected<T> {
+  return function (this: This) {
+    const injector = INJECTABLES.get(this);
+
+    if (injector === undefined) {
+      const name = Object.getPrototypeOf(this.constructor).name;
+
+      throw new Error(
+        `${name} is either not injectable or a service is being called in the constructor. \n Either add the @injectable to your class or use the onInject callback method.`
+      );
+    }
+
+    return injector.get(token);
+  };
+}

package/src/lib/injectable.test.ts

@@ -0,0 +1,144 @@
+import { expect, fixture, html } from '@open-wc/testing';
+
+import { injectable } from './injectable.js';
+import { inject } from './inject.js';
+import { Injector } from './injector.js';
+
+describe('@injectable()', () => {
+  it('should allow a custom element to be injected with deps', () => {
+    class Foo {}
+    class Bar {}
+
+    @injectable
+    class MyElement extends HTMLElement {
+      foo = inject(Foo);
+      bar = inject(Bar);
+    }
+
+    customElements.define('injectable-1', MyElement);
+
+    const el = document.createElement('injectable-1') as MyElement;
+
+    expect(el.foo()).to.be.instanceOf(Foo);
+  });
+
+  it('should locally override a provider', () => {
+    class Foo {}
+
+    class Bar extends Foo {}
+
+    const MyElement = injectable(
+      class {
+        static providers = [{ provide: Foo, use: Bar }];
+
+        foo = inject(Foo);
+      }
+    );
+
+    const el = new MyElement();
+
+    expect(el.foo()).to.be.instanceOf(Bar);
+  });
+
+  it('should call the onInject lifecycle hook', () => {
+    class A {}
+
+    @injectable
+    class B {
+      a = inject(A);
+
+      onInject() {
+        expect(this.a()).to.be.instanceOf(A);
+      }
+    }
+
+    new Injector().get(B);
+  });
+
+  it('should handle parent HTML Injectors', async () => {
+    @injectable
+    class A {}
+
+    const B = injectable(
+      class {
+        a = inject(A);
+      }
+    );
+
+    class AltA implements A {}
+
+    @injectable
+    class Parent extends HTMLElement {
+      static providers = [
+        { provide: B, use: B },
+        { provide: A, use: AltA },
+      ];
+    }
+
+    @injectable
+    class Child extends HTMLElement {
+      b = inject(B);
+    }
+
+    customElements.define('injectable-parent-1', Parent);
+    customElements.define('injectable-child-1', Child);
+
+    const el = await fixture(html`
+      <injectable-parent-1>
+        <injectable-child-1></injectable-child-1>
+      </injectable-parent-1>
+    `);
+
+    const child = el.querySelector<Child>('injectable-child-1')!;
+
+    expect(child.b().a()).to.be.instanceOf(AltA);
+  });
+
+  it('should handle changing contexts', async () => {
+    class A {}
+    class AltA implements A {}
+
+    @injectable
+    class Ctx1 extends HTMLElement {
+      static providers = [{ provide: A, use: A }];
+    }
+
+    @injectable
+    class Ctx2 extends HTMLElement {
+      static providers = [{ provide: A, use: AltA }];
+    }
+
+    @injectable
+    class Child extends HTMLElement {
+      a = inject(A);
+    }
+
+    customElements.define('ctx-1', Ctx1);
+    customElements.define('ctx-2', Ctx2);
+    customElements.define('ctx-child', Child);
+
+    const el = await fixture(html`
+      <div>
+        <ctx-1>
+          <ctx-child></ctx-child>
+        </ctx-1>
+
+        <ctx-2></ctx-2>
+      </div>
+    `);
+
+    const ctx2 = el.querySelector('ctx-2')!;
+
+    let child = el.querySelector<Child>('ctx-child')!;
+
+    expect(child.a()).to.be.instanceOf(A);
+
+    child.remove();
+
+    ctx2.append(child);
+
+    child = el.querySelector<Child>('ctx-child')!;
+
+    expect(child.a()).to.be.instanceOf(AltA);
+  });
+});

package/src/lib/injectable.ts

@@ -0,0 +1,79 @@
+import { ProviderToken } from './provider.js';
+import { Injector } from './injector.js';
+import { environment } from './environment.js';
+
+export const INJECTABLES = new WeakMap<object, Injector>();
+
+export function injectable<T extends ProviderToken<any>>(Base: T, _?: unknown) {
+  return class InjectableNode extends Base {
+    constructor(..._: any[]) {
+      super();
+
+      const injector = new Injector(Base.providers);
+
+      INJECTABLES.set(this, injector);
+
+      try {
+        if (this instanceof HTMLElement) {
+          this.addEventListener('finddiroot', (e) => {
+            const parentInjector = findInjectorRoot(e);
+
+            if (parentInjector !== null) {
+              injector.setParent(parentInjector);
+            } else {
+              injector.setParent(environment());
+            }
+          });
+        }
+      } catch {}
+    }
+
+    onInject() {
+      if (super.onInject) {
+        super.onInject();
+      }
+    }
+
+    connectedCallback() {
+      try {
+        if (this instanceof HTMLElement) {
+          this.dispatchEvent(new Event('finddiroot'));
+
+          if (super.connectedCallback) {
+            super.connectedCallback();
+          }
+        }
+      } catch {}
+    }
+
+    disconnectedCallback() {
+      const injector = INJECTABLES.get(this);
+
+      if (injector) {
+        injector.setParent(undefined);
+      }
+
+      if (super.disconnectedCallback) {
+        super.disconnectedCallback();
+      }
+    }
+  };
+}
+
+function findInjectorRoot(e: Event): Injector | null {
+  const path = e.composedPath();
+
+  // find firt parent
+  // skips the first item which is the target
+  for (let i = 1; i < path.length; i++) {
+    const part = path[i];
+
+    const injector = INJECTABLES.get(part);
+
+    if (injector) {
+      return injector;
+    }
+  }
+
+  return null;
+}

package/src/lib/injector.test.ts

@@ -0,0 +1,86 @@
+import { expect } from '@open-wc/testing';
+
+import { Injector } from './injector.js';
+import { inject } from './inject.js';
+import { injectable } from './injectable.js';
+
+describe('Injector', () => {
+  it('should create a new instance of a single provider', () => {
+    class A { }
+
+    const app = new Injector();
+
+    expect(app.get(A)).to.be.instanceOf(A);
+    expect(app.get(A)).to.equal(app.get(A));
+  });
+
+  it('should inject providers in the correct order', () => {
+    class A { }
+    class B { }
+
+    @injectable
+    class MyService {
+      a = inject(A);
+      b = inject(B);
+    }
+
+    const app = new Injector();
+    const instance = app.get(MyService);
+
+    expect(instance.a()).to.be.instanceOf(A);
+    expect(instance.b()).to.be.instanceOf(B);
+  });
+
+  it('should create a new instance of a provider that has a full dep tree', () => {
+    class A { }
+
+    @injectable
+    class B {
+      a = inject(A);
+    }
+
+    @injectable
+    class C {
+      b = inject(B);
+    }
+
+    @injectable
+    class D {
+      c = inject(C);
+    }
+
+    @injectable
+    class E {
+      d = inject(D);
+    }
+
+    const app = new Injector();
+    const instance = app.get(E);
+
+    expect(instance.d().c().b().a()).to.be.instanceOf(A);
+  });
+
+  it('should override a provider if explicitly instructed', () => {
+    class A { }
+
+    @injectable
+    class B {
+      a = inject(A);
+    }
+
+    class AltA extends A { }
+    const app = new Injector([{ provide: A, use: AltA }]);
+
+    expect(app.get(B).a()).to.be.instanceOf(AltA);
+  });
+
+  it('should return an existing instance from a parent injector', () => {
+    class A { }
+
+    const parent = new Injector();
+
+    const app = new Injector([], parent);
+
+    expect(parent.get(A)).to.equal(app.get(A));
+  });
+});

package/src/lib/injector.ts

@@ -0,0 +1,107 @@
+import { INJECTABLES } from './injectable.js';
+import { ProviderToken, Provider } from './provider.js';
+
+// defines available properties that will be on a class instance that can use the inject function
+export type Injectable = object & {
+  onInject?(): void;
+};
+
+/**
+ * Injectors create and store instances of services.
+ * A service is any constructable class.
+ * When calling Injector.get, the injector will resolve as following.
+ *
+ * 1. Do I have a cached instance locally?
+ * 2. Do I have a local provider definition for the token?
+ * 3. Do I have a parent? Check parent for 1 and 2
+ * 5. All clear, go ahead and construct and cache the requested service
+ *
+ * RootInjector |--> InjectorA |--> InjectorB
+ *                             |--> InjectorC
+ *                             |--> InjectorD |--> InjectorE
+ *
+ * in the above tree, if InjectorE requests a service, it will navigate up to the RootInjector and cache.
+ * If Inject B then requests the same token, it will recieve the same cached instance from RootInjector.
+ */
+export class Injector {
+  // ke track of isntances. One Token can have one instance
+  #instances = new WeakMap<ProviderToken<any>, any>();
+
+  #parent: Injector | undefined = undefined;
+
+  constructor(public providers: Provider<any>[] = [], parent?: Injector) {
+    this.setParent(parent);
+  }
+
+  // resolves and retuns and instance of the requested service
+  get<T extends Injectable>(token: ProviderToken<T>): T {
+    // check for a local instance
+    if (this.#instances.has(token)) {
+      return this.#instances.get(token)!;
+    }
+
+    const provider = this.#findProvider(token);
+
+    // check for a provider definition
+    if (provider) {
+      return this.#createAndCache<T>(provider.use);
+    }
+
+    // check for a parent and attempt to get there
+    if (this.#parent) {
+      return this.#parent.get(token);
+    }
+
+    return this.#createAndCache(token);
+  }
+
+  setParent(parent: Injector | undefined) {
+    this.#parent = parent;
+  }
+
+  clear() {
+    this.#instances = new WeakMap();
+  }
+
+  #createAndCache<T extends Injectable>(token: ProviderToken<T>): T {
+    const instance = new token();
+
+    this.#instances.set(token, instance);
+
+    const injector = INJECTABLES.get(instance);
+
+    if (injector) {
+      /**
+       * set the this injector instance as a parent.
+       * this means that each calling injector will be the parent of what it creates.
+       * this allows the created service to navigate up it's chain to find a root
+       */
+      injector.setParent(this);
+
+      /**
+       * the on inject lifecycle hook should be called after the parent is defined.
+       * this ensures that services are initialized when the chain is settled
+       * this is required since the parent is set after the instance is constructed
+       */
+      if (instance.onInject) {
+        instance.onInject();
+      }
+    }
+
+    return instance;
+  }
+
+  #findProvider(token: ProviderToken<any>): Provider<any> | undefined {
+    if (!this.providers) {
+      return undefined;
+    }
+
+    for (let i = 0; i < this.providers.length; i++) {
+      if (this.providers[i].provide === token) {
+        return this.providers[i];
+      }
+    }
+
+    return undefined;
+  }
+}

package/src/lib/provider.ts

@@ -0,0 +1,10 @@
+export type ProviderToken<T> = {
+  providers?: Provider<any>[];
+
+  new(...args: any[]): T;
+};
+
+export interface Provider<T> {
+  provide: ProviderToken<T>;
+  use: ProviderToken<T>;
+}

package/src/lib.ts

@@ -0,0 +1,5 @@
+export { Injector, Injectable } from './lib/injector.js';
+export { Provider, ProviderToken } from './lib/provider.js';
+export { injectable } from './lib/injectable.js';
+export { inject, Injected } from './lib/inject.js';
+export { defineEnvironment, clearEnvironment } from './lib/environment.js';

package/target/lib/environment.d.ts

@@ -1,3 +1,5 @@
 import { Injector } from './injector.js';
+import { Provider } from './provider.js';
 export declare function environment(): Injector;
+export declare function defineEnvironment(providers: Provider<any>[]): void;
 export declare function clearEnvironment(): void;

package/target/lib/environment.js

@@ -1,8 +1,14 @@
 import { Injector } from './injector.js';
-const rootInjector = new Injector();
+let rootInjector;
 export function environment() {
+    if (!rootInjector) {
+        rootInjector = new Injector();
+    }
     return rootInjector;
 }
+export function defineEnvironment(providers) {
+    environment().providers = providers;
+}
 export function clearEnvironment() {
     rootInjector.providers = [];
     rootInjector.clear();

package/target/lib/environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/lib/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,MAAM,YAAY,GAAG,IAAI,QAAQ,EAAE,CAAC;AAEpC,MAAM,UAAU,WAAW;IACzB,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,YAAY,CAAC,SAAS,GAAG,EAAE,CAAC;IAC5B,YAAY,CAAC,KAAK,EAAE,CAAC;AACvB,CAAC"}
+{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/lib/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,IAAI,YAAsB,CAAC;AAE3B,MAAM,UAAU,WAAW;IACzB,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,YAAY,GAAG,IAAI,QAAQ,EAAE,CAAC;IAChC,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,SAA0B;IAC1D,WAAW,EAAE,CAAC,SAAS,GAAG,SAAS,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,YAAY,CAAC,SAAS,GAAG,EAAE,CAAC;IAC5B,YAAY,CAAC,KAAK,EAAE,CAAC;AACvB,CAAC"}

package/target/lib/inject.js

@@ -1,10 +1,12 @@
+import { INJECTABLES } from './injectable.js';
 export function inject(token) {
     return function () {
-        if (this.injector$$ === undefined) {
+        const injector = INJECTABLES.get(this);
+        if (injector === undefined) {
             const name = Object.getPrototypeOf(this.constructor).name;
             throw new Error(`${name} is either not injectable or a service is being called in the constructor. \n Either add the @injectable to your class or use the onInject callback method.`);
         }
-        return this.injector$$.get(token);
+        return injector.get(token);
     };
 }
 //# sourceMappingURL=inject.js.map

package/target/lib/inject.js.map

@@ -1 +1 @@
-{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../src/lib/inject.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,MAAM,CACpB,KAAuB;IAEvB,OAAO;QACL,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;YACjC,MAAM,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;YAE1D,MAAM,IAAI,KAAK,CACb,GAAG,IAAI,6JAA6J,CACrK,CAAC;SACH;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../src/lib/inject.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAI9C,MAAM,UAAU,MAAM,CACpB,KAAuB;IAEvB,OAAO;QACL,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEvC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;YAE1D,MAAM,IAAI,KAAK,CACb,GAAG,IAAI,6JAA6J,CACrK,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC;AACJ,CAAC"}

package/target/lib/inject.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"inject.test.js","sourceRoot":"","sources":["../../src/lib/inject.test.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,EAAE,CAAC,aAAa,EAAE,GAAG,EAAE;QACrB,MAAM,YAAY;SAAI;YAGhB,UAAU;oCADf,UAAU;;;;8BACc,WAAW;kCAAnB,SAAQ,WAAW;;;;oBAApC,6KAEC;;;oBAFK,uDAAU;;gBACd,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;;;;QAG/B,cAAc,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAE9C,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,UAAU;YACd,KAAK,GAAG,GAAG,CAAC;SACb;YAGK,UAAU;oCADf,UAAU;;;;;;;;oBACX,6KAMC;;;oBANK,uDAAU;;gBACd,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;gBAEzB;oBACE,IAAI,CAAC,GAAG,EAAE,CAAC;gBACb,CAAC;;;;QAGH,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAE9B,IAAI;YACF,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAEvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACvC;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,KAAK,GAAG,GAAY,CAAC;YAE3B,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAC5B,uKAAuK,CACxK,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,UAAU;YACd,KAAK,GAAG,GAAG,CAAC;SACb;YAGK,UAAU;oCADf,UAAU;;;;;;;;oBACX,6KAEC;;;oBAFK,uDAAU;;gBACd,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;;;;QAG3B,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC;YAC1B;gBACE,OAAO,EAAE,UAAU;gBACnB,GAAG,EAAE,KAAM,SAAQ,UAAU;oBAC3B,KAAK,GAAG,KAAK,CAAC;iBACf;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"inject.test.js","sourceRoot":"","sources":["../../src/lib/inject.test.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,EAAE,CAAC,aAAa,EAAE,GAAG,EAAE;QACrB,MAAM,YAAY;SAAI;YAGhB,UAAU;oCADf,UAAU;;;;8BACc,WAAW;kCAAnB,SAAQ,WAAW;;;;oBAApC,6KAEC;;;oBAFK,uDAAU;;gBACd,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;;;;QAG/B,cAAc,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAE9C,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,UAAU;YACd,KAAK,GAAG,GAAG,CAAC;SACb;YAGK,UAAU;oCADf,UAAU;;;;;;;;oBACX,6KAMC;;;oBANK,uDAAU;;gBACd,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;gBAEzB;oBACE,IAAI,CAAC,GAAG,EAAE,CAAC;gBACb,CAAC;;;;QAGH,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAE9B,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAEvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,GAAY,CAAC;YAE3B,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAC5B,uKAAuK,CACxK,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,UAAU;YACd,KAAK,GAAG,GAAG,CAAC;SACb;YAGK,UAAU;oCADf,UAAU;;;;;;;;oBACX,6KAEC;;;oBAFK,uDAAU;;gBACd,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;;;;QAG3B,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC;YAC1B;gBACE,OAAO,EAAE,UAAU;gBACnB,GAAG,EAAE,KAAM,SAAQ,UAAU;oBAC3B,KAAK,GAAG,KAAK,CAAC;iBACf;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/target/lib/injectable.d.ts

@@ -1,9 +1,9 @@
 import { ProviderToken } from './provider.js';
 import { Injector } from './injector.js';
+export declare const INJECTABLES: WeakMap<object, Injector>;
 export declare function injectable<T extends ProviderToken<any>>(Base: T, _?: unknown): {
     new (..._: any[]): {
         [x: string]: any;
-        injector$$: Injector;
         onInject(): void;
         connectedCallback(): void;
         disconnectedCallback(): void;

package/target/lib/injectable.js

@@ -1,19 +1,21 @@
 import { Injector } from './injector.js';
 import { environment } from './environment.js';
+export const INJECTABLES = new WeakMap();
 export function injectable(Base, _) {
     return class InjectableNode extends Base {
-        injector$$ = new Injector(Base.providers);
         constructor(..._) {
             super();
+            const injector = new Injector(Base.providers);
+            INJECTABLES.set(this, injector);
             try {
                 if (this instanceof HTMLElement) {
                     this.addEventListener('finddiroot', (e) => {
                         const parentInjector = findInjectorRoot(e);
                         if (parentInjector !== null) {
-                            this.injector$$.setParent(parentInjector);
+                            injector.setParent(parentInjector);
                         }
                         else {
-                            this.injector$$.setParent(environment());
+                            injector.setParent(environment());
                         }
                     });
                 }
@@ -37,7 +39,10 @@ export function injectable(Base, _) {
             catch { }
         }
         disconnectedCallback() {
-            this.injector$$.setParent(undefined);
+            const injector = INJECTABLES.get(this);
+            if (injector) {
+                injector.setParent(undefined);
+            }
             if (super.disconnectedCallback) {
                 super.disconnectedCallback();
             }
@@ -48,8 +53,9 @@ function findInjectorRoot(e) {
     const path = e.composedPath();
     for (let i = 1; i < path.length; i++) {
         const part = path[i];
-        if ('injector$$' in part && part.injector$$ instanceof Injector) {
-            return part.injector$$;
+        const injector = INJECTABLES.get(part);
+        if (injector) {
+            return injector;
         }
     }
     return null;

package/target/lib/injectable.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectable.js","sourceRoot":"","sources":["../../src/lib/injectable.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,QAAQ,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,UAAU,UAAU,CAA+B,IAAO,EAAE,CAAW;IAC3E,OAAO,MAAM,cAAe,SAAQ,IAAI;QACtC,UAAU,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE1C,YAAY,GAAG,CAAQ;YACrB,KAAK,EAAE,CAAC;YAER,IAAI;gBACF,IAAI,IAAI,YAAY,WAAW,EAAE;oBAC/B,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE;wBACxC,MAAM,cAAc,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;wBAE3C,IAAI,cAAc,KAAK,IAAI,EAAE;4BAC3B,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;yBAC3C;6BAAM;4BACL,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC;yBAC1C;oBACH,CAAC,CAAC,CAAC;iBACJ;aACF;YAAC,MAAM,GAAE;QACZ,CAAC;QAED,QAAQ;YACN,IAAI,KAAK,CAAC,QAAQ,EAAE;gBAClB,KAAK,CAAC,QAAQ,EAAE,CAAC;aAClB;QACH,CAAC;QAED,iBAAiB;YACf,IAAI;gBACF,IAAI,IAAI,YAAY,WAAW,EAAE;oBAC/B,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;oBAE5C,IAAI,KAAK,CAAC,iBAAiB,EAAE;wBAC3B,KAAK,CAAC,iBAAiB,EAAE,CAAC;qBAC3B;iBACF;aACF;YAAC,MAAM,GAAE;QACZ,CAAC;QAED,oBAAoB;YAClB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAErC,IAAI,KAAK,CAAC,oBAAoB,EAAE;gBAC9B,KAAK,CAAC,oBAAoB,EAAE,CAAC;aAC9B;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAQ;IAChC,MAAM,IAAI,GAAG,CAAC,CAAC,YAAY,EAAE,CAAC;IAI9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAErB,IAAI,YAAY,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,YAAY,QAAQ,EAAE;YAC/D,OAAO,IAAI,CAAC,UAAU,CAAC;SACxB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"injectable.js","sourceRoot":"","sources":["../../src/lib/injectable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,OAAO,EAAoB,CAAC;AAE3D,MAAM,UAAU,UAAU,CAA+B,IAAO,EAAE,CAAW;IAC3E,OAAO,MAAM,cAAe,SAAQ,IAAI;QACtC,YAAY,GAAG,CAAQ;YACrB,KAAK,EAAE,CAAC;YAER,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAE9C,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEhC,IAAI,CAAC;gBACH,IAAI,IAAI,YAAY,WAAW,EAAE,CAAC;oBAChC,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE;wBACxC,MAAM,cAAc,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;wBAE3C,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;4BAC5B,QAAQ,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;wBACrC,CAAC;6BAAM,CAAC;4BACN,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC;wBACpC,CAAC;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;QAED,QAAQ;YACN,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACnB,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,CAAC;QACH,CAAC;QAED,iBAAiB;YACf,IAAI,CAAC;gBACH,IAAI,IAAI,YAAY,WAAW,EAAE,CAAC;oBAChC,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;oBAE5C,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;wBAC5B,KAAK,CAAC,iBAAiB,EAAE,CAAC;oBAC5B,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;QAED,oBAAoB;YAClB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAEvC,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAChC,CAAC;YAED,IAAI,KAAK,CAAC,oBAAoB,EAAE,CAAC;gBAC/B,KAAK,CAAC,oBAAoB,EAAE,CAAC;YAC/B,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAQ;IAChC,MAAM,IAAI,GAAG,CAAC,CAAC,YAAY,EAAE,CAAC;IAI9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAErB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEvC,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}

package/target/lib/injector.d.ts

@@ -1,6 +1,5 @@
 import { ProviderToken, Provider } from './provider.js';
 export type Injectable = object & {
-    injector$$?: Injector;
     onInject?(): void;
 };
 export declare class Injector {

package/target/lib/injector.js

@@ -1,4 +1,4 @@
-var _a;
+import { INJECTABLES } from './injectable.js';
 export class Injector {
     providers;
     #instances = new WeakMap();
@@ -29,8 +29,9 @@ export class Injector {
     #createAndCache(token) {
         const instance = new token();
         this.#instances.set(token, instance);
-        if (instance.injector$$ instanceof _a) {
-            instance.injector$$.setParent(this);
+        const injector = INJECTABLES.get(instance);
+        if (injector) {
+            injector.setParent(this);
             if (instance.onInject) {
                 instance.onInject();
             }
@@ -49,5 +50,4 @@ export class Injector {
         return undefined;
     }
 }
-_a = Injector;
 //# sourceMappingURL=injector.js.map

package/target/lib/injector.js.map

@@ -1 +1 @@
-{"version":3,"file":"injector.js","sourceRoot":"","sources":["../../src/lib/injector.ts"],"names":[],"mappings":";AAyBA,MAAM,OAAO,QAAQ;IAMA;IAJnB,UAAU,GAAG,IAAI,OAAO,EAA2B,CAAC;IAEpD,OAAO,GAAyB,SAAS,CAAC;IAE1C,YAAmB,YAA6B,EAAE,EAAE,MAAiB;QAAlD,cAAS,GAAT,SAAS,CAAsB;QAChD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;IAGD,GAAG,CAAuB,KAAuB;QAE/C,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC9B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;SACpC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAG3C,IAAI,QAAQ,EAAE;YACZ,OAAO,IAAI,CAAC,eAAe,CAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;SAC9C;QAGD,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAChC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,MAA4B;QACpC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,GAAG,IAAI,OAAO,EAAE,CAAC;IAClC,CAAC;IAED,eAAe,CAAuB,KAAuB;QAC3D,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAE,CAAC;QAE7B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAErC,IAAI,QAAQ,CAAC,UAAU,YAAY,EAAQ,EAAE;YAM3C,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAOpC,IAAI,QAAQ,CAAC,QAAQ,EAAE;gBACrB,QAAQ,CAAC,QAAQ,EAAE,CAAC;aACrB;SACF;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,aAAa,CAAC,KAAyB;QACrC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,OAAO,SAAS,CAAC;SAClB;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,EAAE;gBACvC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;aAC1B;SACF;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}
+{"version":3,"file":"injector.js","sourceRoot":"","sources":["../../src/lib/injector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAyB9C,MAAM,OAAO,QAAQ;IAMA;IAJnB,UAAU,GAAG,IAAI,OAAO,EAA2B,CAAC;IAEpD,OAAO,GAAyB,SAAS,CAAC;IAE1C,YAAmB,YAA6B,EAAE,EAAE,MAAiB;QAAlD,cAAS,GAAT,SAAS,CAAsB;QAChD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;IAGD,GAAG,CAAuB,KAAuB;QAE/C,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;QACrC,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAG3C,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,eAAe,CAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC/C,CAAC;QAGD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,MAA4B;QACpC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,GAAG,IAAI,OAAO,EAAE,CAAC;IAClC,CAAC;IAED,eAAe,CAAuB,KAAuB;QAC3D,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAE,CAAC;QAE7B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAErC,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE3C,IAAI,QAAQ,EAAE,CAAC;YAMb,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAOzB,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACtB,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACtB,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,aAAa,CAAC,KAAyB;QACrC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;gBACxC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}

package/target/lib.d.ts

@@ -2,3 +2,4 @@ export { Injector, Injectable } from './lib/injector.js';
 export { Provider, ProviderToken } from './lib/provider.js';
 export { injectable } from './lib/injectable.js';
 export { inject, Injected } from './lib/inject.js';
+export { defineEnvironment, clearEnvironment } from './lib/environment.js';

package/target/lib.js

@@ -1,4 +1,5 @@
 export { Injector } from './lib/injector.js';
 export { injectable } from './lib/injectable.js';
 export { inject } from './lib/inject.js';
+export { defineEnvironment, clearEnvironment } from './lib/environment.js';
 //# sourceMappingURL=lib.js.map

package/target/lib.js.map

@@ -1 +1 @@
-{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,mBAAmB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAY,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,mBAAmB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAY,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC"}