removing vdombindings and atom state sync (simplify)

sawka · sawka · commit 352182eee20e · 2025-09-08T16:31:20.000-07:00
diff --git a/tsunami/engine/clientimpl.go b/tsunami/engine/clientimpl.go
@@ -218,12 +218,6 @@ func (c *ClientImpl) SendAsyncInitiation() error {
 	}
 }
 
-func (c *ClientImpl) SetAtomVals(m map[string]any) {
-	for k, v := range m {
-		c.Root.SetAtomVal(k, v, true)
-	}
-}
-
 func (c *ClientImpl) SetAtomVal(name string, val any) {
 	c.Root.SetAtomVal(name, val, true)
 }
@@ -283,7 +277,6 @@ func (c *ClientImpl) fullRender() (*rpctypes.VDomBackendUpdate, error) {
 			{UpdateType: "root", VDom: renderedVDom},
 		},
 		RefOperations: c.Root.GetRefOperations(),
-		StateSync:     c.Root.GetStateSync(true),
 	}, nil
 }
 
@@ -304,7 +297,6 @@ func (c *ClientImpl) incrementalRender() (*rpctypes.VDomBackendUpdate, error) {
 			{UpdateType: "root", VDom: renderedVDom},
 		},
 		RefOperations: c.Root.GetRefOperations(),
-		StateSync:     c.Root.GetStateSync(false),
 	}, nil
 }
 
diff --git a/tsunami/engine/rootelem.go b/tsunami/engine/rootelem.go
@@ -38,7 +38,6 @@ type RenderOpts struct {
 
 type atomImpl struct {
 	Val    any
-	Dirty  bool
 	UsedBy map[string]bool // component waveid -> true
 }
 
@@ -165,20 +164,6 @@ func (r *RootElem) GetAtomVal(name string) any {
 	return atom.Val
 }
 
-func (r *RootElem) GetStateSync(full bool) []rpctypes.VDomStateSync {
-	r.atomLock.Lock()
-	defer r.atomLock.Unlock()
-
-	stateSync := make([]rpctypes.VDomStateSync, 0)
-	for atomName, atom := range r.Atoms {
-		if atom.Dirty || full {
-			stateSync = append(stateSync, rpctypes.VDomStateSync{Atom: atomName, Value: atom.Val})
-			atom.Dirty = false
-		}
-	}
-	return stateSync
-}
-
 func (r *RootElem) SetAtomVal(name string, val any, markDirty bool) {
 	r.atomLock.Lock()
 	defer r.atomLock.Unlock()
@@ -193,7 +178,6 @@ func (r *RootElem) SetAtomVal(name string, val any, markDirty bool) {
 		return
 	}
 	atom.Val = val
-	atom.Dirty = true
 }
 
 func (r *RootElem) RemoveAtom(name string) {
diff --git a/tsunami/engine/serverhandlers.go b/tsunami/engine/serverhandlers.go
@@ -128,10 +128,6 @@ func (h *httpHandlers) processFrontendUpdate(feUpdate *rpctypes.VDomFrontendUpda
 
 	h.Client.Root.RenderTs = feUpdate.Ts
 
-	// set atoms
-	for _, ss := range feUpdate.StateSync {
-		h.Client.Root.SetAtomVal(ss.Atom, ss.Value, false)
-	}
 	// run events
 	for _, event := range feUpdate.Events {
 		if event.GlobalEventType != "" {
diff --git a/tsunami/frontend/src/model/tsunami-model.tsx b/tsunami/frontend/src/model/tsunami-model.tsx
@@ -12,12 +12,6 @@ import { applyCanvasOp, restoreVDomElems } from "./model-utils";
 
 const dlog = debug("wave:vdom");
 
-type AtomContainer = {
-    val: any;
-    beVal: any;
-    usedBy: Set<string>;
-};
-
 type RefContainer = {
     refFn: (elem: HTMLElement) => void;
     vdomRef: VDomRef;
@@ -86,13 +80,11 @@ export class TsunamiModel {
     serverId: string;
     viewRef: React.RefObject<HTMLDivElement> = { current: null };
     vdomRoot: jotai.PrimitiveAtom<VDomElem> = jotai.atom();
-    atoms: Map<string, AtomContainer> = new Map(); // key is atomname
     refs: Map<string, RefContainer> = new Map(); // key is refid
     batchedEvents: VDomEvent[] = [];
     messages: VDomMessage[] = [];
     needsResync: boolean = true;
     vdomNodeVersion: WeakMap<VDomElem, jotai.PrimitiveAtom<number>> = new WeakMap();
-    compoundAtoms: Map<string, jotai.PrimitiveAtom<{ [key: string]: any }>> = new Map();
     rootRefId: string = crypto.randomUUID();
     backendOpts: VDomBackendOpts;
     shouldDispose: boolean;
@@ -155,13 +147,11 @@ export class TsunamiModel {
             this.serverEventSource = null;
         }
         getDefaultStore().set(this.vdomRoot, null);
-        this.atoms.clear();
         this.refs.clear();
         this.batchedEvents = [];
         this.messages = [];
         this.needsResync = true;
         this.vdomNodeVersion = new WeakMap();
-        this.compoundAtoms.clear();
         this.rootRefId = crypto.randomUUID();
         this.backendOpts = {};
         this.shouldDispose = false;
@@ -326,18 +316,6 @@ export class TsunamiModel {
         }
     }
 
-    getAtomContainer(atomName: string): AtomContainer {
-        let container = this.atoms.get(atomName);
-        if (container == null) {
-            container = {
-                val: null,
-                beVal: null,
-                usedBy: new Set(),
-            };
-            this.atoms.set(atomName, container);
-        }
-        return container;
-    }
 
     getOrCreateRefContainer(vdomRef: VDomRef): RefContainer {
         let container = this.refs.get(vdomRef.refid);
@@ -360,19 +338,6 @@ export class TsunamiModel {
         return container;
     }
 
-    tagUseAtoms(waveId: string, atomNames: Set<string>) {
-        for (let atomName of atomNames) {
-            let container = this.getAtomContainer(atomName);
-            container.usedBy.add(waveId);
-        }
-    }
-
-    tagUnuseAtoms(waveId: string, atomNames: Set<string>) {
-        for (let atomName of atomNames) {
-            let container = this.getAtomContainer(atomName);
-            container.usedBy.delete(waveId);
-        }
-    }
 
     getVDomNodeVersionAtom(vdom: VDomElem) {
         let atom = this.vdomNodeVersion.get(vdom);
@@ -469,53 +434,6 @@ export class TsunamiModel {
         }
     }
 
-    setAtomValue(atomName: string, value: any, fromBe: boolean, idMap: Map<string, VDomElem>) {
-        dlog("setAtomValue", atomName, value, fromBe);
-        let container = this.getAtomContainer(atomName);
-        if (container.val === value) {
-            return;
-        }
-        container.val = value;
-        if (fromBe) {
-            container.beVal = value;
-        }
-        for (let id of container.usedBy) {
-            this.incVDomNodeVersion(idMap.get(id));
-        }
-    }
-
-    handleStateSync(update: VDomBackendUpdate, idMap: Map<string, VDomElem>) {
-        if (update.fullupdate) {
-            if (update.statesync == null) {
-                this.atoms.clear();
-                return;
-            }
-
-            const sentAtoms = new Set<string>();
-            for (let sync of update.statesync) {
-                sentAtoms.add(sync.atom);
-                this.setAtomValue(sync.atom, sync.value, true, idMap);
-            }
-
-            const atomsToRemove: string[] = [];
-            for (let atomName of this.atoms.keys()) {
-                if (!sentAtoms.has(atomName)) {
-                    atomsToRemove.push(atomName);
-                }
-            }
-
-            for (let atomName of atomsToRemove) {
-                this.atoms.delete(atomName);
-            }
-        } else {
-            if (update.statesync == null) {
-                return;
-            }
-            for (let sync of update.statesync) {
-                this.setAtomValue(sync.atom, sync.value, true, idMap);
-            }
-        }
-    }
 
     getRefElem(refId: string): HTMLElement {
         if (refId == this.rootRefId) {
@@ -607,7 +525,6 @@ export class TsunamiModel {
         }
         makeVDomIdMap(vdomRoot, idMap);
         this.handleRenderUpdates(update, idMap);
-        this.handleStateSync(update, idMap);
         this.handleRefOperations(update, idMap);
         if (update.messages) {
             for (let message of update.messages) {
diff --git a/tsunami/frontend/src/types/vdom.d.ts b/tsunami/frontend/src/types/vdom.d.ts
@@ -25,17 +25,10 @@ type VDomBackendUpdate = {
     fullupdate?: boolean;
     renderupdates?: VDomRenderUpdate[];
     transferelems?: VDomTransferElem[];
-    statesync?: VDomStateSync[];
     refoperations?: VDomRefOperation[];
     messages?: VDomMessage[];
 };
 
-// vdom.VDomBinding
-type VDomBinding = {
-    type: "binding";
-    bind: string;
-};
-
 // vdom.VDomCreateContext
 type VDomCreateContext = {
     type: "createcontext";
@@ -78,7 +71,6 @@ type VDomFrontendUpdate = {
     resync?: boolean;
     rendercontext: VDomRenderContext;
     events?: VDomEvent[];
-    statesync?: VDomStateSync[];
     refupdates?: VDomRefUpdate[];
     messages?: VDomMessage[];
 };
@@ -152,12 +144,6 @@ type VDomRenderUpdate = {
     index?: number;
 };
 
-// vdom.VDomStateSync
-type VDomStateSync = {
-    atom: string;
-    value: any;
-};
-
 // vdom.VDomTarget
 type VDomTarget = {
     newblock?: boolean;
diff --git a/tsunami/rpctypes/protocoltypes.go b/tsunami/rpctypes/protocoltypes.go
@@ -40,7 +40,6 @@ type VDomFrontendUpdate struct {
 	Resync        bool              `json:"resync,omitempty"`  // resync (send all backend data).  useful when the FE reloads
 	RenderContext VDomRenderContext `json:"rendercontext,omitempty"`
 	Events        []vdom.VDomEvent  `json:"events,omitempty"`
-	StateSync     []VDomStateSync   `json:"statesync,omitempty"`
 	RefUpdates    []VDomRefUpdate   `json:"refupdates,omitempty"`
 	Messages      []VDomMessage     `json:"messages,omitempty"`
 }
@@ -54,7 +53,6 @@ type VDomBackendUpdate struct {
 	FullUpdate    bool                    `json:"fullupdate,omitempty"`
 	RenderUpdates []VDomRenderUpdate      `json:"renderupdates,omitempty"`
 	TransferElems []VDomTransferElem      `json:"transferelems,omitempty"`
-	StateSync     []VDomStateSync         `json:"statesync,omitempty"`
 	RefOperations []vdom.VDomRefOperation `json:"refoperations,omitempty"`
 	Messages      []VDomMessage           `json:"messages,omitempty"`
 }
@@ -157,10 +155,6 @@ type VDomRenderContext struct {
 	Background bool   `json:"background,omitempty"`
 }
 
-type VDomStateSync struct {
-	Atom  string `json:"atom"`
-	Value any    `json:"value"`
-}
 
 type VDomRefUpdate struct {
 	RefId      string                `json:"refid"`
diff --git a/tsunami/vdom/vdom_types.go b/tsunami/vdom/vdom_types.go
@@ -11,7 +11,6 @@ const FragmentTag = "#fragment"
 const KeyPropKey = "key"
 
 const ObjectType_Ref = "ref"
-const ObjectType_Binding = "binding"
 const ObjectType_Func = "func"
 
 // vdom element
@@ -23,12 +22,6 @@ type VDomElem struct {
 	Text     string         `json:"text,omitempty"`
 }
 
-// used in props
-type VDomBinding struct {
-	Type string `json:"type" tstype:"\"binding\""`
-	Bind string `json:"bind"`
-}
-
 // used in props
 type VDomFunc struct {
 	Fn              any      `json:"-"` // server side function (called with reflection)

Original file line number	Diff line number	Diff line change
`@@ -218,12 +218,6 @@ func (c *ClientImpl) SendAsyncInitiation() error {`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`
`221`		`-func (c *ClientImpl) SetAtomVals(m map[string]any) {`
`222`		`- for k, v := range m {`
`223`		`- c.Root.SetAtomVal(k, v, true)`
`224`		`- }`
`225`		`-}`
`226`		`-`
`227`	`221`	`func (c *ClientImpl) SetAtomVal(name string, val any) {`
`228`	`222`	`c.Root.SetAtomVal(name, val, true)`
`229`	`223`	`}`
`@@ -283,7 +277,6 @@ func (c ClientImpl) fullRender() (rpctypes.VDomBackendUpdate, error) {`
`283`	`277`	`{UpdateType: "root", VDom: renderedVDom},`
`284`	`278`	`},`
`285`	`279`	`RefOperations: c.Root.GetRefOperations(),`
`286`		`- StateSync: c.Root.GetStateSync(true),`
`287`	`280`	`}, nil`
`288`	`281`	`}`
`289`	`282`
`@@ -304,7 +297,6 @@ func (c ClientImpl) incrementalRender() (rpctypes.VDomBackendUpdate, error) {`
`304`	`297`	`{UpdateType: "root", VDom: renderedVDom},`
`305`	`298`	`},`
`306`	`299`	`RefOperations: c.Root.GetRefOperations(),`
`307`		`- StateSync: c.Root.GetStateSync(false),`
`308`	`300`	`}, nil`
`309`	`301`	`}`
`310`	`302`