Update 3d chart mode, add US heatmap, move kjol-web -> kjol-website

2026-07-16 12:40:49 -04:00
parent 550e97aa9b
commit 2477c2d6a2
75 changed files with 701 additions and 416 deletions
--- a/go/cmd/kjol-website/wasm/main.go
+++ b/go/cmd/kjol-website/wasm/main.go
@@ -0,0 +1,53 @@
+//go:build js && wasm
+
+// Command wasm is the client entry point: it wires client capabilities into the
+// (generated) routes, then hydrates the server-rendered DOM or renders fresh.
+package main
+
+import (
+	"kjolwebsite/app"
+	"kjol/vdom"
+	"kjol/wasmruntime"
+)
+
+func main() {
+	// (The client transport for httputil.FetchGob / FetchJSON needs no wiring —
+	// importing wasmruntime installs it. On the server it stays nil, so those
+	// fetches no-op during SSR and the page ships its loading state.)
+	//
+	// Collect the signals created during setup so their values can be preserved
+	// across an in-place hot swap. On a normal load RestoreState is nil (fresh
+	// state); after a dev hot-reload it carries the previous instance's values,
+	// which NewSignal restores by creation order.
+	collector := vdom.BeginCollect(wasmruntime.RestoreState())
+	router := wasmruntime.NewRouter()
+	deps := app.Deps{Path: router.Path, Navigate: router.Navigate}
+	routes := app.Routes(deps)
+	vdom.EndCollect() // signals created later (during renders) aren't preserved
+	wasmruntime.PreserveState(collector)
+
+	render := func() *vdom.VNode { return app.Shell(deps, routes) }
+	if wasmruntime.HasServerContent() {
+		wasmruntime.Hydrate(render) // static route: adopt the server-rendered DOM
+	} else {
+		wasmruntime.Run(render) // client-rendered route
+	}
+
+	// Adopt the theme AFTER mounting. The class is already on <html> — the document's
+	// boot script put it there before the first paint — so this is not what makes the
+	// page dark; it is what makes the SWITCH know which way it is pointing, and what
+	// keeps the page following the OS if the user never touched the switch.
+	//
+	// The server rendered this button not knowing the theme (it cannot: the preference is
+	// in localStorage), so it drew the wrong icon. Init's signal write re-renders it, and
+	// the reconciler patches the one button. That mismatch is inherent, not a bug — it is
+	// the same reason the boot script has to exist at all.
+	//
+	// This line used to be unreachable: Hydrate ended in a `select {}` and never returned.
+	// See wasmruntime.Wait.
+	app.Theme.Init()
+
+	// Last line, always: a Go/wasm main that returns is a dead program, and every event
+	// handler on the page dies with it.
+	wasmruntime.Wait()
+}
--- a/go/cmd/kjol-website/wasm/main_native.go
+++ b/go/cmd/kjol-website/wasm/main_native.go
@@ -0,0 +1,9 @@
+//go:build !(js && wasm)
+
+// The wasm client entry point (main.go) builds only under GOOS=js GOARCH=wasm.
+// This native placeholder keeps the package buildable on the host so a plain
+// `go build ./...` succeeds; the real client is built by ./build (or the dev
+// server) with GOOS=js GOARCH=wasm.
+package main
+
+func main() {}