feat(wasm): add configuration to terminal size (#3208)

Author: Codelax

cmd/scw-wasm/main.go

@@ -22,6 +22,7 @@ func main() {
 		cliPackage := js.ValueOf(map[string]any{})
 		cliPackage.Set("run", js.FuncOf(jshelpers.AsPromise(wasm.Run)))
 		cliPackage.Set("complete", js.FuncOf(jshelpers.AsPromise(wasm.Autocomplete)))
+		cliPackage.Set("configureOutput", js.FuncOf(jshelpers.AsPromise(wasm.ConfigureOutput)))
 		cliPackage.Set("stop", js.FuncOf(jshelpers.AsyncJsFunc(stop)))
 		js.Global().Set(args.targetObject, cliPackage)
 	}

internal/human/marshal.go

@@ -418,7 +418,7 @@ func computeMaxCols(grid [][]string) int {
 	maxCols := len(grid[0])
 	width := terminal.GetWidth()
 	// If we are not writing to Stdout or through a tty Stdout, returns max length
-	if color.NoColor || width == 0 {
+	if !terminal.IsTerm() || width == 0 {
 		return maxCols
 	}
 	colMaxSize := make([]int, len(grid[0]))

internal/interactive/utils.go

@@ -18,6 +18,9 @@ var (
 	// IsInteractive must be set to print anything with Printer functions (Print, Printf,...).
 	IsInteractive = isInteractive()
 
+	// TerminalOutput define if the
+	TerminalOutput = IsInteractive
+
 	// outputWriter is the writer used by Printer functions (Print, Printf,...).
 	outputWriter io.Writer
 

internal/jshelpers/objects.go

@@ -8,13 +8,6 @@ import (
 	"syscall/js"
 )
 
-func asString(value js.Value) (string, error) {
-	if value.Type() == js.TypeString {
-		return value.String(), nil
-	}
-	return "", fmt.Errorf("value type should be string")
-}
-
 func goValue(typ reflect.Type, value js.Value) (any, error) {
 	switch typ.Kind() {
 	case reflect.Pointer:
@@ -25,6 +18,10 @@ func goValue(typ reflect.Type, value js.Value) (any, error) {
 		return asObject(typ, value)
 	case reflect.Slice:
 		return asSlice(typ.Elem(), value)
+	case reflect.Int:
+		return asInt(value)
+	case reflect.Bool:
+		return asBool(value)
 	}
 	return nil, fmt.Errorf("value type is unknown")
 }

internal/jshelpers/scalar.go

@@ -0,0 +1,37 @@
+//go:build js
+
+package jshelpers
+
+import (
+	"fmt"
+	"math"
+	"syscall/js"
+)
+
+func asString(value js.Value) (string, error) {
+	if value.Type() == js.TypeString {
+		return value.String(), nil
+	}
+	return "", fmt.Errorf("value type should be string")
+}
+
+func asInt(value js.Value) (int, error) {
+	if value.Type() != js.TypeNumber {
+		return 0, fmt.Errorf("value type should be number")
+	}
+	f := value.Float()
+
+	if f != math.Trunc(f) {
+		return 0, fmt.Errorf("expected an int")
+	}
+
+	return int(f), nil
+}
+
+func asBool(value js.Value) (bool, error) {
+	if value.Type() == js.TypeBoolean {
+		return value.Bool(), nil
+	}
+
+	return false, fmt.Errorf("value type should be boolean")
+}

internal/terminal/terminal.go

@@ -1,10 +1,13 @@
+//go:build !wasm
+
 package terminal
 
 import (
 	"os"
 
-	"github.com/fatih/color"
 	"golang.org/x/term"
+
+	"github.com/fatih/color"
 )
 
 func Style(msg string, styles ...color.Attribute) string {
@@ -26,3 +29,8 @@ func GetHeight() int {
 	}
 	return h
 }
+
+// IsTerm returns if stdout is considered a tty
+func IsTerm() bool {
+	return !color.NoColor
+}

internal/terminal/terminal_wasm.go

@@ -0,0 +1,29 @@
+//go:build wasm
+
+package terminal
+
+import (
+	"github.com/fatih/color"
+)
+
+var (
+	Width  int = 0
+	Height int = 0
+)
+
+func Style(msg string, styles ...color.Attribute) string {
+	return color.New(styles...).Sprint(msg)
+}
+
+func GetWidth() int {
+	return Width
+}
+
+func GetHeight() int {
+	return Height
+}
+
+// IsTerm returns if stdout is considered a tty
+func IsTerm() bool {
+	return true
+}

internal/wasm/autocomplete.go

@@ -1,3 +1,5 @@
+//go:build wasm
+
 package wasm
 
 import (

internal/wasm/output.go

@@ -0,0 +1,23 @@
+//go:build wasm
+
+package wasm
+
+import (
+	"github.com/fatih/color"
+	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
+)
+
+type ConfigureOutputConfig struct {
+	Width int  `js:"width"`
+	Color bool `js:"color"`
+}
+
+type ConfigureOutputResponse struct {
+}
+
+func ConfigureOutput(cfg *ConfigureOutputConfig) (*ConfigureOutputResponse, error) {
+	terminal.Width = cfg.Width
+	color.NoColor = !cfg.Color
+
+	return &ConfigureOutputResponse{}, nil
+}

internal/wasm/run.go

@@ -1,3 +1,5 @@
+//go:build wasm
+
 package wasm
 
 import (