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.

0212dc91 — Peter John

improve template

Files changed (3) hide show

template/parser.go +17 -9
template/template.go +86 -37
template/template_test.go +10 -12

template/parser.go CHANGED Viewed

@@ -7,27 +7,35 @@ import (
 type Module struct {
 	Pos   lexer.Position
-	Nodes []*Xml `parser:"{ @@ }"`
+	Nodes []*Xml `@@`
 }
-type KeyValue struct {
+type Attribute struct {
 	Pos   lexer.Position
 	Key   string   `parser:"@\":\"? @Ident ( @\"-\" @Ident )*"`
 	Value *Literal `parser:"\"=\" @@"`
 }
+type KV struct {
+	Pos   lexer.Position
+	Key   string `@Ident`
+	Value string `":" @"!"? @Ident ( @"." @Ident )*`
+}
 type Literal struct {
+	Pos lexer.Position
-	Str string `parser:"@String"`
+	Str string `@String`
-	Ref string `parser:"| @\"{\" @Ident ( @\".\" @Ident )* @\"}\""`
+	Ref string `| "{" @Ident ( @"." @Ident )* "}"`
+	KV  []*KV  `| "{""{" @@* "}""}"`
 }
 type Xml struct {
 	Pos        lexer.Position
-	Name       string      `parser:"\"<\"@Ident"`
+	Name       string       `parser:"\"<\"@Ident"`
-	Parameters []*KeyValue `parser:"[ @@ { @@ } ] \">\""`
+	Attributes []*Attribute `parser:"[ @@ { @@ } ] \">\""`
-	Children   []*Xml      `parser:"{ @@ }"`
+	Children   []*Xml       `parser:"{ @@ }"`
-	Value      *Literal    `parser:"{ @@ }"` // Todo make this match with @String or Literal
+	Value      *Literal     `parser:"{ @@ }"` // Todo make this match with @String or Literal
-	Close      string      `parser:"\"<\"\"/\"@Ident\">\""`
+	Close      string       `parser:"\"<\"\"/\"@Ident\">\""`
 }
 var xmlParser = participle.MustBuild(&Module{})

template/template.go CHANGED Viewed

@@ -5,12 +5,19 @@ import (
 	"reflect"
 	"runtime"
 	"strings"
+	"github.com/alecthomas/repr"
 )
+type ComponentFunc struct {
+	Func interface{}
+	Args []string
+}
-type Component func(map[string]interface{}) string
+type Html func(string) string
 var htmlTags = []string{"ul", "li", "span", "div"}
-var compMap = map[string]interface{}{}
+var compMap = map[string]ComponentFunc{}
 var funcMap = map[string]interface{}{}
 func getFunctionName(temp interface{}) string {
@@ -18,9 +25,12 @@ func getFunctionName(temp interface{}) string {
 	return strs[len(strs)-1]
 }
-func RegisterComponent(f interface{}) {
+func RegisterComponent(f interface{}, args ...string) {
 	name := getFunctionName(f)
-	compMap[name] = f
+	compMap[name] = ComponentFunc{
+		Func: f,
+		Args: args,
+	}
 }
 func RegisterFunc(f interface{}) {
@@ -28,7 +38,7 @@ func RegisterFunc(f interface{}) {
 	funcMap[name] = f
 }
-func getAttribute(k string, kvs []*KeyValue) string {
+func getAttribute(k string, kvs []*Attribute) string {
 	for _, param := range kvs {
 		if param.Key == k {
 			return strings.ReplaceAll(param.Value.Str, `"`, "")
@@ -37,37 +47,64 @@ func getAttribute(k string, kvs []*KeyValue) string {
 	return ""
 }
+func subsRef(ctx map[string]interface{}, ref string) interface{} {
+	if f, ok := funcMap[ref]; ok {
+		return f.(func() string)()
+	} else {
+		parts := strings.Split(strings.ReplaceAll(ref, "!", ""), ".")
+		if len(parts) == 2 {
+			if v, ok := ctx[parts[0]]; ok {
+				i := reflect.ValueOf(v).Elem().FieldByName(parts[1]).Interface()
+				switch iv := i.(type) {
+				case bool:
+					if strings.Contains(ref, "!") {
+						return !iv
+					} else {
+						return iv
+					}
+				case string:
+					return iv
+				}
+			}
+		}
+	}
+	return nil
+}
 func Render(x *Xml, ctx map[string]interface{}) string {
 	space, _ := ctx["_space"].(string)
 	s := space + "<" + x.Name
-	if len(x.Parameters) > 0 {
+	if len(x.Attributes) > 0 {
 		s += " "
 	}
-	for i, param := range x.Parameters {
+	for i, param := range x.Attributes {
+		if len(param.Value.KV) != 0 {
+			values := []string{}
+			for _, kv := range param.Value.KV {
+				if subsRef(ctx, kv.Value) == true {
+					values = append(values, kv.Key)
+				}
+			}
+			s += param.Key + `="` + strings.Join(values, "") + `"`
+			repr.Println(s)
+		} else if param.Value.Ref != "" {
+			s += param.Key + `="` + subsRef(ctx, param.Value.Ref).(string) + `"`
+		} else {
-		s += param.Key + "=" + param.Value.Str
+			s += param.Key + "=" + param.Value.Str
+		}
-		if i < len(x.Parameters)-1 {
+		if i < len(x.Attributes)-1 {
 			s += " "
 		}
 	}
 	s += ">\n"
 	if x.Value != nil {
 		if x.Value.Ref != "" {
-			key := strings.ReplaceAll(strings.ReplaceAll(x.Value.Ref, "{", ""), "}", "")
+			s += space + "  " + subsRef(ctx, x.Value.Ref).(string) + "\n"
-			if f, ok := funcMap[key]; ok {
-				s += f.(func() string)()
-			} else {
-				parts := strings.Split(key, ".")
-				if len(parts) == 2 {
-					if v, ok := ctx[parts[0]]; ok {
-						s += reflect.ValueOf(v).Elem().FieldByName(parts[1]).Interface().(string)
-					}
-				}
-			}
 		}
 	}
 	if x.Name == "For" {
-		ctxKey := getAttribute("key", x.Parameters)
+		ctxKey := getAttribute("key", x.Attributes)
-		ctxName := getAttribute("name", x.Parameters)
+		ctxName := getAttribute("itemKey", x.Attributes)
 		data := ctx[ctxKey]
 		switch reflect.TypeOf(data).Kind() {
 		case reflect.Slice:
@@ -75,14 +112,24 @@ func Render(x *Xml, ctx map[string]interface{}) string {
 			for i := 0; i < v.Len(); i++ {
 				ctx["_space"] = space + "  "
 				ctx[ctxName] = v.Index(i).Interface()
-				s += Render(x.Children[0], ctx)
+				s += Render(x.Children[0], ctx) + "\n"
 			}
 		}
 	} else {
 		if comp, ok := compMap[x.Name]; ok {
+			ctx["_space"] = space + "  "
+			h := HtmlFunc(ctx)
+			args := []reflect.Value{reflect.ValueOf(h)}
+			for _, k := range comp.Args {
+				if v, ok := ctx[k]; ok {
+					args = append(args, reflect.ValueOf(v))
+				} else {
-			ctxKey := getAttribute("key", x.Parameters)
+					v := getAttribute(k, x.Attributes)
+					args = append(args, reflect.ValueOf(v))
+				}
+			}
-			result := reflect.ValueOf(comp).Call([]reflect.Value{reflect.ValueOf(ctx[ctxKey])})
+			result := reflect.ValueOf(comp.Func).Call(args)
-			s += result[0].Interface().(string)
+			s += result[0].Interface().(string) + "\n"
 		} else {
 			found := false
 			for _, t := range htmlTags {
@@ -103,18 +150,20 @@ func Render(x *Xml, ctx map[string]interface{}) string {
 	return s
 }
-func Html(ctx map[string]interface{}, tpl string) string {
+func HtmlFunc(ctx map[string]interface{}) Html {
+	return func(tpl string) string {
-	tree := &Module{}
+		tree := &Module{}
-	err := xmlParser.ParseBytes("filename", []byte(tpl), tree)
+		err := xmlParser.ParseBytes("filename", []byte(tpl), tree)
-	if err != nil {
+		if err != nil {
-		panic(err)
+			panic(err)
-	}
+		}
-	o := ""
+		o := ""
-	for _, n := range tree.Nodes {
+		for _, n := range tree.Nodes {
-		v := Render(n, ctx)
+			v := Render(n, ctx)
-		o += v
+			o += v
+		}
+		return o
 	}
-	return o
 }
 // <script>

template/template_test.go CHANGED Viewed

@@ -7,16 +7,14 @@ import (
 )
 type TodoData struct {
-	ID   string
+	ID        string
-	Text string
+	Text      string
+	Completed bool
 }
-func Todo(data *TodoData) string {
+func Todo(html Html, todo *TodoData) string {
-	ctx := map[string]interface{}{
-		"todo": data,
-	}
-	return Html(ctx, `
+	return html(`
-		<li id={todo.ID} :class="{ 'completed': todo.Completed }">
+		<li id={todo.ID} class={{ completed: todo.Completed }}>
 			<div class="view">
 				<span>{todo.Text}</span>
 			</div>
@@ -30,17 +28,17 @@ func WebsiteName() string {
 func TestHtml(t *testing.T) {
 	r := require.New(t)
-	RegisterComponent(Todo)
+	RegisterComponent(Todo, "todo")
 	RegisterFunc(WebsiteName)
 	ctx := map[string]interface{}{
 		"_space": "",
 		"todos": []*TodoData{
-			{ID: "b1a7359c-ebb4-11ec-8ea0-0242ac120002", Text: "My first todo"},
+			{ID: "b1a7359c-ebb4-11ec-8ea0-0242ac120002", Text: "My first todo", Completed: true},
 		},
 	}
-	actual := Html(ctx, `
+	actual := HtmlFunc(ctx)(`
 		<ul id="todo-list" class="relative">
-			<For key="todos" name="todo">
+			<For key="todos" itemKey="todo">
 				<Todo key="todo"></Todo>
 			</For>
 			<span>{WebsiteName}</span>

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