Add removed

Entity-Access · Jul 11, 2023 · b7e389d · b7e389d
1 parent b19c5f4
commit b7e389d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/di/di.ts b/src/di/di.ts
@@ -41,12 +41,12 @@ export class ServiceProvider implements IDisposable {
         this[parentServiceProvider] = parent;
     }
 
-    add<T1, T extends T1>(type: IAbstractClassOf<T1> | IClassOf<T1>, instance: T) {
-        this.getRegistration(type, true);
-        this.map.set(type, instance);
-        instance[serviceProvider] = this;
-        return instance;
-    }
+    // add<T1, T extends T1>(type: IAbstractClassOf<T1> | IClassOf<T1>, instance: T) {
+    //     this.getRegistration(type, true);
+    //     this.map.set(type, instance);
+    //     instance[serviceProvider] = this;
+    //     return instance;
+    // }
 
 
     createScope() {
@@ -117,7 +117,7 @@ export class ServiceProvider implements IDisposable {
         if (!sd) {
 
             if (add) {
-                const registration: IServiceDescriptor = { key: type, kind: "Scoped"};
+                const registration: IServiceDescriptor = { key: type, kind: this[parentServiceProvider] ? "Scoped" : "Singleton" };
                 registrations.set(type, registration);
                 return registration;
             }

diff --git a/src/tests/security/tests/place-order.ts b/src/tests/security/tests/place-order.ts
@@ -1,6 +1,6 @@
 import assert from "assert";
 import Logger from "../../../common/Logger.js";
-import { ServiceProvider } from "../../../di/di.js";
+import { ServiceCollection, ServiceProvider } from "../../../di/di.js";
 import { BaseDriver } from "../../../drivers/base/BaseDriver.js";
 import ContextEvents from "../../../model/events/ContextEvents.js";
 import { TestConfig } from "../../TestConfig.js";
@@ -31,10 +31,10 @@ async function getNewOrders(this: TestConfig) {
     try {
         const user = new UserInfo();
         user.userID = 2;
-        scope.add(Logger, Logger.instance);
-        scope.add(BaseDriver, this.driver);
-        scope.add(UserInfo, user);
-        scope.add(ContextEvents, new ShoppingContextEvents());
+        ServiceCollection.register("Singleton", Logger, () => Logger.instance);
+        ServiceCollection.register("Singleton", BaseDriver, () => this.driver);
+        ServiceCollection.register("Scoped", UserInfo, () => user);
+        ServiceCollection.register("Singleton", ContextEvents, () => new ShoppingContextEvents());
         const context = scope.create(ShoppingContext);
         context.verifyFilters = true;
 
@@ -53,10 +53,10 @@ async function addNewOrder(this: TestConfig, customer: User, userID?) {
     try {
         const user = new UserInfo();
         user.userID = userID ?? customer.userID;
-        scope.add(Logger, Logger.instance);
-        scope.add(BaseDriver, this.driver);
-        scope.add(UserInfo, user);
-        scope.add(ContextEvents, new ShoppingContextEvents());
+        ServiceCollection.register("Singleton", Logger, () => Logger.instance);
+        ServiceCollection.register("Singleton", BaseDriver, () => this.driver);
+        ServiceCollection.register("Scoped", UserInfo, () => user);
+        ServiceCollection.register("Singleton", ContextEvents, () => new ShoppingContextEvents());
         const context = scope.create(ShoppingContext);
         context.verifyFilters = true;