Resolve #18

Author: reteps

cmd/version.go

@@ -14,6 +14,6 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print the version number of dockerfmt",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("dockerfmt 0.2.7")
+		fmt.Println("dockerfmt 0.2.8")
 	},
 }

go.mod

@@ -3,6 +3,7 @@ module github.com/reteps/dockerfmt
 go 1.24.1
 
 require (
+	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/moby/buildkit v0.20.2
 	github.com/spf13/cobra v1.9.1
 	mvdan.cc/sh/v3 v3.11.0

go.sum

@@ -9,6 +9,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=

js/format.wasm

@@ -1,6 +1,6 @@
 {
   "name": "@reteps/dockerfmt",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "type": "module",
   "description": "",
   "repository": "git+https://github.com/reteps/dockerfmt/tree/main/js",

js/package-lock.json

@@ -10,6 +10,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/google/shlex"
 	"github.com/moby/buildkit/frontend/dockerfile/command"
 	"github.com/moby/buildkit/frontend/dockerfile/parser"
 	"mvdan.cc/sh/v3/syntax"
@@ -300,7 +301,7 @@ func formatRun(n *ExtendedNode, c *Config) string {
 	var jsonItems []string
 	err := json.Unmarshal([]byte(content), &jsonItems)
 	if err == nil {
-		out, err := json.Marshal(jsonItems)
+		out, err := Marshal(jsonItems)
 		if err != nil {
 			panic(err)
 		}
@@ -328,25 +329,42 @@ func formatBasic(n *ExtendedNode, c *Config) string {
 	return IndentFollowingLines(strings.ToUpper(n.Value)+" "+parts[1], c.IndentSize)
 }
 
+// Marshal is a UTF-8 friendly marshaler.  Go's json.Marshal is not UTF-8
+// friendly because it replaces the valid UTF-8 and JSON characters "&". "<",
+// ">" with the "slash u" unicode escaped forms (e.g. \u0026).  It preemptively
+// escapes for HTML friendliness.  Where text may include any of these
+// characters, json.Marshal should not be used. Playground of Go breaking a
+// title: https://play.golang.org/p/o2hiX0c62oN
+// Source: https://stackoverflow.com/a/69502657/5684541
+func Marshal(i interface{}) ([]byte, error) {
+	buffer := &bytes.Buffer{}
+	encoder := json.NewEncoder(buffer)
+	encoder.SetEscapeHTML(false)
+	err := encoder.Encode(i)
+	return bytes.TrimRight(buffer.Bytes(), "\n"), err
+}
+
 func getCmd(n *ExtendedNode) []string {
 	cmd := []string{}
 	for node := n; node != nil; node = node.Next {
 		// Split value by whitespace
-		parts := regexp.MustCompile("[ \t]+").Split(strings.Trim(node.Value, " \t"), -1)
-		// Remove empty parts
-
-		cmd = append(cmd, parts...)
+		rawValue := strings.Trim(node.Value, " \t")
 		if len(node.Flags) > 0 {
-			cmd = append(cmd, node.Flags...)
+			rawValue += " " + strings.Join(node.Flags, " ")
 		}
+		parts, err := shlex.Split(rawValue)
+		if err != nil {
+			log.Fatalf("Error splitting: %s\n", node.Value)
+		}
+		cmd = append(cmd, parts...)
 	}
 	// log.Printf("getCmd: %v\n", cmd)
 	return cmd
 }
 
 func formatCmd(n *ExtendedNode, c *Config) string {
 	cmd := getCmd(n.Next)
-	b, err := json.Marshal(cmd)
+	b, err := Marshal(cmd)
 	if err != nil {
 		return ""
 	}

js/package.json

@@ -0,0 +1,5 @@
+FROM hackernews
+# https://news.ycombinator.com/item?id=43630653
+ENTRYPOINT service ssh restart && bash
+
+ENTRYPOINT sh -c 'service ssh restart && bash'