@joist/di 2.0.0-next.7 → 2.0.0-next.8

package/README.md

@@ -11,7 +11,7 @@ npm i @joist/di
 #### Example:
 
 ```TS
-import { Injector, inject } from '@joist/di';
+import { Injector } from '@joist/di';
 
 class FooService {
   sayHello() {
@@ -20,7 +20,9 @@ class FooService {
 }
 
 class BarService {
-  constructor(@inject(FooService) private foo: FooService) {}
+  static deps = [FooService];
+
+  constructor(private foo: FooService) {}
 
   sayHello() {
     return this.foo.sayHello();
@@ -44,7 +46,9 @@ class FooService {
 }
 
 class BarService {
-  constructor(@inject(FooService) private foo: FooService) {}
+  static deps = [FooService];
+
+  constructor(private foo: FooService) {}
 
   sayHello() {
     return 'Hello From BarService and ' + this.foo.sayHello();
@@ -75,7 +79,7 @@ If you have nested injectors and you want to make sure the same instance is prov
 ```TS
 import { service } from '@joist/di';
 
-@service()
+@service
 class FooService {
   sayHello() {
     return 'Hello From FooService';
@@ -89,21 +93,23 @@ Joist DI was built with custom elements in mind. Custom elements are an example
 
 Since the browser will be what initializes your custom elements we need to be able to tell the browser how to pass arguments.
 
-The `@injectable()` decorator allows the Joist Dependency Injector to pass arguments to your custom element when instances of your element is created.
+The `@injectable` decorator allows the Joist Dependency Injector to pass arguments to your custom element when instances of your element is created.
 
-`@injectable()` is on required when you will not be able to manually create instances via an injector.
+`@injectable` is on required when you will not be able to manually create instances via an injector.
 
 #### Inject dependency into your custom element constructor
 
 ```TS
 import { inject, service, injectable } from '@joist/di';
 
-@service()
+@service
 class MyService {}
 
-@injectable()
+@injectable
 class MyElement extends HTMLElement {
-  constructor(@inject(MyService) public myService: MyService) {}
+  static deps = [MyService];
+
+  constructor(public myService: MyService) {}
 }
 
 customElements.define('my-element', MyElement);
@@ -129,9 +135,11 @@ defineEnvironment([
   }
 ]);
 
-@injectable()
+@injectable
 class MyElement extends HTMLElement {
-  constructor(@inject(Config) config: Config) {
+  static deps = [Config];
+
+  constructor(config: Config) {
     console.log(config.apiUrl); // http://real-api/api/
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joist/di",
-  "version": "2.0.0-next.7",
+  "version": "2.0.0-next.8",
   "main": "./target/build/lib.js",
   "module": "./target/build/lib.js",
   "exports": {
@@ -34,5 +34,5 @@
     "test": "tsc -p tsconfig.test.json && wtr --config ../../wtr.config.mjs --port 8001",
     "build": "tsc -p tsconfig.build.json"
   },
-  "gitHead": "48190a6eb436c5dcfd6f5b0b358e78d7722c577e"
+  "gitHead": "1212ee3fec6c88bed79dc5ff97076c088f91c852"
 }

package/target/build/lib/service.d.ts

@@ -1,2 +1,2 @@
 import { ProviderToken } from '../lib/provider';
-export declare function service(provider: ProviderToken<any>): void;
+export declare function service(provider: ProviderToken<any>): ProviderToken<any>;

package/target/build/lib/service.js

@@ -1,4 +1,5 @@
 export function service(provider) {
     Object.defineProperty(provider, 'provideInRoot', { value: true });
+    return provider;
 }
 //# sourceMappingURL=service.js.map

package/target/build/lib/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../lib/service.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,OAAO,CAAC,QAA4B;IAClD,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,eAAe,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../lib/service.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,OAAO,CAAC,QAA4B;IAClD,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,eAAe,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAElE,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/target/build/lib/inject.d.ts

@@ -1,2 +0,0 @@
-import { ProviderToken } from '../lib/provider';
-export declare function inject(injectable: ProviderToken<any>): (target: any, _: string, index: number) => void;

package/target/build/lib/inject.js

@@ -1,8 +0,0 @@
-import { PROVIDER_DEPS_KEY } from '../lib/utils';
-export function inject(injectable) {
-    return function (target, _, index) {
-        target[PROVIDER_DEPS_KEY] = target[PROVIDER_DEPS_KEY] || [];
-        target[PROVIDER_DEPS_KEY][index] = injectable;
-    };
-}
-//# sourceMappingURL=inject.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../../lib/inject.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,UAAU,MAAM,CAAC,UAA8B;IACnD,OAAO,UAAU,MAAW,EAAE,CAAS,EAAE,KAAa;QACpD,MAAM,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;QAC5D,MAAM,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;IAChD,CAAC,CAAC;AACJ,CAAC"}