gromer

git clone https://pyrossh.dev/repos/gromer.git

gromer is a framework and cli to build multipage web apps in golang using htmx and alpinejs.

160a5bdd — pyros2097

improve code organisation

Files changed (22) hide show

LICENSE +22 -0
app_nowasm.go +4 -4
attributes.go +2 -8
attributes_test.go +2 -1
component.go +2 -27
concurrency.go +0 -15
condition.go +0 -117
context.go +0 -20
element.go +121 -13
element_test.go +100 -0
html.go +0 -5
js_nowasm.go +32 -41
makefile +0 -31
range_test.go +0 -91
resource.go +0 -151
resource_test.go +0 -85
range.go → selectors.go +106 -0
condition_test.go → selectors_test.go +90 -0
strings.go +0 -45
text.go +0 -120
text_test.go +0 -101
utils.go +56 -0

LICENSE CHANGED Viewed

@@ -19,3 +19,25 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+MIT License
+Copyright (c) 2020 pyros2097
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

app_nowasm.go CHANGED Viewed

@@ -16,17 +16,17 @@ func getenv(k string) string {
 }
 func keepBodyClean() func() {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func navigate(u *url.URL, updateHistory bool) error {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func reload() {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func run(r RenderFunc) {
-	panic(errNoWasm)
+	panic("wasm required")
 }

attributes.go CHANGED Viewed

@@ -2,8 +2,6 @@ package app
 import (
 	"context"
-	"github.com/pyros2097/wapp/errors"
 )
 type baseAttribute struct {
@@ -57,18 +55,14 @@ func (c baseAttribute) children() []UI {
 }
 func (c baseAttribute) mount() error {
-	return errors.New("condition is not mountable").
+	panic("cant mount attributes")
-		Tag("name", c.name()).
-		Tag("kind", c.Kind())
 }
 func (c baseAttribute) dismount() {
 }
 func (c baseAttribute) update(UI) error {
-	return errors.New("condition cannot be updated").
+	panic("cant update attributes")
-		Tag("name", c.name()).
-		Tag("kind", c.Kind())
 }
 type CssAttribute struct {

attributes_test.go CHANGED Viewed

@@ -2,6 +2,7 @@ package app
 import (
 	"bytes"
+	"strconv"
 	"testing"
 	"github.com/stretchr/testify/assert"
@@ -18,7 +19,7 @@ func Counter(c *RenderContext) UI {
 				Text("-"),
 			),
 			Div(
-				Text(count()),
+				Text(strconv.Itoa(count())),
 			),
 			Div(
 				Text("+"),

component.go CHANGED Viewed

@@ -8,31 +8,6 @@ import (
 	"github.com/pyros2097/wapp/errors"
 )
-// Composer is the interface that describes a customized, independent and
-// reusable UI element.
-//
-// Satisfying this interface is done by embedding app.Compo into a struct and
-// implementing the Render function.
-//
-// Example:
-//  type Hello struct {
-//      app.Compo
-//  }
-//
-//  func (c *Hello) Render() app.UI {
-//      return app.Text("hello")
-//  }
-type Composer interface {
-	UI
-	// Render returns the node tree that define how the component is desplayed.
-	Render() UI
-	// Update update the component appearance. It should be called when a field
-	// used to render the component has been modified.
-	Update()
-}
 var contextMap = map[int]*RenderContext{}
 var contextIndex = 0
@@ -95,7 +70,7 @@ func (r RenderFunc) setSelf(n UI) {
 	if n != nil {
 		println("new context")
 		c := NewRenderContext()
-		c.this = n.(Composer)
+		c.this = n.(RenderFunc)
 		return
 	}
@@ -268,7 +243,7 @@ type RenderContext struct {
 	contextMapIndex int
 	parentElem      UI
 	root            UI
-	this            Composer
+	this            RenderFunc
 	index           int
 	values          map[int]interface{}
 	eindex          int

concurrency.go DELETED Viewed

@@ -1,15 +0,0 @@
-package app
-var (
-	dispatch Dispatcher = Dispatch
-	uiChan              = make(chan func(), 512)
-)
-// Dispatcher is a function that executes the given function on the goroutine
-// dedicated to UI.
-type Dispatcher func(func())
-// Dispatch executes the given function on the UI goroutine.
-func Dispatch(f func()) {
-	uiChan <- f
-}

condition.go DELETED Viewed

@@ -1,117 +0,0 @@
-package app
-import (
-	"context"
-	"github.com/pyros2097/wapp/errors"
-)
-// Condition represents a control structure that displays nodes depending on a
-// given expression.
-type Condition interface {
-	UI
-	// ElseIf sets the condition with the given nodes if previous expressions
-	// were not met and given expression is true.
-	ElseIf(expr bool, elems ...UI) Condition
-	// Else sets the condition with the given UI elements if previous
-	// expressions were not met.
-	Else(elems ...UI) Condition
-}
-// If returns a condition that filters the given elements according to the given
-// expression.
-func If(expr bool, elems ...UI) Condition {
-	if !expr {
-		elems = nil
-	}
-	return condition{
-		body:      FilterUIElems(elems...),
-		satisfied: expr,
-	}
-}
-type condition struct {
-	body      []UI
-	satisfied bool
-}
-func (c condition) ElseIf(expr bool, elems ...UI) Condition {
-	if c.satisfied {
-		return c
-	}
-	if expr {
-		c.body = FilterUIElems(elems...)
-		c.satisfied = expr
-	}
-	return c
-}
-func (c condition) Else(elems ...UI) Condition {
-	return c.ElseIf(true, elems...)
-}
-func (c condition) Kind() Kind {
-	return Selector
-}
-func (c condition) JSValue() Value {
-	return nil
-}
-func (c condition) Mounted() bool {
-	return false
-}
-func (c condition) name() string {
-	return "if.else"
-}
-func (c condition) self() UI {
-	return c
-}
-func (c condition) setSelf(UI) {
-}
-func (c condition) context() context.Context {
-	return nil
-}
-func (c condition) attributes() map[string]string {
-	return nil
-}
-func (c condition) eventHandlers() map[string]eventHandler {
-	return nil
-}
-func (c condition) parent() UI {
-	return nil
-}
-func (c condition) setParent(UI) {
-}
-func (c condition) children() []UI {
-	return c.body
-}
-func (c condition) mount() error {
-	return errors.New("condition is not mountable").
-		Tag("name", c.name()).
-		Tag("kind", c.Kind())
-}
-func (c condition) dismount() {
-}
-func (c condition) update(UI) error {
-	return errors.New("condition cannot be updated").
-		Tag("name", c.name()).
-		Tag("kind", c.Kind())
-}

context.go DELETED Viewed

@@ -1,20 +0,0 @@
-package app
-import "context"
-// Context represents a context that is tied to a UI element. It is canceled
-// when the element is dismounted.
-//
-// It implements the context.Context interface.
-//  https://golang.org/pkg/context/#Context
-type Context struct {
-	context.Context
-	// The UI element tied to the context.
-	Src UI
-	// The JavaScript value of the element tied to the context. This is a
-	// shorthand for:
-	//  ctx.Src.JSValue()
-	JSSrc Value
-}

element.go CHANGED Viewed

@@ -278,14 +278,14 @@ func (e *elem) updateAttrs(attrs map[string]string) {
 	}
 }
-func (e *elem) setAttr(k string, v interface{}) {
+func (e *elem) setAttr(k string, v string) {
 	if e.attrs == nil {
 		e.attrs = make(map[string]string)
 	}
 	switch k {
 	case "style", "allow":
-		s := e.attrs[k] + toString(v) + ";"
+		s := e.attrs[k] + v + ";"
 		e.attrs[k] = s
 		return
@@ -294,21 +294,17 @@ func (e *elem) setAttr(k string, v interface{}) {
 		if s != "" {
 			s += " "
 		}
-		s += toString(v)
+		s += v
 		e.attrs[k] = s
 		return
 	}
-	switch v := v.(type) {
+	if v == "false" {
-	case bool:
-		if !v {
-			delete(e.attrs, k)
+		delete(e.attrs, k)
-			return
+		return
-		}
+	} else if v == "true" {
 		e.attrs[k] = ""
-	default:
+	} else {
-		e.attrs[k] = toString(v)
+		e.attrs[k] = v
 	}
 }
@@ -454,3 +450,115 @@ func (e *elem) OnInput(h EventHandler) *elem {
 	e.setEventHandler("input", h)
 	return e
 }
+type text struct {
+	jsvalue    Value
+	parentElem UI
+	value      string
+}
+// Text creates a simple text element.
+func Text(v string) UI {
+	return &text{value: v}
+}
+func (t *text) Kind() Kind {
+	return SimpleText
+}
+func (t *text) JSValue() Value {
+	return t.jsvalue
+}
+func (t *text) Mounted() bool {
+	return t.jsvalue != nil
+}
+func (t *text) name() string {
+	return "text"
+}
+func (t *text) self() UI {
+	return t
+}
+func (t *text) setSelf(n UI) {
+}
+func (t *text) context() context.Context {
+	return context.TODO()
+}
+func (t *text) attributes() map[string]string {
+	return nil
+}
+func (t *text) eventHandlers() map[string]eventHandler {
+	return nil
+}
+func (t *text) parent() UI {
+	return t.parentElem
+}
+func (t *text) setParent(p UI) {
+	t.parentElem = p
+}
+func (t *text) children() []UI {
+	return nil
+}
+func (t *text) mount() error {
+	if t.Mounted() {
+		return errors.New("mounting ui element failed").
+			Tag("reason", "already mounted").
+			Tag("kind", t.Kind()).
+			Tag("name", t.name()).
+			Tag("value", t.value)
+	}
+	t.jsvalue = Window().
+		Get("document").
+		Call("createTextNode", t.value)
+	return nil
+}
+func (t *text) dismount() {
+	t.jsvalue = nil
+}
+func (t *text) update(n UI) error {
+	if !t.Mounted() {
+		return nil
+	}
+	o, isText := n.(*text)
+	if !isText {
+		return errors.New("updating ui element failed").
+			Tag("replace", true).
+			Tag("reason", "different element types").
+			Tag("current-kind", t.Kind()).
+			Tag("current-name", t.name()).
+			Tag("updated-kind", n.Kind()).
+			Tag("updated-name", n.name())
+	}
+	if t.value != o.value {
+		t.value = o.value
+		t.jsvalue.Set("nodeValue", o.value)
+	}
+	return nil
+}
+func (t *text) Html(w io.Writer) {
+	t.HtmlWithIndent(w, 0)
+}
+func (t *text) HtmlWithIndent(w io.Writer, indent int) {
+	writeIndent(w, indent)
+	// html.EscapeString(
+	w.Write(stob(t.value))
+}

element_test.go CHANGED Viewed

@@ -359,3 +359,103 @@ package app
 // // 		},
 // // 	})
 // // }
+// func TestTextMountDismout(t *testing.T) {
+// 	testMountDismount(t, []mountTest{
+// 		{
+// 			scenario: "text",
+// 			node:     Text("hello"),
+// 		},
+// 	})
+// }
+// func TestTextUpdate(t *testing.T) {
+// 	testUpdate(t, []updateTest{
+// 		{
+// 			scenario:   "text element returns replace error when updated with a non text-element",
+// 			a:          Text("hello"),
+// 			b:          Div(),
+// 			replaceErr: true,
+// 		},
+// 		{
+// 			scenario: "text element is updated",
+// 			a:        Text("hello"),
+// 			b:        Text("world"),
+// 			matches: []TestUIDescriptor{
+// 				{
+// 					Expected: Text("world"),
+// 				},
+// 			},
+// 		},
+// 		{
+// 			scenario: "text is replaced by a html elem",
+// 			a: Div().Body(
+// 				Text("hello"),
+// 			),
+// 			b: Div().Body(
+// 				H2().Text("hello"),
+// 			),
+// 			matches: []TestUIDescriptor{
+// 				{
+// 					Path:     TestPath(),
+// 					Expected: Div(),
+// 				},
+// 				{
+// 					Path:     TestPath(0),
+// 					Expected: H2(),
+// 				},
+// 				{
+// 					Path:     TestPath(0, 0),
+// 					Expected: Text("hello"),
+// 				},
+// 			},
+// 		},
+// 		{
+// 			scenario: "text is replaced by a component",
+// 			a: Div().Body(
+// 				Text("hello"),
+// 			),
+// 			// b: Div().Body(
+// 			// 	&hello{},
+// 			// ),
+// 			matches: []TestUIDescriptor{
+// 				{
+// 					Path:     TestPath(),
+// 					Expected: Div(),
+// 				},
+// 				// {
+// 				// 	Path:     TestPath(0),
+// 				// 	Expected: &hello{},
+// 				// },
+// 				{
+// 					Path:     TestPath(0, 0, 0),
+// 					Expected: H1(),
+// 				},
+// 				{
+// 					Path:     TestPath(0, 0, 0, 0),
+// 					Expected: Text("hello, "),
+// 				},
+// 			},
+// 		},
+// 		{
+// 			scenario: "text is replaced by a raw html element",
+// 			a: Div().Body(
+// 				Text("hello"),
+// 			),
+// 			b: Div().Body(
+// 				Raw("<svg></svg>"),
+// 			),
+// 			matches: []TestUIDescriptor{
+// 				{
+// 					Path:     TestPath(),
+// 					Expected: Div(),
+// 				},
+// 				{
+// 					Path:     TestPath(0),
+// 					Expected: Raw("<svg></svg>"),
+// 				},
+// 			},
+// 		},
+// 	})
+// }

html.go CHANGED Viewed

@@ -58,11 +58,6 @@ func Script(str string) *elem {
 // 	return e
 // }
-// func (e *elem) OnClick(h EventHandler) *elem {
-// 	e.setEventHandler("click", h)
-// 	return e
-// }
 // func (e *elem) OnFocus(h EventHandler) *elem {
 // 	e.setEventHandler("focus", h)
 // 	return e

js_nowasm.go CHANGED Viewed

@@ -4,109 +4,100 @@ package app
 import (
 	"net/url"
-	"runtime"
-	"github.com/pyros2097/wapp/errors"
-)
-var (
-	errNoWasm = errors.New("unsupported instruction").
-		Tag("required-architecture", "wasm").
-		Tag("current-architecture", runtime.GOARCH)
 )
 type value struct{}
 func (v value) Bool() bool {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) Call(m string, args ...interface{}) Value {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) Float() float64 {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) Get(p string) Value {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) Index(i int) Value {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) InstanceOf(t Value) bool {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) Int() int {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) Invoke(args ...interface{}) Value {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) IsNaN() bool {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) IsNull() bool {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) IsUndefined() bool {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) JSValue() Value {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) Length() int {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) New(args ...interface{}) Value {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) Set(p string, x interface{}) {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) SetIndex(i int, x interface{}) {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) String() string {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) Truthy() bool {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (v value) Type() Type {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func null() Value {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func undefined() Value {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func valueOf(x interface{}) Value {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func funcOf(fn func(this Value, args []Value) interface{}) Func {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 type browserWindow struct {
@@ -114,37 +105,37 @@ type browserWindow struct {
 }
 func (w browserWindow) URL() *url.URL {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (w browserWindow) Size() (width, height int) {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (w browserWindow) CursorPosition() (x, y int) {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (w browserWindow) setCursorPosition(x, y int) {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (w *browserWindow) GetElementByID(id string) Value {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (w *browserWindow) ScrollToID(id string) {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func (w *browserWindow) AddEventListener(event string, h EventHandler) func() {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func copyBytesToGo(dst []byte, src Value) int {
-	panic(errNoWasm)
+	panic("wasm required")
 }
 func copyBytesToJS(dst Value, src []byte) int {
-	panic(errNoWasm)
+	panic("wasm required")
 }

makefile CHANGED Viewed

@@ -11,34 +11,3 @@ test:
 	go test -race ./...
 	@echo "\033[94m\n• Running go wasm tests\033[00m"
 	GOARCH=wasm GOOS=js go test ./pkg/app
-release: test
-ifdef VERSION
-	@echo "\033[94m\n• Releasing ${VERSION}\033[00m"
-	@git tag ${VERSION}
-	@git push origin ${VERSION}
-else
-	@echo "\033[94m\n• Releasing version\033[00m"
-	@echo "\033[91mVERSION is not defided\033[00m"
-	@echo "~> make VERSION=\033[90mv6.0.0\033[00m release"
-endif
-build:
-	@echo "\033[94m• Building go-app documentation PWA\033[00m"
-	@GOARCH=wasm GOOS=js go build -o docs/web/app.wasm ./docs/src
-	@echo "\033[94m• Building go-app documentation\033[00m"
-	@go build -o docs/documentation ./docs/src
-run: build
-	@echo "\033[94m• Running go-app documentation server\033[00m"
-	@cd docs && ./documentation local
-github: build
-	@echo "\033[94m• Generating GitHub Pages\033[00m"
-	@cd docs && ./documentation github
-clean:
-	@go clean -v ./...
-	-@rm docs/documentation

range_test.go DELETED Viewed

@@ -1,91 +0,0 @@
-package app
-// import "testing"
-// func TestRange(t *testing.T) {
-// 	testUpdate(t, []updateTest{
-// 		{
-// 			scenario: "range slice is updated",
-// 			a: Div().Body(
-// 				Range([]string{"hello", "world"}).Slice(func(i int) UI {
-// 					src := []string{"hello", "world"}
-// 					return Text(src[i])
-// 				}),
-// 			),
-// 			b: Div().Body(
-// 				Range([]string{"hello", "maxoo"}).Slice(func(i int) UI {
-// 					src := []string{"hello", "maxoo"}
-// 					return Text(src[i])
-// 				}),
-// 			),
-// 			matches: []TestUIDescriptor{
-// 				{
-// 					Path:     TestPath(),
-// 					Expected: Div(),
-// 				},
-// 				{
-// 					Path:     TestPath(0),
-// 					Expected: Text("hello"),
-// 				},
-// 				{
-// 					Path:     TestPath(1),
-// 					Expected: Text("maxoo"),
-// 				},
-// 			},
-// 		},
-// 		{
-// 			scenario: "range slice is updated to be empty",
-// 			a: Div().Body(
-// 				Range([]string{"hello", "world"}).Slice(func(i int) UI {
-// 					src := []string{"hello", "world"}
-// 					return Text(src[i])
-// 				}),
-// 			),
-// 			b: Div().Body(
-// 				Range([]string{}).Slice(func(i int) UI {
-// 					src := []string{"hello", "maxoo"}
-// 					return Text(src[i])
-// 				}),
-// 			),
-// 			matches: []TestUIDescriptor{
-// 				{
-// 					Path:     TestPath(),
-// 					Expected: Div(),
-// 				},
-// 				{
-// 					Path:     TestPath(0),
-// 					Expected: nil,
-// 				},
-// 				{
-// 					Path:     TestPath(1),
-// 					Expected: nil,
-// 				},
-// 			},
-// 		},
-// 		{
-// 			scenario: "range map is updated",
-// 			a: Div().Body(
-// 				Range(map[string]string{"key": "value"}).Map(func(k string) UI {
-// 					src := map[string]string{"key": "value"}
-// 					return Text(src[k])
-// 				}),
-// 			),
-// 			b: Div().Body(
-// 				Range(map[string]string{"key": "value"}).Map(func(k string) UI {
-// 					src := map[string]string{"key": "maxoo"}
-// 					return Text(src[k])
-// 				}),
-// 			),
-// 			matches: []TestUIDescriptor{
-// 				{
-// 					Path:     TestPath(),
-// 					Expected: Div(),
-// 				},
-// 				{
-// 					Path:     TestPath(0),
-// 					Expected: Text("maxoo"),
-// 				},
-// 			},
-// 		},
-// 	})
-// }

resource.go DELETED Viewed

@@ -1,151 +0,0 @@
-// +build !wasm
-package app
-import (
-	"net/http"
-	"strings"
-)
-// ResourceProvider is the interface that describes a provider for resources.
-//
-// App resources are the mandatory resources required to run a PWA. They are
-// generated by the Handler and are accessible from the root path. Eg:
-//  "/app-worker.js"
-//  "/manifest.json"
-//  "/wasm_exec.js"
-//
-// Static resources are the resources used by the PWA such as the web assembly
-// binary, styles, scripts, or images. They can be located on a localhost or a
-// remote bucket. In order to avoid confusion with PWA required resources,
-// static resources URL paths are always prefixed by "/web". Eg:
-//  "/web/app.wasm"
-//  "/web/main.css"
-//  "/web/background.jpg"
-//
-// If the resource provider is an http.Handler, the handler is used to serve
-// static resources requests.
-type ResourceProvider interface {
-	// The path to the root directory where app resources are accessible.
-	AppResources() string
-	// The path or URL where the web directory that contains static resources is
-	// located.
-	StaticResources() string
-	// The URL of the app.wasm file. This must match the pattern:
-	//  StaticResources/web/WASM_FILE.
-	AppWASM() string
-	// The URL of the robots.txt file. This must match the pattern:
-	//  StaticResources/web/robots.txt.
-	RobotsTxt() string
-	// The URL of the ads.txt file. This must match the pattern:
-	//  StaticResources/web/ads.txt.
-	AdsTxt() string
-}
-// LocalDir returns a resource provider that serves static resources from a
-// local directory located at the given path.
-func LocalDir(path string) ResourceProvider {
-	return localDir{
-		Handler: http.StripPrefix("/web/", http.FileServer(http.Dir(path))),
-		path:    path,
-	}
-}
-type localDir struct {
-	http.Handler
-	path string
-}
-func (d localDir) AppResources() string {
-	return ""
-}
-func (d localDir) StaticResources() string {
-	return ""
-}
-func (d localDir) AppWASM() string {
-	return "/web/app.wasm"
-}
-func (d localDir) RobotsTxt() string {
-	return "/web/robots.txt"
-}
-func (d localDir) AdsTxt() string {
-	return "/web/ads.txt"
-}
-// RemoteBucket returns a resource provider that provides resources from a
-// remote bucket such as Amazon S3 or Google Cloud Storage.
-func RemoteBucket(url string) ResourceProvider {
-	url = strings.TrimSuffix(url, "/")
-	url = strings.TrimSuffix(url, "/web")
-	return remoteBucket{
-		url: url,
-	}
-}
-type remoteBucket struct {
-	url string
-}
-func (b remoteBucket) AppResources() string {
-	return ""
-}
-func (b remoteBucket) StaticResources() string {
-	return b.url
-}
-func (b remoteBucket) AppWASM() string {
-	return b.StaticResources() + "/web/app.wasm"
-}
-func (b remoteBucket) RobotsTxt() string {
-	return b.StaticResources() + "/web/robots.txt"
-}
-func (b remoteBucket) AdsTxt() string {
-	return b.StaticResources() + "/web/ads.txt"
-}
-// GitHubPages returns a resource provider that provides resources from GitHub
-// pages. This provider must only be used to generate static websites with the
-// GenerateStaticWebsite function.
-func GitHubPages(repoName string) ResourceProvider {
-	if !strings.HasPrefix(repoName, "/") {
-		repoName = "/" + repoName
-	}
-	return gitHubPages{repo: repoName}
-}
-type gitHubPages struct {
-	repo string
-}
-func (g gitHubPages) AppResources() string {
-	return g.repo
-}
-func (g gitHubPages) StaticResources() string {
-	return g.repo
-}
-func (g gitHubPages) AppWASM() string {
-	return g.StaticResources() + "/web/app.wasm"
-}
-func (g gitHubPages) RobotsTxt() string {
-	return g.StaticResources() + "/web/robots.txt"
-}
-func (g gitHubPages) AdsTxt() string {
-	return g.StaticResources() + "/web/ads.txt"
-}

resource_test.go DELETED Viewed

@@ -1,85 +0,0 @@
-// +build !wasm
-package app
-import (
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"github.com/stretchr/testify/require"
-)
-func TestLocalDir(t *testing.T) {
-	testSkipWasm(t)
-	utests := []struct {
-		scenario string
-		provider ResourceProvider
-	}{
-		{
-			scenario: "from web directory",
-			provider: LocalDir("web"),
-		},
-	}
-	for _, u := range utests {
-		t.Run(u.scenario, func(t *testing.T) {
-			h := u.provider.(localDir)
-			require.Empty(t, h.StaticResources())
-			require.Equal(t, "/web/app.wasm", h.AppWASM())
-			require.Equal(t, "/web/robots.txt", h.RobotsTxt())
-			require.Equal(t, "/web/ads.txt", h.AdsTxt())
-			close := testCreateDir(t, "web")
-			defer close()
-			resources := []string{
-				"/web/test",
-				h.AppWASM(),
-				h.RobotsTxt(),
-			}
-			for _, r := range resources {
-				t.Run(r, func(t *testing.T) {
-					path := strings.Replace(r, "/web", h.path, 1)
-					err := ioutil.WriteFile(path, stob("hello"), 0666)
-					require.NoError(t, err)
-					req := httptest.NewRequest(http.MethodGet, r, nil)
-					res := httptest.NewRecorder()
-					h.ServeHTTP(res, req)
-					require.Equal(t, "hello", res.Body.String())
-				})
-			}
-		})
-	}
-}
-func TestRemoteBucket(t *testing.T) {
-	utests := []struct {
-		scenario string
-		provider ResourceProvider
-	}{
-		{
-			scenario: "remote bucket",
-			provider: RemoteBucket("https://storage.googleapis.com/test"),
-		},
-		{
-			scenario: "remote bucket with web suffix",
-			provider: RemoteBucket("https://storage.googleapis.com/test/web/"),
-		},
-	}
-	for _, u := range utests {
-		t.Run(u.scenario, func(t *testing.T) {
-			require.Equal(t, "https://storage.googleapis.com/test", u.provider.StaticResources())
-			require.Equal(t, "https://storage.googleapis.com/test/web/app.wasm", u.provider.AppWASM())
-			require.Equal(t, "https://storage.googleapis.com/test/web/robots.txt", u.provider.RobotsTxt())
-			require.Equal(t, "https://storage.googleapis.com/test/web/ads.txt", u.provider.AdsTxt())
-		})
-	}
-}

range.go → selectors.go RENAMED Viewed

@@ -149,3 +149,109 @@ func (r rangeLoop) update(UI) error {
 func (r rangeLoop) onNav(*url.URL) {
 }
+// Condition represents a control structure that displays nodes depending on a
+// given expression.
+type Condition interface {
+	UI
+	// ElseIf sets the condition with the given nodes if previous expressions
+	// were not met and given expression is true.
+	ElseIf(expr bool, elems ...UI) Condition
+	// Else sets the condition with the given UI elements if previous
+	// expressions were not met.
+	Else(elems ...UI) Condition
+}
+// If returns a condition that filters the given elements according to the given
+// expression.
+func If(expr bool, elems ...UI) Condition {
+	if !expr {
+		elems = nil
+	}
+	return condition{
+		body:      FilterUIElems(elems...),
+		satisfied: expr,
+	}
+}
+type condition struct {
+	body      []UI
+	satisfied bool
+}
+func (c condition) ElseIf(expr bool, elems ...UI) Condition {
+	if c.satisfied {
+		return c
+	}
+	if expr {
+		c.body = FilterUIElems(elems...)
+		c.satisfied = expr
+	}
+	return c
+}
+func (c condition) Else(elems ...UI) Condition {
+	return c.ElseIf(true, elems...)
+}
+func (c condition) Kind() Kind {
+	return Selector
+}
+func (c condition) JSValue() Value {
+	return nil
+}
+func (c condition) Mounted() bool {
+	return false
+}
+func (c condition) name() string {
+	return "if.else"
+}
+func (c condition) self() UI {
+	return c
+}
+func (c condition) setSelf(UI) {
+}
+func (c condition) context() context.Context {
+	return nil
+}
+func (c condition) attributes() map[string]string {
+	return nil
+}
+func (c condition) eventHandlers() map[string]eventHandler {
+	return nil
+}
+func (c condition) parent() UI {
+	return nil
+}
+func (c condition) setParent(UI) {
+}
+func (c condition) children() []UI {
+	return c.body
+}
+func (c condition) mount() error {
+	panic("can't mout condition")
+}
+func (c condition) dismount() {
+}
+func (c condition) update(UI) error {
+	panic("condition cannot be updated")
+}

condition_test.go → selectors_test.go RENAMED Viewed

@@ -1,5 +1,95 @@
 package app
+// import "testing"
+// func TestRange(t *testing.T) {
+// 	testUpdate(t, []updateTest{
+// 		{
+// 			scenario: "range slice is updated",
+// 			a: Div().Body(
+// 				Range([]string{"hello", "world"}).Slice(func(i int) UI {
+// 					src := []string{"hello", "world"}
+// 					return Text(src[i])
+// 				}),
+// 			),
+// 			b: Div().Body(
+// 				Range([]string{"hello", "maxoo"}).Slice(func(i int) UI {
+// 					src := []string{"hello", "maxoo"}
+// 					return Text(src[i])
+// 				}),
+// 			),
+// 			matches: []TestUIDescriptor{
+// 				{
+// 					Path:     TestPath(),
+// 					Expected: Div(),
+// 				},
+// 				{
+// 					Path:     TestPath(0),
+// 					Expected: Text("hello"),
+// 				},
+// 				{
+// 					Path:     TestPath(1),
+// 					Expected: Text("maxoo"),
+// 				},
+// 			},
+// 		},
+// 		{
+// 			scenario: "range slice is updated to be empty",
+// 			a: Div().Body(
+// 				Range([]string{"hello", "world"}).Slice(func(i int) UI {
+// 					src := []string{"hello", "world"}
+// 					return Text(src[i])
+// 				}),
+// 			),
+// 			b: Div().Body(
+// 				Range([]string{}).Slice(func(i int) UI {
+// 					src := []string{"hello", "maxoo"}
+// 					return Text(src[i])
+// 				}),
+// 			),
+// 			matches: []TestUIDescriptor{
+// 				{
+// 					Path:     TestPath(),
+// 					Expected: Div(),
+// 				},
+// 				{
+// 					Path:     TestPath(0),
+// 					Expected: nil,
+// 				},
+// 				{
+// 					Path:     TestPath(1),
+// 					Expected: nil,
+// 				},
+// 			},
+// 		},
+// 		{
+// 			scenario: "range map is updated",
+// 			a: Div().Body(
+// 				Range(map[string]string{"key": "value"}).Map(func(k string) UI {
+// 					src := map[string]string{"key": "value"}
+// 					return Text(src[k])
+// 				}),
+// 			),
+// 			b: Div().Body(
+// 				Range(map[string]string{"key": "value"}).Map(func(k string) UI {
+// 					src := map[string]string{"key": "maxoo"}
+// 					return Text(src[k])
+// 				}),
+// 			),
+// 			matches: []TestUIDescriptor{
+// 				{
+// 					Path:     TestPath(),
+// 					Expected: Div(),
+// 				},
+// 				{
+// 					Path:     TestPath(0),
+// 					Expected: Text("maxoo"),
+// 				},
+// 			},
+// 		},
+// 	})
+// }
 // func TestCondition(t *testing.T) {
 // 	testUpdate(t, []updateTest{
 // 		{

strings.go DELETED Viewed

@@ -1,45 +0,0 @@
-package app
-import (
-	"fmt"
-	"io"
-	"strconv"
-	"unsafe"
-)
-func toString(v interface{}) string {
-	switch v := v.(type) {
-	case string:
-		return v
-	case []byte:
-		return btos(v)
-	case int:
-		return strconv.Itoa(v)
-	case float64:
-		return strconv.FormatFloat(v, 'f', 4, 64)
-	default:
-		return fmt.Sprint(v)
-	}
-}
-func writeIndent(w io.Writer, indent int) {
-	for i := 0; i < indent*4; i++ {
-		w.Write(stob(" "))
-	}
-}
-func ln() []byte {
-	return stob("\n")
-}
-func btos(b []byte) string {
-	return *(*string)(unsafe.Pointer(&b))
-}
-func stob(s string) []byte {
-	return *(*[]byte)(unsafe.Pointer(&s))
-}

text.go DELETED Viewed

@@ -1,120 +0,0 @@
-package app
-import (
-	"context"
-	"io"
-	"github.com/pyros2097/wapp/errors"
-)
-// Text creates a simple text element.
-func Text(v interface{}) UI {
-	return &text{value: toString(v)}
-}
-type text struct {
-	jsvalue    Value
-	parentElem UI
-	value      string
-}
-func (t *text) Kind() Kind {
-	return SimpleText
-}
-func (t *text) JSValue() Value {
-	return t.jsvalue
-}
-func (t *text) Mounted() bool {
-	return t.jsvalue != nil
-}
-func (t *text) name() string {
-	return "text"
-}
-func (t *text) self() UI {
-	return t
-}
-func (t *text) setSelf(n UI) {
-}
-func (t *text) context() context.Context {
-	return context.TODO()
-}
-func (t *text) attributes() map[string]string {
-	return nil
-}
-func (t *text) eventHandlers() map[string]eventHandler {
-	return nil
-}
-func (t *text) parent() UI {
-	return t.parentElem
-}
-func (t *text) setParent(p UI) {
-	t.parentElem = p
-}
-func (t *text) children() []UI {
-	return nil
-}
-func (t *text) mount() error {
-	if t.Mounted() {
-		return errors.New("mounting ui element failed").
-			Tag("reason", "already mounted").
-			Tag("kind", t.Kind()).
-			Tag("name", t.name()).
-			Tag("value", t.value)
-	}
-	t.jsvalue = Window().
-		Get("document").
-		Call("createTextNode", t.value)
-	return nil
-}
-func (t *text) dismount() {
-	t.jsvalue = nil
-}
-func (t *text) update(n UI) error {
-	if !t.Mounted() {
-		return nil
-	}
-	o, isText := n.(*text)
-	if !isText {
-		return errors.New("updating ui element failed").
-			Tag("replace", true).
-			Tag("reason", "different element types").
-			Tag("current-kind", t.Kind()).
-			Tag("current-name", t.name()).
-			Tag("updated-kind", n.Kind()).
-			Tag("updated-name", n.name())
-	}
-	if t.value != o.value {
-		t.value = o.value
-		t.jsvalue.Set("nodeValue", o.value)
-	}
-	return nil
-}
-func (t *text) Html(w io.Writer) {
-	t.HtmlWithIndent(w, 0)
-}
-func (t *text) HtmlWithIndent(w io.Writer, indent int) {
-	writeIndent(w, indent)
-	// html.EscapeString(
-	w.Write(stob(t.value))
-}

text_test.go DELETED Viewed

@@ -1,101 +0,0 @@
-package app
-// func TestTextMountDismout(t *testing.T) {
-// 	testMountDismount(t, []mountTest{
-// 		{
-// 			scenario: "text",
-// 			node:     Text("hello"),
-// 		},
-// 	})
-// }
-// func TestTextUpdate(t *testing.T) {
-// 	testUpdate(t, []updateTest{
-// 		{
-// 			scenario:   "text element returns replace error when updated with a non text-element",
-// 			a:          Text("hello"),
-// 			b:          Div(),
-// 			replaceErr: true,
-// 		},
-// 		{
-// 			scenario: "text element is updated",
-// 			a:        Text("hello"),
-// 			b:        Text("world"),
-// 			matches: []TestUIDescriptor{
-// 				{
-// 					Expected: Text("world"),
-// 				},
-// 			},
-// 		},
-// 		{
-// 			scenario: "text is replaced by a html elem",
-// 			a: Div().Body(
-// 				Text("hello"),
-// 			),
-// 			b: Div().Body(
-// 				H2().Text("hello"),
-// 			),
-// 			matches: []TestUIDescriptor{
-// 				{
-// 					Path:     TestPath(),
-// 					Expected: Div(),
-// 				},
-// 				{
-// 					Path:     TestPath(0),
-// 					Expected: H2(),
-// 				},
-// 				{
-// 					Path:     TestPath(0, 0),
-// 					Expected: Text("hello"),
-// 				},
-// 			},
-// 		},
-// 		{
-// 			scenario: "text is replaced by a component",
-// 			a: Div().Body(
-// 				Text("hello"),
-// 			),
-// 			// b: Div().Body(
-// 			// 	&hello{},
-// 			// ),
-// 			matches: []TestUIDescriptor{
-// 				{
-// 					Path:     TestPath(),
-// 					Expected: Div(),
-// 				},
-// 				// {
-// 				// 	Path:     TestPath(0),
-// 				// 	Expected: &hello{},
-// 				// },
-// 				{
-// 					Path:     TestPath(0, 0, 0),
-// 					Expected: H1(),
-// 				},
-// 				{
-// 					Path:     TestPath(0, 0, 0, 0),
-// 					Expected: Text("hello, "),
-// 				},
-// 			},
-// 		},
-// 		{
-// 			scenario: "text is replaced by a raw html element",
-// 			a: Div().Body(
-// 				Text("hello"),
-// 			),
-// 			b: Div().Body(
-// 				Raw("<svg></svg>"),
-// 			),
-// 			matches: []TestUIDescriptor{
-// 				{
-// 					Path:     TestPath(),
-// 					Expected: Div(),
-// 				},
-// 				{
-// 					Path:     TestPath(0),
-// 					Expected: Raw("<svg></svg>"),
-// 				},
-// 			},
-// 		},
-// 	})
-// }

utils.go ADDED Viewed

@@ -0,0 +1,56 @@
+package app
+import (
+	"context"
+	"io"
+	"unsafe"
+)
+var (
+	dispatch Dispatcher = Dispatch
+	uiChan              = make(chan func(), 512)
+)
+// Context represents a context that is tied to a UI element. It is canceled
+// when the element is dismounted.
+//
+// It implements the context.Context interface.
+//  https://golang.org/pkg/context/#Context
+type Context struct {
+	context.Context
+	// The UI element tied to the context.
+	Src UI
+	// The JavaScript value of the element tied to the context. This is a
+	// shorthand for:
+	//  ctx.Src.JSValue()
+	JSSrc Value
+}
+// Dispatcher is a function that executes the given function on the goroutine
+// dedicated to UI.
+type Dispatcher func(func())
+// Dispatch executes the given function on the UI goroutine.
+func Dispatch(f func()) {
+	uiChan <- f
+}
+func writeIndent(w io.Writer, indent int) {
+	for i := 0; i < indent*4; i++ {
+		w.Write(stob(" "))
+	}
+}
+func ln() []byte {
+	return stob("\n")
+}
+func btos(b []byte) string {
+	return *(*string)(unsafe.Pointer(&b))
+}
+func stob(s string) []byte {
+	return *(*[]byte)(unsafe.Pointer(&s))
+}

~repos /gromer

git clone https://pyrossh.dev/repos/gromer.git

gromer is a framework and cli to build multipage web apps in golang using htmx and alpinejs.