@kithinji/orca 1.0.4 → 1.0.5

package/dist/browser/index.iife.js

@@ -1680,7 +1680,7 @@ var kithinjiorca = (() => {
         vnode.setId(jsx2.id);
       }
       parent.addChild(vnode);
-      this.loadClientComponent(path, name, jsx2.props, container, vnode);
+      this.loadClientComponent(path, name, jsx2.props, container);
       return { domNode: container, vnode };
     }
     buildPendingReference(jsx2, parent) {
@@ -1805,43 +1805,44 @@ var kithinjiorca = (() => {
         dom.removeAttribute(key);
       }
     }
-    async loadClientComponent(path, name, props, container, vnode) {
+    async loadClientComponent(path, name, props, container) {
       try {
+        let register2 = function(Cls, injector2) {
+          if (seen.has(Cls))
+            return;
+          seen.add(Cls);
+          injector2.addProvider({
+            provide: Cls,
+            useClass: Cls,
+            scope: "transient"
+          });
+          const paramDeps = Reflect.getMetadata(DESIGN_PARAMTYPES, Cls) ?? [];
+          const explicitDeps = Reflect.getMetadata(COMPONENT_DEPS, Cls) ?? [];
+          paramDeps.filter((d) => d && d !== Object).forEach((d) => injector2.addProvider(d));
+          explicitDeps.forEach((deps) => register2(deps, injector2));
+        };
+        var register = register2;
         const module = await import(path);
         const ComponentClass = module[name];
-        const params = Reflect.getMetadata(DESIGN_PARAMTYPES, ComponentClass) || [];
-        const deps = Reflect.getMetadata(COMPONENT_DEPS, ComponentClass) || [];
-        const injector = getCurrentInjector();
-        if (injector == null) {
-          throw new Error(`Couldn't find an injector`);
-        }
         if (!ComponentClass) {
           throw new Error(`Component ${name} not found in ${path}`);
         }
-        injector.addProvider({
-          provide: ComponentClass,
-          useClass: ComponentClass,
-          scope: "transient"
-        });
-        deps.forEach(
-          (depClass) => injector.addProvider({
-            provide: depClass,
-            useClass: depClass,
-            scope: "transient"
-          })
-        );
-        params.forEach((p) => injector.addProvider(p));
+        const injector = getCurrentInjector();
+        if (injector == null) {
+          throw new Error("Couldn't find an injector");
+        }
+        const seen = /* @__PURE__ */ new Set();
+        register2(ComponentClass, injector);
         const cleanProps = { ...props };
         delete cleanProps.__clientComponent;
-        const componentInstance = injector.resolve(ComponentClass);
-        componentInstance.__injector = injector;
-        componentInstance.props = cleanProps;
-        if (typeof componentInstance.build === "function") {
-          const rendered = componentInstance.build();
-          container.parentNode?.replaceChild(rendered, container);
-        } else {
-          throw new Error(`Component ${name} does not have a build method`);
+        const instance = injector.resolve(ComponentClass);
+        instance.__injector = injector;
+        instance.props = cleanProps;
+        if (typeof instance.build !== "function") {
+          throw new Error(`Component ${name} does not implement build()`);
         }
+        const rendered = instance.build();
+        container.replaceWith(rendered);
       } catch (error) {
         console.error(`Failed to load client component ${name}:`, error);
         container.textContent = `Error loading component: ${name}`;