3ce8bcf | gromer

git clone https://git.pyrossh.dev/gromer

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

3ce8bcf — Peter John 2021-11-28T20:07:10+05:30

rename package and fix bugs

Generated files not shown: go.sum

Files changed (10) hide show

api_explorer.go +3 -3
cmd/{wapp → gromer}/main.go +31 -23
css.go +3 -2
go.mod +4 -1
hooks.go +1 -1
hooks_test.go +1 -1
html.go +1 -118
html_test.go +1 -1
http.go +133 -0
readme.md +10 -15

api_explorer.go CHANGED Viewed

@@ -1,4 +1,4 @@
-package wapp
+package gromer
 import (
 	"context"
@@ -51,8 +51,8 @@ func ApiExplorer(apiDefs []ApiDefinition) func(c context.Context) (HtmlPage, int
 			Head(
 				Title("Example"),
 				Meta("description", "Example"),
-				Meta("author", "pyros2097"),
+				Meta("author", "pyros.sh"),
-				Meta("keywords", "wapp,pyros2097"),
+				Meta("keywords", "pyros.sh, gromer"),
 				Meta("viewport", "width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, viewport-fit=cover"),
 				Link("icon", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAMFBMVEU0OkArMjhobHEoPUPFEBIuO0L+AAC2FBZ2JyuNICOfGx7xAwTjCAlCNTvVDA1aLzQ3COjMAAAAVUlEQVQI12NgwAaCDSA0888GCItjn0szWGBJTVoGSCjWs8TleQCQYV95evdxkFT8Kpe0PLDi5WfKd4LUsN5zS1sKFolt8bwAZrCaGqNYJAgFDEpQAAAzmxafI4vZWwAAAABJRU5ErkJggg=="),
 				Link("stylesheet", "https://cdn.jsdelivr.net/npm/[email protected]/lib/codemirror.css"),

cmd/{wapp → gromer}/main.go RENAMED Viewed

@@ -2,6 +2,7 @@ package main
 import (
 	"bytes"
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -10,7 +11,7 @@ import (
 	"strings"
 	"github.com/gobuffalo/velvet"
-	"github.com/pyros2097/wapp"
+	"github.com/pyros2097/gromer"
 	"golang.org/x/mod/modfile"
 )
@@ -78,7 +79,7 @@ func rewritePkg(pkg string) string {
 	return lastItem
 }
-func getApiFunc(method, route string, params []string) wapp.ApiDefinition {
+func getApiFunc(method, route string, params []string) gromer.ApiDefinition {
 	muxRoute := bytes.NewBuffer(nil)
 	foundStart := false
 	for _, v := range route {
@@ -92,7 +93,7 @@ func getApiFunc(method, route string, params []string) wapp.ApiDefinition {
 			muxRoute.WriteString(string(v))
 		}
 	}
-	return wapp.ApiDefinition{
+	return gromer.ApiDefinition{
 		Method:     method,
 		PathParams: params,
 		Path:       muxRoute.String(),
@@ -154,19 +155,26 @@ func getApiFunc(method, route string, params []string) wapp.ApiDefinition {
 // }
 func main() {
+	moduleName := ""
+	pkgFlag := flag.String("pkg", "", "specify a package name")
+	flag.Parse()
+	if pkgFlag == nil || *pkgFlag == "" {
-	data, err := ioutil.ReadFile("go.mod")
+		data, err := ioutil.ReadFile("go.mod")
-	if err != nil {
+		if err != nil {
-		log.Fatalf("go.mod file not found %s", err.Error())
+			log.Fatalf("go.mod file not found %s", err.Error())
-	}
+		}
-	modTree, err := modfile.Parse("go.mod", data, nil)
+		modTree, err := modfile.Parse("go.mod", data, nil)
-	if err != nil {
+		if err != nil {
-		log.Fatalf("could not parse go.mod %s", err.Error())
+			log.Fatalf("could not parse go.mod %s", err.Error())
+		}
+		moduleName = modTree.Module.Mod.Path
+	} else {
+		moduleName = *pkgFlag
 	}
-	moduleName := modTree.Module.Mod.Path
 	routes := []*Route{}
-	apiDefs := []wapp.ApiDefinition{}
+	apiDefs := []gromer.ApiDefinition{}
 	allPkgs := map[string]string{}
-	err = filepath.Walk("pages",
+	err := filepath.Walk("pages",
 		func(filesrc string, info os.FileInfo, err error) error {
 			if err != nil {
 				return err
@@ -182,7 +190,7 @@ func main() {
 					pkg = "pages"
 				}
 				routePath := rewritePath(path)
-				params := wapp.GetRouteParams(routePath)
+				params := gromer.GetRouteParams(routePath)
 				routes = append(routes, &Route{
 					Method: method,
 					Path:   routePath,
@@ -206,7 +214,7 @@ func main() {
 	ctx.Set("routes", routes)
 	ctx.Set("apiDefs", apiDefs)
 	ctx.Set("tick", "`")
-	s, err := velvet.Render(`// Code generated by wapp. DO NOT EDIT.
+	s, err := velvet.Render(`// Code generated by gromer. DO NOT EDIT.
 package main
 import (
@@ -217,7 +225,7 @@ import (
 	"github.com/apex/gateway/v2"
 	"github.com/gorilla/mux"
-	"github.com/pyros2097/wapp"
+	"github.com/pyros2097/gromer"
 	"github.com/rs/zerolog/log"
 	"gocloud.dev/server"
@@ -234,7 +242,7 @@ func main() {
 	r := mux.NewRouter()
 	r.NotFoundHandler = http.HandlerFunc(notFound)
 	r.PathPrefix("/assets/").Handler(wrapCache(http.FileServer(http.FS(assetsFS))))
-	handle(r, "GET", "/api", wapp.ApiExplorer(apiDefinitions()))
+	handle(r, "GET", "/api", gromer.ApiExplorer(apiDefinitions()))
 	{{#each routes as |route| }}handle(r, "{{ route.Method }}", "{{ route.Path }}", {{ route.Pkg }}.{{ route.Method }})
 	{{/each}}
 	if !isLambda {
@@ -259,14 +267,14 @@ func wrapCache(h http.Handler) http.Handler {
 }
 func notFound(w http.ResponseWriter, r *http.Request) {
-	wapp.LogReq(404, r)
+	gromer.LogReq(404, r)
 }
 func handle(router *mux.Router, method, route string, h interface{}) {
 	router.HandleFunc(route, func(w http.ResponseWriter, r *http.Request) {
 		var status int
 		defer func() {
-			wapp.LogReq(status, r)
+			gromer.LogReq(status, r)
 		}()
 		ctx, err := context.WithContext(c.WithValue(
 			c.WithValue(
@@ -274,18 +282,18 @@ func handle(router *mux.Router, method, route string, h interface{}) {
 					"url", r.URL),
 			"header", r.Header))
 		if err != nil {
-			wapp.RespondError(w, 500, err)
+			gromer.RespondError(w, 500, err)
 			return
 		}
-		status, err = wapp.PerformRequest(route, h, ctx, w, r)
+		status, err = gromer.PerformRequest(route, h, ctx, w, r)
 		if err != nil {
 			log.Error().Stack().Err(err).Msg("")
 		}
 	}).Methods(method)
 }
-func apiDefinitions() []wapp.ApiDefinition {
+func apiDefinitions() []gromer.ApiDefinition {
-	return []wapp.ApiDefinition{
+	return []gromer.ApiDefinition{
 		{{#each apiDefs as |api| }}
 		{
 			Method: "{{api.Method}}",

css.go CHANGED Viewed

@@ -1,4 +1,4 @@
-package wapp
+package gromer
 type M map[string]interface{}
 type MS map[string]string
@@ -467,8 +467,9 @@ func mapApply(obj KeyValues) {
 				twClassLookup[className] = vstring + ": " + vv + ";"
 			}
 			if varr, ok := v.(Arr); ok {
+				twClassLookup[className] = ""
 				for _, kk := range varr {
-					twClassLookup[className] = kk.(string) + ": " + vv + ";"
+					twClassLookup[className] += kk.(string) + ": " + vv + ";"
 				}
 			}
 		}

go.mod CHANGED Viewed

@@ -1,9 +1,10 @@
-module github.com/pyros2097/wapp
+module github.com/pyros2097/gromer
 go 1.16
 require (
 	git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999 // indirect
+	github.com/apex/gateway/v2 v2.0.0 // indirect
 	github.com/aymerick/raymond v2.0.2+incompatible // indirect
 	github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
 	github.com/bradleyjkemp/cupaloy v2.3.0+incompatible
@@ -19,6 +20,7 @@ require (
 	github.com/gobuffalo/velvet v0.0.0-20170320144106-d97471bf5d8f
 	github.com/gogo/protobuf v1.1.1 // indirect
 	github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/gax-go v2.0.0+incompatible // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
@@ -28,6 +30,7 @@ require (
 	github.com/jonboulle/clockwork v0.1.0 // indirect
 	github.com/jtolds/gls v4.2.1+incompatible // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect
+	github.com/lib/pq v1.10.4 // indirect
 	github.com/markbates/inflect v1.0.4 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect

hooks.go CHANGED Viewed

@@ -1,4 +1,4 @@
-package wapp
+package gromer
 type Context struct {
 	index int

hooks_test.go CHANGED Viewed

@@ -1,4 +1,4 @@
-package wapp
+package gromer
 import (
 	"testing"

html.go CHANGED Viewed

@@ -1,28 +1,13 @@
-package wapp
+package gromer
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"io"
-	"net/http"
-	"os"
-	"reflect"
-	"regexp"
 	"strconv"
 	"strings"
-	"github.com/fatih/color"
-	"github.com/gorilla/mux"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 )
-func init() {
-	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
-	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
-}
 func writeIndent(w io.Writer, indent int) {
 	for i := 0; i < indent*2; i++ {
 		w.Write([]byte(" "))
@@ -413,105 +398,3 @@ func XData(v string) Attribute {
 func XText(v string) Attribute {
 	return Attribute{"x-text", v}
 }
-func RespondError(w http.ResponseWriter, status int, err error) {
-	w.WriteHeader(status)
-	w.Header().Set("Content-Type", "application/json")
-	data, _ := json.Marshal(map[string]string{
-		"error": err.Error(),
-	})
-	w.Write(data)
-}
-var pathParamsRegex = regexp.MustCompile(`{(.*?)}`)
-func GetRouteParams(route string) []string {
-	params := []string{}
-	found := pathParamsRegex.FindAllString(route, -1)
-	for _, v := range found {
-		params = append(params, strings.Replace(strings.Replace(v, "}", "", 1), "{", "", 1))
-	}
-	return params
-}
-func PerformRequest(route string, h interface{}, ctx interface{}, w http.ResponseWriter, r *http.Request) (int, error) {
-	params := GetRouteParams(route)
-	args := []reflect.Value{reflect.ValueOf(ctx)}
-	funcType := reflect.TypeOf(h)
-	icount := funcType.NumIn()
-	vars := mux.Vars(r)
-	for _, k := range params {
-		args = append(args, reflect.ValueOf(vars[k]))
-	}
-	if len(args) != icount {
-		structType := funcType.In(icount - 1)
-		instance := reflect.New(structType)
-		if r.Method == "POST" || r.Method == "PUT" || r.Method == "PATCH" {
-			err := json.NewDecoder(r.Body).Decode(instance.Interface())
-			if err != nil {
-				RespondError(w, 500, err)
-				return 500, err
-			}
-		} else if r.Method == "GET" {
-			rv := instance.Elem()
-			for i := 0; i < structType.NumField(); i++ {
-				if f := rv.Field(i); f.CanSet() {
-					jsonName := structType.Field(i).Tag.Get("json")
-					jsonValue := r.URL.Query().Get(jsonName)
-					if f.Kind() == reflect.String {
-						f.SetString(jsonValue)
-					} else if f.Kind() == reflect.Int64 {
-						v, err := strconv.ParseInt(jsonValue, 10, 64)
-						if err != nil {
-							RespondError(w, 500, err)
-							return 500, err
-						}
-						f.SetInt(v)
-					} else {
-						panic("Uknown query param: " + jsonValue)
-					}
-				}
-			}
-		}
-		args = append(args, instance.Elem())
-	}
-	values := reflect.ValueOf(h).Call(args)
-	response := values[0].Interface()
-	responseStatus := values[1].Interface().(int)
-	responseError := values[2].Interface()
-	if responseError != nil {
-		RespondError(w, responseStatus, responseError.(error))
-		return responseStatus, responseError.(error)
-	}
-	if v, ok := response.(HtmlPage); ok {
-		w.Header().Set("Content-Type", "text/html")
-		// This has to be at end always
-		w.WriteHeader(responseStatus)
-		v.WriteHtml(w)
-		return 200, nil
-	}
-	w.Header().Set("Content-Type", "application/json")
-	// This has to be at end always
-	w.WriteHeader(responseStatus)
-	data, _ := json.Marshal(response)
-	w.Write(data)
-	return 200, nil
-}
-func LogReq(status int, r *http.Request) {
-	a := color.FgGreen
-	if status >= 500 {
-		a = color.FgRed
-	} else if status >= 400 {
-		a = color.FgYellow
-	}
-	m := color.FgCyan
-	if r.Method == "POST" {
-		m = color.FgYellow
-	} else if r.Method == "PUT" {
-		m = color.FgMagenta
-	} else if r.Method == "DELETE" {
-		m = color.FgRed
-	}
-	log.Info().Msgf("%3s %s %s", color.New(a).Sprint(status), color.New(m).Sprintf("%-4s", r.Method), color.WhiteString(r.URL.Path))
-}

html_test.go CHANGED Viewed

@@ -1,4 +1,4 @@
-package wapp
+package gromer
 import (
 	"bytes"

http.go ADDED Viewed

@@ -0,0 +1,133 @@
+package gromer
+import (
+	"encoding/json"
+	"net/http"
+	"os"
+	"reflect"
+	"regexp"
+	"strconv"
+	"strings"
+	"github.com/fatih/color"
+	"github.com/gorilla/mux"
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
+)
+func init() {
+	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
+}
+func RespondError(w http.ResponseWriter, status int, err error) {
+	w.WriteHeader(status)
+	w.Header().Set("Content-Type", "application/json")
+	data, _ := json.Marshal(map[string]string{
+		"error": err.Error(),
+	})
+	w.Write(data)
+}
+var pathParamsRegex = regexp.MustCompile(`{(.*?)}`)
+func GetRouteParams(route string) []string {
+	params := []string{}
+	found := pathParamsRegex.FindAllString(route, -1)
+	for _, v := range found {
+		params = append(params, strings.Replace(strings.Replace(v, "}", "", 1), "{", "", 1))
+	}
+	return params
+}
+func PerformRequest(route string, h interface{}, ctx interface{}, w http.ResponseWriter, r *http.Request) (int, error) {
+	params := GetRouteParams(route)
+	args := []reflect.Value{reflect.ValueOf(ctx)}
+	funcType := reflect.TypeOf(h)
+	icount := funcType.NumIn()
+	vars := mux.Vars(r)
+	for _, k := range params {
+		args = append(args, reflect.ValueOf(vars[k]))
+	}
+	if len(args) != icount {
+		structType := funcType.In(icount - 1)
+		instance := reflect.New(structType)
+		if structType.Kind() != reflect.Struct {
+			panic(route + " func final param should be a struct")
+		}
+		if r.Method == "POST" || r.Method == "PUT" || r.Method == "PATCH" {
+			err := json.NewDecoder(r.Body).Decode(instance.Interface())
+			if err != nil {
+				RespondError(w, 500, err)
+				return 500, err
+			}
+		} else if r.Method == "GET" {
+			rv := instance.Elem()
+			for i := 0; i < structType.NumField(); i++ {
+				if f := rv.Field(i); f.CanSet() {
+					jsonName := structType.Field(i).Tag.Get("json")
+					jsonValue := r.URL.Query().Get(jsonName)
+					if f.Kind() == reflect.String {
+						f.SetString(jsonValue)
+					} else if f.Kind() == reflect.Int64 {
+						v, err := strconv.ParseInt(jsonValue, 10, 64)
+						if err != nil {
+							RespondError(w, 500, err)
+							return 500, err
+						}
+						f.SetInt(v)
+					} else if f.Kind() == reflect.Int32 {
+						v, err := strconv.ParseInt(jsonValue, 10, 32)
+						if err != nil {
+							RespondError(w, 500, err)
+							return 500, err
+						}
+						f.SetInt(v)
+					} else {
+						panic("Uknown query param: " + jsonValue)
+					}
+				}
+			}
+		}
+		args = append(args, instance.Elem())
+	}
+	values := reflect.ValueOf(h).Call(args)
+	response := values[0].Interface()
+	responseStatus := values[1].Interface().(int)
+	responseError := values[2].Interface()
+	if responseError != nil {
+		RespondError(w, responseStatus, responseError.(error))
+		return responseStatus, responseError.(error)
+	}
+	if v, ok := response.(HtmlPage); ok {
+		w.Header().Set("Content-Type", "text/html")
+		// This has to be at end always
+		w.WriteHeader(responseStatus)
+		v.WriteHtml(w)
+		return 200, nil
+	}
+	w.Header().Set("Content-Type", "application/json")
+	// This has to be at end always
+	w.WriteHeader(responseStatus)
+	data, _ := json.Marshal(response)
+	w.Write(data)
+	return 200, nil
+}
+func LogReq(status int, r *http.Request) {
+	a := color.FgGreen
+	if status >= 500 {
+		a = color.FgRed
+	} else if status >= 400 {
+		a = color.FgYellow
+	}
+	m := color.FgCyan
+	if r.Method == "POST" {
+		m = color.FgYellow
+	} else if r.Method == "PUT" {
+		m = color.FgMagenta
+	} else if r.Method == "DELETE" {
+		m = color.FgRed
+	}
+	log.Info().Msgf("%3s %s %s", color.New(a).Sprint(status), color.New(m).Sprintf("%-4s", r.Method), color.WhiteString(r.URL.Path))
+}

readme.md CHANGED Viewed

@@ -1,28 +1,23 @@
 <p align="center">
-    <a href="https://goreportcard.com/report/github.com/pyros2097/wapp"><img src="https://goreportcard.com/badge/github.com/pyros2097/wapp" alt="Go Report Card"></a>
+    <a href="https://goreportcard.com/report/github.com/pyros2097/gromer"><img src="https://goreportcard.com/badge/github.com/pyros2097/gromer" alt="Go Report Card"></a>
-	<a href="https://GitHub.com/pyros2097/wapp/releases/"><img src="https://img.shields.io/github/release/pyros2097/wapp.svg" alt="GitHub release"></a>
+	<a href="https://GitHub.com/pyros2097/gromer/releases/"><img src="https://img.shields.io/github/release/pyros2097/gromer.svg" alt="GitHub release"></a>
-	<a href="https://pkg.go.dev/github.com/pyros2097/wapp"><img src="https://img.shields.io/badge/dev-reference-007d9c?logo=go&logoColor=white&style=flat" alt="pkg.go.dev docs"></a>
+	<a href="https://pkg.go.dev/github.com/pyros2097/gromer"><img src="https://img.shields.io/badge/dev-reference-007d9c?logo=go&logoColor=white&style=flat" alt="pkg.go.dev docs"></a>
 </p>
-# wapp
+# gromer
-**wapp** is a framework to build web apps in golang.
+**gromer** 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. It is highly opioninated and integrates uses tailwind css and alpinejs.
-# Install
-```sh
-go mod init
-go get -u -v github.com/pyros2097/wapp
-```
 # Install Cli
 ```sh
 go mod init
-go get -u -v github.com/pyros2097/wapp/cmd/wapp
+go get -u -v github.com/pyros2097/wapp/cmd/gromer
 ```
-# Example
+# Using
+You need to follow this directory structure similar to nextjs for the api route handlers to be generated
+Please look at the example for now,
-https://github.com/pyros2097/wapp-example
+[Example](https://github.com/pyros2097/gromer/tree/master/example)