feat: port cli to go-cli-builder

also update to go 1.24.3 and point to the new wasm lib path

Author: mirkobrombin

internal/build/build.go cmd/rfw/build/build.gointernal/build/build.go renamed to cmd/rfw/build/build.go

@@ -14,7 +14,7 @@ func Build() error {
 	if err != nil {
 		return fmt.Errorf("failed to get GOROOT: %w", err)
 	}
-	wasmExec := filepath.Join(strings.TrimSpace(string(goroot)), "misc", "wasm", "wasm_exec.js")
+	wasmExec := filepath.Join(strings.TrimSpace(string(goroot)), "lib", "wasm", "wasm_exec.js")
 	if err := copyFile(wasmExec, "wasm_exec.js"); err != nil {
 		return fmt.Errorf("failed to copy wasm_exec.js: %w", err)
 	}

cmd/rfw/commands/build.go

@@ -0,0 +1,25 @@
+package commands
+
+import (
+	"github.com/mirkobrombin/go-cli-builder/v1/command"
+	"github.com/rfwlab/rfw/cmd/rfw/build"
+)
+
+// NewBuildCommand returns the build command.
+func NewBuildCommand() *command.Command {
+	cmd := &command.Command{
+		Name:        "build",
+		Usage:       "build",
+		Description: "Build the current project",
+		Run:         runBuild,
+	}
+	return cmd
+}
+
+func runBuild(cmd *command.Command, _ *command.RootFlags, _ []string) error {
+	if err := build.Build(); err != nil {
+		return err
+	}
+	cmd.Logger.Success("Build completed")
+	return nil
+}

cmd/rfw/commands/dev.go

@@ -0,0 +1,26 @@
+package commands
+
+import (
+	"github.com/mirkobrombin/go-cli-builder/v1/command"
+	"github.com/rfwlab/rfw/cmd/rfw/server"
+)
+
+// NewDevCommand returns the dev command.
+func NewDevCommand() *command.Command {
+	cmd := &command.Command{
+		Name:        "dev",
+		Usage:       "dev [--port <port>] [--host]",
+		Description: "Start the development server",
+		Run:         runDev,
+	}
+	cmd.AddFlag("port", "p", "Port to serve on", "8080", true)
+	cmd.AddBoolFlag("host", "", "Expose the server to the network", false, false)
+	return cmd
+}
+
+func runDev(cmd *command.Command, _ *command.RootFlags, _ []string) error {
+	port := cmd.GetFlagString("port")
+	host := cmd.GetFlagBool("host")
+	srv := server.NewServer(port, host)
+	return srv.Start()
+}

cmd/rfw/commands/init.go

@@ -0,0 +1,31 @@
+package commands
+
+import (
+	"fmt"
+
+	"github.com/mirkobrombin/go-cli-builder/v1/command"
+	"github.com/rfwlab/rfw/cmd/rfw/initproj"
+)
+
+// NewInitCommand returns the init command.
+func NewInitCommand() *command.Command {
+	cmd := &command.Command{
+		Name:        "init",
+		Usage:       "init <project-name>",
+		Description: "Initialize a new RFW project",
+		Run:         runInit,
+	}
+	return cmd
+}
+
+func runInit(cmd *command.Command, _ *command.RootFlags, args []string) error {
+	if len(args) < 1 {
+		return fmt.Errorf("please specify a project name")
+	}
+	projectName := args[0]
+	if err := initproj.InitProject(projectName); err != nil {
+		return err
+	}
+	cmd.Logger.Success("Project initialized")
+	return nil
+}

internal/initproj/init.go cmd/rfw/initproj/init.gointernal/initproj/init.go renamed to cmd/rfw/initproj/init.go

@@ -17,9 +17,6 @@ func InitProject(projectName string) error {
 	projectName = strings.Split(projectName, "/")[len(strings.Split(projectName, "/"))-1]
 
 	projectPath := projectName
-	if len(os.Args) > 3 {
-		projectPath = os.Args[3]
-	}
 
 	if _, err := os.Stat(projectPath); !os.IsNotExist(err) {
 		return fmt.Errorf("project directory already exists")
@@ -40,6 +37,9 @@ func InitProject(projectName string) error {
 
 		relPath := strings.TrimPrefix(path, "./")
 		targetPath := filepath.Join(projectPath, relPath)
+		if strings.HasSuffix(targetPath, ".tmpl") {
+			targetPath = strings.TrimSuffix(targetPath, ".tmpl")
+		}
 
 		if d.IsDir() {
 			return os.MkdirAll(targetPath, 0755)
@@ -58,10 +58,14 @@ func InitProject(projectName string) error {
 		return fmt.Errorf("failed to copy template files: %w", err)
 	}
 
-	if err := copyWasmExec(projectName); err != nil {
+	if err := copyWasmExec(projectPath); err != nil {
 		return fmt.Errorf("failed to copy wasm_exec.js: %w", err)
 	}
 
+	if err := initGoModule(projectPath, projectName); err != nil {
+		return fmt.Errorf("failed to initialize go module: %w", err)
+	}
+
 	fmt.Printf("Project '%s' initialized successfully.\n", projectName)
 	return nil
 }
@@ -88,3 +92,15 @@ func copyWasmExec(projectDir string) error {
 
 	return nil
 }
+
+func initGoModule(projectPath, moduleName string) error {
+	cmd := exec.Command("go", "mod", "init", moduleName)
+	cmd.Dir = projectPath
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+
+	cmd = exec.Command("go", "mod", "tidy")
+	cmd.Dir = projectPath
+	return cmd.Run()
+}

cmd/rfw/initproj/template/components/app_component.go.tmpl

@@ -0,0 +1,26 @@
+//go:build js && wasm
+
+package components
+
+import (
+    _ "embed"
+
+    "github.com/rfwlab/rfw/v1/core"
+)
+
+//go:embed templates/app_component.rtml
+var appComponentTpl []byte
+
+type AppComponent struct {
+    *core.HTMLComponent
+}
+
+func NewAppComponent() *AppComponent {
+    c := &AppComponent{
+        HTMLComponent: core.NewHTMLComponent("AppComponent", appComponentTpl, nil),
+    }
+    c.SetComponent(c)
+    c.Init(nil)
+    return c
+}
+

cmd/rfw/initproj/template/components/templates/app_component.rtml

@@ -0,0 +1,6 @@
+<root>
+  <div class="p-4">
+    <h1 class="text-2xl font-bold">Hello from {{packageName}}!</h1>
+    <p>Edit the component to get started.</p>
+  </div>
+</root>

cmd/rfw/initproj/template/index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>{{packageName}}</title>
+</head>
+<body>
+  <div id="app"></div>
+  <script src="/wasm_exec.js"></script>
+  <script>
+    const go = new Go();
+    WebAssembly.instantiateStreaming(fetch("/main.wasm"), go.importObject).then((result) => {
+      go.run(result.instance);
+    });
+  </script>
+</body>
+</html>

cmd/rfw/initproj/template/main.go.tmpl

@@ -0,0 +1,19 @@
+//go:build js && wasm
+
+package main
+
+import (
+    "github.com/rfwlab/rfw/v1/core"
+    "github.com/rfwlab/rfw/v1/router"
+    "{{packageName}}/components"
+)
+
+func main() {
+    core.SetDevMode(true)
+    router.RegisterRoute(router.Route{
+        Path: "/",
+        Component: func() core.Component { return components.NewAppComponent() },
+    })
+    router.InitRouter()
+    select {}
+}

internal/initproj/templates.go cmd/rfw/initproj/templates.gointernal/initproj/templates.go renamed to cmd/rfw/initproj/templates.go

@@ -4,5 +4,5 @@ import (
 	"embed"
 )
 
-//go:embed template/*
+//go:embed template/**
 var TemplatesFS embed.FS