@nx-ddd/core 4.2.1 → 4.3.0

package/di/injectable.d.ts

@@ -1,2 +1,7 @@
 import 'reflect-metadata';
-export { Injectable, Inject, Optional, InjectionToken } from 'injection-js';
+import { Injector } from 'injection-js';
+export declare function Injectable(params?: {
+    providedIn: 'root';
+}): (target: any) => any;
+export declare function setCurrentInjector(injector: Injector): void;
+export { Inject, Optional, InjectionToken } from 'injection-js';

package/di/injectable.js

@@ -1,10 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InjectionToken = exports.Optional = exports.Inject = exports.Injectable = void 0;
+exports.InjectionToken = exports.Optional = exports.Inject = exports.setCurrentInjector = exports.Injectable = void 0;
 require("reflect-metadata");
-var injection_js_1 = require("injection-js");
-Object.defineProperty(exports, "Injectable", { enumerable: true, get: function () { return injection_js_1.Injectable; } });
-Object.defineProperty(exports, "Inject", { enumerable: true, get: function () { return injection_js_1.Inject; } });
-Object.defineProperty(exports, "Optional", { enumerable: true, get: function () { return injection_js_1.Optional; } });
-Object.defineProperty(exports, "InjectionToken", { enumerable: true, get: function () { return injection_js_1.InjectionToken; } });
+const injection_js_1 = require("injection-js");
+function Injectable(params) {
+    return (target) => {
+        if ((params === null || params === void 0 ? void 0 : params.providedIn) === 'root') {
+            target.providedIn = 'root';
+            const paramTypes = Reflect.getMetadata("design:paramtypes", target) || [];
+            const params = Reflect.getMetadata("parameters", target);
+            const deps = paramTypes.map((paramType, i) => { var _a, _b; return ((_b = (_a = params === null || params === void 0 ? void 0 : params[i]) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.token) || paramType; });
+            target['Θfac'] = compileFactory(target, deps);
+        }
+        return (0, injection_js_1.Injectable)()(target);
+    };
+}
+exports.Injectable = Injectable;
+let currentInjector;
+function setCurrentInjector(injector) {
+    currentInjector = injector;
+}
+exports.setCurrentInjector = setCurrentInjector;
+function inject(token) {
+    return currentInjector.get(token);
+}
+function compileFactory(target, deps) {
+    return () => { var _a; return (_a = target['Θins']) !== null && _a !== void 0 ? _a : (target['Θins'] = new target(...deps.map(dep => inject(dep)))); };
+}
+var injection_js_2 = require("injection-js");
+Object.defineProperty(exports, "Inject", { enumerable: true, get: function () { return injection_js_2.Inject; } });
+Object.defineProperty(exports, "Optional", { enumerable: true, get: function () { return injection_js_2.Optional; } });
+Object.defineProperty(exports, "InjectionToken", { enumerable: true, get: function () { return injection_js_2.InjectionToken; } });
 //# sourceMappingURL=injectable.js.map

package/di/injectable.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectable.js","sourceRoot":"","sources":["../../../../libs/core/src/di/injectable.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,6CAA4E;AAAnE,0GAAA,UAAU,OAAA;AAAE,sGAAA,MAAM,OAAA;AAAE,wGAAA,QAAQ,OAAA;AAAE,8GAAA,cAAc,OAAA"}
+{"version":3,"file":"injectable.js","sourceRoot":"","sources":["../../../../libs/core/src/di/injectable.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,+CAAkF;AAElF,SAAgB,UAAU,CAAC,MAA8B;IACvD,OAAO,CAAC,MAAW,EAAE,EAAE;QACrB,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,MAAK,MAAM,EAAE;YACjC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC;YAC3B,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;YAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YACzD,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,eAAC,OAAA,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,CAAC,0CAAG,CAAC,CAAC,0CAAE,KAAK,KAAI,SAAS,CAAA,EAAA,CAAC,CAAC;YACpF,MAAM,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SAC/C;QACD,OAAO,IAAA,yBAAW,GAAE,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC,CAAA;AACH,CAAC;AAXD,gCAWC;AAED,IAAI,eAAyB,CAAC;AAE9B,SAAgB,kBAAkB,CAAC,QAAkB;IACnD,eAAe,GAAG,QAAQ,CAAC;AAC7B,CAAC;AAFD,gDAEC;AAED,SAAS,MAAM,CAAC,KAAK;IACnB,OAAO,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,cAAc,CAAC,MAAM,EAAE,IAAI;IAClC,OAAO,GAAG,EAAE,wBAAC,MAAM,CAAC,MAAM,qCAAb,MAAM,CAAC,MAAM,IAAM,IAAI,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,CAAC;AAC9E,CAAC;AAED,6CAAgE;AAAvD,sGAAA,MAAM,OAAA;AAAE,wGAAA,QAAQ,OAAA;AAAE,8GAAA,cAAc,OAAA"}

package/di/injector.d.ts

@@ -1,3 +1,3 @@
 import { Injector, ReflectiveInjector } from 'injection-js';
-export { Injector };
+export { Injector } from 'injection-js';
 export declare function resolveAndCreate(providers: any, parent?: Injector): ReflectiveInjector;

package/di/injector.js

@@ -2,9 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveAndCreate = exports.Injector = void 0;
 const injection_js_1 = require("injection-js");
-Object.defineProperty(exports, "Injector", { enumerable: true, get: function () { return injection_js_1.Injector; } });
+const injectable_1 = require("./injectable");
+var injection_js_2 = require("injection-js");
+Object.defineProperty(exports, "Injector", { enumerable: true, get: function () { return injection_js_2.Injector; } });
 function resolveAndCreate(providers, parent = injection_js_1.Injector.NULL) {
-    return injection_js_1.ReflectiveInjector.resolveAndCreate(providers, parent);
+    const injector = injection_js_1.ReflectiveInjector.resolveAndCreate(providers, parent);
+    const originalGet = injector.get;
+    injector.get = function (token, notFoundValue) {
+        (0, injectable_1.setCurrentInjector)(this);
+        if (this.parent === injection_js_1.Injector.NULL && (token === null || token === void 0 ? void 0 : token.providedIn) === 'root') {
+            return originalGet.apply(injector, [token, token['Θfac']()]);
+        }
+        else {
+            return originalGet.apply(injector, [token, notFoundValue]);
+        }
+    };
+    return injector;
 }
 exports.resolveAndCreate = resolveAndCreate;
 //# sourceMappingURL=injector.js.map

package/di/injector.js.map

@@ -1 +1 @@
-{"version":3,"file":"injector.js","sourceRoot":"","sources":["../../../../libs/core/src/di/injector.ts"],"names":[],"mappings":";;;AAAA,+CAA4D;AAEnD,yFAFA,uBAAQ,OAEA;AAEjB,SAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,uBAAQ,CAAC,IAAI;IAChE,OAAO,iCAAkB,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AAChE,CAAC;AAFD,4CAEC"}
+{"version":3,"file":"injector.js","sourceRoot":"","sources":["../../../../libs/core/src/di/injector.ts"],"names":[],"mappings":";;;AAAA,+CAAkG;AAElG,6CAAkD;AAClD,6CAAwC;AAA/B,wGAAA,QAAQ,OAAA;AAGjB,SAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,uBAAQ,CAAC,IAAI;IAChE,MAAM,QAAQ,GAAG,iCAAkB,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;IACjC,QAAQ,CAAC,GAAG,GAAG,UAAS,KAAU,EAAE,aAAmB;QACrD,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QACzB,IAAG,IAAI,CAAC,MAAM,KAAK,uBAAQ,CAAC,IAAI,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,MAAK,MAAM,EAAE;YAChE,OAAO,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAC9D;aAAM;YACL,OAAO,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;SAC5D;IACH,CAAC,CAAA;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAZD,4CAYC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx-ddd/core",
-  "version": "4.2.1",
+  "version": "4.3.0",
   "main": "./index.js",
   "types": "./index.d.ts",
   "dependencies": {

package/test-bed/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestBed = void 0;
 const tslib_1 = require("tslib");
+const injection_js_1 = require("injection-js");
 const nx_module_1 = require("../nx-module");
 class TestBed {
     static get INSTANCE() {
@@ -14,7 +15,7 @@ class TestBed {
         Module = tslib_1.__decorate([
             (0, nx_module_1.NxModule)(nxModule)
         ], Module);
-        this.moduleRef = (0, nx_module_1.createNxModuleRef)(Module);
+        this.moduleRef = (0, nx_module_1.createNxModuleRef)(Module, injection_js_1.Injector.NULL);
         return this;
     }
     inject(token) {

package/test-bed/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/core/src/test-bed/index.ts"],"names":[],"mappings":";;;;AAAA,4CAAwE;AAExE,MAAa,OAAO;IAGlB,MAAM,KAAK,QAAQ;;QACjB,aAAO,IAAI,CAAC,SAAS,oCAAd,IAAI,CAAC,SAAS,GAAK,IAAI,IAAI,EAAE,EAAC;IACvC,CAAC;IAID,sBAAsB,CAAC,QAAkB;QACnB,IAAM,MAAM,GAAZ,MAAM,MAAM;SAAI,CAAA;QAAV,MAAM;YAA/B,IAAA,oBAAQ,EAAC,QAAQ,CAAC;WAAO,MAAM,CAAI;QACpC,IAAI,CAAC,SAAS,GAAG,IAAA,6BAAiB,EAAC,MAAM,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,KAAU;QACf,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,KAAU;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,sBAAsB,CAAC,QAAkB;QAC9C,OAAO,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;CACF;AA1BD,0BA0BC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/core/src/test-bed/index.ts"],"names":[],"mappings":";;;;AAAA,+CAAwC;AACxC,4CAAwE;AAExE,MAAa,OAAO;IAGlB,MAAM,KAAK,QAAQ;;QACjB,aAAO,IAAI,CAAC,SAAS,oCAAd,IAAI,CAAC,SAAS,GAAK,IAAI,IAAI,EAAE,EAAC;IACvC,CAAC;IAID,sBAAsB,CAAC,QAAkB;QACnB,IAAM,MAAM,GAAZ,MAAM,MAAM;SAAI,CAAA;QAAV,MAAM;YAA/B,IAAA,oBAAQ,EAAC,QAAQ,CAAC;WAAO,MAAM,CAAI;QACpC,IAAI,CAAC,SAAS,GAAG,IAAA,6BAAiB,EAAC,MAAM,EAAE,uBAAQ,CAAC,IAAI,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,KAAU;QACf,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,KAAU;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,sBAAsB,CAAC,QAAkB;QAC9C,OAAO,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;CACF;AA1BD,0BA0BC"}