@estjs/template 0.0.16-beta.2 → 0.0.16-beta.4

package/dist/template.d.cts

@@ -1,6 +1,6 @@
 import { Signal, Computed } from '@estjs/signals';
-import { S as Scope } from './internal-Bz6h0aPa.cjs';
-export { I as InjectionKey, i as inject, p as provide } from './internal-Bz6h0aPa.cjs';
+import { S as Scope } from './internal-DSKAj-zW.cjs';
+export { I as InjectionKey, i as inject, p as provide } from './internal-DSKAj-zW.cjs';
 import { normalizeClassName } from '@estjs/shared';
 
 declare enum COMPONENT_STATE {

package/dist/template.d.ts

@@ -1,6 +1,6 @@
 import { Signal, Computed } from '@estjs/signals';
-import { S as Scope } from './internal-Bz6h0aPa.js';
-export { I as InjectionKey, i as inject, p as provide } from './internal-Bz6h0aPa.js';
+import { S as Scope } from './internal-DSKAj-zW.js';
+export { I as InjectionKey, i as inject, p as provide } from './internal-DSKAj-zW.js';
 import { normalizeClassName } from '@estjs/shared';
 
 declare enum COMPONENT_STATE {

package/dist/template.dev.cjs.js

@@ -56,8 +56,10 @@ function getActiveScope() {
   return activeScope;
 }
 function createScope(parent = activeScope) {
+  const reactiveScope = parent ? parent.effectScope.run(() => signals.effectScope()) : signals.effectScope(true);
   const scope = {
     id: ++scopeId,
+    effectScope: reactiveScope,
     parent,
     children: null,
     // Lazy initialized
@@ -86,7 +88,7 @@ function runWithScope(scope, fn) {
   const prevScope = activeScope;
   activeScope = scope;
   try {
-    return fn();
+    return scope.effectScope.run(fn);
   } finally {
     activeScope = prevScope;
   }
@@ -106,15 +108,13 @@ function disposeScope(scope) {
     }
     scope.children.clear();
   }
-  const prevScope = activeScope;
-  activeScope = scope;
-  try {
+  runWithScope(scope, () => {
     if (scope.onDestroy) {
       for (let i = 0; i < scope.onDestroy.length; i++) {
         try {
           scope.onDestroy[i]();
         } catch (error_) {
-          if (true) {
+          {
             shared.error(`Scope(${scope.id}): Error in destroy hook:`, error_);
           }
         }
@@ -126,16 +126,15 @@ function disposeScope(scope) {
         try {
           scope.cleanup[i]();
         } catch (error_) {
-          if (true) {
+          {
             shared.error(`Scope(${scope.id}): Error in cleanup:`, error_);
           }
         }
       }
       scope.cleanup = null;
     }
-  } finally {
-    activeScope = prevScope;
-  }
+  });
+  scope.effectScope.stop();
   if ((_a2 = scope.parent) == null ? void 0 : _a2.children) {
     scope.parent.children.delete(scope);
   }
@@ -692,7 +691,7 @@ function normalizeNode(node) {
 }
 function insert(parent, nodeFactory, before) {
   if (!parent) return;
-  const ownerScope = getActiveScope();
+  const parentScope = getActiveScope();
   let renderedNodes = [];
   let isFirstRun = true;
   const resolveNodes = (raw) => {
@@ -716,8 +715,8 @@ function insert(parent, nodeFactory, before) {
       renderedNodes = reconcileArrays(parent, renderedNodes, nodes, before);
       isFirstRun = false;
     };
-    if (ownerScope && !ownerScope.isDestroyed) {
-      runWithScope(ownerScope, executeUpdate);
+    if (parentScope && !parentScope.isDestroyed) {
+      runWithScope(parentScope, executeUpdate);
     } else {
       executeUpdate();
     }
@@ -918,7 +917,9 @@ var Component = class {
       if (shared.isFunction(result)) {
         result = result(this.reactiveProps);
       }
-      if (signals.isSignal(result) || signals.isComputed(result)) {
+      if (signals.isSignal(result)) {
+        result = result.value;
+      } else if (signals.isComputed(result)) {
         result = result.value;
       }
       return (_a3 = insert(parentNode, result, beforeNode)) != null ? _a3 : [];
@@ -1019,11 +1020,12 @@ var Component = class {
       return () => value(null);
     }
     if (signals.isSignal(value)) {
-      const previousValue = value.value;
-      value.value = root;
+      const ref = value;
+      const previousValue = ref.value;
+      ref.value = root;
       return () => {
-        if (value.value === root) {
-          value.value = previousValue;
+        if (ref.value === root) {
+          ref.value = previousValue;
         }
       };
     }
@@ -1449,10 +1451,10 @@ function Portal(props) {
   placeholder[PORTAL_COMPONENT] = true;
   const { children } = props;
   if (children == null) return placeholder;
-  const ownerScope = getActiveScope();
+  const parentScope = getActiveScope();
   let innerScope = null;
   const mountAt = (parent, before) => {
-    innerScope = createScope(ownerScope);
+    innerScope = createScope(parentScope);
     runWithScope(innerScope, () => {
       insert(parent, () => children, before);
     });