working towards new atom interface

Author: sawka

tsunami/app/defaultclient.go

@@ -8,7 +8,6 @@ import (
 	"io/fs"
 	"net/http"
 
-	"github.com/wavetermdev/waveterm/tsunami/util"
 	"github.com/wavetermdev/waveterm/tsunami/vdom"
 )
 
@@ -42,31 +41,31 @@ func SendAsyncInitiation() error {
 	return defaultClient.SendAsyncInitiation()
 }
 
-func GetSharedAtom[T any](name string) T {
-	rawVal := defaultClient.GetAtomVal("$shared." + name)
-	return util.GetTypedAtomValue[T](rawVal, "$shared."+name)
+func ConfigAtom[T any](name string, defaultValue T) Atom[T] {
+	fullName := "$config." + name
+	// Set the default value if not already set
+	if defaultClient.GetAtomVal(fullName) == nil {
+		defaultClient.SetAtomVal(fullName, defaultValue)
+	}
+	return Atom[T]{name: fullName, client: defaultClient}
 }
 
-func SetSharedAtom[T any](name string, val T) {
-	defaultClient.SetAtomVal("$shared."+name, val)
+func DataAtom[T any](name string, defaultValue T) Atom[T] {
+	fullName := "$data." + name
+	// Set the default value if not already set
+	if defaultClient.GetAtomVal(fullName) == nil {
+		defaultClient.SetAtomVal(fullName, defaultValue)
+	}
+	return Atom[T]{name: fullName, client: defaultClient}
 }
 
-func GetConfig[T any](name string) T {
-	rawVal := defaultClient.GetAtomVal("$config." + name)
-	return util.GetTypedAtomValue[T](rawVal, "$config."+name)
-}
-
-func SetConfig[T any](name string, val T) {
-	defaultClient.SetAtomVal("$config."+name, val)
-}
-
-func GetData[T any](name string) T {
-	rawVal := defaultClient.GetAtomVal("$data." + name)
-	return util.GetTypedAtomValue[T](rawVal, "$data."+name)
-}
-
-func SetData[T any](name string, val T) {
-	defaultClient.SetAtomVal("$data."+name, val)
+func SharedAtom[T any](name string, defaultValue T) Atom[T] {
+	fullName := "$shared." + name
+	// Set the default value if not already set
+	if defaultClient.GetAtomVal(fullName) == nil {
+		defaultClient.SetAtomVal(fullName, defaultValue)
+	}
+	return Atom[T]{name: fullName, client: defaultClient}
 }
 
 // HandleDynFunc registers a dynamic HTTP handler function with the internal http.ServeMux.

tsunami/app/tsunamiapp.go

@@ -306,3 +306,27 @@ func (c *clientImpl) HandleDynFunc(pattern string, fn func(http.ResponseWriter,
 	}
 	c.UrlHandlerMux.HandleFunc(pattern, fn)
 }
+
+// Atom[T] represents a typed atom implementation
+type Atom[T any] struct {
+	name   string
+	client *clientImpl
+}
+
+// AtomName implements the vdom.Atom interface
+func (a Atom[T]) AtomName() string {
+	return a.name
+}
+
+// Get returns the current value of the atom
+func (a Atom[T]) Get() T {
+	val := a.client.GetAtomVal(a.name)
+	return util.GetTypedAtomValue[T](val, a.name)
+}
+
+// Set updates the atom's value
+func (a Atom[T]) Set(newVal T) {
+	a.client.SetAtomVal(a.name, newVal)
+}
+
+

tsunami/demo/cpuchart/app.go

@@ -10,23 +10,23 @@ import (
 	"github.com/wavetermdev/waveterm/tsunami/vdom"
 )
 
-// Use func init() to set atom defaults
-func init() {
-	// Set default configuration
-	app.SetConfig("dataPointCount", 60)
-	
-	// Initialize with empty data points to maintain consistent chart size
-	dataPointCount := 60 // Default value for initialization
-	initialData := make([]CPUDataPoint, dataPointCount)
-	for i := range initialData {
-		initialData[i] = CPUDataPoint{
-			Time:      0,
-			CPUUsage:  nil, // Use nil to represent empty slots
-			Timestamp: "",
+// Global atoms for config and data
+var (
+	dataPointCountAtom = app.ConfigAtom("dataPointCount", 60)
+	cpuDataAtom        = app.DataAtom("cpuData", func() []CPUDataPoint {
+		// Initialize with empty data points to maintain consistent chart size
+		dataPointCount := 60 // Default value for initialization
+		initialData := make([]CPUDataPoint, dataPointCount)
+		for i := range initialData {
+			initialData[i] = CPUDataPoint{
+				Time:      0,
+				CPUUsage:  nil, // Use nil to represent empty slots
+				Timestamp: "",
+			}
 		}
-	}
-	app.SetData("cpuData", initialData)
-}
+		return initialData
+	}())
+)
 
 type CPUDataPoint struct {
 	Time      int64    `json:"time"`      // Unix timestamp in seconds
@@ -145,9 +145,9 @@ var App = app.DefineComponent("App",
 	func(ctx context.Context, _ struct{}) any {
 		vdom.UseSetAppTitle(ctx, "CPU Usage Monitor")
 
-		// Global state
-		cpuData, setCpuData, setCpuDataFn := vdom.UseData[[]CPUDataPoint](ctx, "cpuData")
-		dataPointCount, _, _ := vdom.UseConfig[int](ctx, "dataPointCount")
+		// Global state using atoms
+		cpuData, setCpuData, setCpuDataFn := vdom.UseAtom[[]CPUDataPoint](ctx, cpuDataAtom)
+		dataPointCount, _, _ := vdom.UseAtom[int](ctx, dataPointCountAtom)
 
 		// Local state for forcing re-renders
 		_, _, setTickerFn := vdom.UseState[int](ctx, 0)
@@ -167,7 +167,7 @@ var App = app.DefineComponent("App",
 						setCpuDataFn(func(currentData []CPUDataPoint) []CPUDataPoint {
 							newPoint := generateCPUDataPoint()
 							// Read current config inside the loop to get live updates
-							currentDataPointCount := app.GetConfig[int]("dataPointCount")
+							currentDataPointCount := dataPointCountAtom.Get()
 
 							// Ensure we have the right size array
 							if len(currentData) != currentDataPointCount {
@@ -208,7 +208,7 @@ var App = app.DefineComponent("App",
 
 		handleClear := func() {
 			// Reset with empty data points based on current config
-			currentDataPointCount := app.GetConfig[int]("dataPointCount")
+			currentDataPointCount := dataPointCountAtom.Get()
 			initialData := make([]CPUDataPoint, currentDataPointCount)
 			for i := range initialData {
 				initialData[i] = CPUDataPoint{

tsunami/demo/githubaction/app.go

@@ -16,16 +16,17 @@ import (
 	"github.com/wavetermdev/waveterm/tsunami/vdom"
 )
 
-func init() {
-	app.SetConfig("pollInterval", 5)
-	app.SetConfig("repository", "wavetermdev/waveterm")
-	app.SetConfig("workflow", "build-helper.yml")
-	app.SetConfig("maxWorkflowRuns", 10)
-	app.SetData("workflowRuns", []WorkflowRun{})
-	app.SetData("lastError", "")
-	app.SetData("isLoading", true)
-	app.SetData("lastRefreshTime", time.Time{})
-}
+// Global atoms for config and data
+var (
+	pollIntervalAtom    = app.ConfigAtom("pollInterval", 5)
+	repositoryAtom      = app.ConfigAtom("repository", "wavetermdev/waveterm")
+	workflowAtom        = app.ConfigAtom("workflow", "build-helper.yml")
+	maxWorkflowRunsAtom = app.ConfigAtom("maxWorkflowRuns", 10)
+	workflowRunsAtom    = app.DataAtom("workflowRuns", []WorkflowRun{})
+	lastErrorAtom       = app.DataAtom("lastError", "")
+	isLoadingAtom       = app.DataAtom("isLoading", true)
+	lastRefreshTimeAtom = app.DataAtom("lastRefreshTime", time.Time{})
+)
 
 type WorkflowRun struct {
 	ID         int64     `json:"id"`
@@ -223,14 +224,14 @@ var App = app.DefineComponent("App",
 	func(ctx context.Context, _ struct{}) any {
 		vdom.UseSetAppTitle(ctx, "GitHub Actions Monitor")
 
-		workflowRuns, setWorkflowRuns, _ := vdom.UseData[[]WorkflowRun](ctx, "workflowRuns")
-		lastError, setLastError, _ := vdom.UseData[string](ctx, "lastError")
-		isLoading, setIsLoading, _ := vdom.UseData[bool](ctx, "isLoading")
-		lastRefreshTime, setLastRefreshTime, _ := vdom.UseData[time.Time](ctx, "lastRefreshTime")
-		pollInterval, _, _ := vdom.UseConfig[int](ctx, "pollInterval")
-		repository, _, _ := vdom.UseConfig[string](ctx, "repository")
-		workflow, _, _ := vdom.UseConfig[string](ctx, "workflow")
-		maxWorkflowRuns, _, _ := vdom.UseConfig[int](ctx, "maxWorkflowRuns")
+		workflowRuns, setWorkflowRuns, _ := vdom.UseAtom[[]WorkflowRun](ctx, workflowRunsAtom)
+		lastError, setLastError, _ := vdom.UseAtom[string](ctx, lastErrorAtom)
+		isLoading, setIsLoading, _ := vdom.UseAtom[bool](ctx, isLoadingAtom)
+		lastRefreshTime, setLastRefreshTime, _ := vdom.UseAtom[time.Time](ctx, lastRefreshTimeAtom)
+		pollInterval, _, _ := vdom.UseAtom[int](ctx, pollIntervalAtom)
+		repository, _, _ := vdom.UseAtom[string](ctx, repositoryAtom)
+		workflow, _, _ := vdom.UseAtom[string](ctx, workflowAtom)
+		maxWorkflowRuns, _, _ := vdom.UseAtom[int](ctx, maxWorkflowRunsAtom)
 
 		_, _, setTickerFn := vdom.UseState[int](ctx, 0)
 
@@ -239,7 +240,7 @@ var App = app.DefineComponent("App",
 			done := make(chan bool)
 
 			fetchData := func() {
-				currentMaxRuns := app.GetConfig[int]("maxWorkflowRuns")
+				currentMaxRuns := maxWorkflowRunsAtom.Get()
 				runs, err := fetchWorkflowRuns(repository, workflow, currentMaxRuns)
 				if err != nil {
 					log.Printf("Error fetching workflow runs: %v", err)
@@ -279,7 +280,7 @@ var App = app.DefineComponent("App",
 		handleRefresh := func() {
 			setIsLoading(true)
 			go func() {
-				currentMaxRuns := app.GetConfig[int]("maxWorkflowRuns")
+				currentMaxRuns := maxWorkflowRunsAtom.Get()
 				runs, err := fetchWorkflowRuns(repository, workflow, currentMaxRuns)
 				if err != nil {
 					log.Printf("Error fetching workflow runs: %v", err)

tsunami/demo/recharts/app.go

@@ -9,12 +9,12 @@ import (
 	"github.com/wavetermdev/waveterm/tsunami/vdom"
 )
 
-// Use func init() to set atom defaults
-func init() {
-	app.SetData("chartData", generateInitialData())
-	app.SetConfig("chartType", "line")
-	app.SetSharedAtom("isAnimating", false)
-}
+// Global atoms for config and data
+var (
+	chartDataAtom   = app.DataAtom("chartData", generateInitialData())
+	chartTypeAtom   = app.ConfigAtom("chartType", "line")
+	isAnimatingAtom = app.SharedAtom("isAnimating", false)
+)
 
 type DataPoint struct {
 	Time int     `json:"time"`
@@ -206,10 +206,10 @@ var App = app.DefineComponent("App",
 	func(ctx context.Context, _ struct{}) any {
 		vdom.UseSetAppTitle(ctx, "Recharts Demo")
 
-		// Global state
-		chartData, setChartData, setChartDataFn := vdom.UseData[[]DataPoint](ctx, "chartData")
-		chartType, setChartType, _ := vdom.UseConfig[string](ctx, "chartType")
-		isAnimating, setIsAnimating, _ := vdom.UseSharedAtom[bool](ctx, "isAnimating")
+		// Global state using atoms
+		chartData, setChartData, setChartDataFn := vdom.UseAtom[[]DataPoint](ctx, chartDataAtom)
+		chartType, setChartType, _ := vdom.UseAtom[string](ctx, chartTypeAtom)
+		isAnimating, setIsAnimating, _ := vdom.UseAtom[bool](ctx, isAnimatingAtom)
 
 		// Local state for timer
 		_, _, setTickerFn := vdom.UseState[int](ctx, 0)

tsunami/demo/tsunamiconfig/app.go

@@ -15,6 +15,11 @@ import (
 	"github.com/wavetermdev/waveterm/tsunami/vdom"
 )
 
+// Global atoms for config
+var (
+	serverURLAtom = app.ConfigAtom("serverURL", "")
+)
+
 type URLInputProps struct {
 	Value     string       `json:"value"`
 	OnChange  func(string) `json:"onChange"`
@@ -253,7 +258,7 @@ var App = app.DefineComponent("App",
 		vdom.UseSetAppTitle(ctx, "Tsunami Config Manager")
 
 		// Use UseConfig for the URL input so it persists
-		urlInput, setURLInput, _ := vdom.UseConfig[string](ctx, "serverURL")
+		urlInput, setURLInput, _ := vdom.UseAtom[string](ctx, serverURLAtom)
 		jsonContent, setJSONContent, _ := vdom.UseState(ctx, "")
 		errorMessage, setErrorMessage, _ := vdom.UseState(ctx, "")
 		successMessage, setSuccessMessage, _ := vdom.UseState(ctx, "")

tsunami/vdom/vdom.go

@@ -182,7 +182,6 @@ func UseState[T any](ctx context.Context, initialVal T) (T, func(T), func(func(T
 	return rtnVal, typedSetVal, typedSetFuncVal
 }
 
-
 func useAtom[T any](ctx context.Context, hookName string, atomName string) (T, func(T), func(func(T) T)) {
 	rc := vdomctx.GetRenderContext(ctx)
 	if rc == nil {
@@ -207,28 +206,12 @@ func useAtom[T any](ctx context.Context, hookName string, atomName string) (T, f
 	return atomVal, typedSetVal, typedSetFuncVal
 }
 
-// UseSharedAtom provides access to a shared atom state across components.
+// UseAtom provides access to atom values using an Atom interface.
 // It returns the current atom value, a setter function, and an updater function.
-// Setting a new value causes a re-render of any component using this atom.
-// This hook must be called within a component context.
-func UseSharedAtom[T any](ctx context.Context, atomName string) (T, func(T), func(func(T) T)) {
-	return useAtom[T](ctx, "UseSharedAtom", "$shared."+atomName)
-}
-
-// UseConfig provides access to config values (atom names are global across the app).
-// It returns the current config value, a setter function, and an updater function.
-// Setting a new value causes a re-render of all components using this config atom.
-// This hook must be called within a component context.
-func UseConfig[T any](ctx context.Context, atomName string) (T, func(T), func(func(T) T)) {
-	return useAtom[T](ctx, "UseConfig", "$config."+atomName)
-}
-
-// UseData provides access to data values (atom names are global across the app).
-// It returns the current data value, a setter function, and an updater function.
-// Setting a new value causes a re-render of all components using this data atom.
+// Setting a new value causes a re-render of all components using this atom.
 // This hook must be called within a component context.
-func UseData[T any](ctx context.Context, atomName string) (T, func(T), func(func(T) T)) {
-	return useAtom[T](ctx, "UseData", "$data."+atomName)
+func UseAtom[T any](ctx context.Context, atom Atom) (T, func(T), func(func(T) T)) {
+	return useAtom[T](ctx, "UseAtom", atom.AtomName())
 }
 
 // UseVDomRef provides a reference to a DOM element in the VDOM tree.

tsunami/vdom/vdom_types.go

@@ -126,3 +126,8 @@ type VDomRefOperation struct {
 	Params    []any  `json:"params,omitempty"`
 	OutputRef string `json:"outputref,omitempty"`
 }
+
+// Atom interface for atom implementations
+type Atom interface {
+	AtomName() string
+}