@rhtml/di 0.0.126 → 0.0.127

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.
Files changed (5) hide show
  1. package/dist/module/module.js +8 -7
  2. package/dist/module/module.js.map +1 -1
  3. package/module/module/module.js +8 -7
  4. package/module/module/module.js.map +1 -1
  5. package/package.json +1 -1
package/dist/module/module.js CHANGED
@@ -31,13 +31,14 @@ const Module = (entries = {}) => (0, index_1.createDecorator)({
31
31
  for (const entry of filterNonNull((entries.imports || []))) {
32
32
  setImport(entry);
33
33
  }
34
- for (const entry of filterNonNull((entries.providers || []))) {
35
- if (typeof entry.useFactory === 'function') {
36
- ProvidersMetadata.set(entry, entry);
37
- }
38
- else {
39
- (0, index_1.set)(entry);
40
- }
34
+ const providers = (entries.providers || []);
35
+ const factories = filterNonNull(providers).filter(v => !!v.useFactory);
36
+ const services = filterNonNull(providers).filter(v => !v.useFactory);
37
+ for (const entry of factories) {
38
+ ProvidersMetadata.set(entry, entry);
39
+ }
40
+ for (const entry of services) {
41
+ (0, index_1.set)(entry);
41
42
  }
42
43
  for (const entry of filterNonNull((entries.bootstrap || []))) {
43
44
  BootstrapsMetadata.set(entry, entry);
package/dist/module/module.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module/module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAuD;AACvD,oCAOkB;AAElB,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA8B,CAAC;AAChE,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAA4B,CAAC;AAE/D,MAAM,aAAa,GAAG,CAAI,CAAM,EAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE/D,MAAM,SAAS,GAAG,CAAC,KAA0B,EAAE,EAAE;IAC/C,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACxD,IAAA,WAAG,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACnB;SAAM;QACL,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC;KACZ;AACH,CAAC,CAAC;AAEK,MAAM,SAAS,GAAG,CAAC,OAAiB,EAAE,EAAE,CAAC,IAAA,uBAAe,EAAC,OAAO,CAAC,CAAC;AAA5D,QAAA,SAAS,aAAmD;AAElE,MAAM,MAAM,GAAG,CACpB,UAKI,EAAE,EACN,EAAE,CACF,IAAA,uBAAe,EAAC;IACd,MAAM,CAAC,IAAI;QACT,KAAK,MAAM,KAAK,IAAI,aAAa,CAC/B,CAAE,OAAO,CAAC,OAAmB,IAAI,EAAE,CAA0B,CAC9D,EAAE;YACD,SAAS,CAAC,KAAK,CAAC,CAAC;SAClB;QAED,KAAK,MAAM,KAAK,IAAI,aAAa,CAC/B,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAoB,CAC7C,EAAE;YACD,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,UAAU,EAAE;gBAC1C,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;aACrC;iBAAM;gBACL,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC;aACZ;SACF;QAED,KAAK,MAAM,KAAK,IAAI,aAAa,CAC/B,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAkB,CAC3C,EAAE;YACD,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACtC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC,CAAC;AAlCQ,QAAA,MAAM,UAkCd;AAiBL,SAAsB,SAAS,CAAI,GAAM;;QACvC,SAAS,CAAC,GAAqC,CAAC,CAAC;QACjD,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAO,KAAK,EAAE,EAAE,gDAClD,OAAA,IAAA,WAAG,EAAC,MAAM,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,WAAG,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA,GAAA,CAC3E,CACF,CAAC;QACF,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC,CAAC;IAC9D,CAAC;CAAA;AARD,8BAQC"}
1
+ {"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module/module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAuD;AACvD,oCAOkB;AAElB,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA8B,CAAC;AAChE,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAA4B,CAAC;AAE/D,MAAM,aAAa,GAAG,CAAI,CAAM,EAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE/D,MAAM,SAAS,GAAG,CAAC,KAA0B,EAAE,EAAE;IAC/C,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACxD,IAAA,WAAG,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACnB;SAAM;QACL,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC;KACZ;AACH,CAAC,CAAC;AAEK,MAAM,SAAS,GAAG,CAAC,OAAiB,EAAE,EAAE,CAAC,IAAA,uBAAe,EAAC,OAAO,CAAC,CAAC;AAA5D,QAAA,SAAS,aAAmD;AAElE,MAAM,MAAM,GAAG,CACpB,UAKI,EAAE,EACN,EAAE,CACF,IAAA,uBAAe,EAAC;IACd,MAAM,CAAC,IAAI;QACT,KAAK,MAAM,KAAK,IAAI,aAAa,CAC/B,CAAE,OAAO,CAAC,OAAmB,IAAI,EAAE,CAA0B,CAC9D,EAAE;YACD,SAAS,CAAC,KAAK,CAAC,CAAC;SAClB;QAED,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAoB,CAAC;QAC/D,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAErE,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE;YAC7B,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACrC;QAED,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;YAC5B,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC;SACZ;QAED,KAAK,MAAM,KAAK,IAAI,aAAa,CAC/B,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAkB,CAC3C,EAAE;YACD,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACtC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC,CAAC;AApCQ,QAAA,MAAM,UAoCd;AAiBL,SAAsB,SAAS,CAAI,GAAM;;QACvC,SAAS,CAAC,GAAqC,CAAC,CAAC;QACjD,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAO,KAAK,EAAE,EAAE,gDAClD,OAAA,IAAA,WAAG,EAAC,MAAM,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,WAAG,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA,GAAA,CAC3E,CACF,CAAC;QACF,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC,CAAC;IAC9D,CAAC;CAAA;AARD,8BAQC"}
package/module/module/module.js CHANGED
@@ -31,13 +31,14 @@ const Module = (entries = {}) => (0, index_1.createDecorator)({
31
31
  for (const entry of filterNonNull((entries.imports || []))) {
32
32
  setImport(entry);
33
33
  }
34
- for (const entry of filterNonNull((entries.providers || []))) {
35
- if (typeof entry.useFactory === 'function') {
36
- ProvidersMetadata.set(entry, entry);
37
- }
38
- else {
39
- (0, index_1.set)(entry);
40
- }
34
+ const providers = (entries.providers || []);
35
+ const factories = filterNonNull(providers).filter(v => !!v.useFactory);
36
+ const services = filterNonNull(providers).filter(v => !v.useFactory);
37
+ for (const entry of factories) {
38
+ ProvidersMetadata.set(entry, entry);
39
+ }
40
+ for (const entry of services) {
41
+ (0, index_1.set)(entry);
41
42
  }
42
43
  for (const entry of filterNonNull((entries.bootstrap || []))) {
43
44
  BootstrapsMetadata.set(entry, entry);
package/module/module/module.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module/module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAuD;AACvD,oCAOkB;AAElB,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA8B,CAAC;AAChE,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAA4B,CAAC;AAE/D,MAAM,aAAa,GAAG,CAAI,CAAM,EAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE/D,MAAM,SAAS,GAAG,CAAC,KAA0B,EAAE,EAAE;IAC/C,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACxD,IAAA,WAAG,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACnB;SAAM;QACL,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC;KACZ;AACH,CAAC,CAAC;AAEK,MAAM,SAAS,GAAG,CAAC,OAAiB,EAAE,EAAE,CAAC,IAAA,uBAAe,EAAC,OAAO,CAAC,CAAC;AAA5D,QAAA,SAAS,aAAmD;AAElE,MAAM,MAAM,GAAG,CACpB,UAKI,EAAE,EACN,EAAE,CACF,IAAA,uBAAe,EAAC;IACd,MAAM,CAAC,IAAI;QACT,KAAK,MAAM,KAAK,IAAI,aAAa,CAC/B,CAAE,OAAO,CAAC,OAAmB,IAAI,EAAE,CAA0B,CAC9D,EAAE;YACD,SAAS,CAAC,KAAK,CAAC,CAAC;SAClB;QAED,KAAK,MAAM,KAAK,IAAI,aAAa,CAC/B,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAoB,CAC7C,EAAE;YACD,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,UAAU,EAAE;gBAC1C,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;aACrC;iBAAM;gBACL,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC;aACZ;SACF;QAED,KAAK,MAAM,KAAK,IAAI,aAAa,CAC/B,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAkB,CAC3C,EAAE;YACD,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACtC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC,CAAC;AAlCQ,QAAA,MAAM,UAkCd;AAiBL,SAAsB,SAAS,CAAI,GAAM;;QACvC,SAAS,CAAC,GAAqC,CAAC,CAAC;QACjD,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAO,KAAK,EAAE,EAAE,gDAClD,OAAA,IAAA,WAAG,EAAC,MAAM,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,WAAG,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA,GAAA,CAC3E,CACF,CAAC;QACF,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC,CAAC;IAC9D,CAAC;CAAA;AARD,8BAQC"}
1
+ {"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module/module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAuD;AACvD,oCAOkB;AAElB,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA8B,CAAC;AAChE,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAA4B,CAAC;AAE/D,MAAM,aAAa,GAAG,CAAI,CAAM,EAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE/D,MAAM,SAAS,GAAG,CAAC,KAA0B,EAAE,EAAE;IAC/C,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACxD,IAAA,WAAG,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACnB;SAAM;QACL,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC;KACZ;AACH,CAAC,CAAC;AAEK,MAAM,SAAS,GAAG,CAAC,OAAiB,EAAE,EAAE,CAAC,IAAA,uBAAe,EAAC,OAAO,CAAC,CAAC;AAA5D,QAAA,SAAS,aAAmD;AAElE,MAAM,MAAM,GAAG,CACpB,UAKI,EAAE,EACN,EAAE,CACF,IAAA,uBAAe,EAAC;IACd,MAAM,CAAC,IAAI;QACT,KAAK,MAAM,KAAK,IAAI,aAAa,CAC/B,CAAE,OAAO,CAAC,OAAmB,IAAI,EAAE,CAA0B,CAC9D,EAAE;YACD,SAAS,CAAC,KAAK,CAAC,CAAC;SAClB;QAED,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAoB,CAAC;QAC/D,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAErE,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE;YAC7B,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACrC;QAED,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;YAC5B,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC;SACZ;QAED,KAAK,MAAM,KAAK,IAAI,aAAa,CAC/B,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAkB,CAC3C,EAAE;YACD,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACtC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC,CAAC;AApCQ,QAAA,MAAM,UAoCd;AAiBL,SAAsB,SAAS,CAAI,GAAM;;QACvC,SAAS,CAAC,GAAqC,CAAC,CAAC;QACjD,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAO,KAAK,EAAE,EAAE,gDAClD,OAAA,IAAA,WAAG,EAAC,MAAM,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,WAAG,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA,GAAA,CAC3E,CACF,CAAC;QACF,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,WAAG,EAAC,KAAK,CAAC,CAAC,CAAC;IAC9D,CAAC;CAAA;AARD,8BAQC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rhtml/di",
3
- "version": "0.0.126",
3
+ "version": "0.0.127",
4
4
  "description": "RHTML simplest Dependency Injection",
5
5
  "scripts": {
6
6
  "start": "npx gapi start --local --path=./example/main.ts",