Fix regression in release relating to backticks

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.3.1")
+		fmt.Println("dockerfmt 0.3.2")
 	},
 }

js/format.wasm

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

js/package-lock.json

@@ -234,6 +234,15 @@ func formatShell(content string, hereDoc bool, c *Config) string {
 		// Replace comments with a subshell evaluation -- they won't be run so we can do this.
 		content = StripWhitespace(content, true)
 		lineComment := regexp.MustCompile(`(\n\s*)(#.*)`)
+		lines := strings.SplitAfter(content, "\n")
+		for i := range lines {
+			lineTrim := strings.TrimLeft(lines[i], " \t")
+			if len(lineTrim) >= 1 && lineTrim[0] == '#' {
+				lines[i] = strings.ReplaceAll(lines[i], "`", "×")
+			}
+		}
+		content = strings.Join(lines, "")
+
 		content = lineComment.ReplaceAllString(content, "$1`$2#`\\")
 
 		/*
@@ -254,7 +263,7 @@ func formatShell(content string, hereDoc bool, c *Config) string {
 		content = commentContinuation.ReplaceAllString(content, "&&$1")
 
 		// log.Printf("Content0: %s\n", content)
-		lines := strings.SplitAfter(content, "\n")
+		lines = strings.SplitAfter(content, "\n")
 		/**
 		if the next line is not a comment, and we didn't start with a continuation, don't add the `&&`.
 		*/
@@ -293,6 +302,7 @@ func formatShell(content string, hereDoc bool, c *Config) string {
 	// Now that we have a valid bash-style command, we can format it with shfmt
 	// log.Printf("Content1: %s\n", content)
 	content = formatBash(content, c)
+
 	// log.Printf("Content2: %s\n", content)
 
 	if !hereDoc {
@@ -320,6 +330,7 @@ func formatShell(content string, hereDoc bool, c *Config) string {
 			}
 		}
 		content = strings.Join(lines, "")
+		content = strings.ReplaceAll(content, "×", "`")
 
 	}
 	return content

js/package.json

@@ -0,0 +1,19 @@
+RUN arch="$(uname -m)" \
+    && curl -sfLO "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-${arch}.sh" \
+    && chmod +x "Miniforge3-Linux-${arch}.sh" \
+    && ./"Miniforge3-Linux-${arch}.sh" -b -p /home/coder/conda \
+    # Install conda and mamba hooks for future interactive bash sessions:
+    && /home/coder/conda/bin/mamba init bash \
+    # Activate hooks in the current noninteractive session:
+    && . "/home/coder/conda/etc/profile.d/conda.sh" \
+    && . "/home/coder/conda/etc/profile.d/mamba.sh" \
+    && mamba activate \
+    # Installing `pygraphviz` with pip would require `build-essentials`, `graphviz`,
+    # and `graphviz-dev` to be installed at the OS level, which would increase the
+    # image size. Instead, we install it from Conda, which prebuilds it and also
+    # automatically installs a Conda-specific `graphviz` dependency.
+    && mamba install --yes "$(grep pygraphviz /requirements.txt | head -n 1)" \
+    && pip install --no-cache-dir -r /requirements.txt \
+    && rm "Miniforge3-Linux-${arch}.sh" \
+    && mamba clean --all --yes --quiet \
+    && pip cache purge

lib/format.go

@@ -0,0 +1,19 @@
+RUN arch="$(uname -m)" \
+    && curl -sfLO "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-${arch}.sh" \
+    && chmod +x "Miniforge3-Linux-${arch}.sh" \
+    && ./"Miniforge3-Linux-${arch}.sh" -b -p /home/coder/conda \
+    # Install conda and mamba hooks for future interactive bash sessions:
+    && /home/coder/conda/bin/mamba init bash \
+    # Activate hooks in the current noninteractive session:
+    && . "/home/coder/conda/etc/profile.d/conda.sh" \
+    && . "/home/coder/conda/etc/profile.d/mamba.sh" \
+    && mamba activate \
+    # Installing `pygraphviz` with pip would require `build-essentials`, `graphviz`,
+    # and `graphviz-dev` to be installed at the OS level, which would increase the
+    # image size. Instead, we install it from Conda, which prebuilds it and also
+    # automatically installs a Conda-specific `graphviz` dependency.
+    && mamba install --yes "$(grep pygraphviz /requirements.txt | head -n 1)" \
+    && pip install --no-cache-dir -r /requirements.txt \
+    && rm "Miniforge3-Linux-${arch}.sh" \
+    && mamba clean --all --yes --quiet \
+    && pip cache purge