refactor folder structure

CLAUDE.md

@@ -46,10 +46,18 @@ drag a JavaScript bundler along for a CSS file.
 ### go/ — module `kjol`
 
 Packages, imported as `kjol/<name>`: `appenv basic chrono config csv dbutil finance httputil
-l4g lexer security snailmail validation jsbundler tw`, plus the **gowasm** web-UI engine (`vdom`
+l4g lexer security snailmail validation jsbundler tw`, plus the **gowasm** web-UI engine
-`wasmruntime` `rsc` `wasmdevserver`, and `webui` — a Tailwind-styled component kit ported
+(`wasmruntime` and its sub-packages `wasmruntime/vdom` + `wasmruntime/rsc`, `wasmdevserver`,
-from `jsruntime/uikit`; author components in pure Go compiled to WebAssembly; all
+and `webui` — a Tailwind-styled component kit ported from `jsruntime/uikit`; author
-stdlib-only), and `cmd/{bundle,twcss,migrate,loc,passgen,typecheck,wasmgen}`.
+components in pure Go compiled to WebAssembly; all stdlib-only), and
+`cmd/{bundle,twcss,migrate,loc,passgen,typecheck,wasmgen}`.
+
+`vdom` and `rsc` are **sub-packages of `wasmruntime`** — imported as `kjol/wasmruntime/vdom`
+and `kjol/wasmruntime/rsc` (the package names stay `vdom` / `rsc`, so call sites are still
+`vdom.VNode`, `rsc.Mount`). They nest cleanly because `vdom` imports nothing and both `rsc`
+and `wasmruntime` import only `vdom` — no child imports the parent, so there is no cycle.
+`wasmgen` emits these import paths in the `*.gen.go` glue, so if they ever move again, its
+templates move with them.
 
 `jsbundler` is the **JS** build (TSX → Solid → esbuild + the goja SSR bake). It was called
 `webbundler`.

go/cmd/kjol-website/app/chart.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	. "kjol/vdom"
+	. "kjol/wasmruntime/vdom"
 	ui "kjol/webui"
 )
 

go/cmd/kjol-website/app/clayer.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	. "kjol/vdom"
+	. "kjol/wasmruntime/vdom"
 )
 
 // The C layer's documentation.
@@ -471,7 +471,7 @@ const unityTUSnippet = `// The whole layer, as one translation unit — the only
 // compiler. Order matters: it is textual inclusion, not linking.
 #include "base/base_inc.c"     // core, arena, strings. Everything below needs it.
 
-// The five backends declare their helpers `+ "`internal`" + ` (file-static), so they
+// The five backends declare their helpers ` + "`internal`" + ` (file-static), so they
 // belong in the SAME TU as the dispatch that calls them.
 #include "lexer/lexer.c"
 #include "lexer/lexer_c.c"
@@ -488,7 +488,7 @@ const unityTUSnippet = `// The whole layer, as one translation unit — the only
 // ...and then your own program, compiled with all of it:
 #include "app/app.c"`
 
-const baseCoreSnippet = `// The three meanings of `+ "`static`" + ` in C, given three names.
+const baseCoreSnippet = `// The three meanings of ` + "`static`" + ` in C, given three names.
 #define internal      static   // a function private to this file
 #define global        static   // a variable owned by this translation unit
 #define local_persist static   // a local that survives the call

go/cmd/kjol-website/app/client.gen.go

@@ -5,8 +5,8 @@
 package app
 
 import (
-	"kjol/rsc"
+	"kjol/wasmruntime/rsc"
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // ServerCounter is a generated client stub for the server component of the same name.

go/cmd/kjol-website/app/components.go

@@ -4,8 +4,8 @@ import (
 	"strings"
 	"time"
 
-	. "kjol/vdom"
 	"kjol/wasmruntime"
+	. "kjol/wasmruntime/vdom"
 	ui "kjol/webui"
 )
 

go/cmd/kjol-website/app/data.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"kjol/httputil"
-	. "kjol/vdom"
+	. "kjol/wasmruntime/vdom"
 	ui "kjol/webui"
 )
 

go/cmd/kjol-website/app/docs.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"kjol/lexer" // syntax highlighting for the code blocks — a string in, HTML out
-	. "kjol/vdom"
+	. "kjol/wasmruntime/vdom"
 	// The host API is dual-build — real under js/wasm, no-ops natively — so neutral page
 	// code can measure the browser and still server-render. This page uses it for exactly
 	// one thing: reading the clock when hydration commits.

go/cmd/kjol-website/app/golayer.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	. "kjol/vdom"
+	. "kjol/wasmruntime/vdom"
 	ui "kjol/webui"
 )
 

go/cmd/kjol-website/app/layers.go

@@ -3,7 +3,7 @@ package app
 import (
 	"strings"
 
-	. "kjol/vdom"
+	. "kjol/wasmruntime/vdom"
 	ui "kjol/webui"
 )
 

go/cmd/kjol-website/app/pages.go

@@ -15,7 +15,7 @@ import (
 	"strconv"
 	"strings"
 
-	. "kjol/vdom"
+	. "kjol/wasmruntime/vdom"
 
 	ui "kjol/webui"
 )

go/cmd/kjol-website/app/routes.gen.go

@@ -1,7 +1,7 @@
 // Code generated by wasmgen. DO NOT EDIT.
 package app
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // Routes maps each //gowasm:page path to its instantiated render function.
 func Routes(d Deps) map[string]func() *vdom.VNode {

go/cmd/kjol-website/app/server.gen.go

@@ -4,7 +4,7 @@
 
 package app
 
-import "kjol/rsc"
+import "kjol/wasmruntime/rsc"
 
 func init() {
 	rsc.Register("ServerCounter", ServerCounter)

go/cmd/kjol-website/app/server_counter.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	. "kjol/vdom"
+	. "kjol/wasmruntime/vdom"
 	ui "kjol/webui"
 )
 

go/cmd/kjol-website/app/ssr_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 	"kjol/webui"
 )
 

go/cmd/kjol-website/app/table.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	. "kjol/vdom"
+	. "kjol/wasmruntime/vdom"
 	ui "kjol/webui"
 )
 

go/cmd/kjol-website/app/tworuntimes_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // The two-runtime demo.s whole claim is that its two panes are ONE function: the live

go/cmd/kjol-website/server/main.go

@@ -16,8 +16,8 @@ import (
 	"net/http"
 
 	"kjol/httputil"
-	"kjol/vdom"
 	"kjol/wasmdevserver"
+	"kjol/wasmruntime/vdom"
 	"kjol/webui"
 
 	"kjolwebsite/app"
@@ -43,7 +43,7 @@ func main() {
 		WatchDirs: []string{
 			"app", "wasm", "css", // the Go/WASM app
 			"frontend",                        // the Solid app — a .tsx save rebuilds the JS bundle
-			"../../webui", "../../vdom", "../../wasmruntime", "../../rsc",       // the wasm engine
+			"../../webui", "../../wasmruntime", // the wasm engine (vdom + rsc now live UNDER wasmruntime, and the watcher walks subdirs)
 			"../../lexer",                                     // the code-block highlighter
 			"../../jsruntime/uikit", "../../jsruntime/styles", // the Solid kit + the shared theme
 		},

go/cmd/kjol-website/wasm/main.go

@@ -5,9 +5,9 @@
 package main
 
 import (
-	"kjolwebsite/app"
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
+	"kjolwebsite/app"
 )
 
 func main() {

go/cmd/wasmgen/main.go

@@ -155,7 +155,7 @@ func write(path, tmpl string, data genData) {
 const routesTmpl = `// Code generated by wasmgen. DO NOT EDIT.
 package app
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // Routes maps each //gowasm:page path to its instantiated render function.
 func Routes(d Deps) map[string]func() *vdom.VNode {
@@ -191,7 +191,7 @@ const serverTmpl = `// Code generated by wasmgen. DO NOT EDIT.
 
 package app
 
-import "kjol/rsc"
+import "kjol/wasmruntime/rsc"
 
 func init() {
 {{range .Servers}}	rsc.Register("{{.}}", {{.}})
@@ -205,8 +205,8 @@ const clientTmpl = `// Code generated by wasmgen. DO NOT EDIT.
 package app
 
 import (
-	"kjol/rsc"
+	"kjol/wasmruntime/rsc"
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 {{range .Servers}}// {{.}} is a generated client stub for the server component of the same name.

go/wasmdevserver/devserver.go

@@ -29,7 +29,7 @@ import (
 	"sync"
 	"time"
 
-	"kjol/rsc"
+	"kjol/wasmruntime/rsc"
 )
 
 // Config wires an app into the dev server. Render and Document are called per

go/wasmruntime/host_native.go

@@ -2,7 +2,7 @@
 
 package wasmruntime
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // The server half of the host API (see host.go). Nothing here touches a browser,
 // because there isn't one: measurements are zero, listeners are never installed,

go/wasmruntime/host_test.go

@@ -7,7 +7,7 @@ import (
 	"syscall/js"
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // Run from kjol/go:

go/wasmruntime/host_wasm.go

@@ -5,7 +5,7 @@ package wasmruntime
 import (
 	"syscall/js"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // The browser half of the host API (see host.go for the contract and the two

go/wasmruntime/hydrate_test.go

@@ -7,7 +7,7 @@ import (
 	"syscall/js"
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // buildServerDOM fakes what the HTML parser hands us: a real DOM tree, built from

go/wasmruntime/mount.go

@@ -5,7 +5,7 @@ package wasmruntime
 import (
 	"syscall/js"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 var (

go/wasmruntime/persist_wasm.go

@@ -5,7 +5,7 @@ package wasmruntime
 import (
 	"syscall/js"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // State preservation across an in-place hot swap (see the dev server's

go/wasmruntime/props_test.go

@@ -6,7 +6,7 @@ import (
 	"syscall/js"
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // Run from kjol/go:

go/wasmruntime/reconcile.go

@@ -8,7 +8,7 @@ package wasmruntime
 import (
 	"syscall/js"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 var document = js.Global().Get("document")

go/wasmruntime/reconcile_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // The reconciler is wasm-only and needs a DOM, so these do not run under a plain

go/wasmruntime/router.go

@@ -5,7 +5,7 @@ package wasmruntime
 import (
 	"syscall/js"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // Router holds the current path in a signal, so reading Path() during render

go/wasmruntime/rsc/client_wasm.go

@@ -7,7 +7,7 @@ import (
 	"encoding/gob"
 	"syscall/js"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // Mount connects to a server component by name and returns a render function.

go/wasmruntime/rsc/server.go

@@ -8,7 +8,7 @@ import (
 	"sort"
 	"sync"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // registry maps a server-component name to its factory (created by generated

go/wasmruntime/style_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // Floating.Panel and Modal both declare their initial inline style in the style

go/wasmruntime/svg_test.go

@@ -5,7 +5,7 @@ package wasmruntime
 import (
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // An <svg> built with document.createElement() is NOT an SVG element — it is an

go/webui/accordion.go

@@ -1,6 +1,6 @@
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // Port of web/kit/Accordion.tsx.
 //

go/webui/alerts.go

@@ -1,6 +1,6 @@
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // Port of web/kit/Alerts.tsx. The TSX exports one component per color
 // (AlertWhite, AlertBlue, …); here that's Alert(color, header, children).

go/webui/autotable.go

@@ -43,8 +43,8 @@ import (
 	"strings"
 	"time"
 
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 // ColumnPosition is a cell/header alignment (mirrors the TSX 0|1|2 union).

go/webui/badges.go

@@ -1,6 +1,6 @@
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // Port of web/kit/Badges.tsx.
 

go/webui/buttons.go

@@ -1,6 +1,6 @@
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // Port of web/kit/Buttons.tsx.
 

go/webui/calendar.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"time"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // Day-of-week and month labels (module-level in the TSX). Prefixed to stay

go/webui/cards.go

@@ -1,6 +1,6 @@
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // Port of web/kit/Cards.tsx. The `ui-card`/`no-flex` marker classes are kept so
 // any page CSS targeting them still applies; baseline styling is Tailwind.

go/webui/cellgrid.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // Port of web/kit/CellGrid.tsx — an editable, sortable spreadsheet-style grid.

go/webui/chart.go

@@ -24,8 +24,8 @@ import (
 	"strconv"
 	"strings"
 
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 type ChartKind string

go/webui/crmtabs.go

@@ -3,7 +3,7 @@ package webui
 import (
 	"strconv"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // Port of web/kit/CrmTabs.tsx.

go/webui/datepicker.go

@@ -22,8 +22,8 @@ import (
 	"strings"
 	"time"
 
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 // -- Tailwind class strings, verbatim from DatePicker.tsx (cmd/twcss scans these) --

go/webui/envbadge.go

@@ -5,7 +5,7 @@ package webui
 import (
 	"strings"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // IsNonProdEnv reports whether env is a non-empty, non-production deployment

go/webui/floating.go

@@ -3,8 +3,8 @@ package webui
 import (
 	"strconv"
 
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 // Floating is the live controller for one floating panel — the Go answer to the

go/webui/forms.go

@@ -4,8 +4,8 @@ import (
 	"strconv"
 	"strings"
 
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 // Port of web/kit/Forms.tsx. Reactive accessors collapse to plain values, and

go/webui/forms_async.go

@@ -3,8 +3,8 @@ package webui
 import (
 	"strings"
 
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 // The three form controls the first pass left out, plus the two input masks. All of

go/webui/forms_async_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // ---- input masks ----

go/webui/forms_dropdown_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // fakeEvent is a vdom.Event with no DOM behind it — enough to drive Floating's

go/webui/fuzzymatch.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"unicode"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // Port of web/kit/FuzzyMatch.tsx.

go/webui/general.go

@@ -1,6 +1,6 @@
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // Port of web/kit/General.tsx. Anchor components render plain <a href>; the app
 // wires SPA navigation on top (e.g. its layout nav uses Button/OnClick).

go/webui/icons.go

@@ -3,7 +3,7 @@ package webui
 import (
 	"strconv"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // Port of web/kit/Icons.tsx. The TSX resolves FontAwesome glyphs from an

go/webui/icons_test.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // An unregistered icon name renders as an empty box: right size, no glyph. Nothing

go/webui/menu.go

@@ -1,6 +1,6 @@
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // Port of jsruntime/uikit/Menu.tsx, rebuilt on the Floating controller (floating.go).
 //

go/webui/modal.go

@@ -3,8 +3,8 @@ package webui
 import (
 	"strconv"
 
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 // Port of jsruntime/uikit/Modal.tsx.

go/webui/popovers.go

@@ -27,7 +27,7 @@
 //	}
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 const popoverCls = "bg-surface rounded-default shadow-lg border border-line"
 

go/webui/prettytable.go

@@ -1,6 +1,6 @@
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // Port of web/kit/PrettyTable.tsx.
 //

go/webui/remoteupdateflash.go

@@ -2,7 +2,7 @@
 
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // RemoteFlash is the trigger/signal pair from createRemoteFlash: Fire() shows
 // the flash, Visible() reports whether it is currently shown, and Clear() hides

go/webui/sidebar.go

@@ -2,7 +2,7 @@
 
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 const sidebarNavRoot = "bg-surface rounded-default shadow-sm border border-line py-2"
 const sidebarNavList = "list-none m-0 p-0"

go/webui/signaturepad.go

@@ -4,8 +4,8 @@ import (
 	"strconv"
 	"strings"
 
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 // Port of FormSignaturePad (jsruntime/uikit/Forms.tsx) — freehand signing.

go/webui/signaturepad_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // The pad's value IS the markup it shows — that is the whole reason it draws into an SVG

go/webui/tabs.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"strings"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // Port of web/kit/Tabs.tsx.

go/webui/theme.go

@@ -1,8 +1,8 @@
 package webui
 
 import (
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 // Dark mode.

go/webui/toast.go

@@ -3,8 +3,8 @@ package webui
 import (
 	"strconv"
 
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 // Port of jsruntime/uikit/Toast.tsx.

go/webui/toggleswitch.go

@@ -1,6 +1,6 @@
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 // Port of web/kit/ToggleSwitch.tsx. Reactive accessors collapse to plain values.
 

go/webui/tooltips.go

@@ -35,7 +35,7 @@
 //     trigger lived inside, which yanked the trigger out from under the cursor.
 package webui
 
-import "kjol/vdom"
+import "kjol/wasmruntime/vdom"
 
 const tooltipCls = "bg-neutral-800 text-white text-sm px-2.5 py-1.5 rounded-default shadow-lg max-w-80 relative"
 

go/webui/tutorial.go

@@ -3,8 +3,8 @@ package webui
 import (
 	"strconv"
 
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 // Port of jsruntime/uikit/Tutorial.tsx — a guided tour: it dims the page, cuts a

go/webui/usheatmap.go

@@ -16,8 +16,8 @@ import (
 	"strconv"
 	"strings"
 
-	"kjol/vdom"
 	"kjol/wasmruntime"
+	"kjol/wasmruntime/vdom"
 )
 
 // ── the albersUsa projection (ported from d3-geo; scale 1280, translate [480,300]) ──────

go/webui/webui.go

@@ -46,7 +46,7 @@ package webui
 import (
 	"strings"
 
-	"kjol/vdom"
+	"kjol/wasmruntime/vdom"
 )
 
 // cx joins non-empty class fragments with single spaces (a tiny clsx). Trailing