feat(nanoviews): sync with updated agera

Author: dangreen

packages/nanoviews/src/internals/effects.ts

@@ -5,7 +5,7 @@ import {
   isAccessor,
   effect,
   subscribe as sub,
-  createEffectScope,
+  deferScope,
   getContext,
   run,
   untracked
@@ -30,10 +30,8 @@ export function subscribe<T>(
   }
 }
 
-export function createEffectScopeWithContext(context = getContext()) {
-  const effectScope = createEffectScope()
-
-  return ((fn, lazy) => effectScope(() => run(context, fn), lazy)) as ReturnType<typeof createEffectScope>
+export function createDeferScopeWithContext(context = getContext()) {
+  return (fn => deferScope(() => run(context, fn))) as typeof deferScope
 }
 
 export function effectScopeSwapper<T>(

packages/nanoviews/src/internals/flow/decide.ts

@@ -6,7 +6,7 @@ import {
 } from 'kida'
 import type { Child } from '../types/index.js'
 import {
-  createEffectScopeWithContext,
+  createDeferScopeWithContext,
   effectScopeSwapper
 } from '../effects.js'
 import { createTextNode } from '../elements/text.js'
@@ -21,7 +21,7 @@ export function reactiveDecide<T>(
 ) {
   const start = createTextNode()
   const end = createTextNode()
-  const effectScope = createEffectScopeWithContext()
+  const deferScope = createDeferScopeWithContext()
   const fragment = document.createDocumentFragment()
 
   fragment.append(start, end)
@@ -35,9 +35,8 @@ export function reactiveDecide<T>(
       removeBetween(start, end)
     }
 
-    const runEffects = effectScope(
-      () => insertChildBeforeAnchor(decider(condition), end),
-      true
+    const runEffects = deferScope(
+      () => insertChildBeforeAnchor(decider(condition), end)
     )
 
     // Rerender on condition change in effect

packages/nanoviews/src/internals/flow/loop.ts

@@ -13,7 +13,7 @@ import type {
   EmptyValue
 } from '../types/index.js'
 import {
-  createEffectScopeWithContext,
+  createDeferScopeWithContext,
   effectScopeSwapper
 } from '../effects.js'
 import { isEmpty } from '../utils.js'
@@ -258,7 +258,7 @@ export function loop(
 ): Child {
   const start = createTextNode()
   const end = createTextNode()
-  const effectScope = createEffectScopeWithContext()
+  const deferScope = createDeferScopeWithContext()
   const fragment = document.createDocumentFragment()
   const blocksMap: LookupMap = new Map()
   const itemsList: LoopItemsList = {
@@ -279,7 +279,7 @@ export function loop(
     if (itemsCount && prevItemsCount) {
       // [...m] -> [...n]
       // swap
-      return effectScope(() => {
+      return deferScope(() => {
         batch(() => reconcile(
           itemsList,
           blocksMap,
@@ -289,7 +289,7 @@ export function loop(
           end,
           items
         ))
-      }, true)()
+      })()
     }
 
     const shouldRender = itemsCount || !isPlaceholder
@@ -306,7 +306,7 @@ export function loop(
     if (itemsCount) {
       // [] -> [...n]
       isPlaceholder = false
-      runEffects = effectScope(() => {
+      runEffects = deferScope(() => {
         reconcile(
           itemsList,
           blocksMap,
@@ -316,13 +316,12 @@ export function loop(
           end,
           items
         )
-      }, true)
+      })
     } else if (!isPlaceholder) {
       // ([...n] | []) -> []
       isPlaceholder = true
-      runEffects = effectScope(
-        () => insertChildBeforeAnchor(else_?.(), end),
-        true
+      runEffects = deferScope(
+        () => insertChildBeforeAnchor(else_?.(), end)
       )
     }
 

packages/nanoviews/src/mount.ts

@@ -1,4 +1,4 @@
-import { effectScope } from 'kida'
+import { deferScope } from 'kida'
 import {
   type Child,
   type MaybeDestroy,
@@ -18,7 +18,7 @@ export function mount(app: () => Child, target: ParentNode) {
   target.__mp = true
 
   let unmount: MaybeDestroy
-  const start = effectScope(() => unmount = mountChild(target, app()), true)
+  const start = deferScope(() => unmount = mountChild(target, app()))
   const destroy = start()
 
   return () => {

todo.txt

@@ -10,6 +10,8 @@
 
 ## Nanoviews
 
+- fix TruthyValueOrSignal type, return signal if signal, not accessor
+
 - wrap into untracked needed parts
 - for loop array or empty check for else
 - rework return slot$ to look like element/component? fn.prop is faster than {f,p}
@@ -38,6 +40,8 @@ for_($items)(
 
 ## 🔥🔥🔥 Query 🔥🔥🔥
 
+- map data / default data
+
 - hydration provider / etc?
 - serialize -> dehydrate / hydrate?
 - combine serialize + serializable?