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.

2caf3db0 — Peter John

improve more

Files changed (18) hide show

LICENSE +0 -43
attributes.go +0 -132
attributes_test.go +0 -48
element.go +0 -139
element_test.go +0 -461
example/assets/icon.png +0 -0
example/assets/icon2.png +0 -0
example/components/header.go +1 -1
example/main.go +31 -31
example/makefile +12 -16
example/readme.md +0 -11
example/samconfig.toml +0 -10
example/template.yml +11 -58
go.mod +2 -1
go.sum +18 -0
html.go +219 -6
readme.md +40 -105
router.go +0 -968

LICENSE DELETED Viewed

@@ -1,43 +0,0 @@
-MIT License
-Copyright (c) 2016 Maxence Charriere
-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.
-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.

attributes.go DELETED Viewed

@@ -1,132 +0,0 @@
-package app
-import (
-	"strconv"
-)
-type Attribute struct {
-	Key   string
-	Value string
-}
-func ID(v string) Attribute {
-	return Attribute{"id", v}
-}
-func Style(v string) Attribute {
-	return Attribute{"style", v}
-}
-func Accept(v string) Attribute {
-	return Attribute{"accept", v}
-}
-func AutoComplete(v bool) Attribute {
-	return Attribute{"autocomplete", strconv.FormatBool(v)}
-}
-func Checked(v bool) Attribute {
-	return Attribute{"checked", strconv.FormatBool(v)}
-}
-func Disabled(v bool) Attribute {
-	return Attribute{"disabled", strconv.FormatBool(v)}
-}
-func Name(v string) Attribute {
-	return Attribute{"name", v}
-}
-func Type(v string) Attribute {
-	return Attribute{"type", v}
-}
-func Value(v string) Attribute {
-	return Attribute{"value", v}
-}
-func Placeholder(v string) Attribute {
-	return Attribute{"placeholder", v}
-}
-func Src(v string) Attribute {
-	return Attribute{"src", v}
-}
-func Defer() Attribute {
-	return Attribute{"defer", "true"}
-}
-func ViewBox(v string) Attribute {
-	return Attribute{"viewBox", v}
-}
-func X(v string) Attribute {
-	return Attribute{"x", v}
-}
-func Y(v string) Attribute {
-	return Attribute{"y", v}
-}
-func Href(v string) Attribute {
-	return Attribute{"href", v}
-}
-func Target(v string) Attribute {
-	return Attribute{"target", v}
-}
-func Rel(v string) Attribute {
-	return Attribute{"rel", v}
-}
-type CssAttribute struct {
-	classes string
-}
-func Css(d string) CssAttribute {
-	return CssAttribute{classes: d}
-}
-func CssIf(v bool, d string) CssAttribute {
-	if v {
-		return CssAttribute{classes: d}
-	}
-	return CssAttribute{}
-}
-func XData(v string) Attribute {
-	return Attribute{"x-data", v}
-}
-func XText(v string) Attribute {
-	return Attribute{"x-text", v}
-}
-func MergeAttributes(parent *Element, uis ...interface{}) *Element {
-	elems := []*Element{}
-	for _, v := range uis {
-		switch c := v.(type) {
-		case Attribute:
-			parent.setAttr(c.Key, c.Value)
-		case CssAttribute:
-			if vv, ok := parent.attrs["classes"]; ok {
-				parent.setAttr("class", vv+" "+c.classes)
-			} else {
-				parent.setAttr("class", c.classes)
-			}
-		case *Element:
-			elems = append(elems, c)
-		case nil:
-			// dont need to add nil items
-		default:
-			// fmt.Printf("%v\n", v)
-			panic("unknown type in render")
-		}
-	}
-	if !parent.selfClosing {
-		parent.body = elems
-	}
-	return parent
-}

attributes_test.go DELETED Viewed

@@ -1,48 +0,0 @@
-package app
-import (
-	"bytes"
-	"strconv"
-	"testing"
-	"github.com/stretchr/testify/assert"
-)
-func Counter(c *RenderContext) UI {
-	count, _ := c.UseInt(0)
-	return Col(
-		Row(Css("yellow"),
-			Text("Counter"),
-		),
-		Row(
-			Div(
-				Text("-"),
-			),
-			Div(
-				Text(strconv.Itoa(count())),
-			),
-			Div(
-				Text("+"),
-			),
-		),
-	)
-}
-func HomeRoute(c *RenderContext) UI {
-	return Div(
-		Div(),
-		Counter(c),
-	)
-}
-func TestCreatePage(t *testing.T) {
-	page := bytes.NewBuffer(nil)
-	page.WriteString("<!DOCTYPE html>\n")
-	Html(
-		Head(
-			Title("Title"),
-		),
-		Body(HomeRoute(NewRenderContext())),
-	).Html(page)
-	assert.Equal(t, "<!DOCTYPE html>\n<html>\n    <head>\n        <meta charset=\"UTF-8\">\n        <meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\">\n        <meta http-equiv=\"encoding\" content=\"utf-8\">\n        <title>\n            Title\n        </title>\n    </head>\n    <body>\n        <div>\n            <div></div>\n            <div class=\"flex flex-col justify-center items-center\">\n                <div class=\"flex flex-row justify-center items-center yellow\">\n                    Counter\n                </div>\n                <div class=\"flex flex-row justify-center items-center\">\n                    <div>\n                        -\n                    </div>\n                    <div>\n                        0\n                    </div>\n                    <div>\n                        +\n                    </div>\n                </div>\n            </div>\n        </div>\n    </body>\n</html>", page.String())
-}

element.go DELETED Viewed

@@ -1,139 +0,0 @@
-package app
-import (
-	"io"
-	"unsafe"
-)
-type Element struct {
-	tag         string
-	attrs       map[string]string
-	body        []*Element
-	selfClosing bool
-	text        string
-}
-func NewElement(tag string, selfClosing bool, uis ...interface{}) *Element {
-	return MergeAttributes(&Element{tag: tag, selfClosing: selfClosing}, uis...)
-}
-func (e *Element) updateAttrs(attrs map[string]string) {
-	for k := range e.attrs {
-		if _, exists := attrs[k]; !exists {
-			e.delAttr(k)
-		}
-	}
-	if e.attrs == nil && len(attrs) != 0 {
-		e.attrs = make(map[string]string, len(attrs))
-	}
-	for k, v := range attrs {
-		if curval, exists := e.attrs[k]; !exists || curval != v {
-			e.attrs[k] = v
-		}
-	}
-}
-func (e *Element) setAttr(k string, v string) {
-	if e.attrs == nil {
-		e.attrs = make(map[string]string)
-	}
-	switch k {
-	case "style", "allow":
-		s := e.attrs[k] + v + ";"
-		e.attrs[k] = s
-		return
-	case "class":
-		s := e.attrs[k]
-		if s != "" {
-			s += " "
-		}
-		s += v
-		e.attrs[k] = s
-		return
-	}
-	if v == "false" {
-		delete(e.attrs, k)
-		return
-	} else if v == "true" {
-		e.attrs[k] = ""
-	} else {
-		e.attrs[k] = v
-	}
-}
-func (e *Element) delAttr(k string) {
-	delete(e.attrs, k)
-}
-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))
-}
-func (e *Element) Html(w io.Writer) {
-	e.HtmlWithIndent(w, 0)
-}
-func (e *Element) HtmlWithIndent(w io.Writer, indent int) {
-	writeIndent(w, indent)
-	if e.tag == "html" {
-		w.Write(stob("<!DOCTYPE html>\n"))
-	}
-	if e.tag == "text" {
-		writeIndent(w, indent)
-		w.Write(stob(e.text))
-		return
-	}
-	w.Write(stob("<"))
-	w.Write(stob(e.tag))
-	for k, v := range e.attrs {
-		w.Write(stob(" "))
-		w.Write(stob(k))
-		if v != "" {
-			w.Write(stob(`="`))
-			w.Write(stob(v))
-			w.Write(stob(`"`))
-		}
-	}
-	w.Write(stob(">"))
-	if e.selfClosing {
-		return
-	}
-	for _, c := range e.body {
-		w.Write(ln())
-		if c != nil {
-			c.HtmlWithIndent(w, indent+1)
-		}
-	}
-	if len(e.body) != 0 {
-		w.Write(ln())
-		writeIndent(w, indent)
-	}
-	w.Write(stob("</"))
-	w.Write(stob(e.tag))
-	w.Write(stob(">"))
-}

element_test.go DELETED Viewed

@@ -1,461 +0,0 @@
-package app
-// func TestElemSetAttr(t *testing.T) {
-// 	utests := []struct {
-// 		scenario       string
-// 		key            string
-// 		value          interface{}
-// 		explectedValue string
-// 		valueNotSet    bool
-// 	}{
-// 		{
-// 			scenario:       "string",
-// 			key:            "title",
-// 			value:          "test",
-// 			explectedValue: "test",
-// 		},
-// 		{
-// 			scenario:       "int",
-// 			key:            "max",
-// 			value:          42,
-// 			explectedValue: "42",
-// 		},
-// 		{
-// 			scenario:       "bool true",
-// 			key:            "hidden",
-// 			value:          true,
-// 			explectedValue: "",
-// 		},
-// 		{
-// 			scenario:    "bool false",
-// 			key:         "hidden",
-// 			value:       false,
-// 			valueNotSet: true,
-// 		},
-// 		{
-// 			scenario:       "style",
-// 			key:            "style",
-// 			value:          "margin:42",
-// 			explectedValue: "margin:42;",
-// 		},
-// 		{
-// 			scenario:       "set successive styles",
-// 			key:            "style",
-// 			value:          "padding:42",
-// 			explectedValue: "margin:42;padding:42;",
-// 		},
-// 		{
-// 			scenario:       "class",
-// 			key:            "class",
-// 			value:          "hello",
-// 			explectedValue: "hello",
-// 		},
-// 		{
-// 			scenario:       "set successive classes",
-// 			key:            "class",
-// 			value:          "world",
-// 			explectedValue: "hello world",
-// 		},
-// 	}
-// 	e := &elem{}
-// 	for _, u := range utests {
-// 		t.Run(u.scenario, func(t *testing.T) {
-// 			e.setAttr(u.key, u.value)
-// 			v, exists := e.attrs[u.key]
-// 			require.Equal(t, u.explectedValue, v)
-// 			require.Equal(t, u.valueNotSet, !exists)
-// 		})
-// 	}
-// }
-// func TestElemUpdateAttrs(t *testing.T) {
-// 	utests := []struct {
-// 		scenario string
-// 		current  map[string]string
-// 		incoming map[string]string
-// 	}{
-// 		{
-// 			scenario: "attributes are removed",
-// 			current: map[string]string{
-// 				"foo":   "bar",
-// 				"hello": "world",
-// 			},
-// 			incoming: nil,
-// 		},
-// 		{
-// 			scenario: "attributes are added",
-// 			current:  nil,
-// 			incoming: map[string]string{
-// 				"foo":   "bar",
-// 				"hello": "world",
-// 			},
-// 		},
-// 		{
-// 			scenario: "attributes are updated",
-// 			current: map[string]string{
-// 				"foo":   "bar",
-// 				"hello": "world",
-// 			},
-// 			incoming: map[string]string{
-// 				"foo":   "boo",
-// 				"hello": "there",
-// 			},
-// 		},
-// 		{
-// 			scenario: "attributes are synced",
-// 			current: map[string]string{
-// 				"foo":   "bar",
-// 				"hello": "world",
-// 			},
-// 			incoming: map[string]string{
-// 				"foo":     "boo",
-// 				"goodbye": "world",
-// 			},
-// 		},
-// 	}
-// 	for _, u := range utests {
-// 		t.Run(u.scenario, func(t *testing.T) {
-// 			testSkipNonWasm(t)
-// 			n := Div().(*htmlDiv)
-// 			err := mount(n)
-// 			require.NoError(t, err)
-// 			defer dismount(n)
-// 			n.attrs = u.current
-// 			n.updateAttrs(u.incoming)
-// 			if len(u.incoming) == 0 {
-// 				require.Empty(t, n.attributes())
-// 				return
-// 			}
-// 			require.Equal(t, u.incoming, n.attributes())
-// 		})
-// 	}
-// }
-// func TestElemSetEventHandler(t *testing.T) {
-// 	e := &elem{}
-// 	h := func(Context, Event) {}
-// 	e.setEventHandler("click", h)
-// 	expectedHandler := eventHandler{
-// 		event: "click",
-// 		value: h,
-// 	}
-// 	registeredHandler := e.events["click"]
-// 	require.True(t, expectedHandler.equal(registeredHandler))
-// }
-// func TestElemUpdateEventHandlers(t *testing.T) {
-// 	utests := []struct {
-// 		scenario string
-// 		current  EventHandler
-// 		incoming EventHandler
-// 	}{
-// 		{
-// 			scenario: "handler is removed",
-// 			current:  func(Context, Event) {},
-// 			incoming: nil,
-// 		},
-// 		{
-// 			scenario: "handler is added",
-// 			current:  nil,
-// 			incoming: func(Context, Event) {},
-// 		},
-// 		{
-// 			scenario: "handler is updated",
-// 			current:  func(Context, Event) {},
-// 			incoming: func(Context, Event) {},
-// 		},
-// 	}
-// 	for _, u := range utests {
-// 		t.Run(u.scenario, func(t *testing.T) {
-// 			testSkipNonWasm(t)
-// 			var current map[string]eventHandler
-// 			var incoming map[string]eventHandler
-// 			if u.current != nil {
-// 				current = map[string]eventHandler{
-// 					"click": {
-// 						event: "click",
-// 						value: u.current,
-// 					},
-// 				}
-// 			}
-// 			if u.incoming != nil {
-// 				incoming = map[string]eventHandler{
-// 					"click": {
-// 						event: "click",
-// 						value: u.incoming,
-// 					},
-// 				}
-// 			}
-// 			n := Div().(*htmlDiv)
-// 			n.events = current
-// 			err := mount(n)
-// 			require.NoError(t, err)
-// 			defer dismount(n)
-// 			n.updateEventHandler(incoming)
-// 			if len(incoming) == 0 {
-// 				require.Empty(t, n.attributes())
-// 				return
-// 			}
-// 			h := n.eventHandlers()["click"]
-// 			require.True(t, h.equal(incoming["click"]))
-// 		})
-// 	}
-// }
-// func TestElemMountDismount(t *testing.T) {
-// 	testMountDismount(t, []mountTest{
-// 		{
-// 			scenario: "html element",
-// 			node: Div().
-// 				Class("hello").
-// 				OnClick(func(Context, Event) {}),
-// 		},
-// 	})
-// }
-// // func TestElemUpdate(t *testing.T) {
-// // 	testUpdate(t, []updateTest{
-// // 		{
-// // 			scenario:   "html element returns replace error when updated with a non html-element",
-// // 			a:          Div(),
-// // 			b:          Text("hello"),
-// // 			replaceErr: true,
-// // 		},
-// // 		{
-// // 			scenario: "html element attributes are updated",
-// // 			a: Div().
-// // 				ID("max").
-// // 				Class("foo").
-// // 				AccessKey("test"),
-// // 			b: Div().
-// // 				ID("max").
-// // 				Class("bar").
-// // 				Lang("fr"),
-// // 			matches: []TestUIDescriptor{
-// // 				{
-// // 					Expected: Div().
-// // 						ID("max").
-// // 						Class("bar").
-// // 						Lang("fr"),
-// // 				},
-// // 			},
-// // 		},
-// // 		{
-// // 			scenario: "html element event handlers are updated",
-// // 			a: Div().
-// // 				OnClick(func(Context, Event) {}).
-// // 				OnBlur(func(Context, Event) {}),
-// // 			b: Div().
-// // 				OnClick(func(Context, Event) {}).
-// // 				OnChange(func(Context, Event) {}),
-// // 			matches: []TestUIDescriptor{
-// // 				{
-// // 					Expected: Div().
-// // 						OnClick(nil).
-// // 						OnChange(nil),
-// // 				},
-// // 			},
-// // 		},
-// // 		{
-// // 			scenario: "html element is replaced by a text",
-// // 			a: Div().Body(
-// // 				H2().Text("hello"),
-// // 			),
-// // 			b: Div().Body(
-// // 				Text("hello"),
-// // 			),
-// // 			matches: []TestUIDescriptor{
-// // 				{
-// // 					Path:     TestPath(),
-// // 					Expected: Div(),
-// // 				},
-// // 				{
-// // 					Path:     TestPath(0),
-// // 					Expected: Text("hello"),
-// // 				},
-// // 			},
-// // 		},
-// // 		{
-// // 			scenario: "html element is replaced by a component",
-// // 			a: Div().Body(
-// // 				H2().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: "html element is replaced by another html element",
-// // 			a: Div().Body(
-// // 				H2(),
-// // 			),
-// // 			b: Div().Body(
-// // 				H1(),
-// // 			),
-// // 			matches: []TestUIDescriptor{
-// // 				{
-// // 					Path:     TestPath(),
-// // 					Expected: Div(),
-// // 				},
-// // 				{
-// // 					Path:     TestPath(0),
-// // 					Expected: H1(),
-// // 				},
-// // 			},
-// // 		},
-// // 		{
-// // 			scenario: "html element is replaced by raw html element",
-// // 			a: Div().Body(
-// // 				H2().Text("hello"),
-// // 			),
-// // 			b: Div().Body(
-// // 				Raw("<svg></svg>"),
-// // 			),
-// // 			matches: []TestUIDescriptor{
-// // 				{
-// // 					Path:     TestPath(),
-// // 					Expected: Div(),
-// // 				},
-// // 				{
-// // 					Path:     TestPath(0),
-// // 					Expected: Raw("<svg></svg>"),
-// // 				},
-// // 			},
-// // 		},
-// // 	})
-// // }
-// 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>"),
-// 				},
-// 			},
-// 		},
-// 	})
-// }

example/assets/icon.png CHANGED Viewed

Binary file

example/assets/icon2.png DELETED Viewed

Binary file

example/components/header.go CHANGED Viewed

@@ -7,7 +7,7 @@ import (
 func Header() *Element {
 	return Row(Css("w-full mb-20 font-bold text-xl text-gray-700 p-4"),
 		Div(Css("text-blue-700"),
-			A(Href("https://wapp.pyros2097.dev"), Text("wapp.pyros2097.dev")),
+			A(Href("https://pyros.sh"), Text("pyros.sh")),
 		),
 		Div(Css("flex flex-row flex-1 justify-end items-end p-2"),
 			Div(Css("border-b-2 border-white text-lg text-blue-700 mr-4"), Text("Examples: ")),

example/main.go CHANGED Viewed

@@ -2,44 +2,44 @@ package main
 import (
 	"embed"
+	"log"
-	// "log"
+	"net/http"
+	"os"
+	"time"
-	// sshd "github.com/jpillora/sshd-lite/server"
+	"github.com/apex/gateway/v2"
+	"github.com/gorilla/mux"
 	. "github.com/pyros2097/wapp"
 	"github.com/pyros2097/wapp/example/pages"
 )
 //go:embed assets/*
 var assetsFS embed.FS
+func wrap(f func(http.ResponseWriter, *http.Request) *Element) func(http.ResponseWriter, *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "text/html")
+		f(w, r).WriteHtml(w)
+	}
+}
 func main() {
-	// os.Setenv("HAS_WASM", "false")
+	isLambda := os.Getenv("_LAMBDA_SERVER_PORT") != ""
+	r := mux.NewRouter()
-	// SetErrorHandler(func(w *RenderContext, err error) UI {
+	r.PathPrefix("/assets/").Handler(http.FileServer(http.FS(assetsFS)))
-	// 	return Col(Css("text-4xl text-gray-700"),
-	// 		Header(c),
-	// 		Row(
-	// 			Text("Oops something went wrong"),
-	// 		),
-	// 		Row(Css("mt-6"),
-	// 			Text("Please check back again"),
-	// 		),
-	// 	)
-	// })
-	// go func() {
-	// 	s, err := sshd.NewServer(&sshd.Config{
-	// 		Port:     "2223",
-	// 		AuthType: "peter:pass",
+	r.HandleFunc("/", wrap(pages.Index))
-	// 	})
-	// 	if err != nil {
-	// 		log.Fatal(err)
-	// 	}
-	// 	err = s.Start()
-	// 	if err != nil {
-	// 		log.Fatal(err)
-	// 	}
-	// }()
-	Route("/about", pages.About)
+	r.HandleFunc("/about", wrap(pages.About))
+	if !isLambda {
+		println("http listening on http://localhost:1234")
+		srv := &http.Server{
+			Handler:      r,
+			Addr:         "127.0.0.1:1234",
+			WriteTimeout: 30 * time.Second,
+			ReadTimeout:  30 * time.Second,
+		}
+		log.Fatal(srv.ListenAndServe())
+	} else {
-	Route("/", pages.Index)
+		log.Print("running in lambda mode")
-	Run(assetsFS)
+		log.Fatal(gateway.ListenAndServe(":3000", r))
+	}
 }

example/makefile CHANGED Viewed

@@ -1,25 +1,21 @@
 run:
 	go run *.go
-wasm: export GOOS=js
+local:
-wasm: export GOARCH=wasm
+	sam local start-api
-wasm:
-	go build -ldflags='-s -w' -o assets/main.wasm
 css:
-	npx tailwindcss-cli@latest build assets/config.css -o assets/styles.css
+	npx tailwindcss-cli@latest build -i assets/config.css -o assets/styles.css
+build: export GOOS=linux
+build: export GOARCH=amd64
+build:
+	go build -o main
 deploy: export NODE_ENV=production
 deploy:
-	npx tailwindcss-cli@latest build assets/config.css -o assets/styles.css
+	make css
-	go build -o main
+	make build
 	sam deploy
-	make wasm
-	aws s3 sync ./assets s3://wapp.pyros2097.dev/assets --delete --exclude main.wasm
+	aws s3 sync ./assets s3://wapp-example/assets --delete
-	brotli -Z -j assets/main.wasm
-	mv assets/main.wasm.br assets/main.wasm
-	aws s3 cp assets/main.wasm s3://wapp.pyros2097.dev/assets/main.wasm --content-encoding br --content-type application/wasm
-	aws cloudfront create-invalidation --distribution-id E17XVZYYZ1JXEU --paths "/*"
+	aws cloudfront create-invalidation --distribution-id E3C93YR5O58WG6 --paths "/*"
-local:
-	sam local start-api

example/readme.md DELETED Viewed

@@ -1,11 +0,0 @@
-# wapp-example
-An example to demostrate the wapp framework
-1. Compile wasm frontend,
-`GOOS=js GOARCH=wasm go build -o assets/main.wasm`
-2. Run the server,
-`go run *.go`
-These commands are also available in the makefile for convenience

example/samconfig.toml DELETED Viewed

@@ -1,10 +0,0 @@
-version = 0.1
-[default]
-[default.deploy]
-[default.deploy.parameters]
-stack_name = "wapp-pyros2097-dev"
-s3_bucket = "aws-sam-cli-managed-default-samclisourcebucket-grb3hle00qk9"
-s3_prefix = "wapp-pyros2097-dev"
-region = "us-east-1"
-capabilities = "CAPABILITY_IAM"
-parameter_overrides = "DomainName=\"wapp.pyros2097.dev\" HostedZoneId=\"Z0469276792OXT6RNZF5\" AcmCertificateArn=\"arn:aws:acm:us-east-1:719747015987:certificate/16acd03e-b59a-459c-8a3f-5caa50df7079\""

example/template.yml CHANGED Viewed

@@ -1,36 +1,26 @@
 ---
-AWSTemplateFormatVersion: "2010-09-09"
+AWSTemplateFormatVersion: '2010-09-09'
 Transform: AWS::Serverless-2016-10-31
-Parameters:
-  DomainName:
-    Type: String
-    Default: wapp.pyros2097.dev
-  HostedZoneId:
-    Type: String
-    Default: Z0469276792OXT6RNZF5
-  AcmCertificateArn:
-    Type: String
-    Default: arn:aws:acm:us-east-1:719747015987:certificate/16acd03e-b59a-459c-8a3f-5caa50df7079
 Outputs:
   DistributionId:
     Value: !Ref CloudFrontDistribution
-  DistributionDomain:
+  AppUrl:
     Value: !GetAtt CloudFrontDistribution.DomainName
   ApiUrl:
-    Value: !Sub https://${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/
+    Value: !Sub https://${ServerlessHttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/
 Resources:
   WebBucket:
     Type: AWS::S3::Bucket
     Properties:
-      BucketName: !Ref DomainName
+      BucketName: wapp-example
   CloudFrontOriginAccessIdentity:
     Type: AWS::CloudFront::CloudFrontOriginAccessIdentity
     Properties:
       CloudFrontOriginAccessIdentityConfig:
-        Comment: "CloudFront OAI"
+        Comment: 'CloudFront OAI'
   WebBucketPolicy:
     Type: AWS::S3::BucketPolicy
@@ -42,18 +32,13 @@ Resources:
             Principal:
               CanonicalUser: !GetAtt CloudFrontOriginAccessIdentity.S3CanonicalUserId
             Action: s3:GetObject
-            Resource: !Join ["/", [!GetAtt WebBucket.Arn, "*"]]
+            Resource: !Join ['/', [!GetAtt WebBucket.Arn, '*']]
           - Effect: Allow
             Principal:
               CanonicalUser: !GetAtt CloudFrontOriginAccessIdentity.S3CanonicalUserId
             Action: s3:ListBucket
             Resource: !GetAtt WebBucket.Arn
-  HttpApi:
-    Type: AWS::Serverless::HttpApi
-    Properties:
-      StageName: Prod
   HttpApiLambda:
     Type: AWS::Serverless::Function
     Properties:
@@ -65,8 +50,6 @@ Resources:
         ApiEvent:
           Type: HttpApi
           Properties:
-            ApiId:
-              Ref: HttpApi
             Method: ANY
             Path: '$default'
@@ -74,8 +57,6 @@ Resources:
     Type: AWS::CloudFront::Distribution
     Properties:
       DistributionConfig:
-        Aliases:
-          - !Ref DomainName
         HttpVersion: http2
         Enabled: true
         IPV6Enabled: true
@@ -84,20 +65,18 @@ Resources:
           - Id: s3
             DomainName: !GetAtt WebBucket.DomainName
             S3OriginConfig:
-              OriginAccessIdentity: !Sub "origin-access-identity/cloudfront/${CloudFrontOriginAccessIdentity}"
+              OriginAccessIdentity: !Sub 'origin-access-identity/cloudfront/${CloudFrontOriginAccessIdentity}'
           - Id: app
-            DomainName: !Sub ${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}
+            DomainName: !Sub ${ServerlessHttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}
-            OriginPath: /Prod
             CustomOriginConfig:
               OriginProtocolPolicy: https-only
         DefaultCacheBehavior:
           TargetOriginId: app
-          AllowedMethods: [HEAD, GET]
+          AllowedMethods: [DELETE, GET, HEAD, OPTIONS, PATCH, POST, PUT]
-          CachedMethods: [HEAD, GET]
           ViewerProtocolPolicy: https-only
           Compress: true
           ForwardedValues:
-            QueryString:  true
+            QueryString: true
         CacheBehaviors:
           - TargetOriginId: s3
             PathPattern: /assets/*
@@ -106,30 +85,4 @@ Resources:
             ViewerProtocolPolicy: https-only
             Compress: true
             ForwardedValues:
-              QueryString:  false
+              QueryString: false
-        ViewerCertificate:
-          AcmCertificateArn: !Ref AcmCertificateArn
-          MinimumProtocolVersion: TLSv1.2_2018
-          SslSupportMethod: sni-only
-  DNSRecordSet:
-    Type: AWS::Route53::RecordSet
-    Properties:
-      AliasTarget:
-        DNSName: !GetAtt CloudFrontDistribution.DomainName
-        EvaluateTargetHealth: false
-        HostedZoneId: Z2FDTNDATAQYW2 # CloudFront hosted zone ID
-      HostedZoneId: !Ref HostedZoneId
-      Name: !Ref DomainName
-      Type: A
-  DNSIPV6RecordSet:
-    Type: AWS::Route53::RecordSet
-    Properties:
-      AliasTarget:
-        DNSName: !GetAtt CloudFrontDistribution.DomainName
-        EvaluateTargetHealth: false
-        HostedZoneId: Z2FDTNDATAQYW2 # CloudFront hosted zone ID
-      HostedZoneId: !Ref HostedZoneId
-      Name: !Ref DomainName
-      Type: AAAA

go.mod CHANGED Viewed

@@ -3,7 +3,8 @@ module github.com/pyros2097/wapp
 go 1.16
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/apex/gateway/v2 v2.0.0
+	github.com/gorilla/mux v1.8.0
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/stretchr/testify v1.6.1
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect

go.sum CHANGED Viewed

@@ -1,19 +1,37 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/apex/gateway/v2 v2.0.0 h1:tJwKiB7ObbXuF3yoqTf/CfmaZRhHB+GfilTNSCf1Wnc=
+github.com/apex/gateway/v2 v2.0.0/go.mod h1:y+uuK0JxdvTHZeVns501/7qklBhnDHtGU0hfUQ6QIfI=
+github.com/aws/aws-lambda-go v1.17.0 h1:Ogihmi8BnpmCNktKAGpNwSiILNNING1MiosnKUfU8m0=
+github.com/aws/aws-lambda-go v1.17.0/go.mod h1:FEwgPLE6+8wcGBTe5cJN3JWurd1Ztm9zN4jsXsjzKKw=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk=
+github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk=
+github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

html.go CHANGED Viewed

@@ -1,6 +1,109 @@
 package app
+import (
+	"io"
-import "reflect"
+	"reflect"
+	"strconv"
+)
+type Element struct {
+	tag         string
+	attrs       map[string]string
+	body        []*Element
+	selfClosing bool
+	text        string
+}
+func NewElement(tag string, selfClosing bool, uis ...interface{}) *Element {
+	return MergeAttributes(&Element{tag: tag, selfClosing: selfClosing}, uis...)
+}
+func (e *Element) setAttr(k string, v string) {
+	if e.attrs == nil {
+		e.attrs = make(map[string]string)
+	}
+	switch k {
+	case "style", "allow":
+		s := e.attrs[k] + v + ";"
+		e.attrs[k] = s
+		return
+	case "class":
+		s := e.attrs[k]
+		if s != "" {
+			s += " "
+		}
+		s += v
+		e.attrs[k] = s
+		return
+	}
+	if v == "false" {
+		delete(e.attrs, k)
+		return
+	} else if v == "true" {
+		e.attrs[k] = ""
+	} else {
+		e.attrs[k] = v
+	}
+}
+func (e *Element) WriteHtml(w io.Writer) {
+	e.writeHtmlIndent(w, 0)
+}
+func (e *Element) writeHtmlIndent(w io.Writer, indent int) {
+	e.writeIndent(w, indent)
+	if e.tag == "html" {
+		w.Write([]byte("<!DOCTYPE html>\n"))
+	}
+	if e.tag == "text" {
+		e.writeIndent(w, indent)
+		w.Write([]byte(e.text))
+		return
+	}
+	w.Write([]byte("<"))
+	w.Write([]byte(e.tag))
+	for k, v := range e.attrs {
+		w.Write([]byte(" "))
+		w.Write([]byte(k))
+		if v != "" {
+			w.Write([]byte(`="`))
+			w.Write([]byte(v))
+			w.Write([]byte(`"`))
+		}
+	}
+	w.Write([]byte(">"))
+	if e.selfClosing {
+		return
+	}
+	for _, c := range e.body {
+		w.Write([]byte("\n"))
+		if c != nil {
+			c.writeHtmlIndent(w, indent+1)
+		}
+	}
+	if len(e.body) != 0 {
+		w.Write([]byte("\n"))
+		e.writeIndent(w, indent)
+	}
+	w.Write([]byte("</"))
+	w.Write([]byte(e.tag))
+	w.Write([]byte(">"))
+}
+func (e *Element) writeIndent(w io.Writer, indent int) {
+	for i := 0; i < indent*4; i++ {
+		w.Write([]byte(" "))
+	}
+}
 func Html(elems ...*Element) *Element {
 	return &Element{tag: "html", body: elems}
@@ -74,19 +177,19 @@ func H1(uis ...interface{}) *Element {
 	return NewElement("h1", false, uis...)
 }
 func H2(uis ...interface{}) *Element {
-	return NewElement("h1", false, uis...)
+	return NewElement("h2", false, uis...)
 }
 func H3(uis ...interface{}) *Element {
-	return NewElement("h1", false, uis...)
+	return NewElement("h3", false, uis...)
 }
 func H4(uis ...interface{}) *Element {
-	return NewElement("h1", false, uis...)
+	return NewElement("h4", false, uis...)
 }
 func H5(uis ...interface{}) *Element {
-	return NewElement("h1", false, uis...)
+	return NewElement("h5", false, uis...)
 }
 func H6(uis ...interface{}) *Element {
-	return NewElement("h1", false, uis...)
+	return NewElement("h6", false, uis...)
 }
 func Span(uis ...interface{}) *Element {
@@ -166,3 +269,113 @@ func Map2(source interface{}, f func(v interface{}, i int) *Element) []*Element
 	}
 	return body
 }
+type Attribute struct {
+	Key   string
+	Value string
+}
+func ID(v string) Attribute {
+	return Attribute{"id", v}
+}
+func Style(v string) Attribute {
+	return Attribute{"style", v}
+}
+func Accept(v string) Attribute {
+	return Attribute{"accept", v}
+}
+func AutoComplete(v bool) Attribute {
+	return Attribute{"autocomplete", strconv.FormatBool(v)}
+}
+func Checked(v bool) Attribute {
+	return Attribute{"checked", strconv.FormatBool(v)}
+}
+func Disabled(v bool) Attribute {
+	return Attribute{"disabled", strconv.FormatBool(v)}
+}
+func Name(v string) Attribute {
+	return Attribute{"name", v}
+}
+func Type(v string) Attribute {
+	return Attribute{"type", v}
+}
+func Value(v string) Attribute {
+	return Attribute{"value", v}
+}
+func Placeholder(v string) Attribute {
+	return Attribute{"placeholder", v}
+}
+func Src(v string) Attribute {
+	return Attribute{"src", v}
+}
+func Defer() Attribute {
+	return Attribute{"defer", "true"}
+}
+func ViewBox(v string) Attribute {
+	return Attribute{"viewBox", v}
+}
+func X(v string) Attribute {
+	return Attribute{"x", v}
+}
+func Y(v string) Attribute {
+	return Attribute{"y", v}
+}
+func Href(v string) Attribute {
+	return Attribute{"href", v}
+}
+func Target(v string) Attribute {
+	return Attribute{"target", v}
+}
+func Rel(v string) Attribute {
+	return Attribute{"rel", v}
+}
+func Css(v string) Attribute {
+	return Attribute{"class", v}
+}
+func XData(v string) Attribute {
+	return Attribute{"x-data", v}
+}
+func XText(v string) Attribute {
+	return Attribute{"x-text", v}
+}
+func MergeAttributes(parent *Element, uis ...interface{}) *Element {
+	elems := []*Element{}
+	for _, v := range uis {
+		switch c := v.(type) {
+		case Attribute:
+			parent.setAttr(c.Key, c.Value)
+		case *Element:
+			elems = append(elems, c)
+		case nil:
+			// dont need to add nil items
+		default:
+			// fmt.Printf("%v\n", v)
+			panic("unknown type in render")
+		}
+	}
+	if !parent.selfClosing {
+		parent.body = elems
+	}
+	return parent
+}

readme.md CHANGED Viewed

@@ -6,44 +6,23 @@
 # wapp
-**wapp** is a framework to build isomorphic web apps in golang.
-It uses a declarative syntax using funcs that allows creating and dealing with HTML elements only by using Go, and without writing any HTML markup. The syntax is inspired by react and its awesome hooks and functional component features. It is highly opioninated and integrates very well with tailwind css for now.
-This originally started out as of fork of this awesome go-app PWA framework. All credits goes to Maxence Charriere for majority of the work.
-Inspired by:
-* [go-app](https://github.com/maxence-charriere/go-app)
-* [react](https://reactjs.org/docs/components-and-props.html)
-* [reacct-hooks](https://reactjs.org/docs/hooks-intro.html)
-* [jotai](https://github.com/pmndrs/jotai)
-* [klyva](https://github.com/merisbahti/klyva)
+**wapp** is a framework to build web apps in golang.
+It uses a declarative syntax using funcs that allows creating and dealing with HTML elements only by using Go, and without writing any HTML markup.ZZZIt is highly opioninated and integrates uses tailwind css and alpinejs.
 # Install
 **wapp** requirements:
-- [Go 1.15](https://golang.org/doc/go1.15)
+- [Go 1.16](https://golang.org/doc/go1.16)
 ```sh
 go mod init
 go get -u -v github.com/pyros2097/wapp
 ```
-# Demos
-[Demo 1](https://wapp.pyros2097.dev/)
-[Demo 2](https://timer.pyros2097.dev/)
-# Examples
-[Example 1](https://github.com/pyros2097/wapp/tree/master/example)
-[Example 2](https://github.com/pyros2097/wapp-timer)
+[Demo](https://github.com/pyros2097/wapp-example)
-**Counter**
+**Example**
 ```go
 package main
@@ -52,92 +31,48 @@ import (
 	. "github.com/pyros2097/wapp"
 )
-func Counter(c *RenderContext) UI {
+func Header() *Element {
-	count, setCount := c.UseInt(0)
-	inc := func() { setCount(count() + 1) }
-	dec := func() { setCount(count() - 1) }
+	return Row(Css("w-full mb-20 font-bold text-xl text-gray-700 p-4"),
-	return Col(
-		Row(
-			Row(Css("text-6xl"),
+		Div(Css("text-blue-700"),
-				Text("Counter"),
+			A(Href("https://wapp.pyros2097.dev"), Text("wapp.pyros2097.dev")),
-			),
 		),
-		Row(
+		Div(Css("flex flex-row flex-1 justify-end items-end p-2"),
+			Div(Css("border-b-2 border-white text-lg text-blue-700 mr-4"), Text("Examples: ")),
+			Div(Css("link mr-4"), A(Href("/"), Text("Home"))),
-			Row(Css("text-6xl m-20 cursor-pointer select-none"), OnClick(dec),
+			Div(Css("link mr-4"), A(Href("/clock"), Text("Clock"))),
-				Text("-"),
-			),
-			Row(Css("text-6xl m-20"),
+			Div(Css("link mr-4"), A(Href("/about"), Text("About"))),
-				Text(count()),
+			Div(Css("link mr-4"), A(Href("/container"), Text("Container"))),
-			),
-			Row(Css("text-6xl m-20 cursor-pointer select-none"), OnClick(inc),
+			Div(Css("link mr-4"), A(Href("/panic"), Text("Panic"))),
-				Text("+"),
-			),
 		),
 	)
 }
-func main() {
-	Route("/", Counter)
-	Run()
-}
-```
-**Clock**
-```go
-package main
-import (
-	"time"
-	. "github.com/pyros2097/wapp"
-)
-func Route(c *RenderContext, title string) UI {
+func Index(w http.ResponseWriter, r *http.Request) *Element {
-	timeValue, setTime := c.UseState(time.Now())
-	running, setRunning := c.UseState(false)
-	startTimer := func() {
-		setRunning(true)
-		go func() {
-			for running().(bool) {
-				setTime(time.Now())
-				time.Sleep(time.Second * 1)
-			}
-		}()
-	}
-	stopTimer := func() {
-		setRunning(false)
-	}
-	c.UseEffect(func() func() {
-		startTimer()
-		return stopTimer
-	})
-	return Col(
+	return Page(
+		Col(
+			Header(),
+			H1(Text("Hello this is a h1")),
+			H2(Text("Hello this is a h2")),
+			H2(XData("{ message: 'I ❤️ Alpine' }"), XText("message"), Text("")),
+			Col(Css("text-3xl text-gray-700"),
-		Row(
+				Row(
-			Div(Css("text-6xl"),
+					Row(Css("underline"),
-				Text(title),
+						Text("Counter"),
-			),
+					),
-		),
+				),
-		Row(
+				Row(
-			Div(Css("mt-10"),
+					Button(Css("btn m-20"),
-				Text(timeValue().(time.Time).Format("15:04:05")),
+						Text("-"),
-			),
+					),
+					Row(Css("m-20"),
+						Text(strconv.Itoa(1)),
-		),
+					),
-		Row(
-			Div(Css("text-6xl m-20 cursor-pointer select-none"), OnClick(startTimer),
+					Button(Css("btn m-20"),
-				Text("Start"),
+						Text("+"),
-			),
+					),
-			Div(Css("text-6xl m-20 cursor-pointer select-none"), OnClick(stopTimer),
-				Text("Stop"),
+				),
 			),
 		),
 	)
 }
-func main() {
-	Route("/", Clock)
-	Run()
-}
 ```

router.go DELETED Viewed

@@ -1,968 +0,0 @@
-package app
-import (
-	"context"
-	"embed"
-	"errors"
-	"net/http"
-	"os"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-	// "github.com/aws/aws-lambda-go/events"
-)
-func min(a, b int) int {
-	if a <= b {
-		return a
-	}
-	return b
-}
-func longestCommonPrefix(a, b string) int {
-	i := 0
-	max := min(len(a), len(b))
-	for i < max && a[i] == b[i] {
-		i++
-	}
-	return i
-}
-// Search for a wildcard segment and check the name for invalid characters.
-// Returns -1 as index, if no wildcard was found.
-func findWildcard(path string) (wilcard string, i int, valid bool) {
-	// Find start
-	for start, c := range []byte(path) {
-		// A wildcard starts with ':' (param) or '*' (catch-all)
-		if c != ':' && c != '*' {
-			continue
-		}
-		// Find end and check for invalid characters
-		valid = true
-		for end, c := range []byte(path[start+1:]) {
-			switch c {
-			case '/':
-				return path[start : start+1+end], start, valid
-			case ':', '*':
-				valid = false
-			}
-		}
-		return path[start:], start, valid
-	}
-	return "", -1, false
-}
-func countParams(path string) uint16 {
-	var n uint
-	for i := range []byte(path) {
-		switch path[i] {
-		case ':', '*':
-			n++
-		}
-	}
-	return uint16(n)
-}
-type nodeType uint8
-const (
-	static nodeType = iota // default
-	root
-	param
-	catchAll
-)
-type node struct {
-	path      string
-	indices   string
-	wildChild bool
-	nType     nodeType
-	priority  uint32
-	children  []*node
-	handle    RouteFn
-}
-// Increments priority of the given child and reorders if necessary
-func (n *node) incrementChildPrio(pos int) int {
-	cs := n.children
-	cs[pos].priority++
-	prio := cs[pos].priority
-	// Adjust position (move to front)
-	newPos := pos
-	for ; newPos > 0 && cs[newPos-1].priority < prio; newPos-- {
-		// Swap node positions
-		cs[newPos-1], cs[newPos] = cs[newPos], cs[newPos-1]
-	}
-	// Build new index char string
-	if newPos != pos {
-		n.indices = n.indices[:newPos] + // Unchanged prefix, might be empty
-			n.indices[pos:pos+1] + // The index char we move
-			n.indices[newPos:pos] + n.indices[pos+1:] // Rest without char at 'pos'
-	}
-	return newPos
-}
-// addRoute adds a node with the given handle to the path.
-// Not concurrency-safe!
-func (n *node) addRoute(path string, handle RouteFn) {
-	fullPath := path
-	n.priority++
-	// Empty tree
-	if n.path == "" && n.indices == "" {
-		n.insertChild(path, fullPath, handle)
-		n.nType = root
-		return
-	}
-walk:
-	for {
-		// Find the longest common prefix.
-		// This also implies that the common prefix contains no ':' or '*'
-		// since the existing key can't contain those chars.
-		i := longestCommonPrefix(path, n.path)
-		// Split edge
-		if i < len(n.path) {
-			child := node{
-				path:      n.path[i:],
-				wildChild: n.wildChild,
-				nType:     static,
-				indices:   n.indices,
-				children:  n.children,
-				handle:    n.handle,
-				priority:  n.priority - 1,
-			}
-			n.children = []*node{&child}
-			// []byte for proper unicode char conversion, see #65
-			n.indices = string([]byte{n.path[i]})
-			n.path = path[:i]
-			n.handle = nil
-			n.wildChild = false
-		}
-		// Make new node a child of this node
-		if i < len(path) {
-			path = path[i:]
-			if n.wildChild {
-				n = n.children[0]
-				n.priority++
-				// Check if the wildcard matches
-				if len(path) >= len(n.path) && n.path == path[:len(n.path)] &&
-					// Adding a child to a catchAll is not possible
-					n.nType != catchAll &&
-					// Check for longer wildcard, e.g. :name and :names
-					(len(n.path) >= len(path) || path[len(n.path)] == '/') {
-					continue walk
-				} else {
-					// Wildcard conflict
-					pathSeg := path
-					if n.nType != catchAll {
-						pathSeg = strings.SplitN(pathSeg, "/", 2)[0]
-					}
-					prefix := fullPath[:strings.Index(fullPath, pathSeg)] + n.path
-					panic("'" + pathSeg +
-						"' in new path '" + fullPath +
-						"' conflicts with existing wildcard '" + n.path +
-						"' in existing prefix '" + prefix +
-						"'")
-				}
-			}
-			idxc := path[0]
-			// '/' after param
-			if n.nType == param && idxc == '/' && len(n.children) == 1 {
-				n = n.children[0]
-				n.priority++
-				continue walk
-			}
-			// Check if a child with the next path byte exists
-			for i, c := range []byte(n.indices) {
-				if c == idxc {
-					i = n.incrementChildPrio(i)
-					n = n.children[i]
-					continue walk
-				}
-			}
-			// Otherwise insert it
-			if idxc != ':' && idxc != '*' {
-				// []byte for proper unicode char conversion, see #65
-				n.indices += string([]byte{idxc})
-				child := &node{}
-				n.children = append(n.children, child)
-				n.incrementChildPrio(len(n.indices) - 1)
-				n = child
-			}
-			n.insertChild(path, fullPath, handle)
-			return
-		}
-		// Otherwise add handle to current node
-		if n.handle != nil {
-			panic("a handle is already registered for path '" + fullPath + "'")
-		}
-		n.handle = handle
-		return
-	}
-}
-func (n *node) insertChild(path, fullPath string, handle RouteFn) {
-	for {
-		// Find prefix until first wildcard
-		wildcard, i, valid := findWildcard(path)
-		if i < 0 { // No wilcard found
-			break
-		}
-		// The wildcard name must not contain ':' and '*'
-		if !valid {
-			panic("only one wildcard per path segment is allowed, has: '" +
-				wildcard + "' in path '" + fullPath + "'")
-		}
-		// Check if the wildcard has a name
-		if len(wildcard) < 2 {
-			panic("wildcards must be named with a non-empty name in path '" + fullPath + "'")
-		}
-		// Check if this node has existing children which would be
-		// unreachable if we insert the wildcard here
-		if len(n.children) > 0 {
-			panic("wildcard segment '" + wildcard +
-				"' conflicts with existing children in path '" + fullPath + "'")
-		}
-		// param
-		if wildcard[0] == ':' {
-			if i > 0 {
-				// Insert prefix before the current wildcard
-				n.path = path[:i]
-				path = path[i:]
-			}
-			n.wildChild = true
-			child := &node{
-				nType: param,
-				path:  wildcard,
-			}
-			n.children = []*node{child}
-			n = child
-			n.priority++
-			// If the path doesn't end with the wildcard, then there
-			// will be another non-wildcard subpath starting with '/'
-			if len(wildcard) < len(path) {
-				path = path[len(wildcard):]
-				child := &node{
-					priority: 1,
-				}
-				n.children = []*node{child}
-				n = child
-				continue
-			}
-			// Otherwise we're done. Insert the handle in the new leaf
-			n.handle = handle
-			return
-		}
-		// catchAll
-		if i+len(wildcard) != len(path) {
-			panic("catch-all routes are only allowed at the end of the path in path '" + fullPath + "'")
-		}
-		if len(n.path) > 0 && n.path[len(n.path)-1] == '/' {
-			panic("catch-all conflicts with existing handle for the path segment root in path '" + fullPath + "'")
-		}
-		// Currently fixed width 1 for '/'
-		i--
-		if path[i] != '/' {
-			panic("no / before catch-all in path '" + fullPath + "'")
-		}
-		n.path = path[:i]
-		// First node: catchAll node with empty path
-		child := &node{
-			wildChild: true,
-			nType:     catchAll,
-		}
-		n.children = []*node{child}
-		n.indices = string('/')
-		n = child
-		n.priority++
-		// Second node: node holding the variable
-		child = &node{
-			path:     path[i:],
-			nType:    catchAll,
-			handle:   handle,
-			priority: 1,
-		}
-		n.children = []*node{child}
-		return
-	}
-	// If no wildcard was found, simply insert the path and handle
-	n.path = path
-	n.handle = handle
-}
-// Returns the handle registered with the given path (key). The values of
-// wildcards are saved to a map.
-// If no handle can be found, a TSR (trailing slash redirect) recommendation is
-// made if a handle exists with an extra (without the) trailing slash for the
-// given path.
-func (n *node) getValue(path string, params func() *Params) (handle RouteFn, ps *Params, tsr bool) {
-walk: // Outer loop for walking the tree
-	for {
-		prefix := n.path
-		if len(path) > len(prefix) {
-			if path[:len(prefix)] == prefix {
-				path = path[len(prefix):]
-				// If this node does not have a wildcard (param or catchAll)
-				// child, we can just look up the next child node and continue
-				// to walk down the tree
-				if !n.wildChild {
-					idxc := path[0]
-					for i, c := range []byte(n.indices) {
-						if c == idxc {
-							n = n.children[i]
-							continue walk
-						}
-					}
-					// Nothing found.
-					// We can recommend to redirect to the same URL without a
-					// trailing slash if a leaf exists for that path.
-					tsr = (path == "/" && n.handle != nil)
-					return
-				}
-				// Handle wildcard child
-				n = n.children[0]
-				switch n.nType {
-				case param:
-					// Find param end (either '/' or path end)
-					end := 0
-					for end < len(path) && path[end] != '/' {
-						end++
-					}
-					// Save param value
-					if params != nil {
-						if ps == nil {
-							ps = params()
-						}
-						// Expand slice within preallocated capacity
-						i := len(*ps)
-						*ps = (*ps)[:i+1]
-						(*ps)[i] = Param{
-							Key:   n.path[1:],
-							Value: path[:end],
-						}
-					}
-					// We need to go deeper!
-					if end < len(path) {
-						if len(n.children) > 0 {
-							path = path[end:]
-							n = n.children[0]
-							continue walk
-						}
-						// ... but we can't
-						tsr = (len(path) == end+1)
-						return
-					}
-					if handle = n.handle; handle != nil {
-						return
-					} else if len(n.children) == 1 {
-						// No handle found. Check if a handle for this path + a
-						// trailing slash exists for TSR recommendation
-						n = n.children[0]
-						tsr = (n.path == "/" && n.handle != nil) || (n.path == "" && n.indices == "/")
-					}
-					return
-				case catchAll:
-					// Save param value
-					if params != nil {
-						if ps == nil {
-							ps = params()
-						}
-						// Expand slice within preallocated capacity
-						i := len(*ps)
-						*ps = (*ps)[:i+1]
-						(*ps)[i] = Param{
-							Key:   n.path[2:],
-							Value: path,
-						}
-					}
-					handle = n.handle
-					return
-				default:
-					panic("invalid node type")
-				}
-			}
-		} else if path == prefix {
-			// We should have reached the node containing the handle.
-			// Check if this node has a handle registered.
-			if handle = n.handle; handle != nil {
-				return
-			}
-			// If there is no handle for this route, but this route has a
-			// wildcard child, there must be a handle for this path with an
-			// additional trailing slash
-			if path == "/" && n.wildChild && n.nType != root {
-				tsr = true
-				return
-			}
-			// No handle found. Check if a handle for this path + a
-			// trailing slash exists for trailing slash recommendation
-			for i, c := range []byte(n.indices) {
-				if c == '/' {
-					n = n.children[i]
-					tsr = (len(n.path) == 1 && n.handle != nil) ||
-						(n.nType == catchAll && n.children[0].handle != nil)
-					return
-				}
-			}
-			return
-		}
-		// Nothing found. We can recommend to redirect to the same URL with an
-		// extra trailing slash if a leaf exists for that path
-		tsr = (path == "/") ||
-			(len(prefix) == len(path)+1 && prefix[len(path)] == '/' &&
-				path == prefix[:len(prefix)-1] && n.handle != nil)
-		return
-	}
-}
-// Makes a case-insensitive lookup of the given path and tries to find a handler.
-// It can optionally also fix trailing slashes.
-// It returns the case-corrected path and a bool indicating whether the lookup
-// was successful.
-func (n *node) findCaseInsensitivePath(path string, fixTrailingSlash bool) (fixedPath string, found bool) {
-	const stackBufSize = 128
-	// Use a static sized buffer on the stack in the common case.
-	// If the path is too long, allocate a buffer on the heap instead.
-	buf := make([]byte, 0, stackBufSize)
-	if l := len(path) + 1; l > stackBufSize {
-		buf = make([]byte, 0, l)
-	}
-	ciPath := n.findCaseInsensitivePathRec(
-		path,
-		buf,       // Preallocate enough memory for new path
-		[4]byte{}, // Empty rune buffer
-		fixTrailingSlash,
-	)
-	return string(ciPath), ciPath != nil
-}
-// Shift bytes in array by n bytes left
-func shiftNRuneBytes(rb [4]byte, n int) [4]byte {
-	switch n {
-	case 0:
-		return rb
-	case 1:
-		return [4]byte{rb[1], rb[2], rb[3], 0}
-	case 2:
-		return [4]byte{rb[2], rb[3]}
-	case 3:
-		return [4]byte{rb[3]}
-	default:
-		return [4]byte{}
-	}
-}
-// Recursive case-insensitive lookup function used by n.findCaseInsensitivePath
-func (n *node) findCaseInsensitivePathRec(path string, ciPath []byte, rb [4]byte, fixTrailingSlash bool) []byte {
-	npLen := len(n.path)
-walk: // Outer loop for walking the tree
-	for len(path) >= npLen && (npLen == 0 || strings.EqualFold(path[1:npLen], n.path[1:])) {
-		// Add common prefix to result
-		oldPath := path
-		path = path[npLen:]
-		ciPath = append(ciPath, n.path...)
-		if len(path) > 0 {
-			// If this node does not have a wildcard (param or catchAll) child,
-			// we can just look up the next child node and continue to walk down
-			// the tree
-			if !n.wildChild {
-				// Skip rune bytes already processed
-				rb = shiftNRuneBytes(rb, npLen)
-				if rb[0] != 0 {
-					// Old rune not finished
-					idxc := rb[0]
-					for i, c := range []byte(n.indices) {
-						if c == idxc {
-							// continue with child node
-							n = n.children[i]
-							npLen = len(n.path)
-							continue walk
-						}
-					}
-				} else {
-					// Process a new rune
-					var rv rune
-					// Find rune start.
-					// Runes are up to 4 byte long,
-					// -4 would definitely be another rune.
-					var off int
-					for max := min(npLen, 3); off < max; off++ {
-						if i := npLen - off; utf8.RuneStart(oldPath[i]) {
-							// read rune from cached path
-							rv, _ = utf8.DecodeRuneInString(oldPath[i:])
-							break
-						}
-					}
-					// Calculate lowercase bytes of current rune
-					lo := unicode.ToLower(rv)
-					utf8.EncodeRune(rb[:], lo)
-					// Skip already processed bytes
-					rb = shiftNRuneBytes(rb, off)
-					idxc := rb[0]
-					for i, c := range []byte(n.indices) {
-						// Lowercase matches
-						if c == idxc {
-							// must use a recursive approach since both the
-							// uppercase byte and the lowercase byte might exist
-							// as an index
-							if out := n.children[i].findCaseInsensitivePathRec(
-								path, ciPath, rb, fixTrailingSlash,
-							); out != nil {
-								return out
-							}
-							break
-						}
-					}
-					// If we found no match, the same for the uppercase rune,
-					// if it differs
-					if up := unicode.ToUpper(rv); up != lo {
-						utf8.EncodeRune(rb[:], up)
-						rb = shiftNRuneBytes(rb, off)
-						idxc := rb[0]
-						for i, c := range []byte(n.indices) {
-							// Uppercase matches
-							if c == idxc {
-								// Continue with child node
-								n = n.children[i]
-								npLen = len(n.path)
-								continue walk
-							}
-						}
-					}
-				}
-				// Nothing found. We can recommend to redirect to the same URL
-				// without a trailing slash if a leaf exists for that path
-				if fixTrailingSlash && path == "/" && n.handle != nil {
-					return ciPath
-				}
-				return nil
-			}
-			n = n.children[0]
-			switch n.nType {
-			case param:
-				// Find param end (either '/' or path end)
-				end := 0
-				for end < len(path) && path[end] != '/' {
-					end++
-				}
-				// Add param value to case insensitive path
-				ciPath = append(ciPath, path[:end]...)
-				// We need to go deeper!
-				if end < len(path) {
-					if len(n.children) > 0 {
-						// Continue with child node
-						n = n.children[0]
-						npLen = len(n.path)
-						path = path[end:]
-						continue
-					}
-					// ... but we can't
-					if fixTrailingSlash && len(path) == end+1 {
-						return ciPath
-					}
-					return nil
-				}
-				if n.handle != nil {
-					return ciPath
-				} else if fixTrailingSlash && len(n.children) == 1 {
-					// No handle found. Check if a handle for this path + a
-					// trailing slash exists
-					n = n.children[0]
-					if n.path == "/" && n.handle != nil {
-						return append(ciPath, '/')
-					}
-				}
-				return nil
-			case catchAll:
-				return append(ciPath, path...)
-			default:
-				panic("invalid node type")
-			}
-		} else {
-			// We should have reached the node containing the handle.
-			// Check if this node has a handle registered.
-			if n.handle != nil {
-				return ciPath
-			}
-			// No handle found.
-			// Try to fix the path by adding a trailing slash
-			if fixTrailingSlash {
-				for i, c := range []byte(n.indices) {
-					if c == '/' {
-						n = n.children[i]
-						if (len(n.path) == 1 && n.handle != nil) ||
-							(n.nType == catchAll && n.children[0].handle != nil) {
-							return append(ciPath, '/')
-						}
-						return nil
-					}
-				}
-			}
-			return nil
-		}
-	}
-	// Nothing found.
-	// Try to fix the path by adding / removing a trailing slash
-	if fixTrailingSlash {
-		if path == "/" {
-			return ciPath
-		}
-		if len(path)+1 == npLen && n.path[len(path)] == '/' &&
-			strings.EqualFold(path[1:], n.path[1:len(path)]) && n.handle != nil {
-			return append(ciPath, n.path...)
-		}
-	}
-	return nil
-}
-// Param is a single URL parameter, consisting of a key and a value.
-type Param struct {
-	Key   string
-	Value string
-}
-// Params is a Param-slice, as returned by the router.
-// The slice is ordered, the first URL parameter is also the first slice value.
-// It is therefore safe to read values by the index.
-type Params []Param
-// ByName returns the value of the first Param which key matches the given name.
-// If no matching Param is found, an empty string is returned.
-func (ps Params) ByName(name string) string {
-	for _, p := range ps {
-		if p.Key == name {
-			return p.Value
-		}
-	}
-	return ""
-}
-type paramsKey struct{}
-// ParamsKey is the request context key under which URL params are stored.
-var ParamsKey = paramsKey{}
-// ParamsFromContext pulls the URL parameters from a request context,
-// or returns nil if none are present.
-func ParamsFromContext(ctx context.Context) Params {
-	p, _ := ctx.Value(ParamsKey).(Params)
-	return p
-}
-type RouteFn func(w http.ResponseWriter, r *http.Request) *Element
-// Router is a http.Handler which can be used to dispatch requests to different
-// handler functions via configurable routes
-type Router struct {
-	trees     map[string]*node
-	maxParams uint16
-	// Enables automatic redirection if the current route can't be matched but a
-	// handler for the path with (without) the trailing slash exists.
-	// For example if /foo/ is requested but a route only exists for /foo, the
-	// client is redirected to /foo with http status code 301 for GET requests
-	// and 308 for all other request methods.
-	RedirectTrailingSlash bool
-	// Configurable handler which is called when no matching route is found.
-	NotFound RouteFn
-	// Configurable handler which is called when an error occurs.
-	Error RouteFn
-}
-var globalRouter = &Router{
-	RedirectTrailingSlash: true,
-	NotFound: func(w http.ResponseWriter, r *http.Request) *Element {
-		return Col(
-			Row(
-				Text("This is the default 404 - Not Found Route handler"),
-			),
-			Row(
-				Text("SetNotFoundHandler(func(c *RenderContext) UI {}) to override it"),
-			),
-		)
-	},
-	Error: func(w http.ResponseWriter, r *http.Request) *Element {
-		// err.Error()s
-		return Col(
-			Row(
-				Text("This is the default 500 - Internal Server Error Route handler"),
-			),
-			Row(
-				Text("Error: "),
-			),
-			Row(
-				Text("SetErrorHandler(func(r *http.Request, w http.ResponseWriter) *Element {}) to override it"),
-			),
-		)
-	},
-}
-func SetNotFoundHandler(b RouteFn) {
-	globalRouter.NotFound = b
-}
-func SetErrorHandler(b RouteFn) {
-	globalRouter.Error = b
-}
-// GET route
-func (r *Router) GET(path string, handle RouteFn) {
-	r.Handle("GET", path, handle)
-}
-// POST route
-func (r *Router) POST(path string, handle RouteFn) {
-	r.Handle("POST", path, handle)
-}
-// PUT route
-func (r *Router) PUT(path string, handle RouteFn) {
-	r.Handle("PUT", path, handle)
-}
-// DELETE route
-func (r *Router) DELETE(path string, handle RouteFn) {
-	r.Handle("DELETE", path, handle)
-}
-// Handle registers a new request handle with the given path and method.
-//
-// For GET, POST, PUT, PATCH and DELETE requests the respective shortcut
-// functions can be used.
-//
-// This function is intended for bulk loading and to allow the usage of less
-// frequently used, non-standardized or custom methods (e.g. for internal
-// communication with a proxy).
-func (r *Router) Handle(method, path string, handle RouteFn) {
-	varsCount := uint16(0)
-	if method == "" {
-		panic("method must not be empty")
-	}
-	if len(path) < 1 || path[0] != '/' {
-		panic("path must begin with '/' in path '" + path + "'")
-	}
-	if handle == nil {
-		panic("handle must not be nil")
-	}
-	if r.trees == nil {
-		r.trees = make(map[string]*node)
-	}
-	root := r.trees[method]
-	if root == nil {
-		root = new(node)
-		r.trees[method] = root
-	}
-	root.addRoute(path, handle)
-	// Update maxParams
-	if paramsCount := countParams(path); paramsCount+varsCount > r.maxParams {
-		r.maxParams = paramsCount + varsCount
-	}
-}
-// Lookup allows the manual lookup of a method + path combo.
-// This is e.g. useful to build a framework around this router.
-// If the path was found, it returns the handle function and the path parameter
-// values. Otherwise the third return value indicates whether a redirection to
-// the same path with an extra / without the trailing slash should be performed.
-func (r *Router) Lookup(method, path string) (interface{}, Params, bool) {
-	if root := r.trees[method]; root != nil {
-		handle, ps, tsr := root.getValue(path, nil)
-		if handle == nil {
-			return nil, nil, tsr
-		}
-		if ps == nil {
-			return handle, nil, tsr
-		}
-		return handle, *ps, tsr
-	}
-	return nil, nil, false
-}
-// ServeHTTP makes the router implement the http.Handler interface.
-func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	// Handle errors
-	defer func() {
-		if rcv := recover(); rcv != nil {
-			var err error
-			switch x := rcv.(type) {
-			case string:
-				err = errors.New(x)
-			case error:
-				err = x
-			default:
-				err = errors.New("unknown panic")
-			}
-			w.Header().Set("Content-Type", "text/html")
-			w.WriteHeader(http.StatusInternalServerError)
-			w.Write([]byte(err.Error()))
-			// r.Error(w, req)
-		}
-	}()
-	path := req.URL.Path
-	println("route: " + req.URL.Path)
-	if root := r.trees[req.Method]; root != nil {
-		// TODO: use _ ps save it to context for useParam()
-		if handle, _, tsr := root.getValue(path, nil); handle != nil {
-			// w.Header().Set("Content-Type", "text/html")
-			// w.WriteHeader(http.StatusOK)
-			elm := handle(w, req)
-			if elm != nil {
-				elm.HtmlWithIndent(w, 2)
-			}
-			return
-		} else if req.Method != http.MethodConnect && path != "/" {
-			// Moved Permanently, request with GET method
-			code := http.StatusMovedPermanently
-			if req.Method != http.MethodGet {
-				// Permanent Redirect, request with same method
-				code = http.StatusPermanentRedirect
-			}
-			if tsr && r.RedirectTrailingSlash {
-				if len(path) > 1 && path[len(path)-1] == '/' {
-					req.URL.Path = path[:len(path)-1]
-				} else {
-					req.URL.Path = path + "/"
-				}
-				http.Redirect(w, req, req.URL.String(), code)
-				return
-			}
-		}
-	}
-	// Handle 404
-	w.Header().Set("Content-Type", "text/html")
-	w.WriteHeader(http.StatusNotFound)
-	r.NotFound(w, req)
-}
-// func (r *Router) Lambda(ctx context.Context, e events.APIGatewayV2HTTPRequest) (res events.APIGatewayV2HTTPResponse, err error) {
-// 	res.StatusCode = 200
-// 	res.Headers = map[string]string{
-// 		"Content-Type": "text/html",
-// 	}
-// 	// Handle errors
-// 	defer func() {
-// 		if rcv := recover(); rcv != nil {
-// 			switch x := rcv.(type) {
-// 			case string:
-// 				err = errors.New(x)
-// 			case error:
-// 				err = x
-// 			default:
-// 				err = errors.New("unknown panic")
-// 			}
-// 			res.Body = r.getPage(r.Error(err))
-// 		}
-// 	}()
-// 	println("route: " + e.RawPath)
-// 	path := strings.Replace(e.RawPath, "/Prod/", "/", 1)
-// 	if root := r.trees[e.RequestContext.HTTP.Method]; root != nil {
-// 		if handle, _, _ := root.getValue(path, nil); handle != nil {
-// 			res.Body = r.getPage(handle)
-// 			return
-// 		}
-// 	}
-// 	// Handle 404
-// 	res.StatusCode = http.StatusNotFound
-// 	res.Body = r.getPage(r.NotFound(NewRenderContext()))
-// 	return
-// }
-func Run(assetsFS embed.FS) {
-	isLambda := os.Getenv("_LAMBDA_SERVER_PORT") != ""
-	if !isLambda {
-		assetsHandler := http.FileServer(http.FS(assetsFS))
-		globalRouter.GET("/assets/*filepath", func(w http.ResponseWriter, r *http.Request) *Element {
-			assetsHandler.ServeHTTP(w, r)
-			return nil
-		})
-		println("Serving on http://localhost:1234")
-		http.ListenAndServe(":1234", globalRouter)
-	} else {
-		// 	println("running in lambda mode")
-		// 	lambda.Start(globalRouter.Lambda)
-	}
-}
-func Route(path string, render RouteFn) {
-	println("registering route: " + path)
-	globalRouter.GET(path, render)
-}

~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.