@joist/di 2.0.0-next.8 → 2.0.0

package/target/build/lib/environment.js

@@ -1,16 +1,9 @@
-import { Injector } from './injector';
-let rootInjector = null;
-export function defineEnvironment(providers = []) {
-    rootInjector = new Injector({ providers });
+import { Injector } from './injector.js';
+const rootInjector = new Injector();
+export function environment() {
     return rootInjector;
 }
-export function getEnvironmentRef() {
-    if (rootInjector) {
-        return rootInjector;
-    }
-    return defineEnvironment();
-}
 export function clearEnvironment() {
-    rootInjector = null;
+    rootInjector.providers = [];
+    rootInjector.instances = new WeakMap();
 }
-//# sourceMappingURL=environment.js.map

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

@@ -1,13 +1,317 @@
-import { Provider, ProviderToken } from './provider';
+import { Provider, ProviderToken } from './provider.js';
+import { Injector } from './injector.js';
 export interface Injectable {
-    deps: ProviderToken<any>[];
+    inject?: ProviderToken<any>[];
     providers?: Provider<any>[];
-    new (...args: any[]): any;
+    new (...args: any[]): HTMLElement;
 }
-export declare function injectable<T extends Injectable>(Clazz: T): {
+export declare function injectable<T extends Injectable>(CustomElement: T): {
     new (...args: any[]): {
-        [x: string]: any;
+        injector: Injector;
+        connectedCallback(): void;
+        disconnectedCallback(): void;
+        accessKey: string;
+        readonly accessKeyLabel: string;
+        autocapitalize: string;
+        dir: string;
+        draggable: boolean;
+        hidden: boolean;
+        innerText: string;
+        lang: string;
+        readonly offsetHeight: number;
+        readonly offsetLeft: number;
+        readonly offsetParent: Element | null;
+        readonly offsetTop: number;
+        readonly offsetWidth: number;
+        outerText: string;
+        spellcheck: boolean;
+        title: string;
+        translate: boolean;
+        attachInternals(): ElementInternals;
+        click(): void;
+        addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions | undefined): void;
+        addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions | undefined): void;
+        removeEventListener<K_1 extends keyof HTMLElementEventMap>(type: K_1, listener: (this: HTMLElement, ev: HTMLElementEventMap[K_1]) => any, options?: boolean | EventListenerOptions | undefined): void;
+        removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions | undefined): void;
+        readonly attributes: NamedNodeMap;
+        readonly classList: DOMTokenList;
+        className: string;
+        readonly clientHeight: number;
+        readonly clientLeft: number;
+        readonly clientTop: number;
+        readonly clientWidth: number;
+        id: string;
+        readonly localName: string;
+        readonly namespaceURI: string | null;
+        onfullscreenchange: ((this: Element, ev: Event) => any) | null;
+        onfullscreenerror: ((this: Element, ev: Event) => any) | null;
+        outerHTML: string;
+        readonly ownerDocument: Document;
+        readonly part: DOMTokenList;
+        readonly prefix: string | null;
+        readonly scrollHeight: number;
+        scrollLeft: number;
+        scrollTop: number;
+        readonly scrollWidth: number;
+        readonly shadowRoot: ShadowRoot | null;
+        slot: string;
+        readonly tagName: string;
+        attachShadow(init: ShadowRootInit): ShadowRoot;
+        closest<K_2 extends keyof HTMLElementTagNameMap>(selector: K_2): HTMLElementTagNameMap[K_2] | null;
+        closest<K_3 extends keyof SVGElementTagNameMap>(selector: K_3): SVGElementTagNameMap[K_3] | null;
+        closest<E extends Element = Element>(selectors: string): E | null;
+        getAttribute(qualifiedName: string): string | null;
+        getAttributeNS(namespace: string | null, localName: string): string | null;
+        getAttributeNames(): string[];
+        getAttributeNode(qualifiedName: string): Attr | null;
+        getAttributeNodeNS(namespace: string | null, localName: string): Attr | null;
+        getBoundingClientRect(): DOMRect;
+        getClientRects(): DOMRectList;
+        getElementsByClassName(classNames: string): HTMLCollectionOf<Element>;
+        getElementsByTagName<K_4 extends keyof HTMLElementTagNameMap>(qualifiedName: K_4): HTMLCollectionOf<HTMLElementTagNameMap[K_4]>;
+        getElementsByTagName<K_5 extends keyof SVGElementTagNameMap>(qualifiedName: K_5): HTMLCollectionOf<SVGElementTagNameMap[K_5]>;
+        getElementsByTagName(qualifiedName: string): HTMLCollectionOf<Element>;
+        getElementsByTagNameNS(namespaceURI: "http://www.w3.org/1999/xhtml", localName: string): HTMLCollectionOf<HTMLElement>;
+        getElementsByTagNameNS(namespaceURI: "http://www.w3.org/2000/svg", localName: string): HTMLCollectionOf<SVGElement>;
+        getElementsByTagNameNS(namespace: string | null, localName: string): HTMLCollectionOf<Element>;
+        hasAttribute(qualifiedName: string): boolean;
+        hasAttributeNS(namespace: string | null, localName: string): boolean;
+        hasAttributes(): boolean;
+        hasPointerCapture(pointerId: number): boolean;
+        insertAdjacentElement(where: InsertPosition, element: Element): Element | null;
+        insertAdjacentHTML(position: InsertPosition, text: string): void;
+        insertAdjacentText(where: InsertPosition, data: string): void;
+        matches(selectors: string): boolean;
+        releasePointerCapture(pointerId: number): void;
+        removeAttribute(qualifiedName: string): void;
+        removeAttributeNS(namespace: string | null, localName: string): void;
+        removeAttributeNode(attr: Attr): Attr;
+        requestFullscreen(options?: FullscreenOptions | undefined): Promise<void>;
+        requestPointerLock(): void;
+        scroll(options?: ScrollToOptions | undefined): void;
+        scroll(x: number, y: number): void;
+        scrollBy(options?: ScrollToOptions | undefined): void;
+        scrollBy(x: number, y: number): void;
+        scrollIntoView(arg?: boolean | ScrollIntoViewOptions | undefined): void;
+        scrollTo(options?: ScrollToOptions | undefined): void;
+        scrollTo(x: number, y: number): void;
+        setAttribute(qualifiedName: string, value: string): void;
+        setAttributeNS(namespace: string | null, qualifiedName: string, value: string): void;
+        setAttributeNode(attr: Attr): Attr | null;
+        setAttributeNodeNS(attr: Attr): Attr | null;
+        setPointerCapture(pointerId: number): void;
+        toggleAttribute(qualifiedName: string, force?: boolean | undefined): boolean;
+        webkitMatchesSelector(selectors: string): boolean;
+        readonly baseURI: string;
+        readonly childNodes: NodeListOf<ChildNode>;
+        readonly firstChild: ChildNode | null;
+        readonly isConnected: boolean;
+        readonly lastChild: ChildNode | null;
+        readonly nextSibling: ChildNode | null;
+        readonly nodeName: string;
+        readonly nodeType: number;
+        nodeValue: string | null;
+        readonly parentElement: HTMLElement | null;
+        readonly parentNode: ParentNode | null;
+        readonly previousSibling: ChildNode | null;
+        textContent: string | null;
+        appendChild<T_1 extends Node>(node: T_1): T_1;
+        cloneNode(deep?: boolean | undefined): Node;
+        compareDocumentPosition(other: Node): number;
+        contains(other: Node | null): boolean;
+        getRootNode(options?: GetRootNodeOptions | undefined): Node;
+        hasChildNodes(): boolean;
+        insertBefore<T_2 extends Node>(node: T_2, child: Node | null): T_2;
+        isDefaultNamespace(namespace: string | null): boolean;
+        isEqualNode(otherNode: Node | null): boolean;
+        isSameNode(otherNode: Node | null): boolean;
+        lookupNamespaceURI(prefix: string | null): string | null;
+        lookupPrefix(namespace: string | null): string | null;
+        normalize(): void;
+        removeChild<T_3 extends Node>(child: T_3): T_3;
+        replaceChild<T_4 extends Node>(node: Node, child: T_4): T_4;
+        readonly ATTRIBUTE_NODE: number;
+        readonly CDATA_SECTION_NODE: number;
+        readonly COMMENT_NODE: number;
+        readonly DOCUMENT_FRAGMENT_NODE: number;
+        readonly DOCUMENT_NODE: number;
+        readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+        readonly DOCUMENT_POSITION_CONTAINS: number;
+        readonly DOCUMENT_POSITION_DISCONNECTED: number;
+        readonly DOCUMENT_POSITION_FOLLOWING: number;
+        readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+        readonly DOCUMENT_POSITION_PRECEDING: number;
+        readonly DOCUMENT_TYPE_NODE: number;
+        readonly ELEMENT_NODE: number;
+        readonly ENTITY_NODE: number;
+        readonly ENTITY_REFERENCE_NODE: number;
+        readonly NOTATION_NODE: number;
+        readonly PROCESSING_INSTRUCTION_NODE: number;
+        readonly TEXT_NODE: number;
+        dispatchEvent(event: Event): boolean;
+        ariaAtomic: string | null;
+        ariaAutoComplete: string | null;
+        ariaBusy: string | null;
+        ariaChecked: string | null;
+        ariaColCount: string | null;
+        ariaColIndex: string | null;
+        ariaColSpan: string | null;
+        ariaCurrent: string | null;
+        ariaDisabled: string | null;
+        ariaExpanded: string | null;
+        ariaHasPopup: string | null;
+        ariaHidden: string | null;
+        ariaKeyShortcuts: string | null;
+        ariaLabel: string | null;
+        ariaLevel: string | null;
+        ariaLive: string | null;
+        ariaModal: string | null;
+        ariaMultiLine: string | null;
+        ariaMultiSelectable: string | null;
+        ariaOrientation: string | null;
+        ariaPlaceholder: string | null;
+        ariaPosInSet: string | null;
+        ariaPressed: string | null;
+        ariaReadOnly: string | null;
+        ariaRequired: string | null;
+        ariaRoleDescription: string | null;
+        ariaRowCount: string | null;
+        ariaRowIndex: string | null;
+        ariaRowSpan: string | null;
+        ariaSelected: string | null;
+        ariaSetSize: string | null;
+        ariaSort: string | null;
+        ariaValueMax: string | null;
+        ariaValueMin: string | null;
+        ariaValueNow: string | null;
+        ariaValueText: string | null;
+        animate(keyframes: PropertyIndexedKeyframes | Keyframe[] | null, options?: number | KeyframeAnimationOptions | undefined): Animation;
+        getAnimations(options?: GetAnimationsOptions | undefined): Animation[];
+        after(...nodes: (string | Node)[]): void;
+        before(...nodes: (string | Node)[]): void;
+        remove(): void;
+        replaceWith(...nodes: (string | Node)[]): void;
+        innerHTML: string;
+        readonly nextElementSibling: Element | null;
+        readonly previousElementSibling: Element | null;
+        readonly childElementCount: number;
+        readonly children: HTMLCollection;
+        readonly firstElementChild: Element | null;
+        readonly lastElementChild: Element | null;
+        append(...nodes: (string | Node)[]): void;
+        prepend(...nodes: (string | Node)[]): void;
+        querySelector<K_6 extends keyof HTMLElementTagNameMap>(selectors: K_6): HTMLElementTagNameMap[K_6] | null;
+        querySelector<K_7 extends keyof SVGElementTagNameMap>(selectors: K_7): SVGElementTagNameMap[K_7] | null;
+        querySelector<E_1 extends Element = Element>(selectors: string): E_1 | null;
+        querySelectorAll<K_8 extends keyof HTMLElementTagNameMap>(selectors: K_8): NodeListOf<HTMLElementTagNameMap[K_8]>;
+        querySelectorAll<K_9 extends keyof SVGElementTagNameMap>(selectors: K_9): NodeListOf<SVGElementTagNameMap[K_9]>;
+        querySelectorAll<E_2 extends Element = Element>(selectors: string): NodeListOf<E_2>;
+        replaceChildren(...nodes: (string | Node)[]): void;
+        readonly assignedSlot: HTMLSlotElement | null;
+        oncopy: ((this: DocumentAndElementEventHandlers, ev: ClipboardEvent) => any) | null;
+        oncut: ((this: DocumentAndElementEventHandlers, ev: ClipboardEvent) => any) | null;
+        onpaste: ((this: DocumentAndElementEventHandlers, ev: ClipboardEvent) => any) | null;
+        readonly style: CSSStyleDeclaration;
+        contentEditable: string;
+        enterKeyHint: string;
+        inputMode: string;
+        readonly isContentEditable: boolean;
+        onabort: ((this: GlobalEventHandlers, ev: UIEvent) => any) | null;
+        onanimationcancel: ((this: GlobalEventHandlers, ev: AnimationEvent) => any) | null;
+        onanimationend: ((this: GlobalEventHandlers, ev: AnimationEvent) => any) | null;
+        onanimationiteration: ((this: GlobalEventHandlers, ev: AnimationEvent) => any) | null;
+        onanimationstart: ((this: GlobalEventHandlers, ev: AnimationEvent) => any) | null;
+        onauxclick: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onblur: ((this: GlobalEventHandlers, ev: FocusEvent) => any) | null;
+        oncanplay: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        oncanplaythrough: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onchange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onclick: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onclose: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        oncontextmenu: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        oncuechange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        ondblclick: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        ondrag: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondragend: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondragenter: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondragleave: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondragover: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondragstart: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondrop: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondurationchange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onemptied: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onended: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onerror: OnErrorEventHandler;
+        onfocus: ((this: GlobalEventHandlers, ev: FocusEvent) => any) | null;
+        onformdata: ((this: GlobalEventHandlers, ev: FormDataEvent) => any) | null;
+        ongotpointercapture: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        oninput: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        oninvalid: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onkeydown: ((this: GlobalEventHandlers, ev: KeyboardEvent) => any) | null;
+        onkeypress: ((this: GlobalEventHandlers, ev: KeyboardEvent) => any) | null;
+        onkeyup: ((this: GlobalEventHandlers, ev: KeyboardEvent) => any) | null;
+        onload: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onloadeddata: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onloadedmetadata: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onloadstart: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onlostpointercapture: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onmousedown: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmouseenter: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmouseleave: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmousemove: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmouseout: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmouseover: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmouseup: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onpause: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onplay: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onplaying: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onpointercancel: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerdown: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerenter: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerleave: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointermove: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerout: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerover: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerup: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onprogress: ((this: GlobalEventHandlers, ev: ProgressEvent<EventTarget>) => any) | null;
+        onratechange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onreset: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onresize: ((this: GlobalEventHandlers, ev: UIEvent) => any) | null;
+        onscroll: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onsecuritypolicyviolation: ((this: GlobalEventHandlers, ev: SecurityPolicyViolationEvent) => any) | null;
+        onseeked: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onseeking: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onselect: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onselectionchange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onselectstart: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onslotchange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onstalled: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onsubmit: ((this: GlobalEventHandlers, ev: SubmitEvent) => any) | null;
+        onsuspend: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        ontimeupdate: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        ontoggle: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        ontouchcancel?: ((this: GlobalEventHandlers, ev: TouchEvent) => any) | null | undefined;
+        ontouchend?: ((this: GlobalEventHandlers, ev: TouchEvent) => any) | null | undefined;
+        ontouchmove?: ((this: GlobalEventHandlers, ev: TouchEvent) => any) | null | undefined;
+        ontouchstart?: ((this: GlobalEventHandlers, ev: TouchEvent) => any) | null | undefined;
+        ontransitioncancel: ((this: GlobalEventHandlers, ev: TransitionEvent) => any) | null;
+        ontransitionend: ((this: GlobalEventHandlers, ev: TransitionEvent) => any) | null;
+        ontransitionrun: ((this: GlobalEventHandlers, ev: TransitionEvent) => any) | null;
+        ontransitionstart: ((this: GlobalEventHandlers, ev: TransitionEvent) => any) | null;
+        onvolumechange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwaiting: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwebkitanimationend: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwebkitanimationiteration: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwebkitanimationstart: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwebkittransitionend: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwheel: ((this: GlobalEventHandlers, ev: WheelEvent) => any) | null;
+        autofocus: boolean;
+        readonly dataset: DOMStringMap;
+        nonce?: string | undefined;
+        tabIndex: number;
+        blur(): void;
+        focus(options?: FocusOptions | undefined): void;
     };
-    deps: ProviderToken<any>[];
+    inject?: ProviderToken<any>[] | undefined;
     providers?: Provider<any>[] | undefined;
 } & T;

package/target/build/lib/injectable.js

@@ -1,17 +1,49 @@
-import { getEnvironmentRef } from './environment';
-import { Injector } from './injector';
-export function injectable(Clazz) {
-    const { deps, providers } = Clazz;
-    return class InjectableElement extends Clazz {
+import { Injector } from './injector.js';
+import { environment } from './environment.js';
+export function injectable(CustomElement) {
+    const { inject, providers } = CustomElement;
+    return class InjectableElement extends CustomElement {
         constructor(...args) {
-            if (args.length || !deps.length) {
+            const injector = new Injector(providers, environment());
+            if (args.length || !inject) {
                 super(...args);
             }
             else {
-                const i = new Injector({ providers }, getEnvironmentRef());
-                super(...deps.map((dep) => i.get(dep)));
+                super(...inject.map((dep) => () => injector.get(dep)));
+            }
+            this.injector = injector;
+        }
+        connectedCallback() {
+            // only mark as an injector root if element defines providers
+            if (providers) {
+                this.setAttribute('joist-injector-root', 'true');
+            }
+            this.addEventListener('finddiroot', (e) => {
+                const parentInjector = findInjectorRoot(e);
+                if (parentInjector) {
+                    this.injector.parent = parentInjector;
+                }
+                if (super.connectedCallback) {
+                    super.connectedCallback();
+                }
+            });
+            this.dispatchEvent(new Event('finddiroot'));
+        }
+        disconnectedCallback() {
+            delete this.injector.parent;
+            if (super.disconnectedCallback) {
+                super.disconnectedCallback();
             }
         }
     };
 }
-//# sourceMappingURL=injectable.js.map
+function findInjectorRoot(e) {
+    const path = e.composedPath();
+    const parentInjector = path.find((el) => {
+        return el instanceof HTMLElement && el !== e.target && el.hasAttribute('joist-injector-root');
+    });
+    if (parentInjector) {
+        return Reflect.get(parentInjector, 'injector');
+    }
+    return null;
+}

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

@@ -1,30 +1,13 @@
-import { ProviderToken, Provider, ClassProviderToken } from './provider';
-export interface InjectorOptions {
-    providers?: Provider<any>[];
-    bootstrap?: ProviderToken<any>[];
-}
-/**
- * Create an instance of a Dependency injector.
- * Can be used to create a singleton of any class that is property annotated with dependencies.
- *
- * @param options configuration options for the current instance of Injector
- * @param parent a parent instance of Injector
- */
+import { ProviderToken, Provider, ClassProviderToken } from './provider.js';
+export declare type Injected<T> = () => T;
 export declare class Injector {
-    options: InjectorOptions;
+    providers: Provider<any>[];
     parent?: Injector | undefined;
-    private providerMap;
-    constructor(options?: InjectorOptions, parent?: Injector | undefined);
-    setParent(parent?: Injector): void;
-    /**
-     * recursively check if a singleton instance is available for a provider
-     */
-    has(token: ProviderToken<any>): boolean;
-    /**
-     * fetches a singleton instance of a provider
-     */
+    instances: WeakMap<ProviderToken<any>, any>;
+    constructor(providers?: Provider<any>[], parent?: Injector | undefined);
+    has<T>(token: ProviderToken<T>): boolean;
     get<T>(token: ProviderToken<T>): T;
     create<T>(P: ClassProviderToken<T>): T;
-    private resolve;
+    private createAndCache;
     private findProvider;
 }

package/target/build/lib/injector.js

@@ -1,74 +1,56 @@
-import { readProviderDeps, isProvidedInRoot } from './utils';
-/**
- * Create an instance of a Dependency injector.
- * Can be used to create a singleton of any class that is property annotated with dependencies.
- *
- * @param options configuration options for the current instance of Injector
- * @param parent a parent instance of Injector
- */
+import { readProviderDeps, isProvidedInRoot } from './utils.js';
 export class Injector {
-    options;
-    parent;
-    providerMap = new WeakMap();
-    constructor(options = {}, parent) {
-        this.options = options;
-        this.parent = parent;
-        if (this.options.bootstrap) {
-            this.options.bootstrap.forEach((provider) => this.get(provider));
-        }
-    }
-    setParent(parent) {
+    constructor(providers = [], parent) {
+        this.providers = providers;
         this.parent = parent;
+        this.instances = new WeakMap();
     }
-    /**
-     * recursively check if a singleton instance is available for a provider
-     */
     has(token) {
-        if (this.providerMap.has(token)) {
+        const hasLocally = this.instances.has(token) || !!this.findProvider(token);
+        if (hasLocally) {
             return true;
         }
-        else if (this.findProvider(token)) {
-            return true;
-        }
-        else if (this.parent) {
-            return this.parent.has(token);
-        }
-        return false;
+        return this.parent ? this.parent.has(token) : false;
     }
-    /**
-     * fetches a singleton instance of a provider
-     */
     get(token) {
-        if (this.providerMap.has(token)) {
-            return this.providerMap.get(token);
+        // check for a local instance
+        if (this.instances.has(token)) {
+            return this.instances.get(token);
         }
-        let instance = this.resolve(token);
-        this.providerMap.set(token, instance);
-        return instance;
+        const provider = this.findProvider(token);
+        // check for a provider definition
+        if (provider) {
+            if ('use' in provider) {
+                return this.createAndCache(provider.use);
+            }
+            else {
+                return this.createAndCache(provider);
+            }
+        }
+        // check for a parent and attempt to get there
+        if (this.parent) {
+            if (this.parent.has(token) || isProvidedInRoot(token)) {
+                return this.parent.get(token);
+            }
+        }
+        // If nothing else treat as a local class provider
+        return this.createAndCache(token);
     }
     create(P) {
         const deps = readProviderDeps(P);
-        return new P(...deps.map((dep) => this.get(dep)));
+        return new P(...deps.map((dep) => () => this.get(dep)));
     }
-    resolve(token) {
-        // Check to see if provider is defined in current scope
-        const provider = this.findProvider(token);
-        if (provider) {
-            // If provider is defined in current scope use that implementation
-            return this.create(provider.use);
-        }
-        if (this.parent && (isProvidedInRoot(token) || this.parent.has(token))) {
-            // if a parent is available and contains an instance of the provider already use that
-            return this.parent.get(token);
-        }
-        // if nothing else found assume ClassProviderToken
-        return this.create(token);
+    createAndCache(token) {
+        const instance = this.create(token);
+        this.instances.set(token, instance);
+        return instance;
     }
     findProvider(token) {
-        if (!this.options.providers) {
+        if (!this.providers) {
             return undefined;
         }
-        return this.options.providers.find((provider) => provider.provide === token);
+        return this.providers.find((provider) => {
+            return provider === token || provider.provide === token;
+        });
     }
 }
-//# sourceMappingURL=injector.js.map

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

@@ -7,7 +7,8 @@ export declare type AbstractClassProviderToken<T> = Function & {
     [key: string]: any;
 };
 export declare type ProviderToken<T> = ClassProviderToken<T> | AbstractClassProviderToken<T>;
-export interface Provider<T> {
+export interface ProviderDef<T> {
     provide: ProviderToken<T>;
     use: ClassProviderToken<T>;
 }
+export declare type Provider<T> = ProviderDef<T> | ClassProviderToken<T>;

package/target/build/lib/provider.js

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=provider.js.map

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

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

package/target/build/lib/service.js

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

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

@@ -1,4 +1,4 @@
-import { ProviderToken } from './provider';
-export declare const PROVIDER_DEPS_KEY = "deps";
+import { ProviderToken } from './provider.js';
+export declare const PROVIDER_DEPS_KEY = "inject";
 export declare function readProviderDeps(provider: ProviderToken<any>): ProviderToken<any>[];
 export declare function isProvidedInRoot(provider: ProviderToken<any>): any;

package/target/build/lib/utils.js

@@ -1,8 +1,7 @@
-export const PROVIDER_DEPS_KEY = 'deps';
+export const PROVIDER_DEPS_KEY = 'inject';
 export function readProviderDeps(provider) {
     return provider[PROVIDER_DEPS_KEY] || provider.prototype[PROVIDER_DEPS_KEY] || [];
 }
 export function isProvidedInRoot(provider) {
     return provider.provideInRoot || false;
 }
-//# sourceMappingURL=utils.js.map

package/target/build/lib.d.ts

@@ -1,6 +1,6 @@
-export { Injector, InjectorOptions } from './lib/injector';
-export { Provider, ProviderToken } from './lib/provider';
-export { readProviderDeps } from './lib/utils';
-export { service } from './lib/service';
-export { getEnvironmentRef, defineEnvironment } from './lib/environment';
-export { injectable } from './lib/injectable';
+export { Injector, Injected } from './lib/injector.js';
+export { ProviderDef, Provider, ProviderToken } from './lib/provider.js';
+export { readProviderDeps } from './lib/utils.js';
+export { service } from './lib/service.js';
+export { environment } from './lib/environment.js';
+export { injectable } from './lib/injectable.js';

package/target/build/lib.js

@@ -1,6 +1,5 @@
-export { Injector } from './lib/injector';
-export { readProviderDeps } from './lib/utils';
-export { service } from './lib/service';
-export { getEnvironmentRef, defineEnvironment } from './lib/environment';
-export { injectable } from './lib/injectable';
-//# sourceMappingURL=lib.js.map
+export { Injector } from './lib/injector.js';
+export { readProviderDeps } from './lib/utils.js';
+export { service } from './lib/service.js';
+export { environment } from './lib/environment.js';
+export { injectable } from './lib/injectable.js';

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

@@ -1 +0,0 @@
-{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../lib/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,IAAI,YAAY,GAAoB,IAAI,CAAC;AAEzC,MAAM,UAAU,iBAAiB,CAAC,YAA6B,EAAE;IAC/D,YAAY,GAAG,IAAI,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAE3C,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,iBAAiB;IAC/B,IAAI,YAAY,EAAE;QAChB,OAAO,YAAY,CAAC;KACrB;IAED,OAAO,iBAAiB,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,YAAY,GAAG,IAAI,CAAC;AACtB,CAAC"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"injectable.js","sourceRoot":"","sources":["../../../lib/injectable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAUtC,MAAM,UAAU,UAAU,CAAuB,KAAQ;IACvD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAElC,OAAO,MAAM,iBAAkB,SAAQ,KAAK;QAC1C,YAAY,GAAG,IAAW;YACxB,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC/B,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;aAChB;iBAAM;gBACL,MAAM,CAAC,GAAG,IAAI,QAAQ,CAAC,EAAE,SAAS,EAAE,EAAE,iBAAiB,EAAE,CAAC,CAAC;gBAE3D,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACzC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"injector.js","sourceRoot":"","sources":["../../../lib/injector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAO7D;;;;;;GAMG;AACH,MAAM,OAAO,QAAQ;IAGA;IAAsC;IAFjD,WAAW,GAAG,IAAI,OAAO,EAA2B,CAAC;IAE7D,YAAmB,UAA2B,EAAE,EAAS,MAAiB;QAAvD,YAAO,GAAP,OAAO,CAAsB;QAAS,WAAM,GAAN,MAAM,CAAW;QACxE,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YAC1B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;SAClE;IACH,CAAC;IAED,SAAS,CAAC,MAAiB;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,GAAG,CAAC,KAAyB;QAC3B,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;aAAM,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YACnC,OAAO,IAAI,CAAC;SACb;aAAM,IAAI,IAAI,CAAC,MAAM,EAAE;YACtB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC/B;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,GAAG,CAAI,KAAuB;QAC5B,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACpC;QAED,IAAI,QAAQ,GAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEtC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEtC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,CAAI,CAAwB;QAChC,MAAM,IAAI,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAEjC,OAAO,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAEO,OAAO,CAAI,KAAuB;QACxC,uDAAuD;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAE1C,IAAI,QAAQ,EAAE;YACZ,kEAAkE;YAClE,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SAClC;QAED,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YACtE,qFAAqF;YACrF,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC/B;QAED,kDAAkD;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC,KAA8B,CAAC,CAAC;IACrD,CAAC;IAEO,YAAY,CAAC,KAAyB;QAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YAC3B,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC;IAC/E,CAAC;CACF"}