Compare commits
1 Commits
v0.22.0
...
b3c2d3ae32
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b3c2d3ae32 |
@@ -8,7 +8,7 @@ Create a PR on Gitea, wait for CI, and squash-merge it. Push code to both remote
|
|||||||
5. Create a Gitea PR: `tea pr create --head <branch> --base main`. Reference related issues with `#X`. Only use `Closes #X` if the PR fully resolves the issue.
|
5. Create a Gitea PR: `tea pr create --head <branch> --base main`. Reference related issues with `#X`. Only use `Closes #X` if the PR fully resolves the issue.
|
||||||
6. Wait for CI to pass: poll Gitea CI status. If CI fails, report the failure and stop — do not merge.
|
6. Wait for CI to pass: poll Gitea CI status. If CI fails, report the failure and stop — do not merge.
|
||||||
7. Once CI passes, squash-merge on Gitea: `tea pr merge <index> --style squash` with a clean, semantic commit message including the PR number. No Claude attribution lines.
|
7. Once CI passes, squash-merge on Gitea: `tea pr merge <index> --style squash` with a clean, semantic commit message including the PR number. No Claude attribution lines.
|
||||||
8. Update local main and push to both remotes. If in a worktree, `main` is checked out in the primary tree, so run from there: `cd <primary-worktree> && git pull gitea main && git push origin main` (the primary worktree path is the repo root without `.claude/worktrees/…`). If not in a worktree: `git checkout main && git pull gitea main && git push origin main`.
|
8. Update local main and push to both remotes: `git checkout main && git pull gitea main && git push origin main`.
|
||||||
9. Clean up remote branches: `git push gitea --delete <branch> && git push origin --delete <branch>`.
|
9. Clean up remote branches: `git push gitea --delete <branch> && git push origin --delete <branch>`.
|
||||||
10. Prune refs: `git remote prune gitea && git remote prune origin`.
|
10. Prune refs: `git remote prune gitea && git remote prune origin`.
|
||||||
11. Report the merged PR URL.
|
11. Report the merged PR URL.
|
||||||
|
|||||||
18
.gitignore
vendored
18
.gitignore
vendored
@@ -37,15 +37,21 @@ go.work.sum
|
|||||||
# Air artifacts
|
# Air artifacts
|
||||||
*tmp/
|
*tmp/
|
||||||
|
|
||||||
# Example binaries and data files
|
# binaries
|
||||||
internal/examples/*/[a-z]*[!.go]
|
internal/examples/chatroom/chatroom
|
||||||
internal/examples/shakespeare/shake.db
|
internal/examples/counter/counter
|
||||||
|
internal/examples/countercomp/countercomp
|
||||||
|
internal/examples/greeter/greeter
|
||||||
|
internal/examples/livereload/livereload
|
||||||
|
internal/examples/picocss/picocss
|
||||||
|
internal/examples/plugins/plugins
|
||||||
|
internal/examples/realtimechart/realtimechart
|
||||||
|
internal/examples/shakespeare/shakespeare
|
||||||
|
internal/examples/nats-chatroom/nats-chatroom
|
||||||
|
/nats-chatroom
|
||||||
|
|
||||||
# NATS data directory
|
# NATS data directory
|
||||||
data/
|
data/
|
||||||
|
|
||||||
# Standalone experiments
|
|
||||||
nats-chatroom
|
|
||||||
|
|
||||||
# Claude Code worktrees
|
# Claude Code worktrees
|
||||||
.claude/worktrees/
|
.claude/worktrees/
|
||||||
|
|||||||
@@ -74,13 +74,14 @@ func main() {
|
|||||||
- **Plugin system** — `func(v *V)` hooks for integrating CSS/JS libraries
|
- **Plugin system** — `func(v *V)` hooks for integrating CSS/JS libraries
|
||||||
- **Structured logging** — zerolog with configurable levels; console output in dev, JSON in production
|
- **Structured logging** — zerolog with configurable levels; console output in dev, JSON in production
|
||||||
- **Graceful shutdown** — listens for SIGINT/SIGTERM, drains contexts, closes pub/sub
|
- **Graceful shutdown** — listens for SIGINT/SIGTERM, drains contexts, closes pub/sub
|
||||||
|
- **Context lifecycle** — background reaper cleans up disconnected contexts; configurable TTL
|
||||||
- **HTML DSL** — the `h` package provides type-safe Go-native HTML composition
|
- **HTML DSL** — the `h` package provides type-safe Go-native HTML composition
|
||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
The `internal/examples/` directory contains 19 runnable examples:
|
The `internal/examples/` directory contains 14 runnable examples:
|
||||||
|
|
||||||
`chatroom` · `counter` · `countercomp` · `effectspike` · `greeter` · `keyboard` · `livereload` · `maplibre` · `middleware` · `nats-chatroom` · `pathparams` · `picocss` · `plugins` · `pubsub-crud` · `realtimechart` · `session` · `shakespeare` · `signup` · `spa`
|
`chatroom` · `counter` · `countercomp` · `greeter` · `keyboard` · `livereload` · `nats-chatroom` · `pathparams` · `picocss` · `plugins` · `pubsub-crud` · `realtimechart` · `session` · `shakespeare`
|
||||||
|
|
||||||
## Experimental
|
## Experimental
|
||||||
|
|
||||||
|
|||||||
10
ci-check.sh
10
ci-check.sh
@@ -6,13 +6,9 @@ set -o pipefail
|
|||||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
|
|
||||||
echo "== CI: Check formatting =="
|
echo "== CI: Format code =="
|
||||||
if [ -n "$(gofmt -l .)" ]; then
|
go fmt ./...
|
||||||
echo "ERROR: files not formatted:"
|
echo "OK: formatting complete"
|
||||||
gofmt -l .
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "OK: all files formatted"
|
|
||||||
|
|
||||||
echo "== CI: Run go vet =="
|
echo "== CI: Run go vet =="
|
||||||
if ! go vet ./...; then
|
if ! go vet ./...; then
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package via
|
package via
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -50,5 +51,5 @@ func (s *computedSignal) recompute() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *computedSignal) patchValue() string {
|
func (s *computedSignal) patchValue() string {
|
||||||
return s.lastVal
|
return fmt.Sprintf("%v", s.lastVal)
|
||||||
}
|
}
|
||||||
|
|||||||
32
context.go
32
context.go
@@ -25,7 +25,7 @@ type Context struct {
|
|||||||
app *V
|
app *V
|
||||||
view func() h.H
|
view func() h.H
|
||||||
routeParams map[string]string
|
routeParams map[string]string
|
||||||
parentPageCtx *Context
|
parentPageCtx *Context
|
||||||
patchChan chan patch
|
patchChan chan patch
|
||||||
actionLimiter *rate.Limiter
|
actionLimiter *rate.Limiter
|
||||||
actionRegistry map[string]actionEntry
|
actionRegistry map[string]actionEntry
|
||||||
@@ -39,9 +39,9 @@ type Context struct {
|
|||||||
subscriptions []Subscription
|
subscriptions []Subscription
|
||||||
subsMu sync.Mutex
|
subsMu sync.Mutex
|
||||||
disposeOnce sync.Once
|
disposeOnce sync.Once
|
||||||
createdAt time.Time
|
createdAt time.Time
|
||||||
sseConnected atomic.Bool
|
sseConnected atomic.Bool
|
||||||
sseDisconnectedAt atomic.Pointer[time.Time]
|
sseDisconnectedAt atomic.Pointer[time.Time]
|
||||||
}
|
}
|
||||||
|
|
||||||
// View defines the UI rendered by this context.
|
// View defines the UI rendered by this context.
|
||||||
@@ -630,17 +630,17 @@ func newContext(id string, route string, v *V) *Context {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return &Context{
|
return &Context{
|
||||||
id: id,
|
id: id,
|
||||||
route: route,
|
route: route,
|
||||||
csrfToken: genCSRFToken(),
|
csrfToken: genCSRFToken(),
|
||||||
routeParams: make(map[string]string),
|
routeParams: make(map[string]string),
|
||||||
app: v,
|
app: v,
|
||||||
actionLimiter: newLimiter(v.actionRateLimit, defaultActionRate, defaultActionBurst),
|
actionLimiter: newLimiter(v.actionRateLimit, defaultActionRate, defaultActionBurst),
|
||||||
actionRegistry: make(map[string]actionEntry),
|
actionRegistry: make(map[string]actionEntry),
|
||||||
signals: new(sync.Map),
|
signals: new(sync.Map),
|
||||||
patchChan: make(chan patch, 8),
|
patchChan: make(chan patch, 8),
|
||||||
ctxDisposedChan: make(chan struct{}, 1),
|
ctxDisposedChan: make(chan struct{}, 1),
|
||||||
pageStopChan: make(chan struct{}),
|
pageStopChan: make(chan struct{}),
|
||||||
createdAt: time.Now(),
|
createdAt: time.Now(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ Available triggers:
|
|||||||
|--------|-------|-------|
|
|--------|-------|-------|
|
||||||
| `OnClick()` | `click` | |
|
| `OnClick()` | `click` | |
|
||||||
| `OnDblClick()` | `dblclick` | |
|
| `OnDblClick()` | `dblclick` | |
|
||||||
| `OnChange()` | `change` | |
|
| `OnChange()` | `change` | 200ms debounce |
|
||||||
| `OnInput()` | `input` | No debounce |
|
| `OnInput()` | `input` | No debounce |
|
||||||
| `OnSubmit()` | `submit` | |
|
| `OnSubmit()` | `submit` | |
|
||||||
| `OnKeyDown(key)` | `keydown` | Filtered by key name (e.g. `"Enter"`, `"Escape"`) |
|
| `OnKeyDown(key)` | `keydown` | Filtered by key name (e.g. `"Enter"`, `"Escape"`) |
|
||||||
|
|||||||
2
h/h.go
2
h/h.go
@@ -5,7 +5,7 @@
|
|||||||
//
|
//
|
||||||
// h.Div(
|
// h.Div(
|
||||||
// h.H1(h.Text("Hello, Via")),
|
// h.H1(h.Text("Hello, Via")),
|
||||||
// h.P(h.Text("Pure Go. No templates.")),
|
// h.P(h.Text("Pure Go. No tmplates.")),
|
||||||
// )
|
// )
|
||||||
package h
|
package h
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/ryanhamamura/via"
|
"github.com/ryanhamamura/via"
|
||||||
|
// "github.com/go-via/via-plugin-picocss/picocss"
|
||||||
"github.com/ryanhamamura/via/h"
|
"github.com/ryanhamamura/via/h"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -14,6 +15,9 @@ func main() {
|
|||||||
DocumentTitle: "Live Reload Demo",
|
DocumentTitle: "Live Reload Demo",
|
||||||
DevMode: true,
|
DevMode: true,
|
||||||
LogLevel: via.LogLevelDebug,
|
LogLevel: via.LogLevelDebug,
|
||||||
|
Plugins: []via.Plugin{
|
||||||
|
// picocss.Default
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
v.Page("/", func(c *via.Context) {
|
v.Page("/", func(c *via.Context) {
|
||||||
|
|||||||
@@ -2,8 +2,6 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"strconv"
|
|
||||||
"sync"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/ryanhamamura/via"
|
"github.com/ryanhamamura/via"
|
||||||
@@ -11,19 +9,6 @@ import (
|
|||||||
"github.com/ryanhamamura/via/maplibre"
|
"github.com/ryanhamamura/via/maplibre"
|
||||||
)
|
)
|
||||||
|
|
||||||
type posMsg struct {
|
|
||||||
Lng float64 `json:"lng"`
|
|
||||||
Lat float64 `json:"lat"`
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
vehicleOnce sync.Once
|
|
||||||
vehicle struct {
|
|
||||||
mu sync.RWMutex
|
|
||||||
lng, lat float64
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
v := via.New()
|
v := via.New()
|
||||||
v.Config(via.Options{
|
v.Config(via.Options{
|
||||||
@@ -33,21 +18,6 @@ func main() {
|
|||||||
Plugins: []via.Plugin{maplibre.Plugin},
|
Plugins: []via.Plugin{maplibre.Plugin},
|
||||||
})
|
})
|
||||||
|
|
||||||
// Single goroutine moves the vehicle — all clients read the same position.
|
|
||||||
vehicle.lng = -122.43
|
|
||||||
vehicle.lat = 37.77
|
|
||||||
vehicleOnce.Do(func() {
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
time.Sleep(time.Second)
|
|
||||||
vehicle.mu.Lock()
|
|
||||||
vehicle.lng = -122.43 + (rand.Float64()-0.5)*0.02
|
|
||||||
vehicle.lat = 37.77 + (rand.Float64()-0.5)*0.02
|
|
||||||
vehicle.mu.Unlock()
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
})
|
|
||||||
|
|
||||||
v.Page("/", func(c *via.Context) {
|
v.Page("/", func(c *via.Context) {
|
||||||
m := maplibre.New(c, maplibre.Options{
|
m := maplibre.New(c, maplibre.Options{
|
||||||
Style: "https://demotiles.maplibre.org/style.json",
|
Style: "https://demotiles.maplibre.org/style.json",
|
||||||
@@ -75,7 +45,7 @@ func main() {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
// Purple vehicle marker — reads shared Go state
|
// Signal-backed marker — server pushes position updates
|
||||||
vehicleLng := c.Signal(-122.43)
|
vehicleLng := c.Signal(-122.43)
|
||||||
vehicleLat := c.Signal(37.77)
|
vehicleLat := c.Signal(37.77)
|
||||||
|
|
||||||
@@ -86,37 +56,12 @@ func main() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
c.OnInterval(time.Second, func() {
|
c.OnInterval(time.Second, func() {
|
||||||
vehicle.mu.RLock()
|
vehicleLng.SetValue(-122.43 + (rand.Float64()-0.5)*0.02)
|
||||||
lng, lat := vehicle.lng, vehicle.lat
|
vehicleLat.SetValue(37.77 + (rand.Float64()-0.5)*0.02)
|
||||||
vehicle.mu.RUnlock()
|
|
||||||
vehicleLng.SetValue(lng)
|
|
||||||
vehicleLat.SetValue(lat)
|
|
||||||
c.SyncSignals()
|
c.SyncSignals()
|
||||||
})
|
})
|
||||||
|
|
||||||
// Yellow click marker — synced across clients via PubSub
|
// Draggable marker — user drags, signals update
|
||||||
clickLng := c.Signal(-122.4194)
|
|
||||||
clickLat := c.Signal(37.7749)
|
|
||||||
|
|
||||||
m.AddMarker("clicked", maplibre.Marker{
|
|
||||||
LngSignal: clickLng,
|
|
||||||
LatSignal: clickLat,
|
|
||||||
Color: "#f39c12",
|
|
||||||
})
|
|
||||||
|
|
||||||
via.Subscribe(c, "map.click", func(msg posMsg) {
|
|
||||||
clickLng.SetValue(msg.Lng)
|
|
||||||
clickLat.SetValue(msg.Lat)
|
|
||||||
c.SyncSignals()
|
|
||||||
})
|
|
||||||
|
|
||||||
click := m.OnClick()
|
|
||||||
handleClick := c.Action(func() {
|
|
||||||
e := click.Data()
|
|
||||||
via.Publish(c, "map.click", posMsg{Lng: e.LngLat.Lng, Lat: e.LngLat.Lat})
|
|
||||||
})
|
|
||||||
|
|
||||||
// Blue draggable pin — synced across clients via PubSub
|
|
||||||
pinLng := c.Signal(-122.41)
|
pinLng := c.Signal(-122.41)
|
||||||
pinLat := c.Signal(37.78)
|
pinLat := c.Signal(37.78)
|
||||||
|
|
||||||
@@ -127,16 +72,14 @@ func main() {
|
|||||||
Draggable: true,
|
Draggable: true,
|
||||||
})
|
})
|
||||||
|
|
||||||
via.Subscribe(c, "map.pin", func(msg posMsg) {
|
// Click event — click to place a marker
|
||||||
pinLng.SetValue(msg.Lng)
|
click := m.OnClick()
|
||||||
pinLat.SetValue(msg.Lat)
|
handleClick := c.Action(func() {
|
||||||
c.SyncSignals()
|
e := click.Data()
|
||||||
})
|
m.AddMarker("clicked", maplibre.Marker{
|
||||||
|
LngLat: e.LngLat,
|
||||||
handlePinDrag := c.Action(func() {
|
Color: "#f39c12",
|
||||||
lng, _ := strconv.ParseFloat(pinLng.String(), 64)
|
})
|
||||||
lat, _ := strconv.ParseFloat(pinLat.String(), 64)
|
|
||||||
via.Publish(c, "map.pin", posMsg{Lng: lng, Lat: lat})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
// GeoJSON polygon source + fill layer
|
// GeoJSON polygon source + fill layer
|
||||||
@@ -168,7 +111,7 @@ func main() {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
// FlyTo actions
|
// FlyTo actions using CameraOptions
|
||||||
zoom14 := 14.0
|
zoom14 := 14.0
|
||||||
flyToSF := c.Action(func() {
|
flyToSF := c.Action(func() {
|
||||||
m.FlyTo(maplibre.CameraOptions{
|
m.FlyTo(maplibre.CameraOptions{
|
||||||
@@ -191,7 +134,6 @@ func main() {
|
|||||||
h.H1(h.Text("MapLibre GL Example")),
|
h.H1(h.Text("MapLibre GL Example")),
|
||||||
m.Element(
|
m.Element(
|
||||||
click.Input(handleClick.OnInput()),
|
click.Input(handleClick.OnInput()),
|
||||||
h.Input(h.Type("hidden"), pinLng.Bind(), handlePinDrag.OnInput()),
|
|
||||||
),
|
),
|
||||||
h.Div(h.Attr("style", "margin-top:1rem;display:flex;gap:0.5rem;flex-wrap:wrap"),
|
h.Div(h.Attr("style", "margin-top:1rem;display:flex;gap:0.5rem;flex-wrap:wrap"),
|
||||||
h.Button(h.Text("Fly to San Francisco"), flyToSF.OnClick()),
|
h.Button(h.Text("Fly to San Francisco"), flyToSF.OnClick()),
|
||||||
@@ -200,7 +142,6 @@ func main() {
|
|||||||
h.Div(h.Attr("style", "margin-top:0.5rem;font-size:0.9rem"),
|
h.Div(h.Attr("style", "margin-top:0.5rem;font-size:0.9rem"),
|
||||||
h.P(h.Text("Zoom: "), m.Zoom.Text()),
|
h.P(h.Text("Zoom: "), m.Zoom.Text()),
|
||||||
h.P(h.Text("Center: "), m.CenterLng.Text(), h.Text(", "), m.CenterLat.Text()),
|
h.P(h.Text("Center: "), m.CenterLng.Text(), h.Text(", "), m.CenterLat.Text()),
|
||||||
h.P(h.Text("Click: "), clickLng.Text(), h.Text(", "), clickLat.Text()),
|
|
||||||
h.P(h.Text("Vehicle: "), vehicleLng.Text(), h.Text(", "), vehicleLat.Text()),
|
h.P(h.Text("Vehicle: "), vehicleLng.Text(), h.Text(", "), vehicleLat.Text()),
|
||||||
h.P(h.Text("Draggable Pin: "), pinLng.Text(), h.Text(", "), pinLat.Text()),
|
h.P(h.Text("Draggable Pin: "), pinLng.Text(), h.Text(", "), pinLat.Text()),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -4,12 +4,17 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/ryanhamamura/via"
|
"github.com/ryanhamamura/via"
|
||||||
|
// "github.com/go-via/via-plugin-picocss/picocss"
|
||||||
. "github.com/ryanhamamura/via/h"
|
. "github.com/ryanhamamura/via/h"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
v := via.New()
|
v := via.New()
|
||||||
|
|
||||||
|
v.Config(via.Options{
|
||||||
|
// Plugins: []via.Plugin{picocss.Default},
|
||||||
|
})
|
||||||
|
|
||||||
v.Page("/counters/{counter_id}/{start_at_step}", func(c *via.Context) {
|
v.Page("/counters/{counter_id}/{start_at_step}", func(c *via.Context) {
|
||||||
|
|
||||||
counterID := c.GetPathParam("counter_id")
|
counterID := c.GetPathParam("counter_id")
|
||||||
|
|||||||
BIN
internal/examples/pathparams/pathparams
Executable file
BIN
internal/examples/pathparams/pathparams
Executable file
Binary file not shown.
@@ -2,6 +2,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/ryanhamamura/via"
|
"github.com/ryanhamamura/via"
|
||||||
|
// "github.com/go-via/via-plugin-picocss/picocss"
|
||||||
"github.com/ryanhamamura/via/h"
|
"github.com/ryanhamamura/via/h"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -12,6 +13,11 @@ func main() {
|
|||||||
|
|
||||||
v.Config(via.Options{
|
v.Config(via.Options{
|
||||||
DocumentTitle: "Via Counter",
|
DocumentTitle: "Via Counter",
|
||||||
|
// Plugin is placed here. Use picocss.WithOptions(pococss.Options) to add the plugin
|
||||||
|
// with a different color theme or to enable a classes for a wide range of colors.
|
||||||
|
// Plugins: []via.Plugin{
|
||||||
|
// picocss.Default,
|
||||||
|
// },
|
||||||
})
|
})
|
||||||
|
|
||||||
v.Page("/", func(c *via.Context) {
|
v.Page("/", func(c *via.Context) {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/ryanhamamura/via"
|
"github.com/ryanhamamura/via"
|
||||||
|
// "github.com/go-via/via-plugin-picocss/picocss"
|
||||||
"github.com/ryanhamamura/via/h"
|
"github.com/ryanhamamura/via/h"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -14,7 +15,10 @@ func main() {
|
|||||||
|
|
||||||
v.Config(via.Options{
|
v.Config(via.Options{
|
||||||
LogLevel: via.LogLevelDebug,
|
LogLevel: via.LogLevelDebug,
|
||||||
DevMode: true,
|
DevMode: true,
|
||||||
|
Plugins: []via.Plugin{
|
||||||
|
// picocss.Default,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
v.AppendToHead(
|
v.AppendToHead(
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
_ "github.com/mattn/go-sqlite3"
|
|
||||||
"github.com/ryanhamamura/via"
|
"github.com/ryanhamamura/via"
|
||||||
"github.com/ryanhamamura/via/h"
|
"github.com/ryanhamamura/via/h"
|
||||||
|
_ "github.com/mattn/go-sqlite3"
|
||||||
)
|
)
|
||||||
|
|
||||||
type DataSource interface {
|
type DataSource interface {
|
||||||
@@ -22,9 +22,6 @@ type ShakeDB struct {
|
|||||||
findByTextStmt *sql.Stmt
|
findByTextStmt *sql.Stmt
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare opens shake.db, a ~22 MB SQLite database of Shakespeare's works.
|
|
||||||
// Download from https://github.com/nicholasgasior/gopher-fizzbuzz/raw/master/shake.db
|
|
||||||
// and place it in this directory before running.
|
|
||||||
func (shakeDB *ShakeDB) Prepare() {
|
func (shakeDB *ShakeDB) Prepare() {
|
||||||
db, err := sql.Open("sqlite3", "shake.db")
|
db, err := sql.Open("sqlite3", "shake.db")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
BIN
internal/examples/shakespeare/shake.db
Normal file
BIN
internal/examples/shakespeare/shake.db
Normal file
Binary file not shown.
@@ -316,7 +316,7 @@ type Marker struct {
|
|||||||
type Popup struct {
|
type Popup struct {
|
||||||
Content string // HTML content
|
Content string // HTML content
|
||||||
LngLat LngLat
|
LngLat LngLat
|
||||||
HideCloseButton bool // true removes the close button (MapLibre shows it by default)
|
HideCloseButton bool // true removes the close button (MapLibre shows it by default)
|
||||||
MaxWidth string
|
MaxWidth string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package via
|
package via
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
// "net/http/httptest"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/ryanhamamura/via/h"
|
"github.com/ryanhamamura/via/h"
|
||||||
|
|||||||
@@ -81,8 +81,8 @@ func TestStaticAutoSlash(t *testing.T) {
|
|||||||
|
|
||||||
func TestStaticFS(t *testing.T) {
|
func TestStaticFS(t *testing.T) {
|
||||||
fsys := fstest.MapFS{
|
fsys := fstest.MapFS{
|
||||||
"style.css": {Data: []byte("body{}")},
|
"style.css": {Data: []byte("body{}")},
|
||||||
"js/app.js": {Data: []byte("console.log('hi')")},
|
"js/app.js": {Data: []byte("console.log('hi')")},
|
||||||
}
|
}
|
||||||
|
|
||||||
v := New()
|
v := New()
|
||||||
|
|||||||
73
via.go
73
via.go
@@ -240,10 +240,10 @@ func (v *V) page(route string, raw, wrapped func(*Context)) {
|
|||||||
bodyElements = append(bodyElements, h.Raw("<dataspa-inspector/>"))
|
bodyElements = append(bodyElements, h.Raw("<dataspa-inspector/>"))
|
||||||
}
|
}
|
||||||
view := h.HTML5(h.HTML5Props{
|
view := h.HTML5(h.HTML5Props{
|
||||||
Title: v.cfg.DocumentTitle,
|
Title: v.cfg.DocumentTitle,
|
||||||
Head: headElements,
|
Head: headElements,
|
||||||
Body: bodyElements,
|
Body: bodyElements,
|
||||||
})
|
})
|
||||||
_ = view.Render(w)
|
_ = view.Render(w)
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
@@ -439,39 +439,36 @@ func (v *V) ensureDatastarHandler() {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadDevModeMap(path string) map[string]string {
|
|
||||||
m := make(map[string]string)
|
|
||||||
file, err := os.Open(path)
|
|
||||||
if err != nil {
|
|
||||||
return m
|
|
||||||
}
|
|
||||||
defer file.Close()
|
|
||||||
json.NewDecoder(file).Decode(&m)
|
|
||||||
return m
|
|
||||||
}
|
|
||||||
|
|
||||||
func saveDevModeMap(path string, m map[string]string) error {
|
|
||||||
file, err := os.Create(path)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer file.Close()
|
|
||||||
return json.NewEncoder(file).Encode(m)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (v *V) devModePersist(c *Context) {
|
func (v *V) devModePersist(c *Context) {
|
||||||
p := filepath.Join(".via", "devmode", "ctx.json")
|
p := filepath.Join(".via", "devmode", "ctx.json")
|
||||||
if err := os.MkdirAll(filepath.Dir(p), 0755); err != nil {
|
if err := os.MkdirAll(filepath.Dir(p), 0755); err != nil {
|
||||||
v.logFatal("failed to create directory for devmode files: %v", err)
|
v.logFatal("failed to create directory for devmode files: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
ctxRegMap := loadDevModeMap(p)
|
// load persisted list from file, or empty list if file not found
|
||||||
|
file, err := os.Open(p)
|
||||||
|
ctxRegMap := make(map[string]string)
|
||||||
|
if err == nil {
|
||||||
|
json.NewDecoder(file).Decode(&ctxRegMap)
|
||||||
|
}
|
||||||
|
file.Close()
|
||||||
|
|
||||||
|
// add ctx to persisted list
|
||||||
if _, ok := ctxRegMap[c.id]; !ok {
|
if _, ok := ctxRegMap[c.id]; !ok {
|
||||||
ctxRegMap[c.id] = c.route
|
ctxRegMap[c.id] = c.route
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := saveDevModeMap(p, ctxRegMap); err != nil {
|
// write persisted list to file
|
||||||
v.logErr(c, "devmode failed to persist ctx: %v", err)
|
file, err = os.Create(p)
|
||||||
|
if err != nil {
|
||||||
|
v.logErr(c, "devmode failed to percist ctx: %v", err)
|
||||||
|
|
||||||
|
}
|
||||||
|
defer file.Close()
|
||||||
|
|
||||||
|
encoder := json.NewEncoder(file)
|
||||||
|
if err := encoder.Encode(ctxRegMap); err != nil {
|
||||||
|
v.logErr(c, "devmode failed to persist ctx")
|
||||||
}
|
}
|
||||||
v.logDebug(c, "devmode persisted ctx to file")
|
v.logDebug(c, "devmode persisted ctx to file")
|
||||||
}
|
}
|
||||||
@@ -479,11 +476,27 @@ func (v *V) devModePersist(c *Context) {
|
|||||||
func (v *V) devModeRemovePersisted(c *Context) {
|
func (v *V) devModeRemovePersisted(c *Context) {
|
||||||
p := filepath.Join(".via", "devmode", "ctx.json")
|
p := filepath.Join(".via", "devmode", "ctx.json")
|
||||||
|
|
||||||
ctxRegMap := loadDevModeMap(p)
|
// load persisted list from file, or empty list if file not found
|
||||||
|
file, err := os.Open(p)
|
||||||
|
ctxRegMap := make(map[string]string)
|
||||||
|
if err == nil {
|
||||||
|
json.NewDecoder(file).Decode(&ctxRegMap)
|
||||||
|
}
|
||||||
|
file.Close()
|
||||||
|
|
||||||
delete(ctxRegMap, c.id)
|
delete(ctxRegMap, c.id)
|
||||||
|
|
||||||
if err := saveDevModeMap(p, ctxRegMap); err != nil {
|
// write persisted list to file
|
||||||
v.logErr(c, "devmode failed to remove persisted ctx: %v", err)
|
file, err = os.Create(p)
|
||||||
|
if err != nil {
|
||||||
|
v.logErr(c, "devmode failed to remove percisted ctx: %v", err)
|
||||||
|
|
||||||
|
}
|
||||||
|
defer file.Close()
|
||||||
|
|
||||||
|
encoder := json.NewEncoder(file)
|
||||||
|
if err := encoder.Encode(ctxRegMap); err != nil {
|
||||||
|
v.logErr(c, "devmode failed to remove persisted ctx")
|
||||||
}
|
}
|
||||||
v.logDebug(c, "devmode removed persisted ctx from file")
|
v.logDebug(c, "devmode removed persisted ctx from file")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -134,9 +134,9 @@ func TestAction(t *testing.T) {
|
|||||||
|
|
||||||
func TestEventTypes(t *testing.T) {
|
func TestEventTypes(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
attr string
|
attr string
|
||||||
buildEl func(trigger *actionTrigger) h.H
|
buildEl func(trigger *actionTrigger) h.H
|
||||||
}{
|
}{
|
||||||
{"OnSubmit", "data-on:submit", func(tr *actionTrigger) h.H { return h.Form(tr.OnSubmit()) }},
|
{"OnSubmit", "data-on:submit", func(tr *actionTrigger) h.H { return h.Form(tr.OnSubmit()) }},
|
||||||
{"OnInput", "data-on:input", func(tr *actionTrigger) h.H { return h.Input(tr.OnInput()) }},
|
{"OnInput", "data-on:input", func(tr *actionTrigger) h.H { return h.Input(tr.OnInput()) }},
|
||||||
|
|||||||
Reference in New Issue
Block a user