@joist/di 4.0.0-next.1 → 4.0.0-next.3

package/README.md

@@ -53,7 +53,7 @@ Singleton services are great but the real benefit can be seen when passing insta
 `inject()` returns a function that will then return an instance of the requested service. This means that services are only created when they are needed and not when the class is constructed.
 
 ```ts
-@injectable
+@injectable()
 class App {
   #counter = inject(Counter);
 
@@ -80,7 +80,7 @@ class HttpService {
   }
 }
 
-@injectable
+@injectable()
 class ApiService {
   #http = inject(HttpService);
 
@@ -114,7 +114,7 @@ test('should return json', async () => {
 
 ### Service level providers
 
-Under the hood, each service decorated with `@injectable` creates its own injector. This means that it is possible to defined providers from that level down.
+Under the hood, each service decorated with `@injectable()` creates its own injector. This means that it is possible to defined providers from that level down.
 
 The below example will use this particular instance of Logger as wall as any other services injected into this service.
 
@@ -129,10 +129,10 @@ class ConsoleLogger implements Logger {
   }
 }
 
-@injectable
-class MyService {
-  static providers = [{ provide: Logger, use: ConsoleLogger }];
-}
+@injectable({
+  providers: [{ provide: Logger, use: ConsoleLogger }]
+})
+class MyService {}
 ```
 
 ### Factories
@@ -286,7 +286,7 @@ class Colors {
   secodnary = 'green';
 }
 
-@injectable
+@injectable()
 class MyElement extends HTMLElement {
   #colors = inject(Colors);
 
@@ -314,21 +314,20 @@ class Colors {
   secodnary = 'green';
 }
 
-@injectable
-class ColorCtx extends HTMLElement {
-  // services can be scoped to a particular injectable
-  static providers = [
+@injectable({
+  providers: [
     {
       provide: Colors,
       use: class implements Colors {
         primary = 'orange';
         secondary = 'purple';
-      },
-    },
+      }
+    }
   ]
-}
+})
+class ColorCtx extends HTMLElement {}
 
-@injectable
+@injectable()
 class MyElement extends HTMLElement {
   #colors = inject(Colors);
 
@@ -353,14 +352,3 @@ customElements.define('my-element', MyElement);
   <my-element></my-element>
 </color-ctx>
 ```
-
-### Environment
-
-When using @joist/di with custom elements a default root injector is created dubbed 'environment'. This is the injector that all other injectors will eventually stop at.
-If you need to define something in this environment you can do so with the `defineEnvironment` method.
-
-```ts
-import { defineEnvironment } from '@joist/di';
-
-defineEnvironment([{ provide: MyService, use: SomeOtherService }]);
-```

package/package.json

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

package/src/lib/dom-injector.test.ts

@@ -1,7 +1,7 @@
 import { expect } from '@open-wc/testing';
 
 import { DOMInjector } from './dom-injector.js';
-import { INJECTABLE_MAP } from './injectable.js';
+import { Injectables } from './injector.js';
 
 describe('DOMInjector', () => {
   it('should attach an injector to a dom element', () => {
@@ -10,7 +10,7 @@ describe('DOMInjector', () => {
 
     app.attach(root);
 
-    const injector = INJECTABLE_MAP.get(root);
+    const injector = Injectables.get(root);
 
     expect(injector).to.equal(app);
   });
@@ -21,10 +21,10 @@ describe('DOMInjector', () => {
 
     app.attach(root);
 
-    expect(INJECTABLE_MAP.get(root)).to.equal(app);
+    expect(Injectables.get(root)).to.equal(app);
 
     app.detach(root);
 
-    expect(INJECTABLE_MAP.get(root)).to.equal(undefined);
+    expect(Injectables.get(root)).to.equal(undefined);
   });
 });

package/src/lib/dom-injector.ts

@@ -1,12 +1,11 @@
-import { INJECTABLE_MAP } from './injectable.js';
-import { Injector } from './injector.js';
+import { Injectables, Injector } from './injector.js';
 
 export class DOMInjector extends Injector {
   attach(root: HTMLElement) {
-    INJECTABLE_MAP.set(root, this);
+    Injectables.set(root, this);
   }
 
   detach(root: HTMLElement) {
-    INJECTABLE_MAP.delete(root);
+    Injectables.delete(root);
   }
 }

package/src/lib/inject.test.ts

@@ -9,7 +9,7 @@ describe('inject', () => {
   it('should work', () => {
     class HelloService {}
 
-    @injectable
+    @injectable()
     class HelloWorld extends HTMLElement {
       hello = inject(HelloService);
     }
@@ -24,7 +24,7 @@ describe('inject', () => {
       value = '1';
     }
 
-    @injectable
+    @injectable()
     class BarService {
       foo = inject(FooService);
 
@@ -43,7 +43,7 @@ describe('inject', () => {
       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 [LifeCycle.onInject] callback method.`
+        `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 [LifeCycle.onInject] callback method.`
       );
     }
   });
@@ -53,7 +53,7 @@ describe('inject', () => {
       value = '1';
     }
 
-    @injectable
+    @injectable()
     class BarService {
       foo = inject(FooService);
     }
@@ -73,7 +73,7 @@ describe('inject', () => {
   it('should inject a static token', () => {
     const TOKEN = new StaticToken('test', () => 'Hello World');
 
-    @injectable
+    @injectable()
     class HelloWorld {
       hello = inject(TOKEN);
     }

package/src/lib/inject.ts

@@ -1,19 +1,18 @@
 import { InjectionToken } from './provider.js';
-import { INJECTABLE_MAP } from './injectable.js';
+
+import { Injectables } from './injector.js';
 
 export type Injected<T> = () => T;
 
-export function inject<This extends object, T>(
-  token: InjectionToken<T>
-): Injected<T> {
+export function inject<This extends object, T>(token: InjectionToken<T>): Injected<T> {
   return function (this: This) {
-    const injector = INJECTABLE_MAP.get(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 [LifeCycle.onInject] callback method.`
+        `${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 [LifeCycle.onInject] callback method.`
       );
     }
 

package/src/lib/injectable.test.ts

@@ -8,7 +8,7 @@ describe('@injectable()', () => {
     class Foo {}
     class Bar {}
 
-    @injectable
+    @injectable()
     class MyElement extends HTMLElement {
       foo = inject(Foo);
       bar = inject(Bar);
@@ -26,13 +26,12 @@ describe('@injectable()', () => {
 
     class Bar extends Foo {}
 
-    const MyElement = injectable(
-      class {
-        static providers = [{ provide: Foo, use: Bar }];
-
-        foo = inject(Foo);
-      }
-    );
+    @injectable({
+      providers: [{ provide: Foo, use: Bar }]
+    })
+    class MyElement {
+      foo = inject(Foo);
+    }
 
     const el = new MyElement();
 
@@ -40,26 +39,25 @@ describe('@injectable()', () => {
   });
 
   it('should handle parent HTML Injectors', async () => {
-    @injectable
+    @injectable()
     class A {}
 
-    const B = injectable(
-      class {
-        a = inject(A);
-      }
-    );
+    @injectable()
+    class B {
+      a = inject(A);
+    }
 
     class AltA implements A {}
 
-    @injectable
-    class Parent extends HTMLElement {
-      static providers = [
+    @injectable({
+      providers: [
         { provide: B, use: B },
         { provide: A, use: AltA }
-      ];
-    }
+      ]
+    })
+    class Parent extends HTMLElement {}
 
-    @injectable
+    @injectable()
     class Child extends HTMLElement {
       b = inject(B);
     }
@@ -82,17 +80,17 @@ describe('@injectable()', () => {
     class A {}
     class AltA implements A {}
 
-    @injectable
-    class Ctx1 extends HTMLElement {
-      static providers = [{ provide: A, use: A }];
-    }
+    @injectable({
+      providers: [{ provide: A, use: A }]
+    })
+    class Ctx1 extends HTMLElement {}
 
-    @injectable
-    class Ctx2 extends HTMLElement {
-      static providers = [{ provide: A, use: AltA }];
-    }
+    @injectable({
+      providers: [{ provide: A, use: AltA }]
+    })
+    class Ctx2 extends HTMLElement {}
 
-    @injectable
+    @injectable()
     class Child extends HTMLElement {
       a = inject(A);
     }

package/src/lib/injectable.ts

@@ -1,52 +1,56 @@
-import { ConstructableToken } from './provider.js';
-import { Injector } from './injector.js';
-import { InjectableMap } from './injectable-map.js';
+import { ConstructableToken, Provider } from './provider.js';
+import { Injectables, Injector } from './injector.js';
 
-export const INJECTABLE_MAP = new InjectableMap();
+export interface InjectableOpts {
+  providers: Provider<unknown>[];
+}
 
-export function injectable<T extends ConstructableToken<any>>(Base: T, _?: unknown) {
-  return class InjectableNode extends Base {
-    constructor(..._: any[]) {
-      super();
+export function injectable(opts?: InjectableOpts) {
+  return function injectableDecorator<T extends ConstructableToken<any>>(Base: T, _?: unknown) {
+    return class InjectableNode extends Base {
+      constructor(..._: any[]) {
+        super();
 
-      // Define a new Injector and assiciate it with this instance of the service
-      const injector = new Injector(Base.providers);
-      INJECTABLE_MAP.set(this, injector);
+        // Define a new Injector and assiciate it with this instance of the service
+        const injector = new Injector(opts?.providers);
 
-      // If the current injectable instance is a HTMLElement preform additional startup logic
-      // this will find and attach parent injectors
-      if ('HTMLElement' in globalThis && this instanceof HTMLElement) {
-        this.addEventListener('finddiroot', (e) => {
-          const parentInjector = findInjectorRoot(e);
+        Injectables.set(this, injector);
 
-          if (parentInjector !== null) {
-            injector.setParent(parentInjector);
-          }
-        });
+        // If the current injectable instance is a HTMLElement preform additional startup logic
+        // this will find and attach parent injectors
+        if ('HTMLElement' in globalThis && this instanceof HTMLElement) {
+          this.addEventListener('finddiroot', (e) => {
+            const parentInjector = findInjectorRoot(e);
+
+            if (parentInjector !== null) {
+              injector.setParent(parentInjector);
+            }
+          });
+        }
       }
-    }
 
-    connectedCallback() {
-      if ('HTMLElement' in globalThis && this instanceof HTMLElement) {
-        this.dispatchEvent(new Event('finddiroot'));
+      connectedCallback() {
+        if ('HTMLElement' in globalThis && this instanceof HTMLElement) {
+          this.dispatchEvent(new Event('finddiroot'));
 
-        if (super.connectedCallback) {
-          super.connectedCallback();
+          if (super.connectedCallback) {
+            super.connectedCallback();
+          }
         }
       }
-    }
 
-    disconnectedCallback() {
-      const injector = INJECTABLE_MAP.get(this);
+      disconnectedCallback() {
+        const injector = Injectables.get(this);
 
-      if (injector) {
-        injector.setParent(undefined);
-      }
+        if (injector) {
+          injector.setParent(undefined);
+        }
 
-      if (super.disconnectedCallback) {
-        super.disconnectedCallback();
+        if (super.disconnectedCallback) {
+          super.disconnectedCallback();
+        }
       }
-    }
+    };
   };
 }
 
@@ -58,7 +62,7 @@ function findInjectorRoot(e: Event): Injector | null {
   for (let i = 1; i < path.length; i++) {
     const part = path[i];
 
-    const injector = INJECTABLE_MAP.get(part);
+    const injector = Injectables.get(part);
 
     if (injector) {
       return injector;

package/src/lib/injector.test-node.ts

@@ -20,7 +20,7 @@ test('should inject providers in the correct order', () => {
   class A {}
   class B {}
 
-  @injectable
+  @injectable()
   class MyService {
     a = inject(A);
     b = inject(B);
@@ -36,22 +36,22 @@ test('should inject providers in the correct order', () => {
 test('should create a new instance of a provider that has a full dep tree', () => {
   class A {}
 
-  @injectable
+  @injectable()
   class B {
     a = inject(A);
   }
 
-  @injectable
+  @injectable()
   class C {
     b = inject(B);
   }
 
-  @injectable
+  @injectable()
   class D {
     c = inject(C);
   }
 
-  @injectable
+  @injectable()
   class E {
     d = inject(D);
   }
@@ -65,7 +65,7 @@ test('should create a new instance of a provider that has a full dep tree', () =
 test('should override a provider if explicitly instructed', () => {
   class A {}
 
-  @injectable
+  @injectable()
   class B {
     a = inject(A);
   }

package/src/lib/injector.test.ts

@@ -19,7 +19,7 @@ describe('Injector', () => {
     class A {}
     class B {}
 
-    @injectable
+    @injectable()
     class MyService {
       a = inject(A);
       b = inject(B);
@@ -35,22 +35,22 @@ describe('Injector', () => {
   it('should create a new instance of a provider that has a full dep tree', () => {
     class A {}
 
-    @injectable
+    @injectable()
     class B {
       a = inject(A);
     }
 
-    @injectable
+    @injectable()
     class C {
       b = inject(B);
     }
 
-    @injectable
+    @injectable()
     class D {
       c = inject(C);
     }
 
-    @injectable
+    @injectable()
     class E {
       d = inject(D);
     }
@@ -64,7 +64,7 @@ describe('Injector', () => {
   it('should override a provider if explicitly instructed', () => {
     class A {}
 
-    @injectable
+    @injectable()
     class B {
       a = inject(A);
     }

package/src/lib/injector.ts

@@ -1,7 +1,11 @@
-import { INJECTABLE_MAP } from './injectable.js';
 import { LifeCycle } from './lifecycle.js';
 import { InjectionToken, Provider, StaticToken } from './provider.js';
 
+/**
+ * Keeps track of all Injectable services and their Injector
+ */
+export const Injectables = new WeakMap<object, Injector>();
+
 /**
  * Injectors create and store instances of services.
  * A service is any constructable class.
@@ -31,12 +35,8 @@ export class Injector {
     this.providers = providers;
   }
 
-  inject<T>(token: InjectionToken<T>): T {
-    return this.get(token);
-  }
-
   // resolves and retuns and instance of the requested service
-  get<T>(token: InjectionToken<T>): T {
+  inject<T>(token: InjectionToken<T>): T {
     // check for a local instance
     if (this.#instances.has(token)) {
       const instance = this.#instances.get(token)!;
@@ -98,7 +98,7 @@ export class Injector {
      * Only values that are objects are able to have associated injectors
      */
     if (typeof instance === 'object' && instance !== null) {
-      const injector = INJECTABLE_MAP.get(instance);
+      const injector = Injectables.get(instance);
 
       if (injector) {
         /**

package/src/lib/lifecycle.test.ts

@@ -14,7 +14,7 @@ describe('LifeCycle', () => {
       onInject: 0
     };
 
-    @injectable
+    @injectable()
     class MyService {
       [LifeCycle.onInit]() {
         res.onInit++;
@@ -41,7 +41,7 @@ describe('LifeCycle', () => {
       onInject: 0
     };
 
-    @injectable
+    @injectable()
     class MyService {
       [LifeCycle.onInit]() {
         res.onInit++;
@@ -69,7 +69,7 @@ describe('LifeCycle', () => {
       onInject: 0
     };
 
-    @injectable
+    @injectable()
     class MyService {
       [LifeCycle.onInit]() {
         res.onInit++;
@@ -80,7 +80,7 @@ describe('LifeCycle', () => {
       }
     }
 
-    @injectable
+    @injectable()
     class MyApp {
       service = inject(MyService);
     }

package/src/lib/provider.ts

@@ -1,12 +1,20 @@
 import { Injector } from './injector.js';
 
 export class StaticToken<T> {
-  name;
-  factory;
+  #name;
+  #factory;
+
+  get name() {
+    return this.#name;
+  }
+
+  get factory() {
+    return this.#factory;
+  }
 
   constructor(name: string, factory?: () => T) {
-    this.name = name;
-    this.factory = factory;
+    this.#name = name;
+    this.#factory = factory;
   }
 }
 

package/target/lib/dom-injector.js

@@ -1,11 +1,10 @@
-import { INJECTABLE_MAP } from './injectable.js';
-import { Injector } from './injector.js';
+import { Injectables, Injector } from './injector.js';
 export class DOMInjector extends Injector {
     attach(root) {
-        INJECTABLE_MAP.set(root, this);
+        Injectables.set(root, this);
     }
     detach(root) {
-        INJECTABLE_MAP.delete(root);
+        Injectables.delete(root);
     }
 }
 //# sourceMappingURL=dom-injector.js.map

package/target/lib/dom-injector.js.map

@@ -1 +1 @@
-{"version":3,"file":"dom-injector.js","sourceRoot":"","sources":["../../src/lib/dom-injector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,MAAM,OAAO,WAAY,SAAQ,QAAQ;IACvC,MAAM,CAAC,IAAiB;QACtB,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,IAAiB;QACtB,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;CACF"}
+{"version":3,"file":"dom-injector.js","sourceRoot":"","sources":["../../src/lib/dom-injector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEtD,MAAM,OAAO,WAAY,SAAQ,QAAQ;IACvC,MAAM,CAAC,IAAiB;QACtB,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,IAAiB;QACtB,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;CACF"}

package/target/lib/dom-injector.test.js

@@ -1,21 +1,21 @@
 import { expect } from '@open-wc/testing';
 import { DOMInjector } from './dom-injector.js';
-import { INJECTABLE_MAP } from './injectable.js';
+import { Injectables } from './injector.js';
 describe('DOMInjector', () => {
     it('should attach an injector to a dom element', () => {
         const root = document.createElement('div');
         const app = new DOMInjector();
         app.attach(root);
-        const injector = INJECTABLE_MAP.get(root);
+        const injector = Injectables.get(root);
         expect(injector).to.equal(app);
     });
     it('should remove an injector associated with a dom element', () => {
         const root = document.createElement('div');
         const app = new DOMInjector();
         app.attach(root);
-        expect(INJECTABLE_MAP.get(root)).to.equal(app);
+        expect(Injectables.get(root)).to.equal(app);
         app.detach(root);
-        expect(INJECTABLE_MAP.get(root)).to.equal(undefined);
+        expect(Injectables.get(root)).to.equal(undefined);
     });
 });
 //# sourceMappingURL=dom-injector.test.js.map

package/target/lib/dom-injector.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"dom-injector.test.js","sourceRoot":"","sources":["../../src/lib/dom-injector.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,WAAW,EAAE,CAAC;QAE9B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEjB,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE1C,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,WAAW,EAAE,CAAC;QAE9B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEjB,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE/C,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEjB,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"dom-injector.test.js","sourceRoot":"","sources":["../../src/lib/dom-injector.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,WAAW,EAAE,CAAC;QAE9B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEjB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEvC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,WAAW,EAAE,CAAC;QAE9B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEjB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE5C,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEjB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/target/lib/inject.js

@@ -1,10 +1,10 @@
-import { INJECTABLE_MAP } from './injectable.js';
+import { Injectables } from './injector.js';
 export function inject(token) {
     return function () {
-        const injector = INJECTABLE_MAP.get(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 [LifeCycle.onInject] callback method.`);
+            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 [LifeCycle.onInject] callback method.`);
         }
         return injector.inject(token);
     };