working on getting the runner hooked up.

Author: grantnelson-wf

playground/internal/common/runner.go

@@ -1,16 +1,21 @@
 package common
 
-// Runner is the interface describing the functions to compile and run Go code
+// Runner is the interface describing the functions to compile Go code
 // via GopherJS in the playground.
 type Runner interface {
-
 	// Preload asynchronously starts loading standard library packages needed
-	// to run the given code. A running preload will be cancelled when Run,
-	// Stop, or another Preload is called.
-	Preload(code string)
+	// to run the Go given code.
+	Preload(goCode string)
+
+	// Compile asynchronously compiles the given Go code.
+	// When done the the then callback is invoked with the resulting
+	// JavaScript code or an error if the compilation failed.
+	Compile(goCode string, then func(string, error))
 
-	// Run asynchronously compiles and runs the given code.
+	// Run executes the given JavaScript code.
+	//
+	// TODO(grantnelson-wf): Currently, there is no way to cancel a previous Run.
 	// If this is called again while a previous Run is still in progress,
-	// the previous Run is cancelled.
-	Run(code string)
+	// the previous Run should be cancelled.
+	Run(jsCode string)
 }

playground/internal/page/banner.go

@@ -2,6 +2,7 @@ package page
 
 import (
 	"github.com/gopherjs/gopherjs.github.io/playground/internal/react"
+	"github.com/gopherjs/gopherjs/js"
 )
 
 func Banner(urlHash string, onRun, onFormat, onShare, onSnippetSelected react.Func) *react.Element {
@@ -48,3 +49,15 @@ func bannerComponent(props react.Props) *react.Element {
 		),
 	)
 }
+
+func getDefaultToLightTheme() bool {
+	return js.Global.Get(`window`).Call(`matchMedia`, `(prefers-color-scheme: light)`).Get(`matches`).Bool()
+}
+
+func setDataTheme(lightTheme bool) {
+	theme := `dark`
+	if lightTheme {
+		theme = `light`
+	}
+	js.Global.Get(`document`).Get(`documentElement`).Call(`setAttribute`, `data-theme`, theme)
+}

playground/internal/page/globals.go

@@ -1,16 +1,12 @@
 package page
 
 import (
-	"fmt"
-	"strings"
 	"sync"
 
 	"github.com/gopherjs/gopherjs.github.io/playground/internal/common"
-	"github.com/gopherjs/gopherjs.github.io/playground/internal/react"
 	"github.com/gopherjs/gopherjs.github.io/playground/internal/runner"
 	"github.com/gopherjs/gopherjs.github.io/playground/internal/snippets"
 	"github.com/gopherjs/gopherjs.github.io/playground/internal/undoRedo"
-	"github.com/gopherjs/gopherjs/js"
 )
 
 // globals are the global objects used by the react components.
@@ -50,59 +46,3 @@ func OnceValue[T any](init func() T) func() T {
 		return value
 	}
 }
-
-func getTopWindow() *js.Object { return js.Global.Get(`window`).Get(`top`) }
-func getLocation() *js.Object  { return getTopWindow().Get(`location`) }
-
-func getUrlWithoutHash() string {
-	href := getLocation().Get(`href`).String()
-	index := strings.Index(href, `#`)
-	if index == -1 {
-		return href
-	}
-	return href[:index]
-}
-
-func getUrlHash() string {
-	return getLocation().Get(`hash`).String()
-}
-
-func setUrlHash(hash string) {
-	if hash != `` && !strings.HasPrefix(hash, `#`) {
-		panic(fmt.Errorf(`invalid hash to set. Must be empty or start with a "#": %q`, hash))
-	}
-
-	if history := getTopWindow().Get(`history`); history != js.Undefined {
-		if pushState := history.Get(`pushState`); pushState != js.Undefined {
-			newUrl := getUrlWithoutHash()
-			if hash != `` {
-				newUrl += hash
-			}
-			history.Call(`pushState`, nil, ``, newUrl)
-			return
-		}
-	}
-
-	// Fallback to setting location.hash directly
-	getLocation().Set(`hash`, hash)
-}
-
-func addEventListener(event string, handler react.Func) {
-	getTopWindow().Call(`addEventListener`, event, handler)
-}
-
-func removeEventListener(event string, handler react.Func) {
-	getTopWindow().Call(`removeEventListener`, event, handler)
-}
-
-func getDefaultToLightTheme() bool {
-	return js.Global.Get(`window`).Call(`matchMedia`, `(prefers-color-scheme: light)`).Get(`matches`).Bool()
-}
-
-func setDataTheme(lightTheme bool) {
-	theme := `dark`
-	if lightTheme {
-		theme = `light`
-	}
-	js.Global.Get(`document`).Get(`documentElement`).Call(`setAttribute`, `data-theme`, theme)
-}

playground/internal/page/playground.go

@@ -1,6 +1,9 @@
 package page
 
 import (
+	"fmt"
+	"strings"
+
 	"github.com/gopherjs/gopherjs/js"
 
 	"github.com/gopherjs/gopherjs.github.io/playground/internal/react"
@@ -26,6 +29,7 @@ func playgroundComponent(props react.Props) *react.Element {
 
 		asyncOpInProgress.SetCurrent(true)
 		globals.SnippetsStore().Read(hash, func(snippet string, err error) {
+			defer asyncOpInProgress.SetCurrent(false)
 			o := Output(setOutput)
 			o.Clear()
 			if err != nil {
@@ -36,7 +40,6 @@ func playgroundComponent(props react.Props) *react.Element {
 			}
 			// even on error, set the code so the default code is shown.
 			setCode.Invoke(snippet)
-			asyncOpInProgress.SetCurrent(false)
 		})
 	}, []any{setCode, setShareHash, setOutput, asyncOpInProgress})
 
@@ -85,6 +88,7 @@ func playgroundComponent(props react.Props) *react.Element {
 
 		asyncOpInProgress.SetCurrent(true)
 		globals.SnippetsStore().Write(code, func(hash string, err error) {
+			defer asyncOpInProgress.SetCurrent(false)
 			output := Output(setOutput)
 			output.Clear()
 			if err != nil {
@@ -93,7 +97,6 @@ func playgroundComponent(props react.Props) *react.Element {
 				return
 			}
 			setShareHash.Invoke(hash)
-			asyncOpInProgress.SetCurrent(false)
 		})
 	}, []any{code, setOutput, setShareHash, asyncOpInProgress})
 
@@ -119,9 +122,22 @@ func playgroundComponent(props react.Props) *react.Element {
 		println("Save key pressed") // TODO(grantnelson-wf): Implement by running format or just do nothing?
 	}, []any{})
 
+	// TODO(grantnelson-wf): Implement a periodic read of the code after a change to preload packages.
+
 	onRun := react.UseCallback(func() {
-		println("Run clicked") // TODO(grantnelson-wf): Implement
-	}, []any{})
+		asyncOpInProgress.SetCurrent(true)
+		// TODO(grantnelson-wf): Finish implementing and debugging.
+		globals.Runner().Compile(code, func(jsCode string, err error) {
+			defer asyncOpInProgress.SetCurrent(false)
+			output := Output(setOutput)
+			output.Clear()
+			if err != nil {
+				output.AddError(err)
+				return
+			}
+			globals.Runner().Run(jsCode)
+		})
+	}, []any{code, setOutput, asyncOpInProgress})
 
 	onFormat := react.UseCallback(func(fmtImports bool) {
 		println("Format clicked", fmtImports) // TODO(grantnelson-wf): Implement
@@ -137,3 +153,47 @@ func playgroundComponent(props react.Props) *react.Element {
 		),
 	)
 }
+
+func getTopWindow() *js.Object { return js.Global.Get(`window`).Get(`top`) }
+func getLocation() *js.Object  { return getTopWindow().Get(`location`) }
+
+func getUrlWithoutHash() string {
+	href := getLocation().Get(`href`).String()
+	index := strings.Index(href, `#`)
+	if index == -1 {
+		return href
+	}
+	return href[:index]
+}
+
+func getUrlHash() string {
+	return getLocation().Get(`hash`).String()
+}
+
+func setUrlHash(hash string) {
+	if hash != `` && !strings.HasPrefix(hash, `#`) {
+		panic(fmt.Errorf(`invalid hash to set. Must be empty or start with a "#": %q`, hash))
+	}
+
+	if history := getTopWindow().Get(`history`); history != js.Undefined {
+		if pushState := history.Get(`pushState`); pushState != js.Undefined {
+			newUrl := getUrlWithoutHash()
+			if hash != `` {
+				newUrl += hash
+			}
+			history.Call(`pushState`, nil, ``, newUrl)
+			return
+		}
+	}
+
+	// Fallback to setting location.hash directly
+	getLocation().Set(`hash`, hash)
+}
+
+func addEventListener(event string, handler react.Func) {
+	getTopWindow().Call(`addEventListener`, event, handler)
+}
+
+func removeEventListener(event string, handler react.Func) {
+	getTopWindow().Call(`removeEventListener`, event, handler)
+}

playground/internal/runner/runner.go

@@ -20,8 +20,7 @@ import (
 const pseudoFileName = `prog.go`
 
 type runner struct {
-	cache  *packageCache
-	output common.Output
+	cache *packageCache
 }
 
 func New(fetcher common.Fetcher) common.Runner {
@@ -30,24 +29,9 @@ func New(fetcher common.Fetcher) common.Runner {
 	}
 }
 
-// SetOutput sets the output to write errors to.
-func (r *runner) SetOutput(output common.Output) {
-	r.output = output
-}
-
-func (r *runner) writeError(err error) {
-	if r.output != nil {
-		r.output.AddError(err)
-	} else {
-		fmt.Printf("Runner error: %v\n", err)
-	}
-}
-
-// Preload asynchronously starts loading standard library packages needed
-// to run the given code.
-func (r *runner) Preload(code string) {
+func (r *runner) Preload(goCode string) {
 	fileSet := token.NewFileSet()
-	file, err := parser.ParseFile(fileSet, pseudoFileName, code, parser.ImportsOnly)
+	file, err := parser.ParseFile(fileSet, pseudoFileName, goCode, parser.ImportsOnly)
 	if err != nil {
 		// Ignore errors here. They will be reported during actual compilation.
 		return
@@ -74,15 +58,15 @@ func (r *runner) preloadImports(srcs *sources.Sources) {
 	}
 }
 
-// Run compiles and runs the given code.
-// If this is called again while a previous Run is still in progress,
-// the previous Run is cancelled.
-func (r *runner) Run(code string) {
+func (r *runner) Compile(goCode string, then func(string, error)) {
+	go func() { then(r.syncCompile(goCode)) }()
+}
+
+func (r *runner) syncCompile(goCode string) (string, error) {
 	fileSet := token.NewFileSet()
-	file, err := parser.ParseFile(fileSet, pseudoFileName, code, parser.ParseComments)
+	file, err := parser.ParseFile(fileSet, pseudoFileName, goCode, parser.ParseComments)
 	if err != nil {
-		r.writeError(err)
-		return
+		return ``, err
 	}
 
 	root := &sources.Sources{
@@ -96,24 +80,24 @@ func (r *runner) Run(code string) {
 	// and we can synchronously wait for them later during actual compilation.
 	r.preloadImports(root)
 
-	allSources, ok := r.collectAllSources(root)
-	if !ok {
-		return // Errors have already been reported.
+	allSources, err := r.collectAllSources(root)
+	if err != nil {
+		return ``, err
 	}
 	archives, err := r.prepareAndCompilePackages(allSources)
 	if err != nil {
-		r.writeError(err)
-		return
+		return ``, err
 	}
 
 	jsCode := r.write(archives)
-	r.eval(jsCode)
+	return jsCode, nil
 }
 
-func (r *runner) collectAllSources(root *sources.Sources) ([]*sources.Sources, bool) {
+func (r *runner) collectAllSources(root *sources.Sources) ([]*sources.Sources, error) {
 	allSrcs := map[string]*sources.Sources{}
-	var collect func(srcs *sources.Sources) bool
-	collect = func(srcs *sources.Sources) bool {
+
+	var collect func(srcs *sources.Sources) error
+	collect = func(srcs *sources.Sources) error {
 		allSrcs[srcs.ImportPath] = srcs
 		for _, path := range srcs.UnresolvedImports() {
 			if _, has := allSrcs[path]; has {
@@ -123,24 +107,23 @@ func (r *runner) collectAllSources(root *sources.Sources) ([]*sources.Sources, b
 			srcs, _, err := r.cache.Load(path)
 			if err != nil {
 				// Failed to load an import.
-				r.writeError(fmt.Errorf(`failed to load package %q: %w`, path, err))
-				return false
+				return fmt.Errorf(`failed to load package %q: %w`, path, err)
 			}
-			if !collect(srcs) {
-				return false
+			if err := collect(srcs); err != nil {
+				return err
 			}
 		}
-		return true
+		return nil
 	}
-	if !collect(root) {
-		return nil, false
+	if err := collect(root); err != nil {
+		return nil, err
 	}
 
 	sourcesSlice := make([]*sources.Sources, 0, len(allSrcs))
 	for _, srcs := range allSrcs {
 		sourcesSlice = append(sourcesSlice, srcs)
 	}
-	return sourcesSlice, true
+	return sourcesSlice, nil
 }
 
 func (r *runner) sourcesForImport(path, _ string) (*sources.Sources, error) {
@@ -180,7 +163,7 @@ func (r *runner) write(allPkgs []*compiler.Archive) string {
 	return jsCode.String()
 }
 
-func (r *runner) eval(jsCode string) {
+func (r *runner) Run(jsCode string) {
 	js.Global.Set("$checkForDeadlock", true)
 	js.Global.Call("eval", js.InternalObject(jsCode))
 }