gromer

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

f202d784 — pyros2097

improve code structure

Files changed (9) hide show

.gitattributes DELETED Viewed

	@@ -1,2 +0,0 @@
1	- # Auto detect text files and perform LF normalization
2	- * text=auto

.gitignore DELETED Viewed

@@ -1,21 +0,0 @@
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-*.app
-# Test binary, build with `go test -c`
-*.test
-test
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-# Static generated files
-*.gz
-*.gcloudignore
-*.wasm
-main

app_nowasm.go CHANGED Viewed

@@ -2,23 +2,10 @@
 package app
-import (
-	"net/url"
-	"os"
-)
-func getenv(k string) string {
-	return os.Getenv(k)
-}
-func navigate(u *url.URL, updateHistory bool) error {
-	panic("wasm required")
-}
-func reload() {
+func Reload() {
 	panic("wasm required")
 }
-func run(r RenderFunc) {
+func Run(r RenderFunc) {
 	panic("wasm required")
 }

app_wasm.go CHANGED Viewed

@@ -1,8 +1,7 @@
+// +build wasm
 package app
 import (
-	"net/url"
 	"github.com/pyros2097/wapp/js"
 )
@@ -59,17 +58,15 @@ func initContent() {
 	body.body = append(body.body, content)
 }
-func onPopState(this Value, args []Value) interface{} {
+// func onPopState(this js.Value, args []js.Value) interface{} {
-	dispatch(func() {
+// 	dispatch(func() {
-		// navigate(Window().URL(), false)
+// 		// navigate(Window().URL(), false)
-	})
+// 	})
-	return nil
+// 	return nil
-}
+// }
-func isExternalNavigation(u *url.URL) bool {
+// func isExternalNavigation(u *url.URL) bool {
-	return u.Host != "" && u.Host != Window().URL().Host
+// 	return u.Host != "" && u.Host != js.Window().URL().Host
-}
+// }
-func isFragmentNavigation(u *url.URL) bool {
+// func isFragmentNavigation(u *url.URL) bool {
-	return u.Fragment != ""
+// 	return u.Fragment != ""
-}
+// }

element.go CHANGED Viewed

@@ -294,7 +294,19 @@ func (e *elem) setEventHandler(k string, h js.EventHandlerFunc) {
 }
 func (e *elem) setJsEventHandler(k string, h js.EventHandler) {
-	jshandler := makeJsEventHandler(e.self(), h.Value)
+	jshandler := js.FuncOf(func(this js.Value, args []js.Value) interface{} {
+		dispatch(func() {
+			if !e.self().Mounted() {
+				return
+			}
+			e := js.Event{
+				Value: args[0],
+			}
+			trackMousePosition(e)
+			h.Value(e)
+		})
+		return nil
+	})
 	h.JSvalue = jshandler
 	e.events[k] = h
 	e.JSValue().Call("addEventListener", k, jshandler)

js/js_wasm.go CHANGED Viewed

@@ -1,11 +1,10 @@
+// +build wasm
 package js
 import (
 	"net/url"
 	"reflect"
 	"syscall/js"
-	"github.com/pyros2097/wapp/errors"
 )
 var Window = &browserWindow{value: value{Value: js.Global()}}
@@ -167,13 +166,14 @@ func (w *browserWindow) ScrollToID(id string) {
 }
 func (w *browserWindow) AddEventListener(event string, h EventHandler) func() {
+	panic("not implemented")
-	callback := makeJsEventHandler(body, h)
+	// callback := MakeJsEventHandler(body, h)
-	w.Call("addEventListener", event, callback)
+	// w.Call("addEventListener", event, callback)
-	return func() {
+	// return func() {
-		w.Call("removeEventListener", event, callback)
+	// 	w.Call("removeEventListener", event, callback)
-		callback.Release()
+	// 	callback.Release()
-	}
+	// }
 }
 func (w *browserWindow) Location() *Location {
@@ -181,7 +181,7 @@ func (w *browserWindow) Location() *Location {
 }
 type Location struct {
-	value js.Value
+	value Value
 }
 func (l *Location) Reload() {
@@ -207,9 +207,7 @@ func jsval(v Value) js.Value {
 		return jsval(v.Value)
 	default:
-		Log("%s", errors.New("syscall/js value conversion failed").
+		println("syscall/js value conversion failed type: " + reflect.TypeOf(v).String())
-			Tag("type", reflect.TypeOf(v)),
-		)
 		return js.Undefined()
 	}
 }

node.go CHANGED Viewed

@@ -61,23 +61,6 @@ func FilterUIElems(uis ...interface{}) []UI {
 	return elems
 }
-func makeJsEventHandler(src UI, h js.EventHandlerFunc) js.Func {
-	return js.FuncOf(func(this js.Value, args []js.Value) interface{} {
-		dispatch(func() {
-			if !src.Mounted() {
-				return
-			}
-			e := js.Event{
-				Value: args[0],
-			}
-			trackMousePosition(e)
-			h(e)
-		})
-		return nil
-	})
-}
 func trackMousePosition(e js.Event) {
 	x := e.Get("clientX")
 	if !x.Truthy() {

readme.md CHANGED Viewed

@@ -48,8 +48,8 @@ import (
 func Counter(c *RenderContext) UI {
 	count, setCount := c.UseInt(0)
-	inc := func() { setCount(count() - 1) }
+	inc := func() { setCount(count() + 1) }
-	dec := func() { setCount(count() + 1) }
+	dec := func() { setCount(count() - 1) }
 	return Col(
 		Row(
 			Row(Css("text-6xl"),

storage_wasm.go CHANGED Viewed

@@ -3,9 +3,8 @@ package app
 import (
 	"encoding/json"
 	"sync"
-	"syscall/js"
-	"github.com/pyros2097/wapp/errors"
+	"github.com/pyros2097/wapp/js"
 )
 func init() {
@@ -26,10 +25,7 @@ func (s *jsStorage) Set(k string, v interface{}) (err error) {
 	defer func() {
 		r := recover()
 		if r != nil {
-			err = errors.New("setting storage value failed").
+			panic("setting storage value failed storage-type: " + s.name + "key " + k)
-				Tag("storage-type", s.name).
-				Tag("key", k).
-				Wrap(r.(js.Error))
 		}
 	}()
@@ -41,7 +37,7 @@ func (s *jsStorage) Set(k string, v interface{}) (err error) {
 		return err
 	}
-	Window().Get(s.name).Call("setItem", k, btos(b))
+	js.Window.Get(s.name).Call("setItem", k, btos(b))
 	return nil
 }
@@ -49,7 +45,7 @@ func (s *jsStorage) Get(k string, v interface{}) error {
 	s.mutex.RLock()
 	defer s.mutex.RUnlock()
-	item := Window().Get(s.name).Call("getItem", k)
+	item := js.Window.Get(s.name).Call("getItem", k)
 	if !item.Truthy() {
 		return nil
 	}
@@ -61,12 +57,12 @@ func (s *jsStorage) Del(k string) {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	Window().Get(s.name).Call("removeItem", k)
+	js.Window.Get(s.name).Call("removeItem", k)
 }
 func (s *jsStorage) Clear() {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	Window().Get(s.name).Call("clear")
+	js.Window.Get(s.name).Call("clear")
 }