Working on snippet store

Author: grantnelson-wf

playground/internal/common/snippetStore.go

@@ -6,19 +6,20 @@ package common
 // This interfaces allows the network access to be replaced
 // with a mock implementation for testing.
 type SnippetStore interface {
-
-	// TODO(grantnelson-wf): Update to work better with predefined snippets.
-	//
 	// Read fetches the code snippet with the given hash (including the `#/`)
 	// from the snippet store.
 	// If the has is `#` without the `/`, the remainder is checked to see
 	// if it matches any pre-defined snippets, i.e. `#Hello`.
 	// If the hash is empty or invalid, it returns the default code.
-	// This will block while waiting for the network request to complete.
-	Read(hash string) (string, error)
+	//
+	// This will not block but the then method will be called after
+	// the network request has completed.
+	Read(hash string, then func(string, error))
 
 	// Write sends the given code snippet to the snippet store and returns
 	// the snippet hash (including the `#/`) on success.
-	// This will block while waiting for the network request to complete.
-	Write(code string) (string, error)
+	//
+	// This will not block but the then method will be called after
+	// the network request has completed.
+	Write(code string, then func(string, error))
 }

playground/internal/react/codeBox.go

@@ -29,42 +29,39 @@ func codeBoxComponent(props Props) *Element {
 		lineNumsRef = UseRef()
 	)
 
-	newCBA := func() *codeBoxAssistant {
-		return &codeBoxAssistant{
-			curCode:     curCode,
-			setCode:     setCode,
-			onSave:      onSave,
-			onEscape:    onEscape,
-			textAreaRef: textAreaRef,
-		}
-	}
-
 	onInput := UseCallback(func(e *js.Object) {
-		code := e.Get(`target`).Get(`value`).String()
+		newCode := e.Get(`target`).Get(`value`).String()
 		sel := getSelection(textAreaRef)
-		globals.UndoRedo().RecordCodeChange(sel, curCode, code)
-		setCode(code)
-	}, []any{curCode})
+		globals.UndoRedo().RecordCodeChange(sel, curCode, newCode)
+		setCode(newCode)
+	}, []any{curCode, setCode, textAreaRef})
 
 	onKeyDown := UseCallback(func(e *js.Object) {
 		key := e.Get(`key`).String()
 		shift := e.Get(`shiftKey`).Bool()
 		ctrl := e.Get(`metaKey`).Bool() || e.Get(`ctrlKey`).Bool()
-		if editor.ProcessKeyDown(newCBA(), key, shift, ctrl) {
+		cba := &codeBoxAssistant{
+			curCode:     curCode,
+			setCode:     setCode,
+			onSave:      onSave,
+			onEscape:    onEscape,
+			textAreaRef: textAreaRef,
+		}
+		if editor.ProcessKeyDown(cba, key, shift, ctrl) {
 			e.Call(`preventDefault`)
 			e.Call(`stopPropagation`)
 		}
-	}, []any{curCode})
+	}, []any{curCode, setCode, onSave, onEscape, textAreaRef})
 
 	onScroll := UseCallback(func(e *js.Object) {
 		scrollTop := e.Get(`target`).Get(`scrollTop`).Int()
 		lineNumsRef.Set(`scrollTop`, scrollTop)
-	}, []any{})
+	}, []any{lineNumsRef})
 
 	onSelect := UseCallback(func(e *js.Object) {
 		// Don't normalize the selection so that the direction is preserved.
 		globals.UndoRedo().RecordSelectionChange(getSelection(textAreaRef))
-	}, []any{})
+	}, []any{textAreaRef})
 
 	// TODO(grantnelson-wf): If it is possible to detect a paste event,
 	// then maybe we could indent the pasted code automatically to match

playground/internal/react/globals.go

@@ -24,7 +24,7 @@ var globals = struct {
 	Runner        func() common.Runner
 }{
 	UndoRedo:      OnceValue(undoRedo.NewStack),
-	SnippetsStore: OnceValue(snippets.NewStore),
+	SnippetsStore: OnceValue(snippets.NewLocalStore), // TODO(grantnelson-wf): Switch to snippets.NewStore before deploying
 	Runner:        OnceValue(func() common.Runner { return runner.New(runner.NewFetcher()) }),
 }
 

playground/internal/react/playground.go

@@ -1,6 +1,8 @@
 package react
 
 import (
+	"fmt"
+
 	"github.com/gopherjs/gopherjs/compiler"
 	"github.com/gopherjs/gopherjs/js"
 )
@@ -31,14 +33,15 @@ func playgroundComponent(props Props) *Element {
 
 	UseEffect(func() {
 		hash := getLocation().Get(`hash`).String()
-		code, err := globals.SnippetsStore().Read(hash)
-		if err != nil {
-			o := Output(setOutput)
-			o.Clear()
-			o.AddError(err)
-		}
-		// even on error, set the code so the default code is shown.
-		setCode.Invoke(code)
+		globals.SnippetsStore().Read(hash, func(snippet string, err error) {
+			if err != nil {
+				o := Output(setOutput)
+				o.Clear()
+				o.AddError(err)
+			}
+			// even on error, set the code so the default code is shown.
+			setCode.Invoke(snippet)
+		})
 	}, []any{})
 
 	/* TODO(grantnelson-wf): Implement hashchange loading
@@ -55,11 +58,11 @@ func playgroundComponent(props Props) *Element {
 		// like they would be able to with tab stops but our editor is consuming
 		// tab key presses so tab stops won't work when in the text area.
 		runButtonRef.Call(`focus`)
-	}, []any{})
+	}, []any{runButtonRef})
 
 	onSaveKeyPress := UseCallback(func() {
-		println("Save key pressed") // TODO(grantnelson-wf): Implement by running format (and maybe sharing)
-	}, []any{})
+		println("Save key pressed (fmtImports:", fmtImports, ")") // TODO(grantnelson-wf): Implement by running format
+	}, []any{fmtImports})
 
 	onRunClick := UseCallback(func() {
 		println("Run clicked") // TODO(grantnelson-wf): Implement
@@ -70,8 +73,18 @@ func playgroundComponent(props Props) *Element {
 	}, []any{fmtImports})
 
 	onShareClick := UseCallback(func() {
-		println("Share URL Clicked") // TODO(grantnelson-wf): Implement
-	}, []any{})
+		fmt.Printf(">> Code to share: %q\n", code) // TODO(grantnelson-wf): REMOVE
+		globals.SnippetsStore().Write(code, func(url string, err error) {
+			if err != nil {
+				setShareUrl.Invoke(``)
+				output := Output(setOutput)
+				output.Clear()
+				output.AddError(err)
+				return
+			}
+			setShareUrl.Invoke(url)
+		})
+	}, []any{code, setOutput, setShareUrl})
 
 	return Fragment(
 		Div(Props{

playground/internal/react/shareUrlControl.go

@@ -22,6 +22,10 @@ func shareUrlComponent(props Props) *Element {
 		}
 	}, []any{shareUrl})
 
+	onShareClick := UseCallback(func(e *js.Object) {
+		onShare() // call without the dom target
+	}, []any{onShare})
+
 	onShareUrlFocus := UseCallback(func(e *js.Object) {
 		e.Get(`target`).Call(`select`)
 	}, []any{})
@@ -32,7 +36,7 @@ func shareUrlComponent(props Props) *Element {
 	}
 
 	return Fragment(
-		Button(`share-button`, `Share`, nil, onShare),
+		Button(`share-button`, `Share`, nil, onShareClick),
 		CreateElement(`input`, Props{
 			`id`:        `share-url`,
 			`type`:      `text`,

playground/internal/react/toggleBox.go

@@ -23,7 +23,7 @@ func toggleBoxComponent(props Props) *Element {
 
 	onChange := UseCallback(func(e *js.Object) {
 		setChecked(e.Get(`target`).Get(`checked`).Bool())
-	}, []any{})
+	}, []any{setChecked})
 
 	return Div(Props{
 		`id`:        id,

playground/internal/snippets/snippets.go

@@ -8,10 +8,37 @@ import _ "embed"
 //go:embed default.go.txt
 var DefaultCode string
 
+//go:embed workGroup.go.txt
+var workGroupCode string
+
 // predefined contains the pre-defined code snippets that are available
 // in the playground, keyed by the display name.
 //
 // TODO(grantnelson-wf): Add more pre-defined snippets.
 var predefined = map[string]string{
-	`Hello`: DefaultCode,
+	`Hello`:      DefaultCode,
+	`Work Group`: workGroupCode,
+}
+
+// SnippetNames returns the names of all predefined snippets.
+// The names do not include the leading '#' character.
+func SnippetNames() []string {
+	names := make([]string, 0, len(predefined))
+	for name := range predefined {
+		names = append(names, name)
+	}
+	return names
+}
+
+// getSnippetName returns the name of the predefined snippet that
+// matches the given code.
+// The returned name does not include the leading '#' character.
+// If no predefined snippet matches the given code, false is returned.
+func getSnippetName(code string) (string, bool) {
+	for name, snippet := range predefined {
+		if code == snippet {
+			return name, true
+		}
+	}
+	return ``, false
 }