@joist/di 4.0.0 → 4.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@joist/di",
3
- "version": "4.0.0",
3
+ "version": "4.0.1",
4
4
  "type": "module",
5
5
  "main": "./target/lib.js",
6
6
  "module": "./target/lib.js",
@@ -9,14 +9,22 @@
9
9
  "./*": "./target/lib/*",
10
10
  "./package.json": "./package.json"
11
11
  },
12
- "files": ["src", "target"],
12
+ "files": [
13
+ "src",
14
+ "target"
15
+ ],
13
16
  "sideEffects": false,
14
17
  "description": "Dependency Injection for Vanilla JS classes",
15
18
  "repository": {
16
19
  "type": "git",
17
20
  "url": "git+https://github.com/joist-framework/joist.git"
18
21
  },
19
- "keywords": ["TypeScript", "DI", "Dependency Injection", "WebComponents"],
22
+ "keywords": [
23
+ "TypeScript",
24
+ "DI",
25
+ "Dependency Injection",
26
+ "WebComponents"
27
+ ],
20
28
  "author": "deebloo",
21
29
  "license": "MIT",
22
30
  "bugs": {
@@ -33,14 +41,26 @@
33
41
  "build": {
34
42
  "command": "tsc --build --pretty",
35
43
  "clean": "if-file-deleted",
36
- "files": ["src/**", "tsconfig.json", "../../tsconfig.json"],
37
- "output": ["target/**", "tsconfig.tsbuildinfo"]
44
+ "files": [
45
+ "src/**",
46
+ "tsconfig.json",
47
+ "../../tsconfig.json"
48
+ ],
49
+ "output": [
50
+ "target/**",
51
+ "tsconfig.tsbuildinfo"
52
+ ]
38
53
  },
39
54
  "test": {
40
55
  "command": "wtr --config wtr.config.mjs",
41
- "files": ["wtr.config.mjs", "target/**"],
56
+ "files": [
57
+ "wtr.config.mjs",
58
+ "target/**"
59
+ ],
42
60
  "output": [],
43
- "dependencies": ["build"]
61
+ "dependencies": [
62
+ "build"
63
+ ]
44
64
  }
45
65
  }
46
66
  }
@@ -1,5 +1,3 @@
1
- (Symbol as any).metadata ??= Symbol("Symbol.metadata");
2
-
3
1
  import { injectableEl } from "./injectable-el.js";
4
2
  import { INJECTOR, Injector } from "./injector.js";
5
3
  import type {
@@ -18,9 +18,11 @@ export function readMetadata<T>(
18
18
  return metadata;
19
19
  }
20
20
 
21
- export function readInjector<T extends object>(target: T): Injector | null {
22
- if (INJECTOR in target) {
23
- return target[INJECTOR] as Injector;
21
+ export function readInjector<T>(target: T): Injector | null {
22
+ if (typeof target === "object" && target !== null) {
23
+ if (INJECTOR in target) {
24
+ return target[INJECTOR] as Injector;
25
+ }
24
26
  }
25
27
 
26
28
  return null;
@@ -1,4 +1,3 @@
1
- Symbol.metadata ??= Symbol("Symbol.metadata");
2
1
  import { injectableEl } from "./injectable-el.js";
3
2
  import { INJECTOR, Injector } from "./injector.js";
4
3
  export function injectable(opts) {
@@ -1 +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;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAanD,MAAM,UAAU,UAAU,CAAC,IAAqB;IAC9C,OAAO,SAAS,mBAAmB,CACjC,IAAO,EACP,GAA0B;QAE1B,MAAM,GAAG,GAAG;YACV,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAM,SAAQ,IAAI;gBAC7B,CAAC,QAAQ,CAAC,CAAW;gBAErB,YAAY,GAAG,IAAW;oBACxB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;oBAEf,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAEpC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE;wBAC/B,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ;qBACxB,CAAC,CAAC;oBAEH,IAAI,IAAI,EAAE,aAAa,EAAE,CAAC;wBACxB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;4BACvC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE;gCAC5B,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;6BACpB,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;oBAED,IAAI,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;gBAC5B,CAAC;aACF;SACF,CAAC;QAGF,IAAI,aAAa,IAAI,UAAU,EAAE,CAAC;YAChC,IACE,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CACjC,WAAW,CAAC,SAAS,EACrB,IAAI,CAAC,SAAS,CACf,EACD,CAAC;gBACD,OAAO,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"injectable.js","sourceRoot":"","sources":["../../src/lib/injectable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAanD,MAAM,UAAU,UAAU,CAAC,IAAqB;IAC9C,OAAO,SAAS,mBAAmB,CACjC,IAAO,EACP,GAA0B;QAE1B,MAAM,GAAG,GAAG;YACV,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAM,SAAQ,IAAI;gBAC7B,CAAC,QAAQ,CAAC,CAAW;gBAErB,YAAY,GAAG,IAAW;oBACxB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;oBAEf,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAEpC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE;wBAC/B,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ;qBACxB,CAAC,CAAC;oBAEH,IAAI,IAAI,EAAE,aAAa,EAAE,CAAC;wBACxB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;4BACvC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE;gCAC5B,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;6BACpB,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;oBAED,IAAI,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;gBAC5B,CAAC;aACF;SACF,CAAC;QAGF,IAAI,aAAa,IAAI,UAAU,EAAE,CAAC;YAChC,IACE,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CACjC,WAAW,CAAC,SAAS,EACrB,IAAI,CAAC,SAAS,CACf,EACD,CAAC;gBACD,OAAO,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC"}
@@ -6,4 +6,4 @@ export interface InjectableMetadata {
6
6
  onInjected?: LifecycleCallback[];
7
7
  }
8
8
  export declare function readMetadata<T>(target: InjectionToken<T>): InjectableMetadata | null;
9
- export declare function readInjector<T extends object>(target: T): Injector | null;
9
+ export declare function readInjector<T>(target: T): Injector | null;
@@ -5,8 +5,10 @@ export function readMetadata(target) {
5
5
  return metadata;
6
6
  }
7
7
  export function readInjector(target) {
8
- if (INJECTOR in target) {
9
- return target[INJECTOR];
8
+ if (typeof target === "object" && target !== null) {
9
+ if (INJECTOR in target) {
10
+ return target[INJECTOR];
11
+ }
10
12
  }
11
13
  return null;
12
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/lib/metadata.ts"],"names":[],"mappings":"AAAC,MAAc,CAAC,QAAQ,KAAK,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAEvD,OAAO,EAAE,QAAQ,EAAiB,MAAM,eAAe,CAAC;AAUxD,MAAM,UAAU,YAAY,CAC1B,MAAyB;IAEzB,MAAM,QAAQ,GAA8B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEpE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,YAAY,CAAmB,MAAS;IACtD,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,QAAQ,CAAa,CAAC;IACtC,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/lib/metadata.ts"],"names":[],"mappings":"AAAC,MAAc,CAAC,QAAQ,KAAK,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAEvD,OAAO,EAAE,QAAQ,EAAiB,MAAM,eAAe,CAAC;AAUxD,MAAM,UAAU,YAAY,CAC1B,MAAyB;IAEzB,MAAM,QAAQ,GAA8B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEpE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,YAAY,CAAI,MAAS;IACvC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClD,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC,QAAQ,CAAa,CAAC;QACtC,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}