Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/codegen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"time"

core "dappco.re/go"
"dappco.re/go/html/engine/codegen"
"dappco.re/go/render/engine/codegen"
coreio "dappco.re/go/io"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module dappco.re/go/html/cli
module dappco.re/go/render/cli

go 1.26.2

Expand Down
2 changes: 1 addition & 1 deletion cli/termdemo/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"os"
"strconv"

html "dappco.re/go/html/engine/html"
html "dappco.re/go/render/engine/html"
)

// demoTranslator resolves the demo's Text keys from a fixed catalogue — the
Expand Down
2 changes: 1 addition & 1 deletion cli/wasm/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package main
import (
"syscall/js"

html "dappco.re/go/html/engine/html"
html "dappco.re/go/render/engine/html"
)

// Keep the callback alive for the lifetime of the WASM module.
Expand Down
2 changes: 1 addition & 1 deletion cli/wasm/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package main
import (
core "dappco.re/go"

"dappco.re/go/html/engine/codegen"
"dappco.re/go/render/engine/codegen"
)

// buildComponentJS takes a JSON slot map and returns the WC bundle JS result.
Expand Down
2 changes: 1 addition & 1 deletion cli/wasm/render_layout.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

package main

import html "dappco.re/go/html/engine/html"
import html "dappco.re/go/render/engine/html"

// renderLayout renders an HLCRF layout from a slot map.
//
Expand Down
2 changes: 1 addition & 1 deletion go/display/ctmltest/click.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strconv"
"testing"

html "dappco.re/go/html/engine/html"
html "dappco.re/go/render/engine/html"
)

// runClick dispatches one Click command and reports a failure through t --
Expand Down
2 changes: 1 addition & 1 deletion go/display/ctmltest/click_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package ctmltest
import (
"testing"

html "dappco.re/go/html/engine/html"
html "dappco.re/go/render/engine/html"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion go/display/ctmltest/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func applySet(cfg *tapeConfig, cmd command) {
// "Welcome"` seeds values["session"] = map[string]any{"title": "Welcome"}
// and a .ctml {{session.title}} bind resolves against it -- ctml's own
// {{path}} resolution walks Bindings.Values the same way (see
// dappco.re/go/html/ctml's lookupPath). A key with no dot ("count") is the
// dappco.re/go/render/ctml's lookupPath). A key with no dot ("count") is the
// single-segment case of the same walk: values["count"] = value directly.
// A dotted path whose prefix was previously set to a non-map value (or vice
// versa) simply overwrites at the point of collision -- last Data line for
Expand Down
2 changes: 1 addition & 1 deletion go/display/ctmltest/coverage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package ctmltest_test
import (
"testing"

"dappco.re/go/html/display/ctmltest"
"dappco.re/go/render/display/ctmltest"
)

// This file dogfoods the ctmltest harness against go-html's own render
Expand Down
2 changes: 1 addition & 1 deletion go/display/ctmltest/ctmltest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"testing"

"dappco.re/go/html/display/ctmltest"
"dappco.re/go/render/display/ctmltest"
)

// TestCTML runs every _test.ctml tape directly under testdata/ -- this is
Expand Down
2 changes: 1 addition & 1 deletion go/display/ctmltest/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
// BEFORE the tape's first render-reading command (Expect, Golden, or
// Click -- see isRenderRead) build the initial render inputs -- a
// ctml.Bindings, since .ctml binds resolve at PARSE time, not from a
// Context at render time (see dappco.re/go/html/ctml's package doc) -- and
// Context at render time (see dappco.re/go/render/ctml's package doc) -- and
// a html.TermOptions; RenderTermBoxes renders once to seed that state.
// From there RunFile walks the rest of the tape in order: Expect/Golden/
// Click assert against the CURRENT frame and box map, and a Data command
Expand Down
4 changes: 2 additions & 2 deletions go/display/ctmltest/drive.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package ctmltest
import (
"strconv"

html "dappco.re/go/html/engine/html"
html "dappco.re/go/render/engine/html"
)

// isRenderRead reports whether verb reads the tape's current render state
Expand Down Expand Up @@ -74,7 +74,7 @@ type driveState struct {
// newDriveState seeds a driveState from tapePath and prepareRun's result.
// The live values/sequences maps are result.cfg's own, not a copy -- safe,
// because ctml.Parse resolves Bindings at PARSE time, not from a live
// reference read later at render time (see dappco.re/go/html/ctml's
// reference read later at render time (see dappco.re/go/render/ctml's
// package doc), so mutating values after a Parse call has already returned
// can never reach back into a frame that call already produced.
func newDriveState(tapePath string, result renderResult) *driveState {
Expand Down
2 changes: 1 addition & 1 deletion go/display/ctmltest/drive_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package ctmltest
import (
"testing"

html "dappco.re/go/html/engine/html"
html "dappco.re/go/render/engine/html"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion go/display/ctmltest/expect.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"

core "dappco.re/go"
html "dappco.re/go/html/engine/html"
html "dappco.re/go/render/engine/html"
coreio "dappco.re/go/io"
"charm.land/lipgloss/v2"
"github.com/charmbracelet/x/ansi"
Expand Down
2 changes: 1 addition & 1 deletion go/display/ctmltest/expect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"testing"

html "dappco.re/go/html/engine/html"
html "dappco.re/go/render/engine/html"
coreio "dappco.re/go/io"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
6 changes: 3 additions & 3 deletions go/display/ctmltest/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"testing"

core "dappco.re/go"
html "dappco.re/go/html/engine/html"
ctml "dappco.re/go/html/engine/ctml"
html "dappco.re/go/render/engine/html"
ctml "dappco.re/go/render/engine/ctml"
coreio "dappco.re/go/io"
)

Expand Down Expand Up @@ -178,7 +178,7 @@ func prepareRun(tapePath string) (renderResult, error) {

// renderCTML parses ctmlSrc against the given Bindings -- resolved at
// PARSE time, not from a live reference read later at render time (see
// dappco.re/go/html/ctml's package doc) -- and RenderTermBoxes the result
// dappco.re/go/render/ctml's package doc) -- and RenderTermBoxes the result
// once. Shared by prepareRun's initial render and driveState.redrive's
// mid-tape re-render: the same two steps (parse, render) and the same
// failure shape (naming tapeRef), from two call sites.
Expand Down
2 changes: 1 addition & 1 deletion go/display/http/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
nethttp "net/http"

core "dappco.re/go"
tsengine "dappco.re/go/html/engine/ts"
tsengine "dappco.re/go/render/engine/ts"
)

// Option configures Handler.
Expand Down
2 changes: 1 addition & 1 deletion go/display/pipe/pipe.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package pipe

import (
core "dappco.re/go"
tsengine "dappco.re/go/html/engine/ts"
tsengine "dappco.re/go/render/engine/ts"
)

// Emit renders entry once with a nil input and writes the exact output bytes
Expand Down
4 changes: 2 additions & 2 deletions go/display/socket/socket.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
nethttp "net/http"

core "dappco.re/go"
httpdisplay "dappco.re/go/html/display/http"
tsengine "dappco.re/go/html/engine/ts"
httpdisplay "dappco.re/go/render/display/http"
tsengine "dappco.re/go/render/engine/ts"
)

// Serve serves the HTTP SSR handler over listener until the listener closes.
Expand Down
2 changes: 1 addition & 1 deletion go/display/socket/socket_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

core "dappco.re/go"
httpdisplay "dappco.re/go/html/display/http"
httpdisplay "dappco.re/go/render/display/http"
)

type socketRenderer struct {
Expand Down
6 changes: 3 additions & 3 deletions go/display/tui/anim/anim.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"strings"
"time"

tea "dappco.re/go/html/display/tui"
"dappco.re/go/html/display/tui/spinner"
"dappco.re/go/html/display/tui/style"
tea "dappco.re/go/render/display/tui"
"dappco.re/go/render/display/tui/spinner"
"dappco.re/go/render/display/tui/style"
colorful "github.com/lucasb-eyer/go-colorful"
"github.com/muesli/termenv"
)
Expand Down
4 changes: 2 additions & 2 deletions go/display/tui/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package tui

import (
html "dappco.re/go/html/engine/html"
html "dappco.re/go/render/engine/html"
)

// App is the root manager Model: each frame it renders a .ctml node tree to the
Expand Down Expand Up @@ -48,7 +48,7 @@ func WithRenderContext(ctx *html.Context) AppOption { return func(a *App) { a.ct
func WithQuitKeys(pred func(KeyPressMsg) bool) AppOption { return func(a *App) { a.quit = pred } }

// NewApp builds a manager around a parsed .ctml node tree (see
// dappco.re/go/html/engine/ctml.Parse). Options tune the theme, render context,
// dappco.re/go/render/engine/ctml.Parse). Options tune the theme, render context,
// and quit keys; the defaults render the house theme and quit on ctrl+c / q.
func NewApp(node html.Node, opts ...AppOption) *App {
a := &App{
Expand Down
4 changes: 2 additions & 2 deletions go/display/tui/app_example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package tui_test
import (
"fmt"

ctml "dappco.re/go/html/engine/ctml"
tui "dappco.re/go/html/display/tui"
ctml "dappco.re/go/render/engine/ctml"
tui "dappco.re/go/render/display/tui"
)

// ExampleNewApp builds a manager around a .ctml document -- the shape a consumer
Expand Down
6 changes: 3 additions & 3 deletions go/display/tui/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/charmbracelet/x/ansi"
teatest "github.com/charmbracelet/x/exp/teatest/v2"

ctml "dappco.re/go/html/engine/ctml"
html "dappco.re/go/html/engine/html"
tui "dappco.re/go/html/display/tui"
ctml "dappco.re/go/render/engine/ctml"
html "dappco.re/go/render/engine/html"
tui "dappco.re/go/render/display/tui"
)

// parse compiles a .ctml source to a node, failing the test on a parse error.
Expand Down
2 changes: 1 addition & 1 deletion go/display/tui/colorprofile/colorprofile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"bytes"
"testing"

"dappco.re/go/html/display/tui/colorprofile"
"dappco.re/go/render/display/tui/colorprofile"
)

// --- Profile constants ---
Expand Down
2 changes: 1 addition & 1 deletion go/display/tui/colorprofile/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"bytes"
"fmt"

"dappco.re/go/html/display/tui/colorprofile"
"dappco.re/go/render/display/tui/colorprofile"
)

// ExampleWriter builds a Writer fixed to the ANSI256 profile and writes a
Expand Down
4 changes: 2 additions & 2 deletions go/display/tui/cursor/cursor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/charmbracelet/x/exp/teatest/v2"

tea "dappco.re/go/html/display/tui"
"dappco.re/go/html/display/tui/cursor"
tea "dappco.re/go/render/display/tui"
"dappco.re/go/render/display/tui/cursor"
)

// TestNew builds a cursor with the package defaults and proves them: it
Expand Down
2 changes: 1 addition & 1 deletion go/display/tui/cursor/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package cursor_test
import (
"fmt"

"dappco.re/go/html/display/tui/cursor"
"dappco.re/go/render/display/tui/cursor"
)

// ExampleNew builds a cursor and switches it to CursorStatic — the shape a
Expand Down
2 changes: 1 addition & 1 deletion go/display/tui/doc.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Package tui is go-html's terminal-UI runtime: the event loop and the
// widgets a .ctml consumer needs, so the consumer imports dappco.re/go/html
// widgets a .ctml consumer needs, so the consumer imports dappco.re/go/render
// only and never charmbracelet directly. charm becomes go-html's transitive
// concern — optimise or replace it once here and the whole fleet inherits
// (SPOR).
Expand Down
4 changes: 2 additions & 2 deletions go/display/tui/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package tui_test
import (
"fmt"

htui "dappco.re/go/html/display/tui"
htui "dappco.re/go/render/display/tui"
)

// houseModel is the smallest tea.Model that turns on the two capabilities a
Expand All @@ -27,7 +27,7 @@ func (houseModel) View() htui.View {
// ExampleNewProgram builds a Program with a couple of this file's house
// options — WithoutSignalHandler and WithFPS — and a Model whose View turns
// on the alternate screen and mouse tracking, entirely through
// dappco.re/go/html/display/tui: no charmbracelet import anywhere in this file.
// dappco.re/go/render/display/tui: no charmbracelet import anywhere in this file.
func ExampleNewProgram() {
p := htui.NewProgram(houseModel{}, htui.WithoutSignalHandler(), htui.WithFPS(30))
fmt.Println(p != nil)
Expand Down
2 changes: 1 addition & 1 deletion go/display/tui/filepicker/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package filepicker_test
import (
"fmt"

"dappco.re/go/html/display/tui/filepicker"
"dappco.re/go/render/display/tui/filepicker"
)

// ExampleNew builds a picker and points it at a directory, restricting
Expand Down
6 changes: 3 additions & 3 deletions go/display/tui/filepicker/filepicker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/charmbracelet/x/exp/teatest/v2"

core "dappco.re/go"
tea "dappco.re/go/html/display/tui"
"dappco.re/go/html/display/tui/filepicker"
"dappco.re/go/html/display/tui/style"
tea "dappco.re/go/render/display/tui"
"dappco.re/go/render/display/tui/filepicker"
"dappco.re/go/render/display/tui/style"
coreio "dappco.re/go/io"
)

Expand Down
2 changes: 1 addition & 1 deletion go/display/tui/form/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package form_test
import (
"fmt"

"dappco.re/go/html/display/tui/form"
"dappco.re/go/render/display/tui/form"
)

// ExampleNewForm builds a two-field form — an Input and a generic Select —
Expand Down
2 changes: 1 addition & 1 deletion go/display/tui/form/form_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package form_test
import (
"testing"

"dappco.re/go/html/display/tui/form"
"dappco.re/go/render/display/tui/form"
)

// TestNewForm_Good builds a real form through the wrap — a generic Select and
Expand Down
2 changes: 1 addition & 1 deletion go/display/tui/image/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"strings"

tuiimage "dappco.re/go/html/display/tui/image"
tuiimage "dappco.re/go/render/display/tui/image"
)

// ExampleRender renders a tiny generated image to an 8x4 terminal block —
Expand Down
2 changes: 1 addition & 1 deletion go/display/tui/image/image_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"testing"

tuiimage "dappco.re/go/html/display/tui/image"
tuiimage "dappco.re/go/render/display/tui/image"
)

// newCheckerboard builds a deterministic n-by-n RGBA image — a two-colour
Expand Down
2 changes: 1 addition & 1 deletion go/display/tui/layout/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"image"

"dappco.re/go/html/display/tui/layout"
"dappco.re/go/render/display/tui/layout"
)

// ExampleLayout_Split partitions a 10x10 rect into a 3-tall header and a
Expand Down
Loading
Loading