fix(di): remove default scope configuration on DIConfiguration level

BREAKING CHANGE: configuration.scope is removed. This options doesn't make sense since a $ctx exists. ProviderScope.REQUEST must to be declared explicitly on each controller.

.gitignore

@@ -15,6 +15,8 @@ lib-cov
 
 # Coverage directory used by tools like istanbul
 coverage
+coverage-*
+
 
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt

docs/docs/configuration/index.md

@@ -265,23 +265,6 @@ Add providers or modules here. These modules or provider will be built before th
   </Tab>
 </Tabs>
 
-### scopes
-
-- type: `{[key: string]: ProviderScope}`
-
-Change the default scope for a given provider. See [injection scopes](/docs/injection-scopes) for more details.
-
-```typescript
-import {Configuration, ProviderScope, ProviderType} from "@tsed/di";
-
-@Configuration({
-  scopes: {
-    [ProviderType.CONTROLLER]: ProviderScope.REQUEST
-  }
-})
-export class Server {}
-```
-
 ### logger
 
 - type: @@PlatformLoggerSettings@@

docs/docs/injection-scopes.md

@@ -2,7 +2,7 @@
 
 The scope of a [Provider](/docs/providers.md) defines the lifecycle and visibility of that bean in the context in which it is used.
 
-Ts.ED DI defines 3 types of @@Scope@@ which can be used on injectable classes:
+Ts.ED DI defines 3 types of @@ProviderScope@@ which can be used on injectable classes:
 
 - `singleton`: The default scope. The provider is created during server initialization and is shared across all requests.
 - `request`: A new instance of the provider is created for each incoming request.

packages/di/src/common/domain/Provider.ts

@@ -110,7 +110,7 @@ export class Provider<T = any> implements ProviderOpts<T> {
       return ProviderScope.SINGLETON;
     }
 
-    return this.get("scope");
+    return this.get<ProviderScope>("scope", ProviderScope.SINGLETON);
   }
 
   /**
@@ -122,7 +122,7 @@ export class Provider<T = any> implements ProviderOpts<T> {
   }
 
   get configuration(): Partial<TsED.Configuration> {
-    return this.get("configuration");
+    return this.get("configuration")!;
   }
 
   set configuration(configuration: Partial<TsED.Configuration>) {
@@ -141,8 +141,10 @@ export class Provider<T = any> implements ProviderOpts<T> {
     return this.store.get(`${DI_USE_PARAM_OPTIONS}:${index}`);
   }
 
-  get(key: string) {
-    return this.store.get(key) || this._tokenStore.get(key);
+  get<Type = unknown>(key: string): Type | undefined;
+  get<Type = unknown>(key: string, defaultValue: Type): Type;
+  get<Type = unknown>(key: string, defaultValue?: Type): Type | undefined {
+    return this.store.get(key) || this._tokenStore.get(key) || defaultValue;
   }
 
   isAsync(): boolean {

packages/di/src/common/services/DIConfiguration.spec.ts

@@ -44,21 +44,10 @@ describe("DIConfiguration", () => {
       expect(obj).toEqual({
         imports: [],
         logger: {},
-        routes: [],
-        scopes: {}
+        routes: []
       });
     });
   });
-  describe("scopes()", () => {
-    it("should get scopes", () => {
-      // GIVEN
-      const configuration = new DIConfiguration();
-
-      configuration.scopes = {};
-      expect(configuration.scopes).toEqual({});
-    });
-  });
-
   describe("imports()", () => {
     it("should get imports", () => {
       // GIVEN

packages/di/src/common/services/DIConfiguration.ts

@@ -12,7 +12,6 @@ export class DIConfiguration {
 
   constructor(initialProps = {}) {
     Object.entries({
-      scopes: {},
       imports: [],
       routes: [],
       logger: {},
@@ -46,22 +45,6 @@ export class DIConfiguration {
     this.map.set("env", value);
   }
 
-  get scopes(): Record<string, ProviderScope> {
-    return this.map.get("scopes");
-  }
-
-  set scopes(value: Record<string, ProviderScope>) {
-    this.map.set("scopes", value);
-  }
-  //
-  // get resolvers(): DIResolver[] {
-  //   return this.getRaw("resolvers");
-  // }
-  //
-  // set resolvers(resolvers: DIResolver[]) {
-  //   this.map.set("resolvers", resolvers);
-  // }
-
   get imports(): (TokenProvider | ImportTokenProviderOpts)[] {
     return this.get("imports")!;
   }

packages/di/src/common/services/InjectorService.spec.ts

@@ -616,29 +616,18 @@ describe("InjectorService", () => {
       // GIVEN
       const injector = new InjectorService();
 
-      injector.settings.set({
-        scopes: {
-          [ProviderType.VALUE]: ProviderScope.SINGLETON
-        }
-      });
-
-      expect(injector.settings.get("scopes")).toEqual({
-        [ProviderType.VALUE]: ProviderScope.SINGLETON
-      });
-
       injector.add(Symbol.for("TOKEN1"), {
         configuration: {
-          custom: "config",
-          scopes: {
-            provider_custom: ProviderScope.SINGLETON
+          custom: {
+            config: "1"
           }
         }
       });
 
       injector.add(Symbol.for("TOKEN2"), {
         configuration: {
-          scopes: {
-            provider_custom_2: ProviderScope.SINGLETON
+          custom: {
+            config2: "1"
           }
         }
       });
@@ -647,11 +636,7 @@ describe("InjectorService", () => {
       injector.resolveConfiguration();
 
       // THEN
-      expect(injector.settings.scopes).toEqual({
-        provider_custom: "singleton",
-        provider_custom_2: "singleton",
-        value: "singleton"
-      });
+      expect(injector.settings.get("custom")).toEqual({config: "1", config2: "1"});
     });
   });
 

packages/di/src/common/services/InjectorService.ts

@@ -54,18 +54,6 @@ export class InjectorService extends Container {
     this.#cache.set(InjectorService, this);
   }
 
-  get scopes() {
-    return this.settings.scopes || {};
-  }
-
-  /**
-   * Retrieve default scope for a given provider.
-   * @param provider
-   */
-  public scopeOf(provider: Provider) {
-    return provider.scope || this.scopes[String(provider.type)] || ProviderScope.SINGLETON;
-  }
-
   /**
    * Return a list of instance build by the injector.
    */
@@ -181,7 +169,7 @@ export class InjectorService extends Container {
 
     instance = this.resolve(token, options);
 
-    switch (this.scopeOf(provider)) {
+    switch (provider.scope) {
       case ProviderScope.SINGLETON:
         if (provider.hooks && !options.rebuild) {
           this.registerHooks(provider, instance);
@@ -233,7 +221,7 @@ export class InjectorService extends Container {
    */
   loadSync() {
     for (const [, provider] of this) {
-      if (!this.has(provider.token) && this.scopeOf(provider) === ProviderScope.SINGLETON) {
+      if (!this.has(provider.token) && provider.scope === ProviderScope.SINGLETON) {
         this.invoke(provider.token);
       }
     }

packages/platform/platform-params/vitest.config.mts

@@ -10,12 +10,12 @@ export default defineConfig(
       coverage: {
         ...presets.test.coverage,
         thresholds: {
-          statements: 99.55,
+          statements: 99.4,
           branches: 95.45,
           functions: 100,
-          lines: 99.55
+          lines: 99.4
         }
       }
     }
   }
-);
+);

tools/vitest/presets/index.js

@@ -20,6 +20,10 @@ export const presets = defineConfig({
       all: true,
       include: ["src/**/*.{tsx,ts}"],
       exclude: [
+        "**/exports.ts",
+        "**/interfaces/**",
+        "**/*fixtures.ts",
+        "**/fixtures/**",
         "**/*.spec.{ts,tsx}",
         "**/*.stories.{ts,tsx}",
         "**/*.d.ts",