Merge pull request dop251#60 from ganigeorgiev/console-std-printer

Update the console module to behave similarly as in Node.js

Author: dop251

console/module.go

@@ -1,8 +1,6 @@
 package console
 
 import (
-	"log"
-
 	"github.com/dop251/goja"
 	"github.com/dop251/goja_nodejs/require"
 	"github.com/dop251/goja_nodejs/util"
@@ -22,16 +20,6 @@ type Printer interface {
 	Error(string)
 }
 
-type PrinterFunc func(s string)
-
-func (p PrinterFunc) Log(s string) { p(s) }
-
-func (p PrinterFunc) Warn(s string) { p(s) }
-
-func (p PrinterFunc) Error(s string) { p(s) }
-
-var defaultPrinter Printer = PrinterFunc(func(s string) { log.Print(s) })
-
 func (c *Console) log(p func(string)) func(goja.FunctionCall) goja.Value {
 	return func(call goja.FunctionCall) goja.Value {
 		if format, ok := goja.AssertFunction(c.util.Get("format")); ok {
@@ -50,7 +38,7 @@ func (c *Console) log(p func(string)) func(goja.FunctionCall) goja.Value {
 }
 
 func Require(runtime *goja.Runtime, module *goja.Object) {
-	requireWithPrinter(defaultPrinter)(runtime, module)
+	requireWithPrinter(defaultStdPrinter)(runtime, module)
 }
 
 func RequireWithPrinter(printer Printer) require.ModuleLoader {
@@ -70,6 +58,8 @@ func requireWithPrinter(printer Printer) require.ModuleLoader {
 		o.Set("log", c.log(c.printer.Log))
 		o.Set("error", c.log(c.printer.Error))
 		o.Set("warn", c.log(c.printer.Warn))
+		o.Set("info", c.log(c.printer.Log))
+		o.Set("debug", c.log(c.printer.Log))
 	}
 }
 

console/module_test.go

@@ -28,15 +28,25 @@ func TestConsole(t *testing.T) {
 	if _, err := vm.RunString("console.warn('')"); err != nil {
 		t.Fatal("console.warn() error", err)
 	}
+
+	if _, err := vm.RunString("console.info('')"); err != nil {
+		t.Fatal("console.info() error", err)
+	}
+
+	if _, err := vm.RunString("console.debug('')"); err != nil {
+		t.Fatal("console.debug() error", err)
+	}
 }
 
 func TestConsoleWithPrinter(t *testing.T) {
-	vm := goja.New()
+	var stdoutStr, stderrStr string
+
+	printer := StdPrinter{
+		StdoutPrint: func(s string) { stdoutStr += s },
+		StderrPrint: func(s string) { stderrStr += s },
+	}
 
-	var lastPrint string
-	printer := PrinterFunc(func(s string) {
-		lastPrint = s
-	})
+	vm := goja.New()
 
 	registry := new(require.Registry)
 	registry.Enable(vm)
@@ -47,24 +57,22 @@ func TestConsoleWithPrinter(t *testing.T) {
 		t.Fatal("console not found")
 	}
 
-	if _, err := vm.RunString("console.log('log')"); err != nil {
-		t.Fatal("console.log() error", err)
-	}
-	if lastPrint != "log" {
-		t.Fatal("lastPrint not 'log'", lastPrint)
+	_, err := vm.RunString(`
+		console.log('a')
+		console.error('b')
+		console.warn('c')
+		console.debug('d')
+		console.info('e')
+	`)
+	if err != nil {
+		t.Fatal(err)
 	}
 
-	if _, err := vm.RunString("console.error('error')"); err != nil {
-		t.Fatal("console.error() error", err)
-	}
-	if lastPrint != "error" {
-		t.Fatal("lastPrint not 'error'", lastPrint)
+	if want := "ade"; stdoutStr != want {
+		t.Fatalf("Unexpected stdout output: got %q, want %q", stdoutStr, want)
 	}
 
-	if _, err := vm.RunString("console.warn('warn')"); err != nil {
-		t.Fatal("console.warn() error", err)
-	}
-	if lastPrint != "warn" {
-		t.Fatal("lastPrint not 'warn'", lastPrint)
+	if want := "bc"; stderrStr != want {
+		t.Fatalf("Unexpected stderr output: got %q, want %q", stderrStr, want)
 	}
 }

console/std_printer.go

@@ -0,0 +1,38 @@
+package console
+
+import (
+	"log"
+	"os"
+)
+
+var (
+	stderrLogger = log.Default() // the default logger output to stderr
+	stdoutLogger = log.New(os.Stdout, "", log.LstdFlags)
+
+	defaultStdPrinter Printer = &StdPrinter{
+		StdoutPrint: func(s string) { stdoutLogger.Print(s) },
+		StderrPrint: func(s string) { stderrLogger.Print(s) },
+	}
+)
+
+// StdPrinter implements the console.Printer interface
+// that prints to the stdout or stderr.
+type StdPrinter struct {
+	StdoutPrint func(s string)
+	StderrPrint func(s string)
+}
+
+// Log prints s to the stdout.
+func (p StdPrinter) Log(s string) {
+	p.StdoutPrint(s)
+}
+
+// Warn prints s to the stderr.
+func (p StdPrinter) Warn(s string) {
+	p.StderrPrint(s)
+}
+
+// Error prints s to the stderr.
+func (p StdPrinter) Error(s string) {
+	p.StderrPrint(s)
+}