initiated fixing leaks

Author: levizwannah

package.json

@@ -1,6 +1,6 @@
 {
   "name": "modular-openscriptjs",
-  "version": "1.0.22",
+  "version": "1.0.30",
   "description": "OpenScriptJs Framework - A lightweight, reactive JavaScript framework for building modern web applications",
   "type": "module",
   "main": "./dist/modular-openscriptjs.umd.js",

src/component/Component.js

@@ -105,7 +105,6 @@ export default class Component {
     this.on(this.EVENTS.bound, (th) => (th.bound = true));
     this.on(this.EVENTS.mounted, (th) => (th.mounted = true));
     this.on(this.EVENTS.visible, (th) => (th.visible = true));
-    this.getDeclaredListeners();
 
     this.$$ojs = {
       routeChanged: () => {
@@ -360,9 +359,6 @@ export default class Component {
     this.emit(this.EVENTS.premount);
     await this.bindComponent();
     this.emit(this.EVENTS.mounted);
-
-    // Mark as registered
-    this.__ojsRegistered = true;
   }
 
   /**

src/core/Container.js

@@ -90,9 +90,10 @@ export default class Container {
   /**
    * Resolve a service by name
    * @param {string} name - Service identifier
+   * @param {any} defaultValue - Default value to return if service is not found
    * @returns {any} - The resolved service instance
    */
-  resolve(name) {
+  resolve(name, defaultValue = null) {
     // Check for circular dependencies
     if (this.resolvingStack.has(name)) {
       const stack = Array.from(this.resolvingStack).join(" -> ");
@@ -101,7 +102,7 @@ export default class Container {
 
     const service = this.services.get(name);
     if (!service) {
-      throw new Error(`Service "${name}" not registered in container`);
+      return defaultValue;
     }
 
     // Return cached singleton instance

src/core/Runner.js

@@ -23,40 +23,50 @@ export default class Runner {
   }
 
   async run(...cls) {
+    container.value(
+      "__ojs_registrations",
+      container.resolve("__ojs_registrations") ?? {}
+    );
+
+    const registrations = container.resolve("__ojs_registrations");
+
     for (let i = 0; i < cls.length; i++) {
       let c = cls[i];
       let instance;
+      const classKey = this.getClassKey(c);
 
       if (!this.isClass(c)) {
         // Functional component - always create new instance (not a singleton)
         instance = new Component(c.name);
         instance.render = c.bind(instance);
       } else {
-        // For classes, check if singleton exists in container
-        const classKey = this.getClassKey(c);
+        if (registrations[classKey] === "ongoing") {
+          continue;
+        }
 
         if (container.has(classKey)) {
-          // Retrieve existing singleton from container
           instance = container.resolve(classKey);
-
-          // Skip if already registered (has __ojsRegistered flag)
           if (instance.__ojsRegistered) {
             continue;
           }
         } else {
-          // Create new instance and register as singleton in container
           instance = new c();
           container.singleton(classKey, () => instance, []);
+          registrations[classKey] = "ongoing";
         }
       }
 
       if (instance instanceof Component) {
         instance.getDeclaredListeners();
         await instance.mount();
+        instance.__ojsRegistered = true;
+        registrations[classKey] = "completed";
       } else if (instance instanceof Mediator || instance instanceof Listener) {
         await instance.register();
+        registrations[classKey] = "completed";
       } else if (instance instanceof Context) {
         // Context instances don't need registration
+        registrations[classKey] = "completed";
       } else {
         throw Error(
           `You can only pass declarations which extend Component, Mediator or Listener`

src/index.js

@@ -127,12 +127,13 @@ const dom = DOM;
 /**
  * Access a service from the IoC container or get the container itself
  * @param {string|undefined} [instance] - Service name or undefined to get container
+ * @param {any} [defaultValue] - Default value to return if service is not found
  * @returns {any}
  */
-const app = (instance = null) => {
+const app = (instance = null, defaultValue = null) => {
   if (instance === null) return container;
 
-  return container.resolve(instance);
+  return container.resolve(instance, defaultValue);
 };
 
 // Export everything