genatom interface in rootelem

Author: sawka

tsunami/app/atom.go

@@ -51,7 +51,7 @@ func (a Atom[T]) Set(newVal T) {
 		return
 	}
 	a.client.Root.AtomAddRenderWork(a.name)
-	a.client.SetAtomVal(a.name, newVal)
+	a.client.Root.SetAtomVal(a.name, newVal)
 }
 
 func (a Atom[T]) SetFn(fn func(T) T) {
@@ -64,5 +64,5 @@ func (a Atom[T]) SetFn(fn func(T) T) {
 	typedVal := util.GetTypedAtomValue[T](val, a.name)
 	newVal := fn(typedVal)
 	a.client.Root.AtomAddRenderWork(a.name)
-	a.client.SetAtomVal(a.name, newVal)
+	a.client.Root.SetAtomVal(a.name, newVal)
 }

tsunami/engine/atomimpl.go

@@ -35,3 +35,24 @@ func (a *atomImpl) SetVal(val any) {
 	defer a.lock.Unlock()
 	a.val = val
 }
+
+func (a *atomImpl) SetUsedBy(waveId string, used bool) {
+	a.lock.Lock()
+	defer a.lock.Unlock()
+	if used {
+		a.UsedBy[waveId] = true
+	} else {
+		delete(a.UsedBy, waveId)
+	}
+}
+
+func (a *atomImpl) GetUsedBy() []string {
+	a.lock.Lock()
+	defer a.lock.Unlock()
+
+	keys := make([]string, 0, len(a.UsedBy))
+	for compId := range a.UsedBy {
+		keys = append(keys, compId)
+	}
+	return keys
+}

tsunami/engine/clientimpl.go

@@ -218,10 +218,6 @@ func (c *ClientImpl) SendAsyncInitiation() error {
 	}
 }
 
-func (c *ClientImpl) SetAtomVal(name string, val any) {
-	c.Root.SetAtomVal(name, val, true)
-}
-
 func (c *ClientImpl) GetAtomVal(name string) any {
 	return c.Root.GetAtomVal(name)
 }

tsunami/engine/hooks.go

@@ -99,13 +99,13 @@ func UseAtom(vc *VDomContextImpl, atomName string) (any, func(any), func(func(an
 	atomVal := vc.Root.GetAtomVal(atomName)
 
 	setVal := func(newVal any) {
-		vc.Root.SetAtomVal(atomName, newVal, true)
+		vc.Root.SetAtomVal(atomName, newVal)
 		vc.Root.AtomAddRenderWork(atomName)
 	}
 
 	setFuncVal := func(updateFunc func(any) any) {
 		currentVal := vc.Root.GetAtomVal(atomName)
-		vc.Root.SetAtomVal(atomName, updateFunc(currentVal), true)
+		vc.Root.SetAtomVal(atomName, updateFunc(currentVal))
 		vc.Root.AtomAddRenderWork(atomName)
 	}
 

tsunami/engine/rootelem.go

@@ -41,6 +41,13 @@ type EffectWorkElem struct {
 	EffectIndex int
 }
 
+type genAtom interface {
+	GetVal() any
+	SetVal(any)
+	SetUsedBy(string, bool)
+	GetUsedBy() []string
+}
+
 type RootElem struct {
 	OuterCtx        context.Context
 	Root            *ComponentImpl
@@ -50,7 +57,7 @@ type RootElem struct {
 	CompMap         map[string]*ComponentImpl // component waveid -> component
 	EffectWorkQueue []*EffectWorkElem
 	NeedsRenderMap  map[string]bool
-	Atoms           map[string]*atomImpl
+	Atoms           map[string]genAtom
 	atomLock        sync.Mutex
 	RefOperations   []vdom.VDomRefOperation
 }
@@ -99,7 +106,7 @@ func MakeRoot() *RootElem {
 		Root:    nil,
 		CFuncs:  make(map[string]any),
 		CompMap: make(map[string]*ComponentImpl),
-		Atoms:   make(map[string]*atomImpl),
+		Atoms:   make(map[string]genAtom),
 	}
 }
 
@@ -120,7 +127,7 @@ func (r *RootElem) cleanupUsedByForUnmount(waveId string) {
 	defer r.atomLock.Unlock()
 
 	for _, atom := range r.Atoms {
-		delete(atom.UsedBy, waveId)
+		atom.SetUsedBy(waveId, false)
 	}
 }
 
@@ -132,11 +139,7 @@ func (r *RootElem) AtomSetUsedBy(atomName string, waveId string, used bool) {
 	if !ok {
 		return
 	}
-	if used {
-		atom.UsedBy[waveId] = true
-	} else {
-		delete(atom.UsedBy, waveId)
-	}
+	atom.SetUsedBy(waveId, used)
 }
 
 func (r *RootElem) AtomAddRenderWork(atomName string) {
@@ -147,7 +150,7 @@ func (r *RootElem) AtomAddRenderWork(atomName string) {
 	if !ok {
 		return
 	}
-	for compId := range atom.UsedBy {
+	for _, compId := range atom.GetUsedBy() {
 		r.AddRenderWork(compId)
 	}
 }
@@ -163,7 +166,7 @@ func (r *RootElem) GetAtomVal(name string) any {
 	return atom.GetVal()
 }
 
-func (r *RootElem) SetAtomVal(name string, val any, markDirty bool) {
+func (r *RootElem) SetAtomVal(name string, val any) {
 	r.atomLock.Lock()
 	defer r.atomLock.Unlock()
 

tsunami/engine/serverhandlers.go

@@ -225,7 +225,7 @@ func (h *httpHandlers) handleConfigPost(w http.ResponseWriter, r *http.Request)
 
 	for key, value := range configData {
 		atomName := "$config." + key
-		h.Client.Root.SetAtomVal(atomName, value, true)
+		h.Client.Root.SetAtomVal(atomName, value)
 	}
 
 	w.WriteHeader(http.StatusOK)