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.

dc8f948e — pyros2097

improve attrs and selectors

Files changed (4) hide show

attributes.go +21 -85
html.go +5 -5
node.go +0 -3
selectors.go +27 -167

attributes.go CHANGED Viewed

@@ -4,123 +4,59 @@ import (
 	"github.com/pyros2097/wapp/js"
 )
-type baseAttribute struct {
-	UI
-}
-func (c baseAttribute) Kind() Kind {
-	return Attribute
-}
-func (c baseAttribute) JSValue() js.Value {
-	return nil
-}
-func (c baseAttribute) Mounted() bool {
-	return false
-}
-func (c baseAttribute) name() string {
-	return "css"
-}
-func (c baseAttribute) self() UI {
-	return c
-}
-func (c baseAttribute) setSelf(UI) {
-}
-func (c baseAttribute) attributes() map[string]string {
-	return nil
-}
-func (c baseAttribute) eventHandlers() map[string]js.EventHandler {
-	return nil
-}
-func (c baseAttribute) parent() UI {
-	return nil
-}
-func (c baseAttribute) setParent(UI) {
-}
-func (c baseAttribute) children() []UI {
-	return nil
-}
-func (c baseAttribute) mount() error {
-	panic("cant mount attributes")
-}
-func (c baseAttribute) dismount() {
-}
-func (c baseAttribute) update(UI) error {
-	panic("cant update attributes")
-}
 type CssAttribute struct {
-	baseAttribute
 	classes string
 }
-func Css(d string) UI {
+func Css(d string) CssAttribute {
 	return CssAttribute{classes: d}
 }
 type OnClickAttribute struct {
-	baseAttribute
 	cb func()
 }
-func OnClick(cb func()) UI {
+func OnClick(cb func()) OnClickAttribute {
 	return OnClickAttribute{cb: cb}
 }
 type OnChangeAttribute struct {
-	baseAttribute
 	cb js.EventHandlerFunc
 }
-func OnChange(cb js.EventHandlerFunc) UI {
+func OnChange(cb js.EventHandlerFunc) OnChangeAttribute {
 	return OnChangeAttribute{cb: cb}
 }
 type OnInputAttribute struct {
-	baseAttribute
 	cb js.EventHandlerFunc
 }
-func OnInput(cb js.EventHandlerFunc) UI {
+func OnInput(cb js.EventHandlerFunc) OnInputAttribute {
 	return OnInputAttribute{cb: cb}
 }
-func mergeAttributes(parent *elem, uis ...UI) {
+func mergeAttributes(parent *elem, uis ...interface{}) {
 	elems := make([]UI, 0, len(uis))
 	for _, v := range uis {
-		if v.Kind() == Attribute {
-			switch c := v.(type) {
+		switch c := v.(type) {
-			case CssAttribute:
+		case CssAttribute:
-				if vv, ok := parent.attrs["classes"]; ok {
+			if vv, ok := parent.attrs["classes"]; ok {
-					parent.setAttr("class", vv+" "+c.classes)
+				parent.setAttr("class", vv+" "+c.classes)
-				} else {
+			} else {
-					parent.setAttr("class", c.classes)
+				parent.setAttr("class", c.classes)
-				}
-			case OnClickAttribute:
-				parent.setEventHandler("click", func(e js.Event) {
-					c.cb()
-				})
-			case OnChangeAttribute:
-				parent.setEventHandler("change", c.cb)
-			case OnInputAttribute:
-				parent.setEventHandler("input", c.cb)
 			}
+		case OnClickAttribute:
+			parent.setEventHandler("click", func(e js.Event) {
+				c.cb()
+			})
+		case OnChangeAttribute:
+			parent.setEventHandler("change", c.cb)
+		case OnInputAttribute:
+			parent.setEventHandler("input", c.cb)
-		} else {
+		case UI:
-			elems = append(elems, v)
+			elems = append(elems, c)
 		}
 	}
 	parent.setBody(elems...)
 }

html.go CHANGED Viewed

@@ -48,16 +48,16 @@ func Script(str string) *elem {
 	}
 }
-func Div(uis ...UI) *elem {
+func Div(uis ...interface{}) *elem {
 	e := &elem{tag: "div"}
 	mergeAttributes(e, uis...)
 	return e
 }
-func Row(uis ...UI) UI {
+func Row(uis ...interface{}) UI {
-	return Div(append([]UI{Css("flex flex-row justify-center align-items-center")}, uis...)...)
+	return Div(append([]interface{}{Css("flex flex-row justify-center align-items-center")}, uis...)...)
 }
-func Col(uis ...UI) UI {
+func Col(uis ...interface{}) UI {
-	return Div(append([]UI{Css("flex flex-col justify-center align-items-center")}, uis...)...)
+	return Div(append([]interface{}{Css("flex flex-col justify-center align-items-center")}, uis...)...)
 }

node.go CHANGED Viewed

@@ -75,9 +75,6 @@ const (
 	// elements within a given list.
 	Selector
-	//  Attribute represents css
-	Attribute
 	// RawHTML represents an HTML element obtained from a raw HTML code snippet.
 	RawHTML

selectors.go CHANGED Viewed

@@ -1,49 +1,31 @@
 package app
 import (
-	"net/url"
 	"reflect"
 	"sort"
-	"github.com/pyros2097/wapp/errors"
-	"github.com/pyros2097/wapp/js"
 )
-// RangeLoop represents a control structure that iterates within a slice, an
-// array or a map.
-type RangeLoop interface {
-	UI
-	// Slice sets the loop content by repeating the given function for the
-	// number of elements in the source.
-	//
-	// It panics if the range source is not a slice or an array.
-	Slice(f func(int) UI) RangeLoop
-	// Map sets the loop content by repeating the given function for the number
-	// of elements in the source. Elements are ordered by keys.
-	//
-	// It panics if the range source is not a map or if map keys are not strings.
-	Map(f func(string) UI) RangeLoop
-}
 // Range returns a range loop that iterates within the given source. Source must
 // be a slice, an array or a map with strings as keys.
 func Range(src interface{}) RangeLoop {
-	return rangeLoop{source: src}
+	return RangeLoop{source: src}
 }
+// RangeLoop represents a control structure that iterates within a slice, an
+// array or a map.
-type rangeLoop struct {
+type RangeLoop struct {
 	body   []UI
 	source interface{}
 }
+// Slice sets the loop content by repeating the given function for the
+// number of elements in the source.
+//
+// It panics if the range source is not a slice or an array.
-func (r rangeLoop) Slice(f func(int) UI) RangeLoop {
+func (r RangeLoop) Slice(f func(int) UI) RangeLoop {
 	src := reflect.ValueOf(r.source)
 	if src.Kind() != reflect.Slice && src.Kind() != reflect.Array {
-		panic(errors.New("range loop source is not a slice or array").
+		panic("range loop source is not a slice or array: " + src.Type().String())
-			Tag("src-type", src.Type),
-		)
 	}
 	body := make([]UI, 0, src.Len())
@@ -55,19 +37,18 @@ func (r rangeLoop) Slice(f func(int) UI) RangeLoop {
 	return r
 }
+// Map sets the loop content by repeating the given function for the number
+// of elements in the source. Elements are ordered by keys.
+//
+// It panics if the range source is not a map or if map keys are not strings.
-func (r rangeLoop) Map(f func(string) UI) RangeLoop {
+func (r RangeLoop) Map(f func(string) UI) RangeLoop {
 	src := reflect.ValueOf(r.source)
 	if src.Kind() != reflect.Map {
-		panic(errors.New("range loop source is not a map").
+		panic("range loop source is not a map: " + src.Type().String())
-			Tag("src-type", src.Type),
-		)
 	}
 	if keyType := src.Type().Key(); keyType.Kind() != reflect.String {
-		panic(errors.New("range loop source keys are not strings").
+		panic("range loop source keys are not strings: " + src.Type().String() + keyType.String())
-			Tag("src-type", src.Type).
-			Tag("key-type", keyType),
-		)
 	}
 	body := make([]UI, 0, src.Len())
@@ -86,80 +67,6 @@ func (r rangeLoop) Map(f func(string) UI) RangeLoop {
 	return r
 }
-func (r rangeLoop) Kind() Kind {
-	return Selector
-}
-func (r rangeLoop) JSValue() js.Value {
-	return nil
-}
-func (r rangeLoop) Mounted() bool {
-	return false
-}
-func (r rangeLoop) name() string {
-	return "range"
-}
-func (r rangeLoop) self() UI {
-	return r
-}
-func (r rangeLoop) setSelf(UI) {
-}
-func (r rangeLoop) attributes() map[string]string {
-	return nil
-}
-func (r rangeLoop) eventHandlers() map[string]js.EventHandler {
-	return nil
-}
-func (r rangeLoop) parent() UI {
-	return nil
-}
-func (r rangeLoop) setParent(UI) {
-}
-func (r rangeLoop) children() []UI {
-	return r.body
-}
-func (r rangeLoop) mount() error {
-	return errors.New("range loop is not mountable").
-		Tag("name", r.name()).
-		Tag("kind", r.Kind())
-}
-func (r rangeLoop) dismount() {
-}
-func (r rangeLoop) update(UI) error {
-	return errors.New("range loop cannot be updated").
-		Tag("name", r.name()).
-		Tag("kind", r.Kind())
-}
-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 {
@@ -167,18 +74,22 @@ func If(expr bool, elems ...UI) Condition {
 		elems = nil
 	}
-	return condition{
+	return Condition{
 		body:      FilterUIElems(elems...),
 		satisfied: expr,
 	}
 }
+// Condition represents a control structure that displays nodes depending on a
+// given expression.
-type condition struct {
+type Condition struct {
 	body      []UI
 	satisfied bool
 }
+// ElseIf sets the condition with the given nodes if previous expressions
+// were not met and given expression is true.
-func (c condition) ElseIf(expr bool, elems ...UI) Condition {
+func (c Condition) ElseIf(expr bool, elems ...UI) Condition {
 	if c.satisfied {
 		return c
 	}
@@ -191,59 +102,8 @@ func (c condition) ElseIf(expr bool, elems ...UI) Condition {
 	return c
 }
+// Else sets the condition with the given UI elements if previous
+// expressions were not met.
-func (c condition) Else(elems ...UI) Condition {
+func (c Condition) Else(elems ...UI) Condition {
 	return c.ElseIf(true, elems...)
 }
-func (c condition) Kind() Kind {
-	return Selector
-}
-func (c condition) JSValue() js.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) attributes() map[string]string {
-	return nil
-}
-func (c condition) eventHandlers() map[string]js.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")
-}

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