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

package/package.json

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

package/src/lib/injectable.test.ts

@@ -23,9 +23,12 @@ it('should locally override a provider', () => {
 
 it('should define an injector for a service instance', () => {
   @injectable()
-  class MyService {}
+  class MyService {
+    constructor(public arg = 'a') {}
+  }
 
-  const instance = new MyService();
+  const instance = new MyService('b');
 
   assert.ok(injectables.has(instance));
+  assert.ok(instance.arg === 'b');
 });

package/src/lib/injectable.ts

@@ -14,8 +14,8 @@ export function injectable(opts?: InjectableOpts) {
     ctx: ClassDecoratorContext
   ) {
     class Injectable extends Base {
-      constructor(..._: any[]) {
-        super();
+      constructor(...args: any[]) {
+        super(...args);
 
         injectables.set(this, new Injector(opts?.providers));
       }

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

@@ -39,6 +39,7 @@ export declare function injectableEl<T extends ConstructableToken<HTMLElement>>(
         readonly clientTop: number;
         readonly clientWidth: number;
         id: string;
+        innerHTML: string;
         readonly localName: string;
         readonly namespaceURI: string | null;
         onfullscreenchange: ((this: Element, ev: Event) => any) | null;
@@ -78,12 +79,13 @@ export declare function injectableEl<T extends ConstructableToken<HTMLElement>>(
         getElementsByTagNameNS(namespaceURI: "http://www.w3.org/2000/svg", localName: string): HTMLCollectionOf<SVGElement>;
         getElementsByTagNameNS(namespaceURI: "http://www.w3.org/1998/Math/MathML", localName: string): HTMLCollectionOf<MathMLElement>;
         getElementsByTagNameNS(namespace: string | null, localName: string): HTMLCollectionOf<Element>;
+        getHTML(options?: GetHTMLOptions): string;
         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;
+        insertAdjacentHTML(position: InsertPosition, string: string): void;
         insertAdjacentText(where: InsertPosition, data: string): void;
         matches(selectors: string): boolean;
         releasePointerCapture(pointerId: number): void;
@@ -91,7 +93,7 @@ export declare function injectableEl<T extends ConstructableToken<HTMLElement>>(
         removeAttributeNS(namespace: string | null, localName: string): void;
         removeAttributeNode(attr: Attr): Attr;
         requestFullscreen(options?: FullscreenOptions): Promise<void>;
-        requestPointerLock(): void;
+        requestPointerLock(options?: PointerLockOptions): Promise<void>;
         scroll(options?: ScrollToOptions): void;
         scroll(x: number, y: number): void;
         scrollBy(options?: ScrollToOptions): void;
@@ -201,7 +203,6 @@ export declare function injectableEl<T extends ConstructableToken<HTMLElement>>(
         before(...nodes: (Node | string)[]): void;
         remove(): void;
         replaceWith(...nodes: (Node | string)[]): void;
-        innerHTML: string;
         readonly nextElementSibling: Element | null;
         readonly previousElementSibling: Element | null;
         readonly childElementCount: number;
@@ -243,7 +244,9 @@ export declare function injectableEl<T extends ConstructableToken<HTMLElement>>(
         onchange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
         onclick: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
         onclose: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        oncontextlost: ((this: GlobalEventHandlers, ev: Event) => any) | null;
         oncontextmenu: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        oncontextrestored: ((this: GlobalEventHandlers, ev: Event) => any) | null;
         oncopy: ((this: GlobalEventHandlers, ev: ClipboardEvent) => any) | null;
         oncuechange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
         oncut: ((this: GlobalEventHandlers, ev: ClipboardEvent) => any) | null;

package/target/lib/injectable.d.ts

@@ -3,7 +3,7 @@ export interface InjectableOpts {
     providers?: Provider<unknown>[];
 }
 export declare function injectable(opts?: InjectableOpts): <T extends ConstructableToken<any>>(Base: T, ctx: ClassDecoratorContext) => {
-    new (..._: any[]): {
+    new (...args: any[]): {
         [x: string]: any;
     };
 } & T;

package/target/lib/injectable.js

@@ -4,8 +4,8 @@ import { injectableEl } from './injectable-el.js';
 export function injectable(opts) {
     return function injectableDecorator(Base, ctx) {
         class Injectable extends Base {
-            constructor(..._) {
-                super();
+            constructor(...args) {
+                super(...args);
                 injectables.set(this, new Injector(opts?.providers));
             }
         }

package/target/lib/injectable.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectable.js","sourceRoot":"","sources":["../../src/lib/injectable.ts"],"names":[],"mappings":"AAAC,MAAc,CAAC,QAAQ,KAAK,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,MAAM,UAAU,UAAU,CAAC,IAAqB;IAC9C,OAAO,SAAS,mBAAmB,CACjC,IAAO,EACP,GAA0B;QAE1B,MAAM,UAAW,SAAQ,IAAI;YAC3B,YAAY,GAAG,CAAQ;gBACrB,KAAK,EAAE,CAAC;gBAER,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;YACvD,CAAC;SACF;QAGD,IAAI,aAAa,IAAI,UAAU,EAAE,CAAC;YAChC,IAAI,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;gBACxD,OAAO,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"injectable.js","sourceRoot":"","sources":["../../src/lib/injectable.ts"],"names":[],"mappings":"AAAC,MAAc,CAAC,QAAQ,KAAK,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,MAAM,UAAU,UAAU,CAAC,IAAqB;IAC9C,OAAO,SAAS,mBAAmB,CACjC,IAAO,EACP,GAA0B;QAE1B,MAAM,UAAW,SAAQ,IAAI;YAC3B,YAAY,GAAG,IAAW;gBACxB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;gBAEf,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;YACvD,CAAC;SACF;QAGD,IAAI,aAAa,IAAI,UAAU,EAAE,CAAC;YAChC,IAAI,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;gBACxD,OAAO,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC"}

package/target/lib/injectable.test.js

@@ -46,10 +46,15 @@ it('should define an injector for a service instance', () => {
                 if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
                 __runInitializers(_classThis, _classExtraInitializers);
             }
+            arg;
+            constructor(arg = 'a') {
+                this.arg = arg;
+            }
         };
         return MyService = _classThis;
     })();
-    const instance = new MyService();
+    const instance = new MyService('b');
     assert.ok(injectables.has(instance));
+    assert.ok(instance.arg === 'b');
 });
 //# sourceMappingURL=injectable.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"injectable.test.js","sourceRoot":"","sources":["../../src/lib/injectable.test.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAC5C,MAAM,GAAG;KAAG;IAEZ,MAAM,GAAI,SAAQ,GAAG;KAAG;QAKlB,SAAS;gCAHd,UAAU,CAAC;gBACV,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aACxC,CAAC;;;;;;;;gBACF,6KAEC;;;gBAFK,uDAAS;;YACb,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;;;;IAGpB,MAAM,EAAE,GAAG,IAAI,SAAS,EAAE,CAAC;IAE3B,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAEpD,SAAS;gCADd,UAAU,EAAE;;;;;;;;gBACb,6KAAkB;;;gBAAZ,uDAAS;;;;;IAEf,MAAM,QAAQ,GAAG,IAAI,SAAS,EAAE,CAAC;IAEjC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"injectable.test.js","sourceRoot":"","sources":["../../src/lib/injectable.test.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAC5C,MAAM,GAAG;KAAG;IAEZ,MAAM,GAAI,SAAQ,GAAG;KAAG;QAKlB,SAAS;gCAHd,UAAU,CAAC;gBACV,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;aACxC,CAAC;;;;;;;;gBACF,6KAEC;;;gBAFK,uDAAS;;YACb,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;;;;IAGpB,MAAM,EAAE,GAAG,IAAI,SAAS,EAAE,CAAC;IAE3B,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAEpD,SAAS;gCADd,UAAU,EAAE;;;;;;;;gBACb,6KAEC;;;gBAFK,uDAAS;;YACM,GAAG;YAAtB,YAAmB,GAAG,GAAG,GAAG;gBAAT,QAAG,GAAH,GAAG,CAAM;YAAG,CAAC;;;;IAGlC,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;IAEpC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC"}