@tsed/di 8.9.4 → 8.10.0-rc.1

package/lib/esm/common/utils/discoverHooks.js

@@ -1,4 +1,4 @@
-import { methodsOf } from "@tsed/core";
+import { methodsOf } from "@tsed/core/utils/methodsOf.js";
 export function discoverHooks(token) {
     return methodsOf(token).reduce((hooks, { propertyKey }) => {
         if (String(propertyKey).startsWith("$")) {

package/lib/esm/common/utils/discoverHooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"discoverHooks.js","sourceRoot":"","sources":["../../../../src/common/utils/discoverHooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAY,MAAM,YAAY,CAAC;AAEnE,MAAM,UAAU,aAAa,CAAC,KAA+B;IAC3D,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAC,WAAW,EAAC,EAAE,EAAE;QACtD,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,CAAC,QAAa,EAAE,GAAG,IAAW,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAErF,OAAO;gBACL,GAAG,KAAK;gBACR,CAAC,WAAW,CAAC,EAAE,QAAQ;aACxB,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,EAAE,EAAS,CAAC,CAAC;AAChB,CAAC"}
+{"version":3,"file":"discoverHooks.js","sourceRoot":"","sources":["../../../../src/common/utils/discoverHooks.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,+BAA+B,CAAC;AAExD,MAAM,UAAU,aAAa,CAAC,KAA+B;IAC3D,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAC,WAAW,EAAC,EAAE,EAAE;QACtD,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,CAAC,QAAa,EAAE,GAAG,IAAW,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAErF,OAAO;gBACL,GAAG,KAAK;gBACR,CAAC,WAAW,CAAC,EAAE,QAAQ;aACxB,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,EAAE,EAAS,CAAC,CAAC;AAChB,CAAC"}

package/lib/esm/common/utils/getConfiguration.js

@@ -1,4 +1,4 @@
-import { Store } from "@tsed/core";
+import { Store } from "@tsed/core/types/Store.js";
 export function mergeMount(m1 = {}, m2 = {}) {
     return Object.entries(m2).reduce((mount, [key, controllers]) => {
         return {

package/lib/esm/common/utils/getConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"file":"getConfiguration.js","sourceRoot":"","sources":["../../../../src/common/utils/getConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAO,MAAM,YAAY,CAAC;AAEvC,MAAM,UAAU,UAAU,CAAC,KAAU,EAAE,EAAE,KAAU,EAAE;IACnD,OAAO,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,EAAE;QAC7D,OAAO;YACL,GAAG,KAAK;YACR,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;SAC9C,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAiB,EAAE,gBAAqB,EAAE;IACzE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;IAE5D,OAAO;QACL,GAAG,KAAK;QACR,GAAG,aAAa;QAChB,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC;KACpD,CAAC;AACJ,CAAC"}
+{"version":3,"file":"getConfiguration.js","sourceRoot":"","sources":["../../../../src/common/utils/getConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,2BAA2B,CAAC;AAGhD,MAAM,UAAU,UAAU,CAAC,KAAU,EAAE,EAAE,KAAU,EAAE;IACnD,OAAO,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,EAAE;QAC7D,OAAO;YACL,GAAG,KAAK;YACR,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;SAC9C,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAiB,EAAE,gBAAqB,EAAE;IACzE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;IAE5D,OAAO;QACL,GAAG,KAAK;QACR,GAAG,aAAa;QAChB,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC;KACpD,CAAC;AACJ,CAAC"}

package/lib/esm/common/utils/getConstructorDependencies.js

@@ -1,4 +1,4 @@
-import { Metadata } from "@tsed/core";
+import { Metadata } from "@tsed/core/types/Metadata.js";
 export function getConstructorDependencies(target, propertyKey) {
     return Metadata.getOwn("override:ctor:design:paramtypes", target, propertyKey) || [...Metadata.getParamTypes(target, propertyKey)] || [];
 }

package/lib/esm/common/utils/getConstructorDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"getConstructorDependencies.js","sourceRoot":"","sources":["../../../../src/common/utils/getConstructorDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,MAAM,UAAU,0BAA0B,CAAC,MAAW,EAAE,WAAyC;IAC/F,OAAO,QAAQ,CAAC,MAAM,CAAC,iCAAiC,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;AAC3I,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,MAAW,EAAE,IAAW;IACjE,QAAQ,CAAC,GAAG,CAAC,iCAAiC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAChE,CAAC"}
+{"version":3,"file":"getConstructorDependencies.js","sourceRoot":"","sources":["../../../../src/common/utils/getConstructorDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,8BAA8B,CAAC;AAEtD,MAAM,UAAU,0BAA0B,CAAC,MAAW,EAAE,WAAyC;IAC/F,OAAO,QAAQ,CAAC,MAAM,CAAC,iCAAiC,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;AAC3I,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,MAAW,EAAE,IAAW;IACjE,QAAQ,CAAC,GAAG,CAAC,iCAAiC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAChE,CAAC"}

package/lib/esm/common/utils/providerBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"providerBuilder.js","sourceRoot":"","sources":["../../../../src/common/utils/providerBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,mCAAmC,CAAC;AAI3C,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAC;AAuBjE,MAAM,UAAU,eAAe,CAC7B,KAAe,EACf,WAA4C,EAAE;IAE9C,OAAO,CAA+B,KAAa,EAAE,UAAuC,EAAE,EAAE,EAAE;QAChG,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;YAC9B,GAAG,OAAO;YACV,GAAG,QAAQ;YACX,KAAK;SACN,CAAC;QAEF,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEtD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,QAAQ,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC1C,CAAC;QAED,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACZ,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,IAAI,CAAC,EAAE,UAAU,KAAU;oBACzB,QAAgB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;oBAChC,OAAO,IAAI,CAAC;gBACd,CAAC;aACF,CAAC;QACJ,CAAC,EACD;YACE,OAAO,CAAC,OAAiB;gBACvB,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjB,QAAQ,CAAC,UAAU,GAAG,OAAO,CAAC;gBAC9B,OAAO,IAAI,CAAC;YACd,CAAC;YACD,YAAY,CAAC,YAAsB;gBACjC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjB,QAAQ,CAAC,eAAe,GAAG,YAAY,CAAC;gBACxC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,CAAC,KAAU;gBACd,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjB,QAAQ,CAAC,QAAQ,GAAG,KAAK,CAAC;gBAC1B,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC;gBACnC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,CAAC,CAAM;gBACV,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjB,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK;gBACH,OAAO,QAAQ,CAAC,KAAK,CAAC;YACxB,CAAC;YACD,OAAO;gBACL,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,KAAK;gBACH,OAAO,QAAQ,CAAC,KAAe,CAAC;YAClC,CAAC;SAC2D,CAC/D,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"providerBuilder.js","sourceRoot":"","sources":["../../../../src/common/utils/providerBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,mCAAmC,CAAC;AAK3C,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EAAC,eAAe,EAAC,MAAM,kCAAkC,CAAC;AAuBjE,MAAM,UAAU,eAAe,CAC7B,KAAe,EACf,WAA4C,EAAE;IAE9C,OAAO,CAA+B,KAAa,EAAE,UAAuC,EAAE,EAAE,EAAE;QAChG,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;YAC9B,GAAG,OAAO;YACV,GAAG,QAAQ;YACX,KAAK;SACN,CAAC;QAEF,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEtD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,QAAQ,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC1C,CAAC;QAED,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACZ,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,IAAI,CAAC,EAAE,UAAU,KAAU;oBACzB,QAAgB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;oBAChC,OAAO,IAAI,CAAC;gBACd,CAAC;aACF,CAAC;QACJ,CAAC,EACD;YACE,OAAO,CAAC,OAAiB;gBACvB,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjB,QAAQ,CAAC,UAAU,GAAG,OAAO,CAAC;gBAC9B,OAAO,IAAI,CAAC;YACd,CAAC;YACD,YAAY,CAAC,YAAsB;gBACjC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjB,QAAQ,CAAC,eAAe,GAAG,YAAY,CAAC;gBACxC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,CAAC,KAAU;gBACd,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjB,QAAQ,CAAC,QAAQ,GAAG,KAAK,CAAC;gBAC1B,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC;gBACnC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,CAAC,CAAM;gBACV,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjB,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK;gBACH,OAAO,QAAQ,CAAC,KAAK,CAAC;YACxB,CAAC;YACD,OAAO;gBACL,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,KAAK;gBACH,OAAO,QAAQ,CAAC,KAAe,CAAC;YAClC,CAAC;SAC2D,CAC/D,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}

package/lib/esm/node/decorators/injectContext.js

@@ -1,4 +1,4 @@
-import { catchError } from "@tsed/core";
+import { catchError } from "@tsed/core/utils/catchError.js";
 import { context } from "../fn/context.js";
 /**
  * Inject a context like PlatformContext or any BaseContext.

package/lib/esm/node/decorators/injectContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectContext.js","sourceRoot":"","sources":["../../../../src/node/decorators/injectContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAC;AAGtC,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAC;AAEzC;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,aAAa,CAAC,YAA0C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9E,OAAO,CAAC,MAAW,EAAE,WAAmB,EAAc,EAAE;QACtD,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;QAC9D,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE;YAC1C,GAAG;gBACD,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9B,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"injectContext.js","sourceRoot":"","sources":["../../../../src/node/decorators/injectContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gCAAgC,CAAC;AAG1D,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAC;AAEzC;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,aAAa,CAAC,YAA0C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9E,OAAO,CAAC,MAAW,EAAE,WAAmB,EAAc,EAAE;QACtD,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;QAC9D,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE;YAC1C,GAAG;gBACD,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9B,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}

package/lib/esm/node/services/DITest.js

@@ -1,4 +1,7 @@
-import { Env, getValue, isClass, isObject } from "@tsed/core";
+import { Env } from "@tsed/core/types/Env.js";
+import { getValue } from "@tsed/core/utils/getValue.js";
+import { isClass } from "@tsed/core/utils/isClass.js";
+import { isObject } from "@tsed/core/utils/isObject.js";
 import { $log } from "@tsed/logger";
 import { cleanAllLocalsContainer, detachLocalsContainer, localsContainer } from "../../common/fn/localsContainer.js";
 import { createContainer, destroyInjector, DI_INJECTABLE_PROPS, inject, injector } from "../../common/index.js";

package/lib/esm/node/services/DITest.js.map

@@ -1 +1 @@
-{"version":3,"file":"DITest.js","sourceRoot":"","sources":["../../../../src/node/services/DITest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DITest.js","sourceRoot":"","sources":["../../../../src/node/services/DITest.ts"],"names":[],"mappings":"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"}

package/lib/types/common/decorators/constant.d.ts

@@ -5,7 +5,7 @@ export declare function bindConstant(target: any, propertyKey: string | symbol,
  * ## Example
  *
  * ```typescript
- * import {Env} from "@tsed/core";
+ * import {Env} from "@tsed/core/domain/Env.js";
  * import {Constant, Value} from "@tsed/di";
  *
  * export class MyClass {

package/lib/types/common/decorators/controller.d.ts

@@ -1,4 +1,4 @@
-import { Type } from "@tsed/core";
+import { Type } from "@tsed/core/types/Type.js";
 import type { ControllerMiddlewares } from "../domain/ControllerProvider.js";
 import { ProviderOpts } from "../interfaces/ProviderOpts.js";
 export type PathType = string | RegExp | (string | RegExp)[];

package/lib/types/common/decorators/inject.d.ts

@@ -1,4 +1,4 @@
-import { type Type } from "@tsed/core";
+import { type Type } from "@tsed/core/types/Type.js";
 import { TokenProvider } from "../interfaces/TokenProvider.js";
 export type TransformInjectedProviderCB<T, Klass = any> = (instance: T, { target, propertyKey }: {
     self: Klass;

package/lib/types/common/decorators/intercept.d.ts

@@ -1,4 +1,4 @@
-import { Type } from "@tsed/core";
+import { Type } from "@tsed/core/types/Type.js";
 import type { InterceptorMethods } from "../interfaces/InterceptorMethods.js";
 import type { TokenProvider } from "../interfaces/TokenProvider.js";
 export declare function getInterceptorOptions<T>(target: Type<any>, propertyKey: string | symbol): T;

package/lib/types/common/decorators/overrideProvider.d.ts

@@ -1,4 +1,4 @@
-import { Type } from "@tsed/core";
+import { Type } from "@tsed/core/types/Type.js";
 /**
  * Override a provider which is already registered in ProviderRegistry.
  * @returns {Function}

package/lib/types/common/decorators/value.d.ts

@@ -5,7 +5,7 @@ export declare function bindValue(target: any, propertyKey: string | symbol, exp
  * ## Example
  *
  * ```typescript
- * import {Env} from "@tsed/core";
+ * import {Env} from "@tsed/core/domain/Env.js";
  * import {Constant, Value} from "@tsed/di";
  *
  * export class MyClass {

package/lib/types/common/domain/Provider.d.ts

@@ -1,4 +1,5 @@
-import { type AbstractType, Store, Type } from "@tsed/core";
+import { Store } from "@tsed/core/types/Store.js";
+import { type AbstractType, Type } from "@tsed/core/types/Type.js";
 import type { ProviderOpts } from "../interfaces/ProviderOpts.js";
 import type { TokenProvider } from "../interfaces/TokenProvider.js";
 import { ProviderScope } from "./ProviderScope.js";

package/lib/types/common/fn/injectable.d.ts

@@ -3,5 +3,5 @@ import type { Provider } from "../domain/Provider.js";
 type PickedProps = "scope" | "path" | "alias" | "hooks" | "deps" | "imports" | "configuration" | "priority";
 export declare const injectable: import("../utils/providerBuilder.js").ProviderBuilderFn<Provider<any>, "type" | PickedProps>;
 export declare const interceptor: import("../utils/providerBuilder.js").ProviderBuilderFn<Provider<any>, "type" | PickedProps>;
-export declare const controller: import("../utils/providerBuilder.js").ProviderBuilderFn<ControllerProvider<any>, "middlewares" | "children" | PickedProps>;
+export declare const controller: import("../utils/providerBuilder.js").ProviderBuilderFn<ControllerProvider<any>, "children" | "middlewares" | PickedProps>;
 export {};

package/lib/types/common/interfaces/RegistrySettings.d.ts

@@ -1,4 +1,4 @@
-import { Type } from "@tsed/core";
+import { Type } from "@tsed/core/types/Type.js";
 import type { Provider } from "../domain/Provider.js";
 /**
  * @ignore

package/lib/types/common/registries/GlobalProviders.d.ts

@@ -1,4 +1,4 @@
-import { Type } from "@tsed/core";
+import { Type } from "@tsed/core/types/Type.js";
 import { Provider } from "../domain/Provider.js";
 import { ProviderOpts } from "../interfaces/ProviderOpts.js";
 import { RegistrySettings } from "../interfaces/RegistrySettings.js";

package/lib/types/common/services/DIConfiguration.d.ts

@@ -1,4 +1,4 @@
-import { Env } from "@tsed/core";
+import { Env } from "@tsed/core/types/Env.js";
 import type { DILoggerOptions } from "../interfaces/DILoggerOptions.js";
 import type { ImportTokenProviderOpts } from "../interfaces/ImportTokenProviderOpts.js";
 import type { TokenProvider } from "../interfaces/TokenProvider.js";

package/lib/types/common/utils/createContainer.d.ts

@@ -1,3 +1,3 @@
-import { Type } from "@tsed/core";
+import { Type } from "@tsed/core/types/Type.js";
 import { Container } from "../domain/Container.js";
 export declare function createContainer(rootModule?: Type<any>): Container;

package/lib/types/common/utils/discoverHooks.d.ts

@@ -1,2 +1,2 @@
-import { type AbstractType, type Type } from "@tsed/core";
+import { type AbstractType, type Type } from "@tsed/core/types/Type.js";
 export declare function discoverHooks(token: Type | AbstractType<any>): any;

package/lib/types/common/utils/getConfiguration.d.ts

@@ -1,3 +1,3 @@
-import { Type } from "@tsed/core";
+import { Type } from "@tsed/core/types/Type.js";
 export declare function mergeMount(m1?: any, m2?: any): any;
 export declare function getConfiguration(module: Type<any>, configuration?: any): any;

package/lib/types/common/utils/providerBuilder.d.ts

@@ -1,5 +1,6 @@
 import "../registries/ProviderRegistry.js";
-import { Store, type Type } from "@tsed/core";
+import { Store } from "@tsed/core/types/Store.js";
+import { type Type } from "@tsed/core/types/Type.js";
 import type { ProviderOpts } from "../interfaces/ProviderOpts.js";
 import type { FactoryTokenProvider, TokenProvider } from "../interfaces/TokenProvider.js";
 type BaseMethodsProvider<TypeOf, BaseProvider, T extends object> = {

package/package.json

@@ -2,24 +2,24 @@
   "name": "@tsed/di",
   "description": "DI module for Ts.ED Framework",
   "type": "module",
-  "version": "8.9.4",
+  "version": "8.10.0-rc.1",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
   "typings": "./lib/types/index.d.ts",
-  "browser": "./lib/browser/di.umd.min.js",
+  "browser": "./lib/browser/di.umd.cjs",
   "exports": {
     ".": {
       "tsed-source": "./src/index.ts",
       "types": "./lib/types/index.d.ts",
-      "browser": "./lib/browser/di.umd.min.js",
+      "browser": "./lib/browser/di.umd.cjs",
       "import": "./lib/esm/index.js",
       "default": "./lib/esm/index.js"
     }
   },
   "scripts": {
     "build": "yarn barrels && yarn build:ts && yarn run build:browser",
-    "build:browser": "webpack",
+    "build:browser": "vite build",
     "barrels": "barrels",
     "test": "vitest run",
     "build:ts": "tsc --build tsconfig.esm.json",
@@ -30,23 +30,21 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.9.4",
-    "@tsed/core": "8.9.4",
-    "@tsed/hooks": "8.9.4",
+    "@tsed/barrels": "8.10.0-rc.1",
+    "@tsed/core": "8.10.0-rc.1",
+    "@tsed/hooks": "8.10.0-rc.1",
     "@tsed/logger": "^7.0.1",
-    "@tsed/schema": "8.9.4",
-    "@tsed/typescript": "8.9.4",
+    "@tsed/typescript": "8.10.0-rc.1",
     "cross-env": "7.0.3",
     "eslint": "9.12.0",
     "typescript": "5.4.5",
-    "vitest": "3.1.1",
-    "webpack": "^5.75.0"
+    "vite": "6.2.2",
+    "vitest": "3.1.4"
   },
   "peerDependencies": {
-    "@tsed/core": ">=8.9.4",
-    "@tsed/hooks": ">=8.9.4",
-    "@tsed/logger": ">=7.0.1",
-    "@tsed/schema": ">=8.9.4"
+    "@tsed/core": ">=8.0.0",
+    "@tsed/hooks": ">=8.0.0",
+    "@tsed/logger": ">=7.0.1"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {
@@ -57,9 +55,6 @@
     },
     "@tsed/logger": {
       "optional": false
-    },
-    "@tsed/schema": {
-      "optional": false
     }
   },
   "repository": "https://github.com/tsedio/tsed",
@@ -68,5 +63,8 @@
   },
   "homepage": "https://github.com/tsedio/tsed/tree/production/packages/di",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "rc"
+  }
 }

package/readme.md

@@ -36,7 +36,7 @@ A powerful and flexible Dependency Injection (DI) toolkit inspired by Angular, d
 Install the latest release and required peer dependencies:
 
 ```bash
-npm install --save @tsed/di @tsed/core @tsed/hooks @tsed/logger @tsed/schema
+npm install --save @tsed/di @tsed/core @tsed/hooks @tsed/logger
 ```
 
 > **Important!**

package/src/common/decorators/autoInjectable.ts

@@ -1,4 +1,5 @@
-import {isArray, type Type} from "@tsed/core";
+import {type Type} from "@tsed/core/types/Type.js";
+import {isArray} from "@tsed/core/utils/isArray.js";
 
 import {LocalsContainer} from "../domain/LocalsContainer.js";
 import {injector} from "../fn/injector.js";

package/src/common/decorators/configuration.ts

@@ -1,9 +1,11 @@
-import {DecoratorParameters, decoratorTypeOf, DecoratorTypes} from "@tsed/core";
+import {DecoratorParameters} from "@tsed/core/types/DecoratorParameters.js";
+import {DecoratorTypes} from "@tsed/core/types/DecoratorTypes.js";
+import {decoratorTypeOf} from "@tsed/core/utils/decoratorTypeOf.js";
 
 import {configuration} from "../fn/configuration.js";
 import {injectable} from "../fn/injectable.js";
 import {injector} from "../fn/injector.js";
-import {CONFIGURATION, DIConfiguration} from "../services/DIConfiguration.js";
+import {DIConfiguration} from "../services/DIConfiguration.js";
 import {Inject} from "./inject.js";
 
 /**

package/src/common/decorators/constant.ts

@@ -1,4 +1,5 @@
-import {catchError, deepClone} from "@tsed/core";
+import {catchError} from "@tsed/core/utils/catchError.js";
+import {deepClone} from "@tsed/core/utils/deepClone.js";
 
 import {constant} from "../fn/constant.js";
 
@@ -36,7 +37,7 @@ export function bindConstant(target: any, propertyKey: string | symbol, expressi
  * ## Example
  *
  * ```typescript
- * import {Env} from "@tsed/core";
+ * import {Env} from "@tsed/core/domain/Env.js";
  * import {Constant, Value} from "@tsed/di";
  *
  * export class MyClass {

package/src/common/decorators/controller.ts

@@ -1,5 +1,8 @@
-import {isArrayOrArrayClass, Type, useDecorators} from "@tsed/core";
-import {Children, Path} from "@tsed/schema";
+import {Store} from "@tsed/core/types/Store.js";
+import {Type} from "@tsed/core/types/Type.js";
+import {classOf} from "@tsed/core/utils/classOf.js";
+import {isArrayOrArrayClass} from "@tsed/core/utils/isArray.js";
+import {useDecorators} from "@tsed/core/utils/useDecorators.js";
 
 import type {ControllerMiddlewares} from "../domain/ControllerProvider.js";
 import {controller} from "../fn/injectable.js";
@@ -54,11 +57,17 @@ function mapOptions(options: any): ControllerOptions {
 export function Controller(options: PathType | ControllerOptions): ClassDecorator {
   const {children = [], path, ...opts} = mapOptions(options);
 
-  return useDecorators(
-    (target: Type) => {
-      controller(target, opts);
-    },
-    path && Path(path as any),
-    Children(...children)
-  );
+  return useDecorators((target: Type) => {
+    const factory = controller(target, opts);
+
+    if (path) {
+      factory.store().set("path", path);
+    }
+
+    factory.store().set("childrenControllers", children);
+
+    children.forEach((childToken) => {
+      Store.from(childToken).set("parentController", classOf(target));
+    });
+  });
 }

package/src/common/decorators/inject.ts

@@ -1,4 +1,10 @@
-import {catchError, decoratorTypeOf, DecoratorTypes, isPromise, Metadata, Store, type Type} from "@tsed/core";
+import {DecoratorTypes} from "@tsed/core/types/DecoratorTypes.js";
+import {Metadata} from "@tsed/core/types/Metadata.js";
+import {Store} from "@tsed/core/types/Store.js";
+import {type Type} from "@tsed/core/types/Type.js";
+import {catchError} from "@tsed/core/utils/catchError.js";
+import {decoratorTypeOf} from "@tsed/core/utils/decoratorTypeOf.js";
+import {isPromise} from "@tsed/core/utils/isPromise.js";
 
 import {DI_INJECTABLE_PROPS, DI_INVOKE_OPTIONS, DI_USE_OPTIONS} from "../constants/constants.js";
 import {InvalidPropertyTokenError} from "../errors/InvalidPropertyTokenError.js";

package/src/common/decorators/intercept.ts

@@ -1,4 +1,11 @@
-import {classOf, decorateMethodsOf, DecoratorParameters, decoratorTypeOf, DecoratorTypes, nameOf, Store, Type} from "@tsed/core";
+import {DecoratorParameters} from "@tsed/core/types/DecoratorParameters.js";
+import {DecoratorTypes} from "@tsed/core/types/DecoratorTypes.js";
+import {Store} from "@tsed/core/types/Store.js";
+import {Type} from "@tsed/core/types/Type.js";
+import {classOf} from "@tsed/core/utils/classOf.js";
+import {decorateMethodsOf} from "@tsed/core/utils/decorateMethodsOf.js";
+import {decoratorTypeOf} from "@tsed/core/utils/decoratorTypeOf.js";
+import {nameOf} from "@tsed/core/utils/nameOf.js";
 
 import {DI_INTERCEPTOR_OPTIONS, DI_INVOKE_OPTIONS} from "../constants/constants.js";
 import {inject} from "../fn/inject.js";

package/src/common/decorators/lazyInject.spec.ts

@@ -34,7 +34,7 @@ describe("LazyInject", () => {
     const service = inject<MyInjectable>(MyInjectable);
     const error = await catchAsyncError(() => service.lazy);
 
-    expect(error?.message).toContain("Failed to load url lazy-module");
+    expect(error?.message).toContain("'lazy-module' imported from");
   });
 
   it("should lazy load optionally a module", async () => {

package/src/common/decorators/lazyInject.ts

@@ -1,4 +1,5 @@
-import {catchError, isFunction} from "@tsed/core";
+import {catchError} from "@tsed/core/utils/catchError.js";
+import {isFunction} from "@tsed/core/utils/isFunction.js";
 
 import {lazyInject, optionalLazyInject} from "../fn/lazyInject.js";
 

package/src/common/decorators/module.ts

@@ -1,4 +1,4 @@
-import {useDecorators} from "@tsed/core";
+import {useDecorators} from "@tsed/core/utils/useDecorators.js";
 
 import {ProviderScope} from "../domain/ProviderScope.js";
 import {ProviderType} from "../domain/ProviderType.js";

package/src/common/decorators/opts.ts

@@ -1,4 +1,4 @@
-import {classOf} from "@tsed/core";
+import {classOf} from "@tsed/core/utils/classOf.js";
 
 import {DI_USE_PARAM_OPTIONS} from "../constants/constants.js";
 import {ProviderScope} from "../domain/ProviderScope.js";

package/src/common/decorators/overrideProvider.ts

@@ -1,4 +1,4 @@
-import {Type} from "@tsed/core";
+import {Type} from "@tsed/core/types/Type.js";
 
 import {GlobalProviders} from "../registries/GlobalProviders.js";
 

package/src/common/decorators/scope.ts

@@ -1,4 +1,4 @@
-import {StoreSet} from "@tsed/core";
+import {StoreSet} from "@tsed/core/decorators/storeSet.js";
 
 import {ProviderScope} from "../domain/ProviderScope.js";
 

package/src/common/decorators/useOpts.ts

@@ -1,4 +1,7 @@
-import {decoratorTypeOf, DecoratorTypes, Store, UnsupportedDecoratorType} from "@tsed/core";
+import {UnsupportedDecoratorType} from "@tsed/core/errors/UnsupportedDecoratorType.js";
+import {DecoratorTypes} from "@tsed/core/types/DecoratorTypes.js";
+import {Store} from "@tsed/core/types/Store.js";
+import {decoratorTypeOf} from "@tsed/core/utils/decoratorTypeOf.js";
 
 import {DI_USE_OPTIONS, DI_USE_PARAM_OPTIONS} from "../constants/constants.js";
 

package/src/common/decorators/value.ts

@@ -1,4 +1,4 @@
-import {catchError} from "@tsed/core";
+import {catchError} from "@tsed/core/utils/catchError.js";
 
 import {injector} from "../fn/injector.js";
 
@@ -24,7 +24,7 @@ export function bindValue(target: any, propertyKey: string | symbol, expression:
  * ## Example
  *
  * ```typescript
- * import {Env} from "@tsed/core";
+ * import {Env} from "@tsed/core/domain/Env.js";
  * import {Constant, Value} from "@tsed/di";
  *
  * export class MyClass {

package/src/common/domain/Provider.ts

@@ -1,4 +1,9 @@
-import {type AbstractType, classOf, getClassOrSymbol, isClass, nameOf, Store, Type} from "@tsed/core";
+import {Store} from "@tsed/core/types/Store.js";
+import {type AbstractType, Type} from "@tsed/core/types/Type.js";
+import {classOf} from "@tsed/core/utils/classOf.js";
+import {getClassOrSymbol} from "@tsed/core/utils/getClassOrSymbol.js";
+import {isClass} from "@tsed/core/utils/isClass.js";
+import {nameOf} from "@tsed/core/utils/nameOf.js";
 
 import {DI_USE_PARAM_OPTIONS} from "../constants/constants.js";
 import type {ProviderOpts} from "../interfaces/ProviderOpts.js";

package/src/common/errors/InjectionError.ts

@@ -1,4 +1,7 @@
-import {getConstructorArgNames, isClass, isString, nameOf} from "@tsed/core";
+import {getConstructorArgNames} from "@tsed/core/utils/getConstructorArgNames.js";
+import {isClass} from "@tsed/core/utils/isClass.js";
+import {isString} from "@tsed/core/utils/isString.js";
+import {nameOf} from "@tsed/core/utils/nameOf.js";
 
 import {TokenProvider} from "../interfaces/TokenProvider.js";
 import {colors} from "../utils/colors.js";

package/src/common/errors/InvalidPropertyTokenError.ts

@@ -1,4 +1,5 @@
-import {classOf, nameOf} from "@tsed/core";
+import {classOf} from "@tsed/core/utils/classOf.js";
+import {nameOf} from "@tsed/core/utils/nameOf.js";
 
 export class InvalidPropertyTokenError extends Error {
   name = "INVALID_TOKEN_ERROR";

package/src/common/fn/configuration.ts

@@ -1,4 +1,4 @@
-import {Store} from "@tsed/core";
+import {Store} from "@tsed/core/types/Store.js";
 
 import type {TokenProvider} from "../interfaces/TokenProvider.js";
 import {DIConfiguration} from "../services/DIConfiguration.js";

package/src/common/fn/lazyInject.ts

@@ -1,4 +1,4 @@
-import {isFunction} from "@tsed/core";
+import {isFunction} from "@tsed/core/utils/isFunction.js";
 
 import type {TokenProvider} from "../interfaces/TokenProvider.js";
 import {inject} from "./inject.js";

package/src/common/interfaces/RegistrySettings.ts

@@ -1,4 +1,4 @@
-import {Type} from "@tsed/core";
+import {Type} from "@tsed/core/types/Type.js";
 
 import type {Provider} from "../domain/Provider.js";
 

package/src/common/registries/GlobalProviders.ts

@@ -1,4 +1,5 @@
-import {getClassOrSymbol, Type} from "@tsed/core";
+import {Type} from "@tsed/core/types/Type.js";
+import {getClassOrSymbol} from "@tsed/core/utils/getClassOrSymbol.js";
 
 import {Provider} from "../domain/Provider.js";
 import {ProviderType} from "../domain/ProviderType.js";

package/src/common/services/DIConfiguration.ts

@@ -1,4 +1,6 @@
-import {Env, getValue, setValue} from "@tsed/core";
+import {Env} from "@tsed/core/types/Env.js";
+import {getValue} from "@tsed/core/utils/getValue.js";
+import {setValue} from "@tsed/core/utils/setValue.js";
 
 import type {DILoggerOptions} from "../interfaces/DILoggerOptions.js";
 import type {ImportTokenProviderOpts} from "../interfaces/ImportTokenProviderOpts.js";

package/src/common/services/InjectorService.ts

@@ -1,4 +1,13 @@
-import {classOf, deepClone, deepMerge, isArray, isClass, isFunction, isInheritedFrom, isObject, isPromise, nameOf} from "@tsed/core";
+import {classOf} from "@tsed/core/utils/classOf.js";
+import {deepClone} from "@tsed/core/utils/deepClone.js";
+import {deepMerge} from "@tsed/core/utils/deepMerge.js";
+import {isArray} from "@tsed/core/utils/isArray.js";
+import {isClass} from "@tsed/core/utils/isClass.js";
+import {isFunction} from "@tsed/core/utils/isFunction.js";
+import {isInheritedFrom} from "@tsed/core/utils/isInheritedFrom.js";
+import {isObject} from "@tsed/core/utils/isObject.js";
+import {isPromise} from "@tsed/core/utils/isPromise.js";
+import {nameOf} from "@tsed/core/utils/nameOf.js";
 import {$alter, $asyncAlter, $asyncEmit, $emit, $off, $on} from "@tsed/hooks";
 
 import {DI_INVOKE_OPTIONS, DI_USE_PARAM_OPTIONS} from "../constants/constants.js";

package/src/common/utils/createContainer.ts

@@ -1,4 +1,4 @@
-import {Type} from "@tsed/core";
+import {Type} from "@tsed/core/types/Type.js";
 
 import {Container} from "../domain/Container.js";
 import {GlobalProviders} from "../registries/GlobalProviders.js";

package/src/common/utils/discoverHooks.ts

@@ -1,4 +1,5 @@
-import {type AbstractType, methodsOf, type Type} from "@tsed/core";
+import {type AbstractType, type Type} from "@tsed/core/types/Type.js";
+import {methodsOf} from "@tsed/core/utils/methodsOf.js";
 
 export function discoverHooks(token: Type | AbstractType<any>) {
   return methodsOf(token).reduce((hooks, {propertyKey}) => {

package/src/common/utils/getConfiguration.ts

@@ -1,4 +1,5 @@
-import {Store, Type} from "@tsed/core";
+import {Store} from "@tsed/core/types/Store.js";
+import {Type} from "@tsed/core/types/Type.js";
 
 export function mergeMount(m1: any = {}, m2: any = {}) {
   return Object.entries(m2).reduce((mount, [key, controllers]) => {

package/src/common/utils/getConstructorDependencies.ts

@@ -1,4 +1,4 @@
-import {Metadata} from "@tsed/core";
+import {Metadata} from "@tsed/core/types/Metadata.js";
 
 export function getConstructorDependencies(target: any, propertyKey?: string | symbol | undefined) {
   return Metadata.getOwn("override:ctor:design:paramtypes", target, propertyKey) || [...Metadata.getParamTypes(target, propertyKey)] || [];

package/src/common/utils/providerBuilder.ts

@@ -1,6 +1,7 @@
 import "../registries/ProviderRegistry.js";
 
-import {Store, type Type} from "@tsed/core";
+import {Store} from "@tsed/core/types/Store.js";
+import {type Type} from "@tsed/core/types/Type.js";
 
 import {ProviderType} from "../domain/ProviderType.js";
 import {injector} from "../fn/injector.js";