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

package/target/lib/lifecycle.test.js

@@ -1,134 +1,153 @@
 import { __esDecorate, __runInitializers } from "tslib";
-import { expect } from '@open-wc/testing';
+import { assert } from 'chai';
 import { Injector } from './injector.js';
-import { LifeCycle } from './lifecycle.js';
-import { injectable } from './injectable';
+import { injected, created } from './lifecycle.js';
+import { injectable } from './injectable.js';
 import { inject } from './inject.js';
-describe('LifeCycle', () => {
-    it('should call onInit and onInject when a service is first created', () => {
-        const i = new Injector();
-        const res = {
-            onInit: 0,
-            onInject: 0
+it('should call onInit and onInject when a service is first created', () => {
+    const i = new Injector();
+    let MyService = (() => {
+        let _classDecorators = [injectable()];
+        let _classDescriptor;
+        let _classExtraInitializers = [];
+        let _classThis;
+        let _instanceExtraInitializers = [];
+        let _onCreated_decorators;
+        let _onInjected_decorators;
+        var MyService = class {
+            static { _classThis = this; }
+            static {
+                const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+                _onCreated_decorators = [created()];
+                _onInjected_decorators = [injected()];
+                __esDecorate(this, null, _onCreated_decorators, { kind: "method", name: "onCreated", static: false, private: false, access: { has: obj => "onCreated" in obj, get: obj => obj.onCreated }, metadata: _metadata }, null, _instanceExtraInitializers);
+                __esDecorate(this, null, _onInjected_decorators, { kind: "method", name: "onInjected", static: false, private: false, access: { has: obj => "onInjected" in obj, get: obj => obj.onInjected }, metadata: _metadata }, null, _instanceExtraInitializers);
+                __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+                MyService = _classThis = _classDescriptor.value;
+                if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+                __runInitializers(_classThis, _classExtraInitializers);
+            }
+            res = (__runInitializers(this, _instanceExtraInitializers), {
+                onCreated: 0,
+                onInjected: 0
+            });
+            onCreated() {
+                this.res.onCreated++;
+            }
+            onInjected() {
+                this.res.onInjected++;
+            }
         };
-        let MyService = (() => {
-            let _classDecorators = [injectable];
-            let _classDescriptor;
-            let _classExtraInitializers = [];
-            let _classThis;
-            var MyService = class {
-                static { _classThis = this; }
-                static {
-                    const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-                    __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-                    MyService = _classThis = _classDescriptor.value;
-                    if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-                    __runInitializers(_classThis, _classExtraInitializers);
-                }
-                [LifeCycle.onInit]() {
-                    res.onInit++;
-                }
-                [LifeCycle.onInject]() {
-                    res.onInject++;
-                }
-            };
-            return MyService = _classThis;
-        })();
-        i.inject(MyService);
-        expect(res).to.deep.equal({
-            onInit: 1,
-            onInject: 1
-        });
+        return MyService = _classThis;
+    })();
+    const service = i.inject(MyService);
+    assert.deepEqual(service.res, {
+        onCreated: 1,
+        onInjected: 1
     });
-    it('should call onInject any time a service is returned', () => {
-        const i = new Injector();
-        const res = {
-            onInit: 0,
-            onInject: 0
+});
+it('should call onInject any time a service is returned', () => {
+    const i = new Injector();
+    let MyService = (() => {
+        let _classDecorators = [injectable()];
+        let _classDescriptor;
+        let _classExtraInitializers = [];
+        let _classThis;
+        let _instanceExtraInitializers = [];
+        let _onCreated_decorators;
+        let _onInjected_decorators;
+        var MyService = class {
+            static { _classThis = this; }
+            static {
+                const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+                _onCreated_decorators = [created()];
+                _onInjected_decorators = [injected()];
+                __esDecorate(this, null, _onCreated_decorators, { kind: "method", name: "onCreated", static: false, private: false, access: { has: obj => "onCreated" in obj, get: obj => obj.onCreated }, metadata: _metadata }, null, _instanceExtraInitializers);
+                __esDecorate(this, null, _onInjected_decorators, { kind: "method", name: "onInjected", static: false, private: false, access: { has: obj => "onInjected" in obj, get: obj => obj.onInjected }, metadata: _metadata }, null, _instanceExtraInitializers);
+                __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+                MyService = _classThis = _classDescriptor.value;
+                if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+                __runInitializers(_classThis, _classExtraInitializers);
+            }
+            res = (__runInitializers(this, _instanceExtraInitializers), {
+                onCreated: 0,
+                onInjected: 0
+            });
+            onCreated() {
+                this.res.onCreated++;
+            }
+            onInjected() {
+                this.res.onInjected++;
+            }
         };
-        let MyService = (() => {
-            let _classDecorators = [injectable];
-            let _classDescriptor;
-            let _classExtraInitializers = [];
-            let _classThis;
-            var MyService = class {
-                static { _classThis = this; }
-                static {
-                    const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-                    __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-                    MyService = _classThis = _classDescriptor.value;
-                    if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-                    __runInitializers(_classThis, _classExtraInitializers);
-                }
-                [LifeCycle.onInit]() {
-                    res.onInit++;
-                }
-                [LifeCycle.onInject]() {
-                    res.onInject++;
-                }
-            };
-            return MyService = _classThis;
-        })();
-        i.inject(MyService);
-        i.inject(MyService);
-        expect(res).to.deep.equal({
-            onInit: 1,
-            onInject: 2
-        });
+        return MyService = _classThis;
+    })();
+    i.inject(MyService);
+    const service = i.inject(MyService);
+    assert.deepEqual(service.res, {
+        onCreated: 1,
+        onInjected: 2
     });
-    it('should call onInject and on init when injected from another service', () => {
-        const i = new Injector();
-        const res = {
-            onInit: 0,
-            onInject: 0
+});
+it('should call onInject and on init when injected from another service', () => {
+    const i = new Injector();
+    let MyService = (() => {
+        let _classDecorators = [injectable()];
+        let _classDescriptor;
+        let _classExtraInitializers = [];
+        let _classThis;
+        let _instanceExtraInitializers = [];
+        let _onCreated_decorators;
+        let _onInjected_decorators;
+        var MyService = class {
+            static { _classThis = this; }
+            static {
+                const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+                _onCreated_decorators = [created()];
+                _onInjected_decorators = [injected()];
+                __esDecorate(this, null, _onCreated_decorators, { kind: "method", name: "onCreated", static: false, private: false, access: { has: obj => "onCreated" in obj, get: obj => obj.onCreated }, metadata: _metadata }, null, _instanceExtraInitializers);
+                __esDecorate(this, null, _onInjected_decorators, { kind: "method", name: "onInjected", static: false, private: false, access: { has: obj => "onInjected" in obj, get: obj => obj.onInjected }, metadata: _metadata }, null, _instanceExtraInitializers);
+                __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+                MyService = _classThis = _classDescriptor.value;
+                if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+                __runInitializers(_classThis, _classExtraInitializers);
+            }
+            res = (__runInitializers(this, _instanceExtraInitializers), {
+                onCreated: 0,
+                onInjected: 0
+            });
+            onCreated() {
+                this.res.onCreated++;
+            }
+            onInjected() {
+                this.res.onInjected++;
+            }
+        };
+        return MyService = _classThis;
+    })();
+    let MyApp = (() => {
+        let _classDecorators = [injectable()];
+        let _classDescriptor;
+        let _classExtraInitializers = [];
+        let _classThis;
+        var MyApp = class {
+            static { _classThis = this; }
+            static {
+                const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+                __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+                MyApp = _classThis = _classDescriptor.value;
+                if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+                __runInitializers(_classThis, _classExtraInitializers);
+            }
+            service = inject(MyService);
         };
-        let MyService = (() => {
-            let _classDecorators = [injectable];
-            let _classDescriptor;
-            let _classExtraInitializers = [];
-            let _classThis;
-            var MyService = class {
-                static { _classThis = this; }
-                static {
-                    const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-                    __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-                    MyService = _classThis = _classDescriptor.value;
-                    if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-                    __runInitializers(_classThis, _classExtraInitializers);
-                }
-                [LifeCycle.onInit]() {
-                    res.onInit++;
-                }
-                [LifeCycle.onInject]() {
-                    res.onInject++;
-                }
-            };
-            return MyService = _classThis;
-        })();
-        let MyApp = (() => {
-            let _classDecorators = [injectable];
-            let _classDescriptor;
-            let _classExtraInitializers = [];
-            let _classThis;
-            var MyApp = class {
-                static { _classThis = this; }
-                static {
-                    const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-                    __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-                    MyApp = _classThis = _classDescriptor.value;
-                    if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-                    __runInitializers(_classThis, _classExtraInitializers);
-                }
-                service = inject(MyService);
-            };
-            return MyApp = _classThis;
-        })();
-        i.inject(MyApp).service();
-        i.inject(MyService);
-        expect(res).to.deep.equal({
-            onInit: 1,
-            onInject: 2
-        });
+        return MyApp = _classThis;
+    })();
+    i.inject(MyApp).service();
+    const service = i.inject(MyService);
+    assert.deepEqual(service.res, {
+        onCreated: 1,
+        onInjected: 2
     });
 });
 //# sourceMappingURL=lifecycle.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"lifecycle.test.js","sourceRoot":"","sources":["../../src/lib/lifecycle.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lifecycle.test.js","sourceRoot":"","sources":["../../src/lib/lifecycle.test.ts"],"names":[],"mappings":"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"}

package/target/lib/metadata.d.ts

@@ -0,0 +1,6 @@
+import { ConstructableToken } from './provider.js';
+export interface InjectableMetadata {
+    onCreated?: Function[];
+    onInjected?: Function[];
+}
+export declare function readMetadata<T>(target: ConstructableToken<T>): InjectableMetadata | null;

package/target/lib/metadata.js

@@ -0,0 +1,5 @@
+export function readMetadata(target) {
+    const metadata = target[Symbol.metadata];
+    return metadata;
+}
+//# sourceMappingURL=metadata.js.map

package/target/lib/metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/lib/metadata.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,YAAY,CAAI,MAA6B;IAC3D,MAAM,QAAQ,GAA8B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEpE,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/target/lib/provider.d.ts

@@ -1,16 +1,17 @@
 import { Injector } from './injector.js';
+export type ProviderFactory<T> = (injector: Injector) => T;
 export declare class StaticToken<T> {
-    name: string;
-    factory: (() => T) | undefined;
-    constructor(name: string, factory?: () => T);
+    #private;
+    get name(): string;
+    get factory(): ProviderFactory<T> | undefined;
+    constructor(name: string, factory?: ProviderFactory<T>);
 }
 export interface ConstructableToken<T> {
-    providers?: Provider<any>[];
     new (...args: any[]): T;
 }
 export type InjectionToken<T> = ConstructableToken<T> | StaticToken<T>;
 export interface Provider<T> {
     provide: InjectionToken<T>;
     use?: ConstructableToken<T>;
-    factory?(injector: Injector): T;
+    factory?: ProviderFactory<T>;
 }

package/target/lib/provider.js

@@ -1,9 +1,15 @@
 export class StaticToken {
-    name;
-    factory;
+    #name;
+    #factory;
+    get name() {
+        return this.#name;
+    }
+    get factory() {
+        return this.#factory;
+    }
     constructor(name, factory) {
-        this.name = name;
-        this.factory = factory;
+        this.#name = name;
+        this.#factory = factory;
     }
 }
 //# sourceMappingURL=provider.js.map

package/target/lib/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/lib/provider.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,WAAW;IACtB,IAAI,CAAC;IACL,OAAO,CAAC;IAER,YAAY,IAAY,EAAE,OAAiB;QACzC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF"}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/lib/provider.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,WAAW;IACtB,KAAK,CAAC;IACN,QAAQ,CAAC;IAET,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,YAAY,IAAY,EAAE,OAA4B;QACpD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;CACF"}

package/target/lib.d.ts

@@ -2,5 +2,5 @@ export { Injector } from './lib/injector.js';
 export { Provider, ConstructableToken, StaticToken } from './lib/provider.js';
 export { injectable } from './lib/injectable.js';
 export { inject, Injected } from './lib/inject.js';
-export { LifeCycle } from './lib/lifecycle.js';
+export { injected, created } from './lib/lifecycle.js';
 export { DOMInjector } from './lib/dom-injector.js';

package/target/lib.js

@@ -2,6 +2,6 @@ export { Injector } from './lib/injector.js';
 export { StaticToken } from './lib/provider.js';
 export { injectable } from './lib/injectable.js';
 export { inject } from './lib/inject.js';
-export { LifeCycle } from './lib/lifecycle.js';
+export { injected, created } from './lib/lifecycle.js';
 export { DOMInjector } from './lib/dom-injector.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,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAgC,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAY,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"lib.js","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAgC,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAY,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC"}

package/src/lib/injectable-map.test.ts

@@ -1,18 +0,0 @@
-import { expect } from '@open-wc/testing';
-
-import { InjectableMap } from './injectable-map.js';
-import { Injector } from './injector.js';
-
-describe('InjectableMap', () => {
-  it('should add a new weak reference for an injector', () => {
-    const map = new InjectableMap();
-    const app = {
-      key: {},
-      injector: new Injector()
-    };
-
-    map.set(app.key, app.injector);
-
-    expect(map.get(app.key)).to.equal(app.injector);
-  });
-});

package/src/lib/injectable-map.ts

@@ -1,3 +0,0 @@
-import { Injector } from './injector.js';
-
-export class InjectableMap extends WeakMap<object, Injector> {}

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

@@ -1,187 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert';
-
-import { Injector } from './injector.js';
-import { inject } from './inject.js';
-import { injectable } from './injectable.js';
-import { Provider, StaticToken } from './provider.js';
-
-test('should create a new instance of a single provider', () => {
-  class A {}
-
-  const app = new Injector();
-
-  assert(app.inject(A) instanceof A);
-
-  assert.equal(app.inject(A), app.inject(A));
-});
-
-test('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.inject(MyService);
-
-  assert(instance.a() instanceof A);
-  assert(instance.b() instanceof B);
-});
-
-test('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.inject(E);
-
-  assert(instance.d().c().b().a() instanceof A);
-});
-
-test('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 }]);
-
-  assert(app.inject(B).a() instanceof AltA);
-});
-
-test('should return an existing instance from a parent injector', () => {
-  class A {}
-
-  const parent = new Injector();
-
-  const app = new Injector([], parent);
-
-  assert.equal(parent.inject(A), app.inject(A));
-});
-
-test('should use a factory if provided', () => {
-  class Service {
-    hello() {
-      return 'world';
-    }
-  }
-
-  const injector = new Injector([
-    {
-      provide: Service,
-      factory() {
-        return {
-          hello() {
-            return 'world';
-          }
-        };
-      }
-    }
-  ]);
-
-  assert.equal(injector.inject(Service).hello(), 'world');
-});
-
-test('should throw an error if provider is missing both factory and use', () => {
-  class Service {
-    hello() {
-      return 'world';
-    }
-  }
-
-  const injector = new Injector([
-    {
-      provide: Service
-    }
-  ]);
-
-  assert.throws(
-    () => injector.inject(Service),
-    new Error("Provider for Service found but is missing either 'use' or 'factory'")
-  );
-});
-
-test('should pass factories and instance of the injector', async () => {
-  class Service {
-    hello() {
-      return 'world';
-    }
-  }
-
-  let factoryInjector: Injector | null = null;
-
-  const injector = new Injector([
-    {
-      provide: Service,
-      factory(i) {
-        factoryInjector = i;
-      }
-    }
-  ]);
-
-  injector.inject(Service);
-
-  assert.equal(factoryInjector, injector);
-});
-
-test('should create an instance from a StaticToken factory', () => {
-  const TOKEN = new StaticToken('test', () => 'Hello World');
-  const injector = new Injector();
-
-  const res = injector.inject(TOKEN);
-
-  assert.equal(res, 'Hello World');
-});
-
-test('should create an instance from an async StaticToken factory', async () => {
-  const TOKEN = new StaticToken('test', () => Promise.resolve('Hello World'));
-  const injector = new Injector();
-
-  const res = await injector.inject(TOKEN);
-
-  assert.equal(res, 'Hello World');
-});
-
-test('should allow static token to be overridden', () => {
-  const TOKEN = new StaticToken<string>('test');
-
-  const provider: Provider<string> = {
-    provide: TOKEN,
-    factory() {
-      return 'Hello World';
-    }
-  };
-
-  const injector = new Injector([provider]);
-
-  const res = injector.inject(TOKEN);
-
-  assert.equal(res, 'Hello World');
-});

package/target/lib/injectable-map.d.ts

@@ -1,3 +0,0 @@
-import { Injector } from './injector.js';
-export declare class InjectableMap extends WeakMap<object, Injector> {
-}

package/target/lib/injectable-map.js

@@ -1,3 +0,0 @@
-export class InjectableMap extends WeakMap {
-}
-//# sourceMappingURL=injectable-map.js.map

package/target/lib/injectable-map.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"injectable-map.js","sourceRoot":"","sources":["../../src/lib/injectable-map.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,aAAc,SAAQ,OAAyB;CAAG"}

package/target/lib/injectable-map.test.js

@@ -1,15 +0,0 @@
-import { expect } from '@open-wc/testing';
-import { InjectableMap } from './injectable-map.js';
-import { Injector } from './injector.js';
-describe('InjectableMap', () => {
-    it('should add a new weak reference for an injector', () => {
-        const map = new InjectableMap();
-        const app = {
-            key: {},
-            injector: new Injector()
-        };
-        map.set(app.key, app.injector);
-        expect(map.get(app.key)).to.equal(app.injector);
-    });
-});
-//# sourceMappingURL=injectable-map.test.js.map

package/target/lib/injectable-map.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"injectable-map.test.js","sourceRoot":"","sources":["../../src/lib/injectable-map.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,GAAG,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG;YACV,GAAG,EAAE,EAAE;YACP,QAAQ,EAAE,IAAI,QAAQ,EAAE;SACzB,CAAC;QAEF,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/target/lib/injector.test-node.d.ts

@@ -1 +0,0 @@
-export {};