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.

13e9ba96 — Peter John

something working

Files changed (17) hide show

_example/components/page.go +4 -8
_example/components/todo.go +4 -4
_example/containers/TodoCount.go +4 -6
_example/containers/TodoList.go +9 -19
_example/main.go +9 -9
_example/pages/about/get.go +0 -20
_example/pages/get.go +0 -103
_example/{pages → routes}/404/get.go +4 -5
_example/routes/about/get.go +18 -0
_example/routes/get.go +119 -0
_example/{pages → routes}/post.go +16 -17
cmd/gromer/main.go +13 -14
go.mod +22 -6
go.sum +38 -5
gsx/gsx.go +106 -27
gsx/gsx_test.go +84 -10
http.go +13 -7

_example/components/page.go CHANGED Viewed

@@ -217,9 +217,9 @@ var _ = Css(`
 	}
 `)
-func Page(h Html, title string) string {
+func Page(ctx Context, title string) *Node {
+	ctx.Set("title", title)
-	return h.Render(`
+	return ctx.Render(`
-		<!DOCTYPE html>
 		<html lang="en">
 			<head>
 					<meta charset="UTF-8" />
@@ -228,12 +228,8 @@ func Page(h Html, title string) string {
 					<title>{title}</title>
 					<meta name="description" content="{title}" />
 					<meta name="author" content="pyrossh" />
-					<meta name="keywords" content="pyros.sh, pyrossh, gromer"  />
+					<meta name="keywords" content="pyros.sh, pyrossh, gromer" />
 					<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, viewport-fit=cover" />
-					<link rel="icon" href="{GetAssetUrl "images/icon.png"}" />
-					<link rel="stylesheet" href="{GetStylesUrl}" />
-					<script src="{GetAlpineJsUrl}"></script>
-					<script src="{GetHtmxJsUrl}" defer=""></script>
 			</head>
 			<body>
 			{children}

_example/components/todo.go CHANGED Viewed

@@ -8,14 +8,14 @@ import (
 var _ = Css(`
 `)
-func Todo(h Html, todo *todos.Todo) string {
+func Todo(ctx Context, todo *todos.Todo) *Node {
-	return h.Render(`
+	return ctx.Render(`
-		<li id="todo-{todo.ID}" class={{ completed: todo.Completed }}>
+		<li id="todo-{todo.ID}" class="{ completed: todo.Completed }">
 			<div class="view">
 				<form  hx-target="#todo-{todo.ID}" hx-swap="outerHTML">
 					<input type="hidden" name="intent" value="complete" />
 					<input type="hidden" name="id" value="{todo.ID}" />
-					<input hx-post="/" class="checkbox" type="checkbox" checked={{ completed: todo.Completed }} />
+					<input hx-post="/" class="checkbox" type="checkbox" checked="{ completed: todo.Completed }" />
 				</form>
 				<label>{todo.Text}</label>
 				<form hx-post="/" hx-target="#todo-{todo.ID}" hx-swap="delete">

_example/containers/TodoCount.go CHANGED Viewed

@@ -1,8 +1,6 @@
 package containers
 import (
-	"context"
 	"github.com/pyros2097/gromer/_example/services/todos"
 	. "github.com/pyros2097/gromer/gsx"
 )
@@ -18,16 +16,16 @@ var _ = Css(`
 	}
 `)
-func TodoCount(h Html, ctx context.Context, filter string) (string, error) {
+func TodoCount(ctx Context, filter string) (*Node, error) {
 	todos, err := todos.GetAllTodo(ctx, todos.GetAllTodoParams{
 		Filter: filter,
 		Limit:  1000,
 	})
 	if err != nil {
-		return "", err
+		return nil, err
 	}
-	h["count"] = len(todos)
+	ctx.Set("count", len(todos))
-	return h.Render(`
+	return ctx.Render(`
 		<span class="todo-count" id="todo-count" hx-swap-oob="true">
 			<strong>{count}</strong> item left
 		</span>

_example/containers/TodoList.go CHANGED Viewed

@@ -1,8 +1,6 @@
 package containers
 import (
-	"context"
 	. "github.com/pyros2097/gromer"
 	"github.com/pyros2097/gromer/_example/services/todos"
 	. "github.com/pyros2097/gromer/gsx"
@@ -129,27 +127,19 @@ var _ = Css(`
 `)
-type TodoListProps struct {
-	ID     string `json:"id"`
-	Page   int    `json:"page"`
-	Filter string `json:"filter"`
-}
-func TodoList(h Html, ctx context.Context, props TodoListProps) (string, error) {
+func TodoList(ctx Context, page int, filter string) (*Node, error) {
-	index := Default(props.Page, 1)
+	index := Default(page, 1)
 	todos, err := todos.GetAllTodo(ctx, todos.GetAllTodoParams{
-		Filter: props.Filter,
+		Filter: filter,
 		Limit:  index,
 	})
 	if err != nil {
-		return "", err
+		return nil, err
-	}
+	}
-	h["todos"] = todos
+	ctx.Set("todos", todos)
-	return h.Render(`
+	return ctx.Render(`
-		<ul id="todo-list" class="relative">
+		<ul id="todo-list" class="relative" x-for="todo in todos">
-			<For key="todos" itemKey="todo">
-				<Todo key="todo"></Todo>
-			</For>
+			<Todo />
 		</ul>
 	`), nil
 }

_example/main.go CHANGED Viewed

@@ -10,19 +10,19 @@ import (
 	"github.com/pyros2097/gromer/_example/assets"
 	"github.com/pyros2097/gromer/_example/components"
 	"github.com/pyros2097/gromer/_example/containers"
-	"github.com/pyros2097/gromer/_example/pages/404"
+	"github.com/pyros2097/gromer/_example/routes/404"
-	"github.com/pyros2097/gromer/_example/pages"
+	"github.com/pyros2097/gromer/_example/routes"
-	"github.com/pyros2097/gromer/_example/pages/about"
+	"github.com/pyros2097/gromer/_example/routes/about"
 	"github.com/pyros2097/gromer/gsx"
 )
 func init() {
-	gsx.RegisterComponent(components.Page)
+	gsx.RegisterComponent(components.Page, "title")
-	gsx.RegisterComponent(components.Todo)
+	gsx.RegisterComponent(components.Todo, "todo")
-	gsx.RegisterComponent(containers.TodoCount)
+	gsx.RegisterComponent(containers.TodoCount, "filter")
-	gsx.RegisterComponent(containers.TodoList)
+	gsx.RegisterComponent(containers.TodoList, "page", "filter")
 	gromer.RegisterAssets(assets.FS)
 }
@@ -40,8 +40,8 @@ func main() {
 	pageRouter := baseRouter.NewRoute().Subrouter()
 	// gromer.ApiExplorerRoute(pageRouter, "/explorer")
-	gromer.Handle(pageRouter, "GET", "/", pages.GET)
+	gromer.Handle(pageRouter, "GET", "/", routes.GET)
-	gromer.Handle(pageRouter, "POST", "/", pages.POST)
+	gromer.Handle(pageRouter, "POST", "/", routes.POST)
 	gromer.Handle(pageRouter, "GET", "/about", about.GET)

_example/pages/about/get.go DELETED Viewed

@@ -1,20 +0,0 @@
-package about
-import (
-	"context"
-	. "github.com/pyros2097/gromer/gsx"
-)
-func GET(h Html, c context.Context) (string, int, error) {
-	return h.Render(`
-		{{#Page title="About me"}}
-			<div class="flex flex-col justify-center items-center">
-					{{#Header}}
-						A new link is here
-					{{/Header}}
-					<h1>About Me</h1>
-			</div>
-		{{/Page}}
-	`), 200, nil
-}

_example/pages/get.go DELETED Viewed

@@ -1,103 +0,0 @@
-package pages
-import (
-	"context"
-	_ "github.com/pyros2097/gromer/_example/components"
-	. "github.com/pyros2097/gromer/gsx"
-)
-var _ = Css(`
-	.todoapp {
-		background: #fff;
-		margin: 130px 0 40px 0;
-		position: relative;
-		box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.1);
-	}
-	.todoapp input::-webkit-input-placeholder {
-		font-style: italic;
-		font-weight: 300;
-		color: #e6e6e6;
-	}
-	.todoapp input::-moz-placeholder {
-		font-style: italic;
-		font-weight: 300;
-		color: #e6e6e6;
-	}
-	.todoapp input::input-placeholder {
-		font-style: italic;
-		font-weight: 300;
-		color: #e6e6e6;
-	}
-	.todoapp h1 {
-		position: absolute;
-		top: -155px;
-		width: 100%;
-		font-size: 100px;
-		font-weight: 100;
-		text-align: center;
-		color: rgba(175, 47, 47, 0.15);
-		-webkit-text-rendering: optimizeLegibility;
-		-moz-text-rendering: optimizeLegibility;
-		text-rendering: optimizeLegibility;
-	}
-`)
-// var (
-// 	Container = Css(`
-// 		background: #fff;
-// 		margin: 130px 0 40px 0;
-// 		position: relative;
-// 		box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.1);
-// 	`)
-// )
-type GetParams struct {
-	Page   int    `json:"page"`
-	Filter string `json:"filter"`
-}
-func GET(h Html, ctx context.Context, params GetParams) (string, int, error) {
-	h["page"] = params.Page
-	h["filter"] = params.Filter
-	return h.Render(`
-		<Page title="gromer example">
-			<section class="todoapp">
-				<header class="header">
-					<h1>todos</h1>
-					<form hx-post="/" hx-target="#todo-list" hx-swap="afterbegin" _="on htmx:afterOnLoad set #text.value to ''">
-						<input type="hidden" name="intent" value="create"></input>
-						<input class="new-todo" id="text" name="text" placeholder="What needs to be done?" autofocus="false" autocomplete="off"></input>
-					</form>
-				</header>
-				<section class="main">
-					<input class="toggle-all" id="toggle-all" type="checkbox">
-					<label for="toggle-all">Mark all as complete</label>
-					<TodoList id="todo-list" page={page} filter={filter}></TodoList>
-				</section>
-				<footer class="footer">
-					<TodoCount filter={filter}></TodoCount>
-					<ul class="filters">
-						<li>
-							<a href="?filter=all">All</a>
-						</li>
-						<li>
-							<a href="?filter=active">Active</a>
-						</li>
-						<li>
-							<a href="?filter=completed">Completed</a>
-						</li>
-					</ul>
-					<form hx-target="#todo-list" hx-post="/">
-						<input type="hidden" name="intent" value="clear_completed" />
-						<button type="submit" class="clear-completed" >Clear completed</button>
-					</form>
-				</footer>
-			</section>
-		</Page>
-	`), 200, nil
-}

_example/{pages → routes}/404/get.go RENAMED Viewed

@@ -6,16 +6,15 @@ import (
 	. "github.com/pyros2097/gromer/gsx"
 )
-func GET(h Html, c context.Context) (string, int, error) {
+func GET(h Context, c context.Context) (*Node, int, error) {
 	return h.Render(`
-		{{#Page title="Page Not Found"}}
+		<Page title="Page Not Found">
-			{{#Header}}{{/Header}}
 			<main class="box center">
 				<h1>Page Not Found</h1>
 				<h2 class="mt-6">
 					<a class="is-underlined" href="/">Go Back</a>
-				</h1>
+				</h2>
 			</main>
-		{{/Page}}
+		</Page>
 	`), 404, nil
 }

_example/routes/about/get.go ADDED Viewed

@@ -0,0 +1,18 @@
+package about
+import (
+	"context"
+	. "github.com/pyros2097/gromer/gsx"
+)
+func GET(h Context, c context.Context) (*Node, int, error) {
+	return h.Render(`
+		<Page title="About me">
+			<div class="flex flex-col justify-center items-center">
+				A new link is here
+				P<h1>About Me</h1>
+			</div>
+		</Page>
+	`), 200, nil
+}

_example/routes/get.go ADDED Viewed

@@ -0,0 +1,119 @@
+package routes
+import (
+	"context"
+	_ "github.com/pyros2097/gromer/_example/components"
+	. "github.com/pyros2097/gromer/gsx"
+)
+var _ = Css(`
+	.todoapp {
+		background: #fff;
+		margin: 130px 0 40px 0;
+		position: relative;
+		box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.1);
+	}
+	.todoapp input::-webkit-input-placeholder {
+		font-style: italic;
+		font-weight: 300;
+		color: #e6e6e6;
+	}
+	.todoapp input::-moz-placeholder {
+		font-style: italic;
+		font-weight: 300;
+		color: #e6e6e6;
+	}
+	.todoapp input::input-placeholder {
+		font-style: italic;
+		font-weight: 300;
+		color: #e6e6e6;
+	}
+	.todoapp h1 {
+		position: absolute;
+		top: -155px;
+		width: 100%;
+		font-size: 100px;
+		font-weight: 100;
+		text-align: center;
+		color: rgba(175, 47, 47, 0.15);
+		-webkit-text-rendering: optimizeLegibility;
+		-moz-text-rendering: optimizeLegibility;
+		text-rendering: optimizeLegibility;
+	}
+`)
+// var (
+// 	Container = Css(`
+// 		background: #fff;
+// 		margin: 130px 0 40px 0;
+// 		position: relative;
+// 		box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.1);
+// 	`)
+// )
+type GetParams struct {
+	Page   int    `json:"page"`
+	Filter string `json:"filter"`
+}
+// func IndexLoader() {
+// 	Data: M{},
+// 	Meta: []*Meta{},
+// 	Links: []*Link{},
+// }
+func IndexAction(h Context, ctx context.Context, params PostParams) {
+}
+func IndexPage() {
+}
+// <meta name="description" content="{title}" />
+// <meta name="author" content="pyrossh" />
+// <meta name="keywords" content="pyros.sh, pyrossh, gromer" />
+// <meta  />
+func GET(h Context, params GetParams) (*Node, int, error) {
+	h.Meta("title", "Todos")
+	h.Set("page", params.Page)
+	h.Set("filter", params.Filter)
+	return h.Render(`
+		<section class="todoapp">
+			<header class="header">
+				<h1>todos</h1>
+				<form hx-post="/" hx-target="#todo-list" hx-swap="afterbegin" _="on htmx:afterOnLoad set #text.value to ''">
+					<input type="hidden" name="intent" value="create" />
+					<input class="new-todo" id="text" name="text" placeholder="What needs to be done?" autofocus="false" autocomplete="off" /s>
+				</form>
+			</header>
+			<section class="main">
+				<input class="toggle-all" id="toggle-all" type="checkbox" />
+				<label for="toggle-all">Mark all as complete</label>
+				<TodoList id="todo-list" page="{page}" filter="{filter}" />
+			</section>
+			<footer class="footer">
+				<TodoCount filter="{filter}" />
+				<ul class="filters">
+					<li>
+						<a href="?filter=all">All</a>
+					</li>
+					<li>
+						<a href="?filter=active">Active</a>
+					</li>
+					<li>
+						<a href="?filter=completed">Completed</a>
+					</li>
+				</ul>
+				<form hx-target="#todo-list" hx-post="/">
+					<input type="hidden" name="intent" value="clear_completed" />
+					<button type="submit" class="clear-completed" >Clear completed</button>
+				</form>
+			</footer>
+		</section>
+	`), 200, nil
+}

_example/{pages → routes}/post.go RENAMED Viewed

@@ -1,7 +1,6 @@
-package pages
+package routes
 import (
-	"context"
 	"fmt"
 	_ "github.com/pyros2097/gromer/_example/components"
@@ -15,59 +14,59 @@ type PostParams struct {
 	Text   string `json:"text"`
 }
-func POST(h Html, ctx context.Context, params PostParams) (string, int, error) {
+func POST(ctx Context, params PostParams) (*Node, int, error) {
 	if params.Intent == "clear_completed" {
 		allTodos, err := todos.GetAllTodo(ctx, todos.GetAllTodoParams{
 			Filter: "all",
 			Limit:  1000,
 		})
 		if err != nil {
-			return "", 500, err
+			return nil, 500, err
 		}
 		for _, t := range allTodos {
 			if t.Completed {
 				_, err := todos.DeleteTodo(ctx, t.ID)
 				if err != nil {
-					return "", 500, err
+					return nil, 500, err
 				}
 			}
 		}
-		return h.Render(`
+		return ctx.Render(`
 			<TodoList id="todo-list" filter="all" page="1"></TodoList>
 			<TodoCount filter="all" page="1"></TodoCount>
 		`), 200, nil
 	} else if params.Intent == "create" {
 		todo, err := todos.CreateTodo(ctx, params.Text)
 		if err != nil {
-			return "", 500, err
+			return nil, 500, err
 		}
-		h["todo"] = todo
+		ctx.Set("todo", todo)
-		return h.Render(`
+		return ctx.Render(`
 			<Todo todo=todo></Todo>
-			<TodoCount filter="all" page=1></TodoCount>
+			<TodoCount filter="all" page="1"></TodoCount>
 		`), 200, nil
 	} else if params.Intent == "delete" {
 		_, err := todos.DeleteTodo(ctx, params.ID)
 		if err != nil {
-			return "", 500, err
+			return nil, 500, err
 		}
-		return "", 200, nil
+		return nil, 200, nil
 	} else if params.Intent == "complete" {
 		todo, err := todos.GetTodo(ctx, params.ID)
 		if err != nil {
-			return "", 500, err
+			return nil, 500, err
 		}
 		_, err = todos.UpdateTodo(ctx, params.ID, todos.UpdateTodoParams{
 			Text:      todo.Text,
 			Completed: !todo.Completed,
 		})
 		if err != nil {
-			return "", 500, err
+			return nil, 500, err
 		}
-		h["todo"] = todo
+		ctx.Set("todo", todo)
-		return h.Render(`
+		return ctx.Render(`
 			{{#Todo todo=todo}}{{/Todo}}
 		`), 200, nil
 	}
-	return "", 404, fmt.Errorf("Intent not specified: %s", params.Intent)
+	return nil, 404, fmt.Errorf("Intent not specified: %s", params.Intent)
 }

cmd/gromer/main.go CHANGED Viewed

@@ -12,9 +12,8 @@ import (
 	"strings"
 	"unicode"
+	"github.com/gobuffalo/velvet"
 	"github.com/pyros2097/gromer"
-	"github.com/pyros2097/gromer/handlebars"
-	. "github.com/pyros2097/gromer/handlebars"
 	"golang.org/x/mod/modfile"
 )
@@ -141,7 +140,7 @@ func main() {
 			pageRoutes = append(pageRoutes, r)
 		}
 	}
-	err = handlebars.GlobalHelpers.Add("title", func(v string) string {
+	err = velvet.Helpers.Add("title", func(v string) string {
 		return strings.Title(strings.ToLower(v))
 	})
 	if err != nil {
@@ -177,7 +176,16 @@ func main() {
 			log.Fatal(err)
 		}
 	}
+	ctx := velvet.NewContext()
+	ctx.Set("moduleName", moduleName)
+	ctx.Set("pageRoutes", pageRoutes)
+	ctx.Set("apiRoutes", apiRoutes)
+	ctx.Set("routeImports", routeImports)
+	ctx.Set("componentNames", componentNames)
+	ctx.Set("containerNames", containerNames)
+	ctx.Set("notFoundPkg", notFoundPkg)
+	ctx.Set("tick", "`")
-	s, _, err := Html(`// Code generated by gromer. DO NOT EDIT.
+	s, err := velvet.Render(`// Code generated by gromer. DO NOT EDIT.
 package main
 import (
@@ -231,16 +239,7 @@ func main() {
 		log.Fatal().Stack().Err(err).Msg("failed to listen")
 	}
 }
-`).Props(
+`, ctx)
-		"moduleName", moduleName,
-		"pageRoutes", pageRoutes,
-		"apiRoutes", apiRoutes,
-		"routeImports", routeImports,
-		"componentNames", componentNames,
-		"containerNames", containerNames,
-		"notFoundPkg", notFoundPkg,
-		"tick", "`",
-	).Render()
 	if err != nil {
 		panic(err)
 	}

go.mod CHANGED Viewed

@@ -3,40 +3,56 @@ module github.com/pyros2097/gromer
 go 1.18
 require (
-	github.com/aymerick/raymond v2.0.2+incompatible
-	github.com/carlmjohnson/versioninfo v0.22.1
+	github.com/alecthomas/repr v0.1.0
 	github.com/go-playground/validator/v10 v10.9.0
+	github.com/gobuffalo/velvet v0.0.0-20170320144106-d97471bf5d8f
 	github.com/gorilla/mux v1.8.0
 	github.com/imdario/mergo v0.3.12
-	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.26.1
 	github.com/segmentio/go-camelcase v0.0.0-20160726192923-7085f1e3c734
 	github.com/stretchr/testify v1.7.0
 	gocloud.dev v0.24.0
 	golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57
+	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
 	xojoc.pw/useragent v0.0.0-20200116211053-1ec61d55e8fe
 )
 require (
 	cloud.google.com/go v0.94.0 // indirect
 	cloud.google.com/go/firestore v1.5.0 // indirect
-	github.com/alecthomas/participle/v2 v2.0.0-alpha9 // indirect
-	github.com/alecthomas/repr v0.1.0 // indirect
+	github.com/aymerick/douceur v0.2.0 // indirect
+	github.com/aymerick/raymond v2.0.2+incompatible // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/gobuffalo/envy v1.6.5 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/google/wire v0.5.0 // indirect
 	github.com/googleapis/gax-go/v2 v2.1.0 // indirect
+	github.com/gorilla/css v1.0.0 // indirect
+	github.com/joho/godotenv v1.3.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/markbates/inflect v1.0.4 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.18 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/russross/blackfriday v1.5.2 // indirect
+	github.com/sergi/go-diff v1.2.0 // indirect
+	github.com/shurcooL/github_flavored_markdown v0.0.0-20210228213109-c3a9aa474629 // indirect
+	github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636 // indirect
+	github.com/shurcooL/go-goon v1.0.0 // indirect
+	github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480 // indirect
+	github.com/shurcooL/highlight_go v0.0.0-20191220051317-782971ddf21b // indirect
+	github.com/shurcooL/octicon v0.0.0-20191102190552-cbb32d6a785c // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
+	github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e // indirect
 	go.opencensus.io v0.23.0 // indirect
 	golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e // indirect
-	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
 	golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
 	golang.org/x/text v0.3.7 // indirect

go.sum CHANGED Viewed

@@ -99,9 +99,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/GoogleCloudPlatform/cloudsql-proxy v1.24.0/go.mod h1:3tx938GhY4FC+E1KT/jNjDw7Z5qxAEtIiERJ2sXjnII=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/alecthomas/participle/v2 v2.0.0-alpha9 h1:TnflwDbtf5/aG6JMbmdiA+YB3bLg0sc6yRtmAfedfN4=
-github.com/alecthomas/participle/v2 v2.0.0-alpha9/go.mod h1:NumScqsC42o9x+dGj8/YqsIfhrIQjFEOFovxotbBirA=
-github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
 github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE=
 github.com/alecthomas/repr v0.1.0/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -130,13 +127,13 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.7.0 h1:1at4e5P+lvHNl2nUktdM2/v+rpICg
 github.com/aws/aws-sdk-go-v2/service/sts v1.7.0/go.mod h1:0qcSMCyASQPN2sk/1KQLQ2Fh6yq8wm0HSDAimPhzCoM=
 github.com/aws/smithy-go v1.8.0 h1:AEwwwXQZtUwP5Mz506FeXXrKBe0jA8gVM+1gEcSRooc=
 github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
+github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
+github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/aymerick/raymond v2.0.2+incompatible h1:VEp3GpgdAnv9B2GFyTvqgcKvY+mfKMjPOA3SbKLtnU0=
 github.com/aymerick/raymond v2.0.2+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/carlmjohnson/versioninfo v0.22.1 h1:NVwTmCUpSoxBxy8+z10CbyBazeRZ4R2n6QgrNi3Wd6M=
-github.com/carlmjohnson/versioninfo v0.22.1/go.mod h1:QT9mph3wcVfISUKd0i9sZfVrPviHuSF+cUtLjm2WSf8=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -188,6 +185,10 @@ github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GO
 github.com/go-playground/validator/v10 v10.9.0 h1:NgTtmN58D0m8+UuxtYmGztBJB7VnPgjj221I1QHci2A=
 github.com/go-playground/validator/v10 v10.9.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/gobuffalo/envy v1.6.5 h1:X3is06x7v0nW2xiy2yFbbIjwHz57CD6z6MkvqULTCm8=
+github.com/gobuffalo/envy v1.6.5/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ=
+github.com/gobuffalo/velvet v0.0.0-20170320144106-d97471bf5d8f h1:ddIdPdlkAgKMB0mbkft2LT3oxN1h3MN1fopCFrOgkhY=
+github.com/gobuffalo/velvet v0.0.0-20170320144106-d97471bf5d8f/go.mod h1:m9x1vDSQYrGiEhEiu0c4XuE0SZzw31Ms8ULjGdhaA54=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
@@ -283,6 +284,8 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0 h1:6DWmvNpomjL1+3liNSZbVns3zsYzzCjm6pRBO1tLeso=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
+github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
+github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -297,6 +300,7 @@ github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
@@ -316,9 +320,13 @@ github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgx
 github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
 github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/markbates/inflect v1.0.4 h1:5fh1gzTFhfae06u3hzHYO9xe3l3v3nW5Pwt3naLTP5g=
+github.com/markbates/inflect v1.0.4/go.mod h1:1fR9+pO2KHEO9ZRtto13gDwwZaAKstQzferVeWqbgNs=
 github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI=
 github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/microcosm-cc/bluemonday v1.0.18 h1:6HcxvXDAi3ARt3slx6nTesbvorIc3QeTzBNRvWktHBo=
+github.com/microcosm-cc/bluemonday v1.0.18/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
@@ -339,11 +347,34 @@ github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6po
 github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc=
 github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc=
+github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/segmentio/go-camelcase v0.0.0-20160726192923-7085f1e3c734 h1:Cpx2WLIv6fuPvaJAHNhYOgYzk/8RcJXu/8+mOrxf2KM=
 github.com/segmentio/go-camelcase v0.0.0-20160726192923-7085f1e3c734/go.mod h1:hqVOMAwu+ekffC3Tvq5N1ljnXRrFKcaSjbCmQ8JgYaI=
+github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
+github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/shurcooL/github_flavored_markdown v0.0.0-20210228213109-c3a9aa474629 h1:86e54L0i3pH3dAIA8OxBbfLrVyhoGpnNk1iJCigAWYs=
+github.com/shurcooL/github_flavored_markdown v0.0.0-20210228213109-c3a9aa474629/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
+github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636 h1:aSISeOcal5irEhJd1M+IrApc0PdcN7e7Aj4yuEnOrfQ=
+github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
+github.com/shurcooL/go-goon v1.0.0 h1:BCQPvxGkHHJ4WpBO4m/9FXbITVIsvAm/T66cCcCGI7E=
+github.com/shurcooL/go-goon v1.0.0/go.mod h1:2wTHMsGo7qnpmqA8ADYZtP4I1DD94JpXGQ3Dxq2YQ5w=
+github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480 h1:KaKXZldeYH73dpQL+Nr38j1r5BgpAYQjYvENOUpIZDQ=
+github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU=
+github.com/shurcooL/highlight_go v0.0.0-20191220051317-782971ddf21b h1:rBIwpb5ggtqf0uZZY5BPs1sL7njUMM7I8qD2jiou70E=
+github.com/shurcooL/highlight_go v0.0.0-20191220051317-782971ddf21b/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag=
+github.com/shurcooL/octicon v0.0.0-20191102190552-cbb32d6a785c h1:p3w+lTqXulfa3aDeycxmcLJDNxyUB89gf2/XqqK3eO0=
+github.com/shurcooL/octicon v0.0.0-20191102190552-cbb32d6a785c/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d h1:yKm7XZV6j9Ev6lojP2XaIshpT4ymkqhMeSghO5Ps00E=
+github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
+github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e h1:qpG93cPwA5f7s/ZPBJnGOYQNK/vKsaDaseuKT5Asee8=
+github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
@@ -775,11 +806,13 @@ google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+Rur
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

gsx/gsx.go CHANGED Viewed

@@ -2,6 +2,7 @@ package gsx
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io"
 	"reflect"
@@ -9,6 +10,7 @@ import (
 	"runtime"
 	"strings"
+	"github.com/alecthomas/repr"
 	"golang.org/x/net/html"
 	"golang.org/x/net/html/atom"
 )
@@ -31,29 +33,92 @@ type (
 		Func interface{}
 		Args []string
 	}
+	link struct {
+		Rel  string
+		Href string
+		Type string
+		As   string
+	}
+	Context struct {
+		context.Context
-	Html map[string]interface{}
+		data    map[string]interface{}
+		metas   map[string]string
+		links   map[string]link
+		scripts map[string]bool
+	}
 	Node struct {
-		*html.Node
+		html.Node
 	}
 )
+func NewContext(c context.Context) Context {
+	return Context{Context: c, data: map[string]interface{}{}, metas: map[string]string{}, links: map[string]link{}, scripts: map[string]bool{}}
+}
+func (h Context) Get(k string) interface{} {
+	return h.data[k]
+}
+func (h Context) Set(k string, v interface{}) {
+	h.data[k] = v
+}
+func (h Context) Meta(k, v string) {
+	h.metas[k] = v
+}
+func (h Context) Link(rel, href, t, as string) {
+	h.links[href] = link{rel, href, t, as}
+}
+func (h Context) Script(src string, sdefer bool) {
+	h.scripts[src] = sdefer
+}
-func (h Html) Render(tpl string) Node {
+func (h Context) Render(tpl string) *Node {
 	newTpl := stripWhitespace(tpl)
 	doc, err := html.ParseFragment(bytes.NewBuffer([]byte(newTpl)), contextNode)
 	if err != nil {
 		panic(err)
 	}
 	populate(h, doc[0])
-	return Node{doc[0]}
+	return &Node{*doc[0]}
 }
-func (n Node) Write(w io.Writer) error {
+func (n *Node) Write(ctx Context, w io.Writer) {
+	w.Write([]byte(`<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8">`))
+	w.Write([]byte(`<meta http-equiv="Content-Type" content="text/html;charset=utf-8"><meta content="utf-8" http-equiv="encoding">`))
+	w.Write([]byte(`<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, viewport-fit=cover">`))
+	for k, v := range ctx.metas {
+		w.Write([]byte(fmt.Sprintf(`<meta name="%s" content="%s">`, k, v)))
+	}
+	for k, v := range ctx.metas {
+		if k == "title" {
+			w.Write([]byte(fmt.Sprintf(`<title>%s</title>`, v)))
+		}
+	}
+	for _, v := range ctx.links {
+		if v.Type != "" || v.As != "" {
+			w.Write([]byte(fmt.Sprintf(`<link rel="%s" href="%s" type="%s" as="%s">`, v.Rel, v.Href, v.Type, v.As)))
+		} else {
+			w.Write([]byte(fmt.Sprintf(`<link rel="%s" href="%s">`, v.Rel, v.Href)))
+		}
+	}
+	for src, sdefer := range ctx.scripts {
+		if sdefer {
+			w.Write([]byte(fmt.Sprintf(`<script src="%s" defer="true"></script>`, src)))
+		} else {
+			w.Write([]byte(fmt.Sprintf(`<script src="%s"></script>`, src)))
+		}
+	}
+	w.Write([]byte(`</head><body>`))
-	return html.Render(w, n.Node)
+	html.Render(w, &n.Node)
+	w.Write([]byte(`</body></html>`))
 }
-func (n Node) String() string {
+func (n *Node) String() string {
 	b := bytes.NewBuffer(nil)
-	html.Render(b, n.Node)
+	html.Render(b, &n.Node)
 	return b.String()
 }
@@ -121,18 +186,18 @@ func convert(ref string, i interface{}) interface{} {
 	return nil
 }
-func getRefValue(ctx map[string]interface{}, ref string) interface{} {
+func getRefValue(ctx Context, 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 {
+			if v, ok := ctx.data[parts[0]]; ok {
 				i := reflect.ValueOf(v).Elem().FieldByName(parts[1]).Interface()
 				return convert(ref, i)
 			}
 		}
-		return convert(ref, ctx[ref])
+		return convert(ref, ctx.data[ref])
 	}
 }
@@ -140,7 +205,7 @@ func removeBrackets(v string) string {
 	return strings.ReplaceAll(strings.ReplaceAll(v, "{", ""), "}", "")
 }
-func substituteString(ctx map[string]interface{}, v string) string {
+func substituteString(ctx Context, v string) string {
 	found := refRegex.FindString(v)
 	if found != "" {
 		varName := removeBrackets(found)
@@ -201,7 +266,7 @@ func cloneNode(n *html.Node) *html.Node {
 	return newNode
 }
-func populate(ctx Html, n *html.Node) {
+func populate(ctx Context, n *html.Node) {
 	if n.Type == html.TextNode {
 		if n.Data != "" && strings.Contains(n.Data, "{") && n.Data != "{children}" {
 			n.Data = substituteString(ctx, n.Data)
@@ -213,15 +278,28 @@ func populate(ctx Html, n *html.Node) {
 				arr := strings.Split(xfor, " in ")
 				ctxItemKey := arr[0]
 				ctxKey := arr[1]
-				data := ctx[ctxKey]
+				data := ctx.data[ctxKey]
 				switch reflect.TypeOf(data).Kind() {
 				case reflect.Slice:
 					v := reflect.ValueOf(data)
+					if v.Len() == 0 {
+						if n.FirstChild != nil {
+							n.RemoveChild(n.FirstChild)
+						}
+						continue
+					}
+					repr.Println("AAAAAAA", n.Data)
+					if n.FirstChild == nil {
+						continue
+					}
 					firstChild := cloneNode(n.FirstChild)
 					n.RemoveChild(n.FirstChild)
 					for i := 0; i < v.Len(); i++ {
+						compCtx := Context{
+							Context: ctx.Context,
-						compCtx := map[string]interface{}{
+							data: map[string]interface{}{
-							ctxItemKey: v.Index(i).Interface(),
+								ctxItemKey: v.Index(i).Interface(),
+							},
 						}
 						itemChild := cloneNode(firstChild)
 						itemChild.Parent = nil
@@ -261,21 +339,20 @@ func populate(ctx Html, n *html.Node) {
 				}
 			}
 		}
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			populate(ctx, c)
+		}
 		if comp, ok := compMap[n.Data]; ok {
 			newNode := populateComponent(ctx, comp, n, true)
 			n.AppendChild(newNode)
 		}
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			populate(ctx, c)
-		}
 	}
 }
-func renderComponent(ctx Html, comp ComponentFunc, n *html.Node) Node {
+func renderComponent(ctx Context, comp ComponentFunc, n *html.Node) *Node {
-	h := Html(ctx)
-	args := []reflect.Value{reflect.ValueOf(h)}
+	args := []reflect.Value{reflect.ValueOf(ctx)}
 	for _, arg := range comp.Args {
-		if v, ok := ctx[arg]; ok {
+		if v, ok := ctx.data[arg]; ok {
 			args = append(args, reflect.ValueOf(v))
 		} else {
 			v := getAttribute(arg, n.Attr)
@@ -283,11 +360,11 @@ func renderComponent(ctx Html, comp ComponentFunc, n *html.Node) Node {
 		}
 	}
 	result := reflect.ValueOf(comp.Func).Call(args)
-	compNode := result[0].Interface().(Node)
+	compNode := result[0].Interface().(*Node)
 	return compNode
 }
-func populateComponent(ctx Html, comp ComponentFunc, n *html.Node, remove bool) *html.Node {
+func populateComponent(ctx Context, comp ComponentFunc, n *html.Node, remove bool) *html.Node {
 	compNode := renderComponent(ctx, comp, n)
 	if n.FirstChild != nil {
 		newChild := cloneNode(n.FirstChild)
@@ -298,7 +375,9 @@ func populateComponent(ctx Html, comp ComponentFunc, n *html.Node, remove bool)
 		if !remove {
 			populate(ctx, newChild)
 		}
+		if compNode.FirstChild != nil {
-		populateChildren(compNode.FirstChild, newChild)
+			populateChildren(compNode.FirstChild, newChild)
+		}
 	}
-	return compNode.Node
+	return &compNode.Node
 }

gsx/gsx_test.go CHANGED Viewed

@@ -12,7 +12,7 @@ type TodoData struct {
 	Completed bool
 }
-func Todo(h Html, todo *TodoData) Node {
+func Todo(h Context, todo *TodoData) *Node {
 	return h.Render(`
 		<li id="todo-{todo.ID}" class="{ completed: todo.Completed }">
 			<div class="view">
@@ -28,6 +28,14 @@ func Todo(h Html, todo *TodoData) Node {
 	`)
 }
+func TodoList(ctx Context, todos []*TodoData) (*Node, error) {
+	return ctx.Render(`
+		<ul id="todo-list" class="relative" x-for="todo in todos">
+			<Todo />
+		</ul>
+	`), nil
+}
 func WebsiteName() string {
 	return "My Website"
 }
@@ -36,9 +44,11 @@ func TestComponent(t *testing.T) {
 	r := require.New(t)
 	RegisterComponent(Todo, "todo")
 	RegisterFunc(WebsiteName)
+	h := Context{
-	h := Html(map[string]interface{}{
+		data: map[string]interface{}{
-		"todo": &TodoData{ID: "4", Text: "My fourth todo", Completed: false},
+			"todo": &TodoData{ID: "4", Text: "My fourth todo", Completed: false},
-	})
+		},
+	}
 	actual := h.Render(`
 		<div>
 			<Todo>
@@ -67,13 +77,15 @@ func TestFor(t *testing.T) {
 	r := require.New(t)
 	RegisterComponent(Todo, "todo")
 	RegisterFunc(WebsiteName)
+	h := Context{
-	h := Html(map[string]interface{}{
+		data: map[string]interface{}{
-		"todos": []*TodoData{
+			"todos": []*TodoData{
-			{ID: "1", Text: "My first todo", Completed: true},
+				{ID: "1", Text: "My first todo", Completed: true},
-			{ID: "2", Text: "My second todo", Completed: false},
+				{ID: "2", Text: "My second todo", Completed: false},
-			{ID: "3", Text: "My third todo", Completed: false},
+				{ID: "3", Text: "My third todo", Completed: false},
+			},
 		},
-	})
+	}
 	actual := h.Render(`
 		<div>
 			<ul x-for="todo in todos" class="relative">
@@ -121,3 +133,65 @@ func TestFor(t *testing.T) {
 	`)
 	r.Equal(expected, actual)
 }
+func TestForComponent(t *testing.T) {
+	r := require.New(t)
+	RegisterComponent(Todo, "todo")
+	RegisterComponent(TodoList, "todos")
+	RegisterFunc(WebsiteName)
+	h := Context{
+		data: map[string]interface{}{
+			"todos": []*TodoData{
+				{ID: "1", Text: "My first todo", Completed: true},
+				{ID: "2", Text: "My second todo", Completed: false},
+				{ID: "3", Text: "My third todo", Completed: false},
+			},
+		},
+	}
+	actual := h.Render(`
+		<div>
+			<TodoList />
+		</div>
+	`).String()
+	expected := stripWhitespace(`
+		<div>
+			<ul id="todo-list" class="relative" x-for="todo in todos">
+				<li id="todo-1" class="completed">
+					<div class="view"><span>My first todo</span><span>My first todo</span></div>
+					<div class="todo-panel"><span>My first todo</span><span>true</span></div>
+					<div class="count"><span>true</span><span>true</span></div>
+				</li>
+				<li id="todo-2" class="">
+					<div class="view"><span>My second todo</span><span>My second todo</span></div>
+					<div class="todo-panel"><span>My second todo</span><span>false</span></div>
+					<div class="count"><span>false</span><span>false</span></div>
+				</li>
+				<li id="todo-3" class="">
+					<div class="view"><span>My third todo</span><span>My third todo</span></div>
+					<div class="todo-panel"><span>My third todo</span><span>false</span></div>
+					<div class="count"><span>false</span><span>false</span></div>
+				</li>
+			</ul>
+		</div>
+	`)
+	r.Equal(expected, actual)
+}
+// func TestPage(t *testing.T) {
+// 	r := require.New(t)
+// 	RegisterFunc(WebsiteName)
+// 	h := Context{
+// 		data: map[string]interface{}{},
+// 	}
+// 	actual := h.Render(`
+// 		<Page title="test">
+// 			<span>Hello</span>
+// 		</Page}>
+// 	`).String()
+// 	expected := stripWhitespace(`
+// 		<page title="test">
+// 			<meta charset="UTF-8"/>
+// 		</page>
+// 	`)
+// 	r.Equal(expected, actual)
+// }

http.go CHANGED Viewed

@@ -21,6 +21,7 @@ import (
 	"github.com/alecthomas/repr"
 	"github.com/go-playground/validator/v10"
+	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"github.com/pyros2097/gromer/assets"
 	"github.com/pyros2097/gromer/gsx"
@@ -224,10 +225,15 @@ func addRouteDef(method, route string, h interface{}) {
 	})
 }
-func PerformRequest(route string, h interface{}, ctx interface{}, w http.ResponseWriter, r *http.Request) {
+func PerformRequest(route string, h interface{}, ctx context.Context, w http.ResponseWriter, r *http.Request) {
 	params := GetRouteParams(route)
-	htmlTemplate := gsx.Html(map[string]interface{}{})
+	renderContext := gsx.NewContext(ctx)
+	renderContext.Set("requestId", uuid.NewString())
+	renderContext.Link("rel", GetAssetUrl("images/icon.png"), "", "")
+	renderContext.Link("stylesheet", GetStylesUrl(), "", "")
+	renderContext.Script(GetAlpineJsUrl(), true)
+	renderContext.Script(GetHtmxJsUrl(), false)
-	args := []reflect.Value{reflect.ValueOf(htmlTemplate), reflect.ValueOf(ctx)}
+	args := []reflect.Value{reflect.ValueOf(renderContext)}
 	funcType := reflect.TypeOf(h)
 	icount := funcType.NumIn()
 	vars := mux.Vars(r)
@@ -312,11 +318,11 @@ func PerformRequest(route string, h interface{}, ctx interface{}, w http.Respons
 		RespondError(w, responseStatus, responseError.(error))
 		return
 	}
-	if v, ok := response.(string); ok {
+	if v, ok := response.(*gsx.Node); ok {
 		w.Header().Set("Content-Type", "text/html")
 		// This has to be at end always
 		w.WriteHeader(responseStatus)
-		w.Write([]byte(v))
+		v.Write(renderContext, w)
 		return
 	}
 	// if v, ok := response.(handlebars.CssContent); ok {
@@ -445,7 +451,7 @@ func CacheMiddleware(next http.Handler) http.Handler {
 func StatusHandler(h interface{}) http.Handler {
 	return LogMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		ctx := context.WithValue(context.WithValue(r.Context(), "url", r.URL), "header", r.Header)
-		values := reflect.ValueOf(h).Call([]reflect.Value{reflect.ValueOf(ctx)})
+		values := reflect.ValueOf(h).Call([]reflect.Value{reflect.ValueOf(map[string]interface{}{}), reflect.ValueOf(ctx)})
 		response := values[0].Interface()
 		responseStatus := values[1].Interface().(int)
 		responseError := values[2].Interface()
@@ -457,7 +463,7 @@ func StatusHandler(h interface{}) http.Handler {
 		// This has to be at end always after headers are set
 		w.WriteHeader(responseStatus)
-		w.Write([]byte(response.(string)))
+		response.(*gsx.Node).Write(gsx.NewContext(r.Context()), w)
 	})).(http.Handler)
 }

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