Merge zero

Makefile

@@ -18,6 +18,13 @@ install:
 # Examples
 ##
 
+example.zero:
+	@ # go run main.go -C example/zero generate2 --embed
+	@ go run main.go -C example/zero generate2
+
+example.zero.watch:
+	@ watch --clear -- $(MAKE) example.zero
+
 example.basic:
 	@ (cd example/basic && npm link ../../livebud)
 	@ go run main.go -C example/basic run

example/zero/_bud/cmd/app/main.go

@@ -0,0 +1,56 @@
+package main
+
+import (
+	command "github.com/livebud/bud/example/zero/bud/internal/command"
+	env "github.com/livebud/bud/example/zero/bud/internal/env"
+	transpiler "github.com/livebud/bud/example/zero/bud/pkg/transpiler"
+	viewer "github.com/livebud/bud/example/zero/bud/pkg/viewer"
+	web1 "github.com/livebud/bud/example/zero/bud/pkg/web"
+	controller "github.com/livebud/bud/example/zero/bud/pkg/web/controller"
+	middleware "github.com/livebud/bud/example/zero/bud/pkg/web/middleware"
+	view "github.com/livebud/bud/example/zero/bud/pkg/web/view"
+	web2 "github.com/livebud/bud/example/zero/command/web"
+	posts "github.com/livebud/bud/example/zero/controller/posts"
+	sessions "github.com/livebud/bud/example/zero/controller/sessions"
+	users "github.com/livebud/bud/example/zero/controller/users"
+	app "github.com/livebud/bud/example/zero/generator/app"
+	csrf "github.com/livebud/bud/example/zero/middleware/csrf"
+	wraprw "github.com/livebud/bud/example/zero/middleware/wraprw"
+	mw "github.com/livebud/bud/example/zero/mw"
+	goldmark "github.com/livebud/bud/example/zero/transpiler/goldmark"
+	tailwind "github.com/livebud/bud/example/zero/transpiler/tailwind"
+	gohtml "github.com/livebud/bud/example/zero/viewer/gohtml"
+	web "github.com/livebud/bud/example/zero/web"
+	gomod "github.com/livebud/bud/package/gomod"
+	log "github.com/livebud/bud/package/log"
+)
+
+func main() {
+	app.Main(loadCLI)
+}
+
+func loadCLI(gomodModule *gomod.Module, logLog log.Log) (*command.CLI, error) {
+	envEnv, err := env.Load()
+	if err != nil {
+		return nil, err
+	}
+	tailwindTranspiler := &tailwind.Transpiler{Log: logLog}
+	goldmarkTranspiler := &goldmark.Transpiler{Log: logLog}
+	transpilerTranspiler := transpiler.Load(tailwindTranspiler, goldmarkTranspiler)
+	gohtmlViewer := gohtml.New(logLog, transpilerTranspiler)
+	viewerViewer := viewer.New(transpilerTranspiler, gohtmlViewer)
+	viewView := view.New(gomodModule, viewerViewer)
+	postsController := &posts.Controller{}
+	sessionsController := &sessions.Controller{}
+	usersController := &users.Controller{Env: envEnv}
+	controllerController := controller.New(viewView, postsController, sessionsController, usersController)
+	csrfMiddleware := &csrf.Middleware{Env: envEnv}
+	wraprwMiddleware := &wraprw.Middleware{}
+	middlewareMiddleware := middleware.New(csrfMiddleware, wraprwMiddleware)
+	mwMiddleware := &mw.Middleware{Env: envEnv}
+	webWeb := &web.Web{Env: envEnv, Controller: controllerController, Middleware: middlewareMiddleware, MW: mwMiddleware, View: viewView}
+	web1Server := web1.New(webWeb)
+	web2Command := web2.New(envEnv, logLog, web1Server)
+	commandCLI := command.New(logLog, web2Command)
+	return commandCLI, err
+}

example/zero/_bud/cmd/gen/main.go

@@ -0,0 +1,47 @@
+package main
+
+import (
+	generator "github.com/livebud/bud/example/zero/bud/internal/generator"
+	transpiler "github.com/livebud/bud/example/zero/bud/pkg/transpiler"
+	viewer "github.com/livebud/bud/example/zero/bud/pkg/viewer"
+	app "github.com/livebud/bud/example/zero/generator/app"
+	command "github.com/livebud/bud/example/zero/generator/command"
+	controller "github.com/livebud/bud/example/zero/generator/controller"
+	env "github.com/livebud/bud/example/zero/generator/env"
+	middleware "github.com/livebud/bud/example/zero/generator/middleware"
+	session "github.com/livebud/bud/example/zero/generator/session"
+	view "github.com/livebud/bud/example/zero/generator/view"
+	web "github.com/livebud/bud/example/zero/generator/web"
+	goldmark "github.com/livebud/bud/example/zero/transpiler/goldmark"
+	tailwind "github.com/livebud/bud/example/zero/transpiler/tailwind"
+	gohtml "github.com/livebud/bud/example/zero/viewer/gohtml"
+	framework "github.com/livebud/bud/framework"
+	genfs "github.com/livebud/bud/package/genfs"
+	gomod "github.com/livebud/bud/package/gomod"
+	log "github.com/livebud/bud/package/log"
+	gen "github.com/livebud/bud/runtime/gen"
+)
+
+func main() {
+	gen.Main(loadGenerator)
+}
+
+func loadGenerator(frameworkFlag *framework.Flag, genfsFileSystem genfs.FileSystem, gomodModule *gomod.Module, logLog log.Log) (*generator.Generator, error) {
+	genParser := gen.ProvideParser(genfsFileSystem, gomodModule)
+	genInjector := gen.ProvideInjector(genfsFileSystem, logLog, gomodModule, genParser)
+	appGenerator := app.New(frameworkFlag, genInjector, gomodModule)
+	commandGenerator := command.NewGenerator(gomodModule)
+	webGenerator := web.New(gomodModule)
+	controllerGenerator := controller.New(genInjector, gomodModule)
+	tailwindTranspiler := &tailwind.Transpiler{Log: logLog}
+	goldmarkTranspiler := &goldmark.Transpiler{Log: logLog}
+	transpilerTranspiler := transpiler.Load(tailwindTranspiler, goldmarkTranspiler)
+	gohtmlViewer := gohtml.New(logLog, transpilerTranspiler)
+	viewerViewer := viewer.New(transpilerTranspiler, gohtmlViewer)
+	viewGenerator := view.New(frameworkFlag, gomodModule, viewerViewer)
+	envGenerator := env.New(gomodModule)
+	middlewareGenerator := middleware.New(gomodModule)
+	sessionGenerator := session.New(gomodModule)
+	generatorGenerator := generator.NewGenerator(genfsFileSystem, logLog, appGenerator, commandGenerator, webGenerator, controllerGenerator, viewGenerator, envGenerator, middlewareGenerator, sessionGenerator)
+	return generatorGenerator, nil
+}

example/zero/_bud/internal/command/command.go

@@ -0,0 +1,36 @@
+package command
+
+import (
+	context "context"
+	web "github.com/livebud/bud/example/zero/command/web"
+	command "github.com/livebud/bud/example/zero/generator/command"
+	log "github.com/livebud/bud/package/log"
+)
+
+func New(
+	log log.Log,
+	webCmd *web.Command,
+) *CLI {
+	cli := command.New("app")
+	webIn := new(web.Serve)
+	cli.Run(func(ctx context.Context) error {
+		return command.Go(ctx, log,
+			func(ctx context.Context) error { return webCmd.GoServe(ctx, webIn) },
+		)
+	})
+
+	{ // web
+
+		{ // web:serve
+			cmd := cli.Command("web:serve", "serve web requests")
+			in := new(web.Serve)
+			cmd.Run(func(ctx context.Context) error {
+				return webCmd.GoServe(ctx, in)
+			})
+		}
+	}
+
+	return cli
+}
+
+type CLI = command.CLI

example/zero/_bud/internal/generator/generator.go

@@ -0,0 +1,42 @@
+package generator
+
+import (
+	app "github.com/livebud/bud/example/zero/generator/app"
+	command "github.com/livebud/bud/example/zero/generator/command"
+	controller "github.com/livebud/bud/example/zero/generator/controller"
+	env "github.com/livebud/bud/example/zero/generator/env"
+	middleware "github.com/livebud/bud/example/zero/generator/middleware"
+	session "github.com/livebud/bud/example/zero/generator/session"
+	view "github.com/livebud/bud/example/zero/generator/view"
+	web "github.com/livebud/bud/example/zero/generator/web"
+	log "github.com/livebud/bud/package/log"
+	generator "github.com/livebud/bud/runtime/generator"
+)
+
+func NewGenerator(
+	genfs generator.FileSystem,
+	log log.Log,
+	app *app.Generator,
+	command *command.Generator,
+	web *web.Generator,
+	controller *controller.Generator,
+	view *view.Generator,
+	env *env.Generator,
+	middleware *middleware.Generator,
+	session *session.Generator,
+) *Generator {
+	return generator.NewGenerator(
+		genfs,
+		log,
+		app,
+		command,
+		web,
+		controller,
+		view,
+		env,
+		middleware,
+		session,
+	)
+}
+
+type Generator = generator.Generator

example/zero/_bud/pkg/transpiler/transpiler.go

@@ -0,0 +1,36 @@
+package transpiler
+
+import (
+	errors "errors"
+	goldmark "github.com/livebud/bud/example/zero/transpiler/goldmark"
+	tailwind "github.com/livebud/bud/example/zero/transpiler/tailwind"
+	transpiler "github.com/livebud/bud/runtime/transpiler2"
+)
+
+// Load the transpiler
+func Load(
+	tailwind *tailwind.Transpiler,
+	goldmark *goldmark.Transpiler,
+) Transpiler {
+	tr := transpiler.New()
+	tr.Add(".gohtml", ".gohtml", tailwind.GohtmlToGohtml)
+	tr.Add(".md", ".gohtml", goldmark.MdToGohtml)
+	return &proxy{tr}
+}
+
+type Transpiler = transpiler.Interface
+
+type proxy struct {
+	Transpiler
+}
+
+func (p *proxy) Transpile(fromExt, toExt string, code []byte) ([]byte, error) {
+	transpiled, err := p.Transpiler.Transpile(fromExt, toExt, code)
+	if err != nil {
+		if !errors.Is(err, transpiler.ErrNoPath) {
+			return nil, err
+		}
+		return code, nil
+	}
+	return transpiled, nil
+}