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.

a49aad0d — pyros2097

improve example

Files changed (19) hide show

app_nowasm.go +64 -2
app_wasm.go +4 -3
cli/cli.go +360 -351
example/{pages/about.go → about.go} +0 -0
example/{config.css → assets/config.css} +0 -0
example/assets/manifest.json +0 -21
example/{pages/clock.go → clock.go} +0 -0
example/{pages/container.go → container.go} +0 -0
example/{pages/index.go → index.go} +0 -0
example/main.go +9 -2
example/makefile +10 -1
example/pages/main.go +0 -27
example/readme.md +6 -2
example/samconfig.toml +9 -0
example/template.yml +43 -0
go.mod +3 -1
go.sum +75 -0
utils.go +31 -0
utils_test.go +22 -0

app_nowasm.go CHANGED Viewed

@@ -2,10 +2,72 @@
 package app
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"github.com/akrylysov/algnhsa"
+	"github.com/markbates/pkger"
+)
+func Run(isAwsLambda bool, routes map[string]RenderFunc) {
+	wd, err := os.Getwd()
+	if err != nil {
+		fmt.Printf("could not get wd")
+		return
+	}
+	assetsFileServer := http.FileServer(pkger.Dir(filepath.Join(wd, "assets")))
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		println("route: " + r.URL.Path)
+		renderFunc := MatchRoute(routes, r.URL.Path)
+		if strings.Contains(r.URL.Path, "/assets") {
+			r.URL.Path = strings.Replace(r.URL.Path, "/assets", "", 1)
+			assetsFileServer.ServeHTTP(w, r)
+			return
+		}
+		page := createPage("wapp-example", renderFunc(NewRenderContext()))
+		w.Header().Set("Content-Length", strconv.Itoa(page.Len()))
+		w.Header().Set("Content-Type", "text/html")
+		w.WriteHeader(http.StatusOK)
+		w.Write(page.Bytes())
+	})
+	if !isAwsLambda {
+		println("Serving on HTTP port: 1234")
+		http.ListenAndServe(":1234", nil)
+	} else {
+		println("algnhsa serving default mux")
+		algnhsa.ListenAndServe(http.DefaultServeMux, nil)
+	}
+}
 func Reload() {
 	panic("wasm required")
 }
-func Run(r RenderFunc) {
-	panic("wasm required")
+func createPage(title string, ui UI) *bytes.Buffer {
+	page := bytes.NewBuffer(nil)
+	page.WriteString("<!DOCTYPE html>\n")
+	elems := FilterUIElems(ui)
+	Html(
+		Head(
+			Title(title),
+			Meta("author", "pyros2097"),
+			Meta("description", "Description"),
+			Meta("keywords", ""),
+			Meta("theme-color", ""),
+			Meta("viewport", "width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, viewport-fit=cover"),
+			Link("icon", "/assets/icon.png"),
+			Link("apple-touch-icon", "/assets/icon.png"),
+			Link("stylesheet", "/assets/styles.css"),
+			Link("manifest", "manifest"),
+			Script(`const enosys = () => { const a = new Error("not implemented"); return a.code = "ENOSYS", a }; let outputBuf = ""; window.fs = { constants: { O_WRONLY: -1, O_RDWR: -1, O_CREAT: -1, O_TRUNC: -1, O_APPEND: -1, O_EXCL: -1 }, writeSync(a, b) { outputBuf += decoder.decode(b); const c = outputBuf.lastIndexOf("\n"); return -1 != c && (console.log(outputBuf.substr(0, c)), outputBuf = outputBuf.substr(c + 1)), b.length }, write(a, b, c, d, e, f) { if (0 !== c || d !== b.length || null !== e) return void f(enosys()); const g = this.writeSync(a, b); f(null, g) } }; const encoder = new TextEncoder("utf-8"), decoder = new TextDecoder("utf-8"); class Go { constructor() { this.argv = ["js"], this.env = {}, this.exit = a => { 0 !== a && console.warn("exit code:", a) }, this._exitPromise = new Promise(a => { this._resolveExitPromise = a }), this._pendingEvent = null, this._scheduledTimeouts = new Map, this._nextCallbackTimeoutID = 1; const a = (a, b) => { this.mem.setUint32(a + 0, b, !0), this.mem.setUint32(a + 4, Math.floor(b / 4294967296), !0) }, b = a => { const b = this.mem.getUint32(a + 0, !0), c = this.mem.getInt32(a + 4, !0); return b + 4294967296 * c }, c = a => { const b = this.mem.getFloat64(a, !0); if (0 !== b) { if (!isNaN(b)) return b; const c = this.mem.getUint32(a, !0); return this._values[c] } }, d = (a, b) => { const c = 2146959360; if ("number" == typeof b) return isNaN(b) ? (this.mem.setUint32(a + 4, 2146959360, !0), void this.mem.setUint32(a, 0, !0)) : 0 === b ? (this.mem.setUint32(a + 4, 2146959360, !0), void this.mem.setUint32(a, 1, !0)) : void this.mem.setFloat64(a, b, !0); switch (b) { case void 0: return void this.mem.setFloat64(a, 0, !0); case null: return this.mem.setUint32(a + 4, c, !0), void this.mem.setUint32(a, 2, !0); case !0: return this.mem.setUint32(a + 4, c, !0), void this.mem.setUint32(a, 3, !0); case !1: return this.mem.setUint32(a + 4, c, !0), void this.mem.setUint32(a, 4, !0); }let d = this._ids.get(b); d === void 0 && (d = this._idPool.pop(), d === void 0 && (d = this._values.length), this._values[d] = b, this._goRefCounts[d] = 0, this._ids.set(b, d)), this._goRefCounts[d]++; let e = 1; switch (typeof b) { case "string": e = 2; break; case "symbol": e = 3; break; case "function": e = 4; }this.mem.setUint32(a + 4, 2146959360 | e, !0), this.mem.setUint32(a, d, !0) }, e = a => { const c = b(a + 0), d = b(a + 8); return new Uint8Array(this._inst.exports.mem.buffer, c, d) }, f = d => { const e = b(d + 0), f = b(d + 8), g = Array(f); for (let a = 0; a < f; a++)g[a] = c(e + 8 * a); return g }, g = a => { const c = b(a + 0), d = b(a + 8); return decoder.decode(new DataView(this._inst.exports.mem.buffer, c, d)) }, h = Date.now() - performance.now(); this.importObject = { go: { "runtime.wasmExit": a => { const b = this.mem.getInt32(a + 8, !0); this.exited = !0, delete this._inst, delete this._values, delete this._goRefCounts, delete this._ids, delete this._idPool, this.exit(b) }, "runtime.wasmWrite": a => { const c = b(a + 8), d = b(a + 16), e = this.mem.getInt32(a + 24, !0); fs.writeSync(c, new Uint8Array(this._inst.exports.mem.buffer, d, e)) }, "runtime.resetMemoryDataView": () => { this.mem = new DataView(this._inst.exports.mem.buffer) }, "runtime.nanotime1": b => { a(b + 8, 1e6 * (h + performance.now())) }, "runtime.walltime1": b => { const c = new Date().getTime(); a(b + 8, c / 1e3), this.mem.setInt32(b + 16, 1e6 * (c % 1e3), !0) }, "runtime.scheduleTimeoutEvent": a => { const c = this._nextCallbackTimeoutID; this._nextCallbackTimeoutID++, this._scheduledTimeouts.set(c, setTimeout(() => { for (this._resume(); this._scheduledTimeouts.has(c);)console.warn("scheduleTimeoutEvent: missed timeout event"), this._resume() }, b(a + 8) + 1)), this.mem.setInt32(a + 16, c, !0) }, "runtime.clearTimeoutEvent": a => { const b = this.mem.getInt32(a + 8, !0); clearTimeout(this._scheduledTimeouts.get(b)), this._scheduledTimeouts.delete(b) }, "runtime.getRandomData": a => { crypto.getRandomValues(e(a + 8)) }, "syscall/js.finalizeRef": a => { const b = this.mem.getUint32(a + 8, !0); if (this._goRefCounts[b]--, 0 === this._goRefCounts[b]) { const a = this._values[b]; this._values[b] = null, this._ids.delete(a), this._idPool.push(b) } }, "syscall/js.stringVal": a => { d(a + 24, g(a + 8)) }, "syscall/js.valueGet": a => { const b = Reflect.get(c(a + 8), g(a + 16)); a = this._inst.exports.getsp(), d(a + 32, b) }, "syscall/js.valueSet": a => { Reflect.set(c(a + 8), g(a + 16), c(a + 32)) }, "syscall/js.valueDelete": a => { Reflect.deleteProperty(c(a + 8), g(a + 16)) }, "syscall/js.valueIndex": a => { d(a + 24, Reflect.get(c(a + 8), b(a + 16))) }, "syscall/js.valueSetIndex": a => { Reflect.set(c(a + 8), b(a + 16), c(a + 24)) }, "syscall/js.valueCall": a => { try { const b = c(a + 8), e = Reflect.get(b, g(a + 16)), h = f(a + 32), i = Reflect.apply(e, b, h); a = this._inst.exports.getsp(), d(a + 56, i), this.mem.setUint8(a + 64, 1) } catch (b) { d(a + 56, b), this.mem.setUint8(a + 64, 0) } }, "syscall/js.valueInvoke": a => { try { const b = c(a + 8), e = f(a + 16), g = Reflect.apply(b, void 0, e); a = this._inst.exports.getsp(), d(a + 40, g), this.mem.setUint8(a + 48, 1) } catch (b) { d(a + 40, b), this.mem.setUint8(a + 48, 0) } }, "syscall/js.valueNew": a => { try { const b = c(a + 8), e = f(a + 16), g = Reflect.construct(b, e); a = this._inst.exports.getsp(), d(a + 40, g), this.mem.setUint8(a + 48, 1) } catch (b) { d(a + 40, b), this.mem.setUint8(a + 48, 0) } }, "syscall/js.valueLength": b => { a(b + 16, parseInt(c(b + 8).length)) }, "syscall/js.valuePrepareString": b => { const e = encoder.encode(c(b + 8) + ""); d(b + 16, e), a(b + 24, e.length) }, "syscall/js.valueLoadString": a => { const b = c(a + 8); e(a + 16).set(b) }, "syscall/js.valueInstanceOf": a => { this.mem.setUint8(a + 24, c(a + 8) instanceof c(a + 16)) }, "syscall/js.copyBytesToGo": b => { const d = e(b + 8), f = c(b + 32); if (!(f instanceof Uint8Array)) return void this.mem.setUint8(b + 48, 0); const g = f.subarray(0, d.length); d.set(g), a(b + 40, g.length), this.mem.setUint8(b + 48, 1) }, "syscall/js.copyBytesToJS": b => { const d = c(b + 8), f = e(b + 16); if (!(d instanceof Uint8Array)) return void this.mem.setUint8(b + 48, 0); const g = f.subarray(0, d.length); d.set(g), a(b + 40, g.length), this.mem.setUint8(b + 48, 1) }, debug: a => { console.log(a) } } } } async run(a) { this._inst = a, this.mem = new DataView(this._inst.exports.mem.buffer), this._values = [NaN, 0, null, !0, !1, window, this], this._goRefCounts = [], this._ids = new Map, this._idPool = [], this.exited = !1; let b = 4096; const c = a => { const c = b, d = encoder.encode(a + "\0"); return new Uint8Array(this.mem.buffer, b, d.length).set(d), b += d.length, 0 != b % 8 && (b += 8 - b % 8), c }, d = this.argv.length, e = []; this.argv.forEach(a => { e.push(c(a)) }), e.push(0); const f = Object.keys(this.env).sort(); f.forEach(a => { e.push(c(a + "=" + this.env[a])) }), e.push(0); const g = b; e.forEach(a => { this.mem.setUint32(b, a, !0), this.mem.setUint32(b + 4, 0, !0), b += 8 }), this._inst.exports.run(d, g), this.exited && this._resolveExitPromise(), await this._exitPromise } _resume() { if (this.exited) throw new Error("Go program has already exited"); this._inst.exports.resume(), this.exited && this._resolveExitPromise() } _makeFuncWrapper(a) { const b = this; return function () { const c = { id: a, this: this, args: arguments }; return b._pendingEvent = c, b._resume(), c.result } } } const go = new Go; WebAssembly.instantiateStreaming(fetch("/assets/main.wasm"), go.importObject).then(a => go.run(a.instance)).catch(a => console.error("could not load wasm", a));`),
+		),
+		Body(elems[0]),
+	).Html(page)
+	return page
 }

app_wasm.go CHANGED Viewed

@@ -11,7 +11,8 @@ var (
 	rootPrefix string
 )
-func Run(render RenderFunc) {
+func Run(isAwsLambda bool, routes map[string]RenderFunc) {
+	renderFunc := MatchRoute(routes, js.Window.URL().Path)
 	defer func() {
 		err := recover()
 		// show alert
@@ -20,10 +21,10 @@ func Run(render RenderFunc) {
 	initBody()
 	initContent()
-	if err := body.replaceChildAt(0, render); err != nil {
+	if err := body.replaceChildAt(0, renderFunc); err != nil {
 		panic("replacing content failed")
 	}
-	content = render
+	content = renderFunc
 	for {
 		select {

cli/cli.go CHANGED Viewed

@@ -1,353 +1,362 @@
 package cli
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"plugin"
-	"strconv"
-	"strings"
-	"text/template"
-	"time"
-	"github.com/markbates/pkger"
-	app "github.com/pyros2097/wapp"
-	"gopkg.in/fsnotify.v1"
-)
-const wasmExecTemplate = `const enosys=()=>{const a=new Error("not implemented");return a.code="ENOSYS",a};let outputBuf="";window.fs={constants:{O_WRONLY:-1,O_RDWR:-1,O_CREAT:-1,O_TRUNC:-1,O_APPEND:-1,O_EXCL:-1},writeSync(a,b){outputBuf+=decoder.decode(b);const c=outputBuf.lastIndexOf("\n");return-1!=c&&(console.log(outputBuf.substr(0,c)),outputBuf=outputBuf.substr(c+1)),b.length},write(a,b,c,d,e,f){if(0!==c||d!==b.length||null!==e)return void f(enosys());const g=this.writeSync(a,b);f(null,g)}};const encoder=new TextEncoder("utf-8"),decoder=new TextDecoder("utf-8");class Go{constructor(){this.argv=["js"],this.env={},this.exit=a=>{0!==a&&console.warn("exit code:",a)},this._exitPromise=new Promise(a=>{this._resolveExitPromise=a}),this._pendingEvent=null,this._scheduledTimeouts=new Map,this._nextCallbackTimeoutID=1;const a=(a,b)=>{this.mem.setUint32(a+0,b,!0),this.mem.setUint32(a+4,Math.floor(b/4294967296),!0)},b=a=>{const b=this.mem.getUint32(a+0,!0),c=this.mem.getInt32(a+4,!0);return b+4294967296*c},c=a=>{const b=this.mem.getFloat64(a,!0);if(0!==b){if(!isNaN(b))return b;const c=this.mem.getUint32(a,!0);return this._values[c]}},d=(a,b)=>{const c=2146959360;if("number"==typeof b)return isNaN(b)?(this.mem.setUint32(a+4,2146959360,!0),void this.mem.setUint32(a,0,!0)):0===b?(this.mem.setUint32(a+4,2146959360,!0),void this.mem.setUint32(a,1,!0)):void this.mem.setFloat64(a,b,!0);switch(b){case void 0:return void this.mem.setFloat64(a,0,!0);case null:return this.mem.setUint32(a+4,c,!0),void this.mem.setUint32(a,2,!0);case!0:return this.mem.setUint32(a+4,c,!0),void this.mem.setUint32(a,3,!0);case!1:return this.mem.setUint32(a+4,c,!0),void this.mem.setUint32(a,4,!0);}let d=this._ids.get(b);d===void 0&&(d=this._idPool.pop(),d===void 0&&(d=this._values.length),this._values[d]=b,this._goRefCounts[d]=0,this._ids.set(b,d)),this._goRefCounts[d]++;let e=1;switch(typeof b){case"string":e=2;break;case"symbol":e=3;break;case"function":e=4;}this.mem.setUint32(a+4,2146959360|e,!0),this.mem.setUint32(a,d,!0)},e=a=>{const c=b(a+0),d=b(a+8);return new Uint8Array(this._inst.exports.mem.buffer,c,d)},f=d=>{const e=b(d+0),f=b(d+8),g=Array(f);for(let a=0;a<f;a++)g[a]=c(e+8*a);return g},g=a=>{const c=b(a+0),d=b(a+8);return decoder.decode(new DataView(this._inst.exports.mem.buffer,c,d))},h=Date.now()-performance.now();this.importObject={go:{"runtime.wasmExit":a=>{const b=this.mem.getInt32(a+8,!0);this.exited=!0,delete this._inst,delete this._values,delete this._goRefCounts,delete this._ids,delete this._idPool,this.exit(b)},"runtime.wasmWrite":a=>{const c=b(a+8),d=b(a+16),e=this.mem.getInt32(a+24,!0);fs.writeSync(c,new Uint8Array(this._inst.exports.mem.buffer,d,e))},"runtime.resetMemoryDataView":()=>{this.mem=new DataView(this._inst.exports.mem.buffer)},"runtime.nanotime1":b=>{a(b+8,1e6*(h+performance.now()))},"runtime.walltime1":b=>{const c=new Date().getTime();a(b+8,c/1e3),this.mem.setInt32(b+16,1e6*(c%1e3),!0)},"runtime.scheduleTimeoutEvent":a=>{const c=this._nextCallbackTimeoutID;this._nextCallbackTimeoutID++,this._scheduledTimeouts.set(c,setTimeout(()=>{for(this._resume();this._scheduledTimeouts.has(c);)console.warn("scheduleTimeoutEvent: missed timeout event"),this._resume()},b(a+8)+1)),this.mem.setInt32(a+16,c,!0)},"runtime.clearTimeoutEvent":a=>{const b=this.mem.getInt32(a+8,!0);clearTimeout(this._scheduledTimeouts.get(b)),this._scheduledTimeouts.delete(b)},"runtime.getRandomData":a=>{crypto.getRandomValues(e(a+8))},"syscall/js.finalizeRef":a=>{const b=this.mem.getUint32(a+8,!0);if(this._goRefCounts[b]--,0===this._goRefCounts[b]){const a=this._values[b];this._values[b]=null,this._ids.delete(a),this._idPool.push(b)}},"syscall/js.stringVal":a=>{d(a+24,g(a+8))},"syscall/js.valueGet":a=>{const b=Reflect.get(c(a+8),g(a+16));a=this._inst.exports.getsp(),d(a+32,b)},"syscall/js.valueSet":a=>{Reflect.set(c(a+8),g(a+16),c(a+32))},"syscall/js.valueDelete":a=>{Reflect.deleteProperty(c(a+8),g(a+16))},"syscall/js.valueIndex":a=>{d(a+24,Reflect.get(c(a+8),b(a+16)))},"syscall/js.valueSetIndex":a=>{Reflect.set(c(a+8),b(a+16),c(a+24))},"syscall/js.valueCall":a=>{try{const b=c(a+8),e=Reflect.get(b,g(a+16)),h=f(a+32),i=Reflect.apply(e,b,h);a=this._inst.exports.getsp(),d(a+56,i),this.mem.setUint8(a+64,1)}catch(b){d(a+56,b),this.mem.setUint8(a+64,0)}},"syscall/js.valueInvoke":a=>{try{const b=c(a+8),e=f(a+16),g=Reflect.apply(b,void 0,e);a=this._inst.exports.getsp(),d(a+40,g),this.mem.setUint8(a+48,1)}catch(b){d(a+40,b),this.mem.setUint8(a+48,0)}},"syscall/js.valueNew":a=>{try{const b=c(a+8),e=f(a+16),g=Reflect.construct(b,e);a=this._inst.exports.getsp(),d(a+40,g),this.mem.setUint8(a+48,1)}catch(b){d(a+40,b),this.mem.setUint8(a+48,0)}},"syscall/js.valueLength":b=>{a(b+16,parseInt(c(b+8).length))},"syscall/js.valuePrepareString":b=>{const e=encoder.encode(c(b+8)+"");d(b+16,e),a(b+24,e.length)},"syscall/js.valueLoadString":a=>{const b=c(a+8);e(a+16).set(b)},"syscall/js.valueInstanceOf":a=>{this.mem.setUint8(a+24,c(a+8)instanceof c(a+16))},"syscall/js.copyBytesToGo":b=>{const d=e(b+8),f=c(b+32);if(!(f instanceof Uint8Array))return void this.mem.setUint8(b+48,0);const g=f.subarray(0,d.length);d.set(g),a(b+40,g.length),this.mem.setUint8(b+48,1)},"syscall/js.copyBytesToJS":b=>{const d=c(b+8),f=e(b+16);if(!(d instanceof Uint8Array))return void this.mem.setUint8(b+48,0);const g=f.subarray(0,d.length);d.set(g),a(b+40,g.length),this.mem.setUint8(b+48,1)},debug:a=>{console.log(a)}}}}async run(a){this._inst=a,this.mem=new DataView(this._inst.exports.mem.buffer),this._values=[NaN,0,null,!0,!1,window,this],this._goRefCounts=[],this._ids=new Map,this._idPool=[],this.exited=!1;let b=4096;const c=a=>{const c=b,d=encoder.encode(a+"\0");return new Uint8Array(this.mem.buffer,b,d.length).set(d),b+=d.length,0!=b%8&&(b+=8-b%8),c},d=this.argv.length,e=[];this.argv.forEach(a=>{e.push(c(a))}),e.push(0);const f=Object.keys(this.env).sort();f.forEach(a=>{e.push(c(a+"="+this.env[a]))}),e.push(0);const g=b;e.forEach(a=>{this.mem.setUint32(b,a,!0),this.mem.setUint32(b+4,0,!0),b+=8}),this._inst.exports.run(d,g),this.exited&&this._resolveExitPromise(),await this._exitPromise}_resume(){if(this.exited)throw new Error("Go program has already exited");this._inst.exports.resume(),this.exited&&this._resolveExitPromise()}_makeFuncWrapper(a){const b=this;return function(){const c={id:a,this:this,args:arguments};return b._pendingEvent=c,b._resume(),c.result}}}const go=new Go;WebAssembly.instantiateStreaming(fetch("__path__"),go.importObject).then(a=>go.run(a.instance)).catch(a=>console.error("could not load wasm",a));`
-func wasmExecJs(path string) string {
-	return strings.Replace(wasmExecTemplate, "__path__", path, 1)
-}
-var watchDelta = 1000 * time.Millisecond
-type Watcher struct {
-	rootdir     string
-	watcher     *fsnotify.Watcher
-	watchVendor bool
-	update      chan string
-}
-// MustRegisterWatcher creates a new Watcher and starts listening to
-// given folders
-func MustRegisterWatcher() *Watcher {
-	w := &Watcher{
-		update:      make(chan string),
-		watchVendor: false,
-	}
-	var err error
-	w.watcher, err = fsnotify.NewWatcher()
-	if err != nil {
-		log.Fatalf("Could not register watcher: %s", err)
-	}
-	w.watchFolders()
-	return w
-}
-// Watch listens file updates, and sends signal to
-// update channel when .go and .tmpl files are updated
-func (w *Watcher) Watch() {
-	eventSent := false
-	for {
-		select {
-		case event := <-w.watcher.Events:
-			// discard chmod events
-			if event.Op&fsnotify.Chmod != fsnotify.Chmod {
-				// test files do not need a rebuild
-				if isTestFile(event.Name) {
-					continue
-				}
-				if !isWatchedFileType(event.Name) {
-					continue
-				}
-				if eventSent {
-					continue
-				}
-				eventSent = true
-				// prevent consequent builds
-				go func() {
-					w.update <- event.Name
-					time.Sleep(watchDelta)
-					eventSent = false
-				}()
-			}
-		case err := <-w.watcher.Errors:
-			if err != nil {
-				log.Fatalf("Watcher error: %s", err)
-			}
-			return
-		}
-	}
-}
-func isTestFile(fileName string) bool {
-	return strings.HasSuffix(filepath.Base(fileName), "_test.go")
-}
-func isWatchedFileType(fileName string) bool {
-	ext := filepath.Ext(fileName)
-	return ext == ".go"
-}
-// Close closes the fsnotify watcher channel
-func (w *Watcher) Close() {
-	w.watcher.Close()
-	close(w.update)
-}
-// watchFolders recursively adds folders that will be watched against the changes,
-// starting from the working directory
-func (w *Watcher) watchFolders() {
-	wd, err := os.Getwd()
-	if err != nil {
-		log.Fatalf("Could not get root working directory: %s", err)
-	}
-	filepath.Walk(wd, func(path string, info os.FileInfo, err error) error {
-		// skip files
-		if info == nil {
-			log.Fatalf("wrong watcher package: %s", path)
-		}
-		if !info.IsDir() {
-			return nil
-		}
-		if !w.watchVendor {
-			// skip vendor directory
-			vendor := fmt.Sprintf("%s/vendor", wd)
-			if strings.HasPrefix(path, vendor) {
-				return filepath.SkipDir
-			}
-		}
-		// skip hidden folders
-		if len(path) > 1 && strings.HasPrefix(filepath.Base(path), ".") {
-			return filepath.SkipDir
-		}
-		w.addFolder(path)
-		return err
-	})
-}
-// addFolder adds given folder name to the watched folders, and starts
-// watching it for further changes
-func (w *Watcher) addFolder(name string) {
-	println("watch: " + name)
-	if err := w.watcher.Add(name); err != nil {
-		log.Fatalf("Could not watch folder: %s", err)
-	}
-}
-type RouteInfo struct {
-	Path       string
-	FuncName   string
-	RenderFunc func(*app.RenderContext) app.UI
-}
-var routesMap = map[string]RouteInfo{}
-func getSOPath(p string) string {
-	return "build/" + filepath.Base(filepath.Dir(p)) + ".so"
-}
-func getWasmPath(p string) string {
-	return "build/" + filepath.Base(filepath.Dir(p)) + ".wasm"
-}
-func buildSo(path string) (string, error) {
-	soPath := getSOPath(path)
-	out, err := exec.Command("go", "build", "-buildmode=plugin", "-o", soPath, path).CombinedOutput()
-	if err != nil {
-		println(string(out))
-		println(err.Error())
-		return "", err
-	}
-	fmt.Printf("wrote: %s\n", soPath)
-	return soPath, nil
-}
-func buildWasm(path string) (string, error) {
-	wasmPath := getWasmPath(path)
-	cmd := exec.Command("go", "build", "-o", wasmPath, path)
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "GOOS=js", "GOARCH=wasm")
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		println(string(out))
-		println(err.Error())
-		return "", err
-	}
-	fmt.Printf("wrote: %s\n", wasmPath)
-	return wasmPath, nil
-}
-func getRoute(basePath, p string) (string, string) {
-	clean := strings.Replace(strings.Replace(p, basePath, "", 1), ".go", "", -1)
-	return strings.Replace(clean, "index", "", -1), strings.Title(strings.Replace(clean, "/", "", -1))
-}
-func writeMainFile(basePath string) {
-	tpl, err := template.New("writeMain").Parse(`// GENERATED FILE DO NOT EDIT
-package main
-import (
-	. "github.com/pyros2097/wapp"
-	"github.com/pyros2097/wapp/js"
-)
-func main() {
-	{{range $key, $element := .}}
-		if js.Window.URL().Path == "{{.Path}}" {
-			Run({{.FuncName}})
-		}
-	{{end}}
-}
-`)
-	if err != nil {
-		panic(err)
-	}
-	buf := bytes.NewBuffer(nil)
-	err = tpl.Execute(buf, routesMap)
-	if err != nil {
-		panic(err)
-	}
-	err = ioutil.WriteFile("pages/main.go", buf.Bytes(), 0644)
-	if err != nil {
-		panic(err)
-	}
-}
-func loadRoutes(p *plugin.Plugin, basePath string, dry bool) {
-	err := filepath.Walk(basePath, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			fmt.Printf("prevent panic by handling failure accessing a path %q: %v\n", path, err)
-			return err
-		}
-		if !info.IsDir() {
-			routePath, routeFunc := getRoute(basePath, path)
-			if routePath == "/main" {
-				return nil
-			}
-			routesMap[routePath] = RouteInfo{
-				Path:     routePath,
-				FuncName: routeFunc,
-			}
-			if dry {
-				// println("Dry")
-				return nil
-			}
-			fmt.Printf("route: %s routeFunc: %s\n", routePath, routeFunc)
-			renderFn, err := p.Lookup(routeFunc)
-			if err != nil {
-				return err
-			}
-			routesMap[routePath] = RouteInfo{
-				Path:       routePath,
-				FuncName:   routeFunc,
-				RenderFunc: renderFn.(func(*app.RenderContext) app.UI),
-			}
-			// println(createPage(routesMap[routePath](app.NewRenderContext())).String())
-		}
-		return nil
-	})
-	if err != nil {
-		fmt.Printf("error walking the path %q: %v\n", basePath, err)
-		panic(err)
-	}
-}
-func createPage(ui app.UI, wasmPath string) *bytes.Buffer {
-	page := bytes.NewBuffer(nil)
-	page.WriteString("<!DOCTYPE html>\n")
-	elems := app.FilterUIElems(ui)
-	app.Html(
-		app.Head(
-			app.Title("Title"),
-			app.Meta("author", "pyros2097"),
-			app.Meta("description", "Description"),
-			app.Meta("keywords", ""),
-			app.Meta("theme-color", ""),
-			app.Meta("viewport", "width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, viewport-fit=cover"),
-			app.Link("icon", "/assets/icon.png"),
-			app.Link("apple-touch-icon", "/assets/icon.png"),
-			app.Link("stylesheet", "/assets/styles.css"),
-			app.Link("manifest", "manifest"),
-			app.Script(wasmExecJs(wasmPath)),
-		),
-		app.Body(elems[0]),
-	).Html(page)
-	return page
-}
-func serve(wd string) {
-	assetsFileServer := http.FileServer(pkger.Dir(filepath.Join(wd, "assets")))
-	buildFileServer := http.FileServer(pkger.Dir(filepath.Join(wd, "build")))
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		if routeInfo, ok := routesMap[r.URL.Path]; ok {
-			wasmPath := "/build/" + filepath.Base(wd) + ".wasm"
-			page := createPage(routeInfo.RenderFunc(app.NewRenderContext()), wasmPath)
-			w.Header().Set("Content-Length", strconv.Itoa(page.Len()))
-			w.Header().Set("Content-Type", "text/html")
-			w.WriteHeader(http.StatusOK)
-			w.Write(page.Bytes())
-		} else if strings.Contains(r.URL.Path, "/build") {
-			r.URL.Path = strings.Replace(r.URL.Path, "/build", "", 1)
-			buildFileServer.ServeHTTP(w, r)
-		} else {
-			r.URL.Path = strings.Replace(r.URL.Path, "/assets", "", 1)
-			assetsFileServer.ServeHTTP(w, r)
-		}
-	})
-	log.Printf("Serving on HTTP port: 1234")
-	log.Fatal(http.ListenAndServe(":1234", nil))
-}
-func buildAll(basePath string) {
-	loadRoutes(nil, basePath, true)
-	writeMainFile(basePath)
-	buildWasm(basePath)
-	soPath, err := buildSo(basePath)
-	if err != nil {
-		println("could not build")
-		panic(err)
-	}
-	p, err := plugin.Open(soPath)
-	if err != nil {
-		println("could not load so plugin")
-		panic(err)
-	}
-	// fmt.Printf("%+v\n", p)
-	loadRoutes(p, basePath, false)
-}
-func Watch() {
-	wd, err := os.Getwd()
-	if err != nil {
-		fmt.Printf("could not get wd")
-		return
-	}
-	basePath := filepath.Join(wd, "pages")
-	buildAll(basePath)
-	watcher := MustRegisterWatcher()
-	go watcher.Watch()
-	go serve(wd)
-	for file := range watcher.update {
-		println("changed: " + file)
-		buildAll(basePath)
-	}
-}
+// import (
+// 	"bytes"
+// 	"fmt"
+// 	"io/ioutil"
+// 	"log"
+// 	"net/http"
+// 	"os"
+// 	"os/exec"
+// 	"path/filepath"
+// 	"plugin"
+// 	"strconv"
+// 	"strings"
+// 	"text/template"
+// 	"time"
+// 	"github.com/akrylysov/algnhsa"
+// 	"github.com/markbates/pkger"
+// 	app "github.com/pyros2097/wapp"
+// 	"gopkg.in/fsnotify.v1"
+// )
+// const wasmExecTemplate = `const enosys=()=>{const a=new Error("not implemented");return a.code="ENOSYS",a};let outputBuf="";window.fs={constants:{O_WRONLY:-1,O_RDWR:-1,O_CREAT:-1,O_TRUNC:-1,O_APPEND:-1,O_EXCL:-1},writeSync(a,b){outputBuf+=decoder.decode(b);const c=outputBuf.lastIndexOf("\n");return-1!=c&&(console.log(outputBuf.substr(0,c)),outputBuf=outputBuf.substr(c+1)),b.length},write(a,b,c,d,e,f){if(0!==c||d!==b.length||null!==e)return void f(enosys());const g=this.writeSync(a,b);f(null,g)}};const encoder=new TextEncoder("utf-8"),decoder=new TextDecoder("utf-8");class Go{constructor(){this.argv=["js"],this.env={},this.exit=a=>{0!==a&&console.warn("exit code:",a)},this._exitPromise=new Promise(a=>{this._resolveExitPromise=a}),this._pendingEvent=null,this._scheduledTimeouts=new Map,this._nextCallbackTimeoutID=1;const a=(a,b)=>{this.mem.setUint32(a+0,b,!0),this.mem.setUint32(a+4,Math.floor(b/4294967296),!0)},b=a=>{const b=this.mem.getUint32(a+0,!0),c=this.mem.getInt32(a+4,!0);return b+4294967296*c},c=a=>{const b=this.mem.getFloat64(a,!0);if(0!==b){if(!isNaN(b))return b;const c=this.mem.getUint32(a,!0);return this._values[c]}},d=(a,b)=>{const c=2146959360;if("number"==typeof b)return isNaN(b)?(this.mem.setUint32(a+4,2146959360,!0),void this.mem.setUint32(a,0,!0)):0===b?(this.mem.setUint32(a+4,2146959360,!0),void this.mem.setUint32(a,1,!0)):void this.mem.setFloat64(a,b,!0);switch(b){case void 0:return void this.mem.setFloat64(a,0,!0);case null:return this.mem.setUint32(a+4,c,!0),void this.mem.setUint32(a,2,!0);case!0:return this.mem.setUint32(a+4,c,!0),void this.mem.setUint32(a,3,!0);case!1:return this.mem.setUint32(a+4,c,!0),void this.mem.setUint32(a,4,!0);}let d=this._ids.get(b);d===void 0&&(d=this._idPool.pop(),d===void 0&&(d=this._values.length),this._values[d]=b,this._goRefCounts[d]=0,this._ids.set(b,d)),this._goRefCounts[d]++;let e=1;switch(typeof b){case"string":e=2;break;case"symbol":e=3;break;case"function":e=4;}this.mem.setUint32(a+4,2146959360|e,!0),this.mem.setUint32(a,d,!0)},e=a=>{const c=b(a+0),d=b(a+8);return new Uint8Array(this._inst.exports.mem.buffer,c,d)},f=d=>{const e=b(d+0),f=b(d+8),g=Array(f);for(let a=0;a<f;a++)g[a]=c(e+8*a);return g},g=a=>{const c=b(a+0),d=b(a+8);return decoder.decode(new DataView(this._inst.exports.mem.buffer,c,d))},h=Date.now()-performance.now();this.importObject={go:{"runtime.wasmExit":a=>{const b=this.mem.getInt32(a+8,!0);this.exited=!0,delete this._inst,delete this._values,delete this._goRefCounts,delete this._ids,delete this._idPool,this.exit(b)},"runtime.wasmWrite":a=>{const c=b(a+8),d=b(a+16),e=this.mem.getInt32(a+24,!0);fs.writeSync(c,new Uint8Array(this._inst.exports.mem.buffer,d,e))},"runtime.resetMemoryDataView":()=>{this.mem=new DataView(this._inst.exports.mem.buffer)},"runtime.nanotime1":b=>{a(b+8,1e6*(h+performance.now()))},"runtime.walltime1":b=>{const c=new Date().getTime();a(b+8,c/1e3),this.mem.setInt32(b+16,1e6*(c%1e3),!0)},"runtime.scheduleTimeoutEvent":a=>{const c=this._nextCallbackTimeoutID;this._nextCallbackTimeoutID++,this._scheduledTimeouts.set(c,setTimeout(()=>{for(this._resume();this._scheduledTimeouts.has(c);)console.warn("scheduleTimeoutEvent: missed timeout event"),this._resume()},b(a+8)+1)),this.mem.setInt32(a+16,c,!0)},"runtime.clearTimeoutEvent":a=>{const b=this.mem.getInt32(a+8,!0);clearTimeout(this._scheduledTimeouts.get(b)),this._scheduledTimeouts.delete(b)},"runtime.getRandomData":a=>{crypto.getRandomValues(e(a+8))},"syscall/js.finalizeRef":a=>{const b=this.mem.getUint32(a+8,!0);if(this._goRefCounts[b]--,0===this._goRefCounts[b]){const a=this._values[b];this._values[b]=null,this._ids.delete(a),this._idPool.push(b)}},"syscall/js.stringVal":a=>{d(a+24,g(a+8))},"syscall/js.valueGet":a=>{const b=Reflect.get(c(a+8),g(a+16));a=this._inst.exports.getsp(),d(a+32,b)},"syscall/js.valueSet":a=>{Reflect.set(c(a+8),g(a+16),c(a+32))},"syscall/js.valueDelete":a=>{Reflect.deleteProperty(c(a+8),g(a+16))},"syscall/js.valueIndex":a=>{d(a+24,Reflect.get(c(a+8),b(a+16)))},"syscall/js.valueSetIndex":a=>{Reflect.set(c(a+8),b(a+16),c(a+24))},"syscall/js.valueCall":a=>{try{const b=c(a+8),e=Reflect.get(b,g(a+16)),h=f(a+32),i=Reflect.apply(e,b,h);a=this._inst.exports.getsp(),d(a+56,i),this.mem.setUint8(a+64,1)}catch(b){d(a+56,b),this.mem.setUint8(a+64,0)}},"syscall/js.valueInvoke":a=>{try{const b=c(a+8),e=f(a+16),g=Reflect.apply(b,void 0,e);a=this._inst.exports.getsp(),d(a+40,g),this.mem.setUint8(a+48,1)}catch(b){d(a+40,b),this.mem.setUint8(a+48,0)}},"syscall/js.valueNew":a=>{try{const b=c(a+8),e=f(a+16),g=Reflect.construct(b,e);a=this._inst.exports.getsp(),d(a+40,g),this.mem.setUint8(a+48,1)}catch(b){d(a+40,b),this.mem.setUint8(a+48,0)}},"syscall/js.valueLength":b=>{a(b+16,parseInt(c(b+8).length))},"syscall/js.valuePrepareString":b=>{const e=encoder.encode(c(b+8)+"");d(b+16,e),a(b+24,e.length)},"syscall/js.valueLoadString":a=>{const b=c(a+8);e(a+16).set(b)},"syscall/js.valueInstanceOf":a=>{this.mem.setUint8(a+24,c(a+8)instanceof c(a+16))},"syscall/js.copyBytesToGo":b=>{const d=e(b+8),f=c(b+32);if(!(f instanceof Uint8Array))return void this.mem.setUint8(b+48,0);const g=f.subarray(0,d.length);d.set(g),a(b+40,g.length),this.mem.setUint8(b+48,1)},"syscall/js.copyBytesToJS":b=>{const d=c(b+8),f=e(b+16);if(!(d instanceof Uint8Array))return void this.mem.setUint8(b+48,0);const g=f.subarray(0,d.length);d.set(g),a(b+40,g.length),this.mem.setUint8(b+48,1)},debug:a=>{console.log(a)}}}}async run(a){this._inst=a,this.mem=new DataView(this._inst.exports.mem.buffer),this._values=[NaN,0,null,!0,!1,window,this],this._goRefCounts=[],this._ids=new Map,this._idPool=[],this.exited=!1;let b=4096;const c=a=>{const c=b,d=encoder.encode(a+"\0");return new Uint8Array(this.mem.buffer,b,d.length).set(d),b+=d.length,0!=b%8&&(b+=8-b%8),c},d=this.argv.length,e=[];this.argv.forEach(a=>{e.push(c(a))}),e.push(0);const f=Object.keys(this.env).sort();f.forEach(a=>{e.push(c(a+"="+this.env[a]))}),e.push(0);const g=b;e.forEach(a=>{this.mem.setUint32(b,a,!0),this.mem.setUint32(b+4,0,!0),b+=8}),this._inst.exports.run(d,g),this.exited&&this._resolveExitPromise(),await this._exitPromise}_resume(){if(this.exited)throw new Error("Go program has already exited");this._inst.exports.resume(),this.exited&&this._resolveExitPromise()}_makeFuncWrapper(a){const b=this;return function(){const c={id:a,this:this,args:arguments};return b._pendingEvent=c,b._resume(),c.result}}}const go=new Go;WebAssembly.instantiateStreaming(fetch("__path__"),go.importObject).then(a=>go.run(a.instance)).catch(a=>console.error("could not load wasm",a));`
+// func wasmExecJs(path string) string {
+// 	return strings.Replace(wasmExecTemplate, "__path__", path, 1)
+// }
+// var watchDelta = 1000 * time.Millisecond
+// type Watcher struct {
+// 	rootdir     string
+// 	watcher     *fsnotify.Watcher
+// 	watchVendor bool
+// 	update      chan string
+// }
+// // MustRegisterWatcher creates a new Watcher and starts listening to
+// // given folders
+// func MustRegisterWatcher() *Watcher {
+// 	w := &Watcher{
+// 		update:      make(chan string),
+// 		watchVendor: false,
+// 	}
+// 	var err error
+// 	w.watcher, err = fsnotify.NewWatcher()
+// 	if err != nil {
+// 		log.Fatalf("Could not register watcher: %s", err)
+// 	}
+// 	w.watchFolders()
+// 	return w
+// }
+// // Watch listens file updates, and sends signal to
+// // update channel when .go and .tmpl files are updated
+// func (w *Watcher) Watch() {
+// 	eventSent := false
+// 	for {
+// 		select {
+// 		case event := <-w.watcher.Events:
+// 			// discard chmod events
+// 			if event.Op&fsnotify.Chmod != fsnotify.Chmod {
+// 				// test files do not need a rebuild
+// 				if isTestFile(event.Name) {
+// 					continue
+// 				}
+// 				if !isWatchedFileType(event.Name) {
+// 					continue
+// 				}
+// 				if eventSent {
+// 					continue
+// 				}
+// 				eventSent = true
+// 				// prevent consequent builds
+// 				go func() {
+// 					w.update <- event.Name
+// 					time.Sleep(watchDelta)
+// 					eventSent = false
+// 				}()
+// 			}
+// 		case err := <-w.watcher.Errors:
+// 			if err != nil {
+// 				log.Fatalf("Watcher error: %s", err)
+// 			}
+// 			return
+// 		}
+// 	}
+// }
+// func isTestFile(fileName string) bool {
+// 	return strings.HasSuffix(filepath.Base(fileName), "_test.go")
+// }
+// func isWatchedFileType(fileName string) bool {
+// 	ext := filepath.Ext(fileName)
+// 	return ext == ".go"
+// }
+// // Close closes the fsnotify watcher channel
+// func (w *Watcher) Close() {
+// 	w.watcher.Close()
+// 	close(w.update)
+// }
+// // watchFolders recursively adds folders that will be watched against the changes,
+// // starting from the working directory
+// func (w *Watcher) watchFolders() {
+// 	wd, err := os.Getwd()
+// 	if err != nil {
+// 		log.Fatalf("Could not get root working directory: %s", err)
+// 	}
+// 	filepath.Walk(wd, func(path string, info os.FileInfo, err error) error {
+// 		// skip files
+// 		if info == nil {
+// 			log.Fatalf("wrong watcher package: %s", path)
+// 		}
+// 		if !info.IsDir() {
+// 			return nil
+// 		}
+// 		if !w.watchVendor {
+// 			// skip vendor directory
+// 			vendor := fmt.Sprintf("%s/vendor", wd)
+// 			if strings.HasPrefix(path, vendor) {
+// 				return filepath.SkipDir
+// 			}
+// 		}
+// 		// skip hidden folders
+// 		if len(path) > 1 && strings.HasPrefix(filepath.Base(path), ".") {
+// 			return filepath.SkipDir
+// 		}
+// 		w.addFolder(path)
+// 		return err
+// 	})
+// }
+// // addFolder adds given folder name to the watched folders, and starts
+// // watching it for further changes
+// func (w *Watcher) addFolder(name string) {
+// 	println("watch: " + name)
+// 	if err := w.watcher.Add(name); err != nil {
+// 		log.Fatalf("Could not watch folder: %s", err)
+// 	}
+// }
+// type RouteInfo struct {
+// 	Path       string
+// 	FuncName   string
+// 	RenderFunc func(*app.RenderContext) app.UI
+// }
+// var routesMap = map[string]RouteInfo{}
+// func getSOPath(p string) string {
+// 	return "build/" + filepath.Base(filepath.Dir(p)) + ".so"
+// }
+// func getWasmPath(p string) string {
+// 	return "build/" + filepath.Base(filepath.Dir(p)) + ".wasm"
+// }
+// func buildSo(path string) (string, error) {
+// 	soPath := getSOPath(path)
+// 	out, err := exec.Command("go", "build", "-buildmode=plugin", "-o", soPath, path).CombinedOutput()
+// 	if err != nil {
+// 		println(string(out))
+// 		println(err.Error())
+// 		return "", err
+// 	}
+// 	fmt.Printf("wrote: %s\n", soPath)
+// 	return soPath, nil
+// }
+// func buildWasm(path string) (string, error) {
+// 	wasmPath := getWasmPath(path)
+// 	cmd := exec.Command("go", "build", "-o", wasmPath, path)
+// 	cmd.Env = os.Environ()
+// 	cmd.Env = append(cmd.Env, "GOOS=js", "GOARCH=wasm")
+// 	out, err := cmd.CombinedOutput()
+// 	if err != nil {
+// 		println(string(out))
+// 		println(err.Error())
+// 		return "", err
+// 	}
+// 	fmt.Printf("wrote: %s\n", wasmPath)
+// 	return wasmPath, nil
+// }
+// func getRoute(basePath, p string) (string, string) {
+// 	clean := strings.Replace(strings.Replace(p, basePath, "", 1), ".go", "", -1)
+// 	return strings.Replace(clean, "index", "", -1), strings.Title(strings.Replace(clean, "/", "", -1))
+// }
+// func writeMainFile(basePath string) {
+// 	tpl, err := template.New("writeMain").Parse(`// GENERATED FILE DO NOT EDIT
+// package main
+// import (
+// 	. "github.com/pyros2097/wapp"
+// 	"github.com/pyros2097/wapp/js"
+// )
+// func main() {
+// 	{{range $key, $element := .}}
+// 		if js.Window.URL().Path == "{{.Path}}" {
+// 			Run({{.FuncName}})
+// 		}
+// 	{{end}}
+// }
+// `)
+// 	if err != nil {
+// 		panic(err)
+// 	}
+// 	buf := bytes.NewBuffer(nil)
+// 	err = tpl.Execute(buf, routesMap)
+// 	if err != nil {
+// 		panic(err)
+// 	}
+// 	err = ioutil.WriteFile("pages/main.go", buf.Bytes(), 0644)
+// 	if err != nil {
+// 		panic(err)
+// 	}
+// }
+// func loadRoutes(p *plugin.Plugin, basePath string, dry bool) {
+// 	err := filepath.Walk(basePath, func(path string, info os.FileInfo, err error) error {
+// 		if err != nil {
+// 			fmt.Printf("prevent panic by handling failure accessing a path %q: %v\n", path, err)
+// 			return err
+// 		}
+// 		if !info.IsDir() {
+// 			routePath, routeFunc := getRoute(basePath, path)
+// 			if routePath == "/main" {
+// 				return nil
+// 			}
+// 			routesMap[routePath] = RouteInfo{
+// 				Path:     routePath,
+// 				FuncName: routeFunc,
+// 			}
+// 			if dry {
+// 				// println("Dry")
+// 				return nil
+// 			}
+// 			fmt.Printf("route: %s routeFunc: %s\n", routePath, routeFunc)
+// 			renderFn, err := p.Lookup(routeFunc)
+// 			if err != nil {
+// 				return err
+// 			}
+// 			routesMap[routePath] = RouteInfo{
+// 				Path:       routePath,
+// 				FuncName:   routeFunc,
+// 				RenderFunc: renderFn.(func(*app.RenderContext) app.UI),
+// 			}
+// 			// println(createPage(routesMap[routePath](app.NewRenderContext())).String())
+// 		}
+// 		return nil
+// 	})
+// 	if err != nil {
+// 		fmt.Printf("error walking the path %q: %v\n", basePath, err)
+// 		panic(err)
+// 	}
+// }
+// func CreatePage(title string, ui app.UI, wasmPath string) *bytes.Buffer {
+// 	page := bytes.NewBuffer(nil)
+// 	page.WriteString("<!DOCTYPE html>\n")
+// 	elems := app.FilterUIElems(ui)
+// 	app.Html(
+// 		app.Head(
+// 			app.Title(title),
+// 			app.Meta("author", "pyros2097"),
+// 			app.Meta("description", "Description"),
+// 			app.Meta("keywords", ""),
+// 			app.Meta("theme-color", ""),
+// 			app.Meta("viewport", "width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, viewport-fit=cover"),
+// 			app.Link("icon", "/assets/icon.png"),
+// 			app.Link("apple-touch-icon", "/assets/icon.png"),
+// 			app.Link("stylesheet", "/assets/styles.css"),
+// 			app.Link("manifest", "manifest"),
+// 			app.Script(`const enosys = () => { const a = new Error("not implemented"); return a.code = "ENOSYS", a }; let outputBuf = ""; window.fs = { constants: { O_WRONLY: -1, O_RDWR: -1, O_CREAT: -1, O_TRUNC: -1, O_APPEND: -1, O_EXCL: -1 }, writeSync(a, b) { outputBuf += decoder.decode(b); const c = outputBuf.lastIndexOf("\n"); return -1 != c && (console.log(outputBuf.substr(0, c)), outputBuf = outputBuf.substr(c + 1)), b.length }, write(a, b, c, d, e, f) { if (0 !== c || d !== b.length || null !== e) return void f(enosys()); const g = this.writeSync(a, b); f(null, g) } }; const encoder = new TextEncoder("utf-8"), decoder = new TextDecoder("utf-8"); class Go { constructor() { this.argv = ["js"], this.env = {}, this.exit = a => { 0 !== a && console.warn("exit code:", a) }, this._exitPromise = new Promise(a => { this._resolveExitPromise = a }), this._pendingEvent = null, this._scheduledTimeouts = new Map, this._nextCallbackTimeoutID = 1; const a = (a, b) => { this.mem.setUint32(a + 0, b, !0), this.mem.setUint32(a + 4, Math.floor(b / 4294967296), !0) }, b = a => { const b = this.mem.getUint32(a + 0, !0), c = this.mem.getInt32(a + 4, !0); return b + 4294967296 * c }, c = a => { const b = this.mem.getFloat64(a, !0); if (0 !== b) { if (!isNaN(b)) return b; const c = this.mem.getUint32(a, !0); return this._values[c] } }, d = (a, b) => { const c = 2146959360; if ("number" == typeof b) return isNaN(b) ? (this.mem.setUint32(a + 4, 2146959360, !0), void this.mem.setUint32(a, 0, !0)) : 0 === b ? (this.mem.setUint32(a + 4, 2146959360, !0), void this.mem.setUint32(a, 1, !0)) : void this.mem.setFloat64(a, b, !0); switch (b) { case void 0: return void this.mem.setFloat64(a, 0, !0); case null: return this.mem.setUint32(a + 4, c, !0), void this.mem.setUint32(a, 2, !0); case !0: return this.mem.setUint32(a + 4, c, !0), void this.mem.setUint32(a, 3, !0); case !1: return this.mem.setUint32(a + 4, c, !0), void this.mem.setUint32(a, 4, !0); }let d = this._ids.get(b); d === void 0 && (d = this._idPool.pop(), d === void 0 && (d = this._values.length), this._values[d] = b, this._goRefCounts[d] = 0, this._ids.set(b, d)), this._goRefCounts[d]++; let e = 1; switch (typeof b) { case "string": e = 2; break; case "symbol": e = 3; break; case "function": e = 4; }this.mem.setUint32(a + 4, 2146959360 | e, !0), this.mem.setUint32(a, d, !0) }, e = a => { const c = b(a + 0), d = b(a + 8); return new Uint8Array(this._inst.exports.mem.buffer, c, d) }, f = d => { const e = b(d + 0), f = b(d + 8), g = Array(f); for (let a = 0; a < f; a++)g[a] = c(e + 8 * a); return g }, g = a => { const c = b(a + 0), d = b(a + 8); return decoder.decode(new DataView(this._inst.exports.mem.buffer, c, d)) }, h = Date.now() - performance.now(); this.importObject = { go: { "runtime.wasmExit": a => { const b = this.mem.getInt32(a + 8, !0); this.exited = !0, delete this._inst, delete this._values, delete this._goRefCounts, delete this._ids, delete this._idPool, this.exit(b) }, "runtime.wasmWrite": a => { const c = b(a + 8), d = b(a + 16), e = this.mem.getInt32(a + 24, !0); fs.writeSync(c, new Uint8Array(this._inst.exports.mem.buffer, d, e)) }, "runtime.resetMemoryDataView": () => { this.mem = new DataView(this._inst.exports.mem.buffer) }, "runtime.nanotime1": b => { a(b + 8, 1e6 * (h + performance.now())) }, "runtime.walltime1": b => { const c = new Date().getTime(); a(b + 8, c / 1e3), this.mem.setInt32(b + 16, 1e6 * (c % 1e3), !0) }, "runtime.scheduleTimeoutEvent": a => { const c = this._nextCallbackTimeoutID; this._nextCallbackTimeoutID++, this._scheduledTimeouts.set(c, setTimeout(() => { for (this._resume(); this._scheduledTimeouts.has(c);)console.warn("scheduleTimeoutEvent: missed timeout event"), this._resume() }, b(a + 8) + 1)), this.mem.setInt32(a + 16, c, !0) }, "runtime.clearTimeoutEvent": a => { const b = this.mem.getInt32(a + 8, !0); clearTimeout(this._scheduledTimeouts.get(b)), this._scheduledTimeouts.delete(b) }, "runtime.getRandomData": a => { crypto.getRandomValues(e(a + 8)) }, "syscall/js.finalizeRef": a => { const b = this.mem.getUint32(a + 8, !0); if (this._goRefCounts[b]--, 0 === this._goRefCounts[b]) { const a = this._values[b]; this._values[b] = null, this._ids.delete(a), this._idPool.push(b) } }, "syscall/js.stringVal": a => { d(a + 24, g(a + 8)) }, "syscall/js.valueGet": a => { const b = Reflect.get(c(a + 8), g(a + 16)); a = this._inst.exports.getsp(), d(a + 32, b) }, "syscall/js.valueSet": a => { Reflect.set(c(a + 8), g(a + 16), c(a + 32)) }, "syscall/js.valueDelete": a => { Reflect.deleteProperty(c(a + 8), g(a + 16)) }, "syscall/js.valueIndex": a => { d(a + 24, Reflect.get(c(a + 8), b(a + 16))) }, "syscall/js.valueSetIndex": a => { Reflect.set(c(a + 8), b(a + 16), c(a + 24)) }, "syscall/js.valueCall": a => { try { const b = c(a + 8), e = Reflect.get(b, g(a + 16)), h = f(a + 32), i = Reflect.apply(e, b, h); a = this._inst.exports.getsp(), d(a + 56, i), this.mem.setUint8(a + 64, 1) } catch (b) { d(a + 56, b), this.mem.setUint8(a + 64, 0) } }, "syscall/js.valueInvoke": a => { try { const b = c(a + 8), e = f(a + 16), g = Reflect.apply(b, void 0, e); a = this._inst.exports.getsp(), d(a + 40, g), this.mem.setUint8(a + 48, 1) } catch (b) { d(a + 40, b), this.mem.setUint8(a + 48, 0) } }, "syscall/js.valueNew": a => { try { const b = c(a + 8), e = f(a + 16), g = Reflect.construct(b, e); a = this._inst.exports.getsp(), d(a + 40, g), this.mem.setUint8(a + 48, 1) } catch (b) { d(a + 40, b), this.mem.setUint8(a + 48, 0) } }, "syscall/js.valueLength": b => { a(b + 16, parseInt(c(b + 8).length)) }, "syscall/js.valuePrepareString": b => { const e = encoder.encode(c(b + 8) + ""); d(b + 16, e), a(b + 24, e.length) }, "syscall/js.valueLoadString": a => { const b = c(a + 8); e(a + 16).set(b) }, "syscall/js.valueInstanceOf": a => { this.mem.setUint8(a + 24, c(a + 8) instanceof c(a + 16)) }, "syscall/js.copyBytesToGo": b => { const d = e(b + 8), f = c(b + 32); if (!(f instanceof Uint8Array)) return void this.mem.setUint8(b + 48, 0); const g = f.subarray(0, d.length); d.set(g), a(b + 40, g.length), this.mem.setUint8(b + 48, 1) }, "syscall/js.copyBytesToJS": b => { const d = c(b + 8), f = e(b + 16); if (!(d instanceof Uint8Array)) return void this.mem.setUint8(b + 48, 0); const g = f.subarray(0, d.length); d.set(g), a(b + 40, g.length), this.mem.setUint8(b + 48, 1) }, debug: a => { console.log(a) } } } } async run(a) { this._inst = a, this.mem = new DataView(this._inst.exports.mem.buffer), this._values = [NaN, 0, null, !0, !1, window, this], this._goRefCounts = [], this._ids = new Map, this._idPool = [], this.exited = !1; let b = 4096; const c = a => { const c = b, d = encoder.encode(a + "\0"); return new Uint8Array(this.mem.buffer, b, d.length).set(d), b += d.length, 0 != b % 8 && (b += 8 - b % 8), c }, d = this.argv.length, e = []; this.argv.forEach(a => { e.push(c(a)) }), e.push(0); const f = Object.keys(this.env).sort(); f.forEach(a => { e.push(c(a + "=" + this.env[a])) }), e.push(0); const g = b; e.forEach(a => { this.mem.setUint32(b, a, !0), this.mem.setUint32(b + 4, 0, !0), b += 8 }), this._inst.exports.run(d, g), this.exited && this._resolveExitPromise(), await this._exitPromise } _resume() { if (this.exited) throw new Error("Go program has already exited"); this._inst.exports.resume(), this.exited && this._resolveExitPromise() } _makeFuncWrapper(a) { const b = this; return function () { const c = { id: a, this: this, args: arguments }; return b._pendingEvent = c, b._resume(), c.result } } } const go = new Go; WebAssembly.instantiateStreaming(fetch("/assets/main.wasm"), go.importObject).then(a => go.run(a.instance)).catch(a => console.error("could not load wasm", a));`),
+// 		),
+// 		app.Body(elems[0]),
+// 	).Html(page)
+// 	return page
+// }
+// func serve(wd string, isDev bool) {
+// 	assetsFileServer := http.FileServer(pkger.Dir(filepath.Join(wd, "assets")))
+// 	buildFileServer := http.FileServer(pkger.Dir(filepath.Join(wd, "build")))
+// 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+// 		println("path: " + r.URL.Path)
+// 		if routeInfo, ok := routesMap[r.URL.Path]; ok {
+// 			wasmPath := "/build/" + filepath.Base(wd) + ".wasm"
+// 			page := CreatePage(routeInfo.RenderFunc(app.NewRenderContext()), wasmPath)
+// 			w.Header().Set("Content-Length", strconv.Itoa(page.Len()))
+// 			w.Header().Set("Content-Type", "text/html")
+// 			w.WriteHeader(http.StatusOK)
+// 			w.Write(page.Bytes())
+// 		} else if strings.Contains(r.URL.Path, "/build") {
+// 			r.URL.Path = strings.Replace(r.URL.Path, "/build", "", 1)
+// 			buildFileServer.ServeHTTP(w, r)
+// 		} else {
+// 			r.URL.Path = strings.Replace(r.URL.Path, "/assets", "", 1)
+// 			assetsFileServer.ServeHTTP(w, r)
+// 		}
+// 	})
+// 	if isDev {
+// 		println("Serving on HTTP port: 1234")
+// 		http.ListenAndServe(":1234", nil)
+// 	} else {
+// 		println("algnhsa serving default mux")
+// 		algnhsa.ListenAndServe(http.DefaultServeMux, nil)
+// 	}
+// }
+// func buildAll(basePath string) {
+// 	loadRoutes(nil, basePath, true)
+// 	writeMainFile(basePath)
+// 	buildWasm(basePath)
+// 	soPath, err := buildSo(basePath)
+// 	if err != nil {
+// 		println("could not build")
+// 		panic(err)
+// 	}
+// 	p, err := plugin.Open(soPath)
+// 	if err != nil {
+// 		println("could not load so plugin")
+// 		panic(err)
+// 	}
+// 	// fmt.Printf("%+v\n", p)
+// 	loadRoutes(p, basePath, false)
+// }
+// func Watch(isDev bool) {
+// 	wd, err := os.Getwd()
+// 	if err != nil {
+// 		fmt.Printf("could not get wd")
+// 		return
+// 	}
+// 	if isDev {
+// 		basePath := filepath.Join(wd, "pages")
+// 		buildAll(basePath)
+// 		watcher := MustRegisterWatcher()
+// 		go watcher.Watch()
+// 		go serve(wd, isDev)
+// 		for file := range watcher.update {
+// 			println("changed: " + file)
+// 			buildAll(basePath)
+// 		}
+// 	} else {
+// 		serve(wd, isDev)
+// 	}
+// }

example/{pages/about.go → about.go} RENAMED Viewed

File without changes

example/{config.css → assets/config.css} RENAMED Viewed

File without changes

example/assets/manifest.json DELETED Viewed

@@ -1,21 +0,0 @@
-{
-  "short_name": "{{.ShortName}}",
-  "name": "{{.Name}}",
-  "icons": [
-    {
-      "src": "{{.DefaultIcon}}",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "{{.LargeIcon}}",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "scope": "{{.Scope}}",
-  "start_url": "{{.StartURL}}",
-  "background_color": "{{.BackgroundColor}}",
-  "display": "standalone",
-  "theme_color": "{{.ThemeColor}}"
-}

example/{pages/clock.go → clock.go} RENAMED Viewed

File without changes

example/{pages/container.go → container.go} RENAMED Viewed

File without changes

example/{pages/index.go → index.go} RENAMED Viewed

File without changes

example/main.go CHANGED Viewed

@@ -1,9 +1,16 @@
 package main
 import (
-	"github.com/pyros2097/wapp/cli"
+	app "github.com/pyros2097/wapp"
 )
+var routes = map[string]app.RenderFunc{
+	"/about":     About,
+	"/clock":     Clock,
+	"/container": Container,
+	"/":          Index,
+}
 func main() {
-	cli.Watch()
+	app.Run(false, routes)
 }

example/makefile CHANGED Viewed

@@ -1,2 +1,11 @@
+run:
+	go run *.go
+build:
+	go build
+build-wasm:
+	GOOS=js GOARCH=wasm go build -o assets/main.wasm
 build-css:
-	npx tailwindcss-cli@latest build config.css -o assets/styles.css
+	npx tailwindcss-cli@latest build assets/config.css -o assets/styles.css

example/pages/main.go DELETED Viewed

@@ -1,27 +0,0 @@
-// GENERATED FILE DO NOT EDIT
-package main
-import (
-	. "github.com/pyros2097/wapp"
-	"github.com/pyros2097/wapp/js"
-)
-func main() {
-		if js.Window.URL().Path == "/" {
-			Run(Index)
-		}
-		if js.Window.URL().Path == "/about" {
-			Run(About)
-		}
-		if js.Window.URL().Path == "/clock" {
-			Run(Clock)
-		}
-		if js.Window.URL().Path == "/container" {
-			Run(Container)
-		}
-}

example/readme.md CHANGED Viewed

@@ -2,6 +2,10 @@
 An example to demostrate the wapp framework
-Just run,
+1. Compile wasm frontend,
+`GOOS=js GOARCH=wasm go build -o assets/main.wasm`
+2. Run the server,
-`go run main.go`
+`go run *.go`
+These commands are also available in the makefile for convenience

example/samconfig.toml ADDED Viewed

@@ -0,0 +1,9 @@
+version = 0.1
+[default]
+[default.deploy]
+[default.deploy.parameters]
+stack_name = "go-app"
+s3_bucket = "aws-sam-cli-managed-default-samclisourcebucket-grb3hle00qk9"
+s3_prefix = "go-app"
+region = "us-east-1"
+capabilities = "CAPABILITY_IAM"

example/template.yml ADDED Viewed

@@ -0,0 +1,43 @@
+AWSTemplateFormatVersion: 2010-09-09
+Outputs:
+  ApiUrl:
+    Export:
+      Name: ApiUrl
+    Value:
+      Fn::Sub: https://${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/
+Resources:
+  HttpApi:
+    Properties:
+      AccessLogSettings:
+        DestinationArn:
+          Fn::GetAtt:
+            - HttpApiAccessLogs
+            - Arn
+        Format:
+          '{"requestId":"$context.requestId", "ip": "$context.identity.sourceIp",
+          "caller":"$context.identity.caller", "user":"$context.identity.user", "requestTime":"$context.requestTime","routeKey":"$context.routeKey",
+          "status":"$context.status", "error": "$context.integrationErrorMessage"}'
+      StageName: Prod
+    Type: AWS::Serverless::HttpApi
+  HttpApiAccessLogs:
+    Properties:
+      LogGroupName: /aws/http/py-app
+      RetentionInDays: 365
+    Type: AWS::Logs::LogGroup
+  RouteIndex:
+    Properties:
+      Handler: ./example
+      Events:
+        ApiEvent:
+          Properties:
+            ApiId:
+              Ref: HttpApi
+            Method: GET
+            Path: $default
+            PayloadFormatVersion: '1.0'
+          Type: HttpApi
+      MemorySize: 128
+      Runtime: go1.x
+      Timeout: 30
+    Type: AWS::Serverless::Function
+Transform: AWS::Serverless-2016-10-31

go.mod CHANGED Viewed

@@ -3,7 +3,9 @@ module github.com/pyros2097/wapp
 go 1.15
 require (
+	github.com/akrylysov/algnhsa v0.12.1
+	github.com/aws/aws-lambda-go v1.20.0
-	github.com/fsnotify/fsnotify v1.4.7 // indirect
+	github.com/awslabs/goformation/v4 v4.15.6
 	github.com/markbates/pkger v0.17.1
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/sys v0.0.0-20201112073958-5cba982894dd // indirect

go.sum CHANGED Viewed

@@ -1,10 +1,35 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/akrylysov/algnhsa v0.12.1 h1:A9Ojt4hZrL77mhBc3qGO3Sn9reyf+tvM3DmR0SfXguc=
+github.com/akrylysov/algnhsa v0.12.1/go.mod h1:xAcJ/X8DV+81e+dUjIoB/r5CbISrSXV9//leoMDHcdk=
+github.com/aws/aws-lambda-go v1.9.0/go.mod h1:zUsUQhAUjYzR8AuduJPCfhBuKWUaDbQiPOG+ouzmE1A=
+github.com/aws/aws-lambda-go v1.20.0 h1:ZSweJx/Hy9BoIDXKBEh16vbHH0t0dehnF8MKpMiOWc0=
+github.com/aws/aws-lambda-go v1.20.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU=
+github.com/awslabs/goformation v1.4.1 h1:jws9kTrcI53Hq2COJAy50uAhgxB5N/Enb9Gmclr/MP4=
+github.com/awslabs/goformation/v4 v4.15.6 h1:9F0MbtJVSMkuI19G6Fm+qHc1nqScHcOIf+3YRRv+Ohc=
+github.com/awslabs/goformation/v4 v4.15.6/go.mod h1:wB5lKZf1J0MYH1Lt4B9w3opqz0uIjP7MMCAcib3QkwA=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=
 github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
+github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -12,20 +37,70 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno=
 github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b h1:jUK33OXuZP/l6babJtnLo1qsGvq6G9so9KMflGAm4YA=
+github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod h1:8458kAagoME2+LN5//WxE71ysZ3B7r22fdgb7qVmXSY=
+github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 h1:fOCp11H0yuyAt2wqlbJtbyPzSgaxHTv8uN1pMpkG1t8=
+github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod h1:tQTYKOQgxoH3v6dEmdHiz4JG+nbxWwM5fgPQUpSZqVQ=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+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.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY=
 golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/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.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

utils.go CHANGED Viewed

@@ -2,6 +2,7 @@ package app
 import (
 	"io"
+	"regexp"
 	"unsafe"
 	"github.com/pyros2097/wapp/js"
@@ -48,3 +49,33 @@ func btos(b []byte) string {
 func stob(s string) []byte {
 	return *(*[]byte)(unsafe.Pointer(&s))
 }
+func matchPath(k, p string) bool {
+	validRoute := regexp.MustCompile(k)
+	if validRoute.MatchString(p) {
+		return true
+	}
+	return false
+}
+func MatchRoute(routes map[string]RenderFunc, path string) RenderFunc {
+	for key, renderFn := range routes {
+		if matchPath(key, path) {
+			return renderFn
+		}
+	}
+	notFound, ok := routes["/notfound"]
+	if ok {
+		return notFound
+	}
+	return func(c *RenderContext) UI {
+		return Col(
+			Row(
+				"This is the default 404 - Not Found Route handler",
+			),
+			Row(
+				"Create a notfound.go file and add a  func NotFound(c *RenderContext) UI {} to override it",
+			),
+		)
+	}
+}

utils_test.go ADDED Viewed

@@ -0,0 +1,22 @@
+package app
+import (
+	"testing"
+	"github.com/stretchr/testify/assert"
+)
+func stubRoute(c *RenderContext) UI {
+	return Div(Text("Stub"))
+}
+var testRoutes = map[string]RenderFunc{
+	"/about":     stubRoute,
+	"/clock":     stubRoute,
+	"/container": stubRoute,
+	"/":          stubRoute,
+}
+func TestMatchPath(t *testing.T) {
+	assert.Equal(t, true, matchPath("/", "/about"))
+}

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