Add streaming support

2 years ago · 3b9ac1d023
parent 7028357eba
commit 3b9ac1d023
6 changed files with 91 additions and 37 deletions
--- a/README.md
+++ b/README.md
@ -8,8 +8,8 @@ _* Function eXecution_

 ## Features

- Interactive viewer
 - Mouse support
+- Streaming support
 - Preserves key order
 - Preserves big numbers

--- a/go.mod
+++ b/go.mod
@ -16,6 +16,7 @@ require (
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/containerd/console v1.0.3 // indirect
 	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/mazznoer/csscolorparser v0.1.2 // indirect
@ -25,5 +26,6 @@ require (
 	github.com/rivo/uniseg v0.2.0 // indirect
 	golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
 	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -12,8 +12,17 @@ github.com/charmbracelet/lipgloss v0.5.0/go.mod h1:EZLha/HbzEt7cYqdFPovlqy5FZPj0
 github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ=
 github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
 github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
@ -46,6 +55,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
@ -61,7 +72,10 @@ golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/term v0.0.0-20210422114643-f5beecf764ed/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
 golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/main.go
+++ b/main.go
@ -60,6 +60,7 @@ func main() {
 	var args []string
 	var dec *json.Decoder
 	if stdinIsTty {
+		// Nothing was piped, maybe file argument?
 		if len(os.Args) >= 2 {
 			filePath = os.Args[1]
 			f, err := os.Open(os.Args[1])
@ -91,18 +92,26 @@ func main() {
 		os.Exit(1)
 	}

+	lang, ok := os.LookupEnv("FX_LANG")
+	if !ok {
+		lang = "node"
+	}
+
+	if dec.More() {
+		exitCode := stream(dec, jsonObject, lang, args, theme)
+		os.Exit(exitCode)
+	}
+
 	if len(args) > 0 || !stdoutIsTty {
 		if len(args) > 0 && args[0] == "--print-code" {
-			fmt.Print(GenerateCode(args[1:]))
+			fmt.Print(GenerateCode(lang, args[1:]))
 			return
 		}
-		Reduce(jsonObject, args, theme)
-		return
+		exitCode := Reduce(jsonObject, lang, args, theme)
+		os.Exit(exitCode)
 	}

-	expand := map[string]bool{
-		"": true,
-	}
+	expand := map[string]bool{"": true}
 	if array, ok := jsonObject.(Array); ok {
 		for i := range array {
 			expand[accessor("", i)] = true
--- a/pkg/reducer/reduce.go
+++ b/pkg/reducer/reduce.go
@ -5,7 +5,6 @@ import (
 	_ "embed"
 	"encoding/json"
 	"fmt"
-	"os"
 	"os/exec"
 	"strings"

@ -13,11 +12,7 @@ import (
 	. "github.com/antonmedv/fx/pkg/theme"
 )

-func GenerateCode(args []string) string {
-	lang, ok := os.LookupEnv("FX_LANG")
-	if !ok {
-		lang = "node"
-	}
+func GenerateCode(lang string, args []string) string {
 	switch lang {
 	case "node":
 		return nodejs(args)
@ -30,12 +25,13 @@ func GenerateCode(args []string) string {
 	}
 }

-func Reduce(object interface{}, args []string, theme Theme) {
-	var cmd *exec.Cmd
-	lang, ok := os.LookupEnv("FX_LANG")
-	if !ok {
-		lang = "node"
+func Reduce(object interface{}, lang string, args []string, theme Theme) int {
+	if len(args) == 0 {
+		echo(object, theme)
+		return 0
 	}
+
+	var cmd *exec.Cmd
 	switch lang {
 	case "node":
 		cmd = CreateNodejs(args)
@ -49,23 +45,7 @@ func Reduce(object interface{}, args []string, theme Theme) {

 	cmd.Stdin = strings.NewReader(Stringify(object))
 	output, err := cmd.CombinedOutput()
-	if err == nil {
-		dec := json.NewDecoder(bytes.NewReader(output))
-		dec.UseNumber()
-		jsonObject, err := Parse(dec)
-		if err != nil {
-			fmt.Print(string(output))
-			return
-		}
-		if str, ok := jsonObject.(string); ok {
-			fmt.Println(str)
-		} else {
-			fmt.Println(PrettyPrint(jsonObject, 1, theme))
-		}
-		if dec.InputOffset() < int64(len(output)) {
-			fmt.Print(string(output[dec.InputOffset():]))
-		}
-	} else {
+	if err != nil {
 		exitCode := 1
 		status, ok := err.(*exec.ExitError)
 		if ok {
@ -74,7 +54,28 @@ func Reduce(object interface{}, args []string, theme Theme) {
 			fmt.Println(err.Error())
 		}
 		fmt.Print(string(output))
-		os.Exit(exitCode)
+		return exitCode
+	}
+
+	dec := json.NewDecoder(bytes.NewReader(output))
+	dec.UseNumber()
+	jsonObject, err := Parse(dec)
+	if err != nil {
+		fmt.Print(string(output))
+		return 0
+	}
+	echo(jsonObject, theme)
+	if dec.InputOffset() < int64(len(output)) {
+		fmt.Print(string(output[dec.InputOffset():]))
+	}
+	return 0
+}
+
+func echo(object interface{}, theme Theme) {
+	if s, ok := object.(string); ok {
+		fmt.Println(s)
+	} else {
+		fmt.Println(PrettyPrint(object, 1, theme))
 	}
 }

--- a/stream.go
+++ b/stream.go
@ -0,0 +1,28 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+
+	. "github.com/antonmedv/fx/pkg/json"
+	. "github.com/antonmedv/fx/pkg/reducer"
+	. "github.com/antonmedv/fx/pkg/theme"
+)
+
+func stream(dec *json.Decoder, jsonObject interface{}, lang string, args []string, theme Theme) int {
+	var err error
+	for {
+		if jsonObject != nil {
+			Reduce(jsonObject, lang, args, theme)
+		}
+		jsonObject, err = Parse(dec)
+		if err == io.EOF {
+			return 0
+		}
+		if err != nil {
+			fmt.Println("JSON Parse Error:", err.Error())
+			return 1
+		}
+	}
+}