Merge pull request #33 from terrastruct/whitespace-2eec

fmt: trailing whitespace fixes

Makefile

@@ -2,13 +2,22 @@
 
 .PHONY: all
 all: fmt build
+ifndef CI
+all: gen
+endif
 
 .PHONY: fmt
 fmt: node_modules
 	prefix "$@" ./ci/sub/bin/fmt.sh
+.PHONY: gen
+gen:
+	prefix "$@" ./ci/render.sh
 .PHONY: build
 build: node_modules
 	prefix "$@" yarn build
+ifndef CI
+build: gen
+endif
 .PHONY: node_modules
 node_modules:
 	prefix "$@" yarn $${CI:+--immutable} $${CI:+--immutable-cache}

ci/render.sh

@@ -1,30 +1,58 @@
 #!/bin/sh
+set -eu
+. "$(dirname "$0")/../ci/sub/lib.sh"
 cd -- "$(dirname "$0")/.."
-examples=()
 
+_d2() {
+  sh_c D2_LAYOUT=tala hide d2 ./src/examples/"$ex"/syntax/d2.d2 ./src/examples/"$ex"/render/d2_tala.svg
+  sh_c D2_LAYOUT=dagre hide d2 ./src/examples/"$ex"/syntax/d2.d2 ./src/examples/"$ex"/render/d2_dagre.svg
+  sh_c D2_LAYOUT=elk hide d2 ./src/examples/"$ex"/syntax/d2.d2 ./src/examples/"$ex"/render/d2_elk.svg
+}
 
-if [ -z "$1" ]
-then
-  # Rendering for all examples
-  search_dir=./src/examples
-  for f in "$search_dir"/*
-  do
-    filename=$(basename -- "$f")
-    examples+=("$filename")
+mmdc() {
+  config=$(mktempd)/mmdc-config
+  echo '{"deterministicIds": true}' >$config
+  npx --package @mermaid-js/[email protected] -- mmdc -c"$config" "$@"
+}
+
+_mmdc() {
+  sh_c mmdc -i ./src/examples/"$ex"/syntax/mermaid.mmd -o ./src/examples/"$ex"/render/mermaid_dagre.svg
+}
+
+_dot() {
+  sh_c dot -Tsvg ./src/examples/"$ex"/syntax/graphviz.dot >src/examples/"$ex"/render/graphviz_dot.svg
+  sh_c dot -Kneato -Tsvg ./src/examples/"$ex"/syntax/graphviz.dot >src/examples/"$ex"/render/graphviz_neato.svg
+}
+
+_plantuml() {
+  sh_c plantuml -Tsvg ./src/examples/"$ex"/syntax/plantuml.puml -o ../render
+  mv ./src/examples/"$ex"/render/plantuml.svg ./src/examples/"$ex"/render/plantuml_dot.svg
+}
+
+main() {
+  job_parseflags "$@"
+  for ex in $(find ./src/examples -mindepth 1 -maxdepth 1 | sort -V); do
+    ex=${ex#./src/examples/}
+    export JOBNAME=$ex
+    if ! _runjob_filter; then
+      continue
+    fi
+
+    bigheader "$ex"
+    if [ -f ./src/examples/"$ex"/syntax/d2.d2 ]; then
+      runjob _d2 &
+    fi
+    if [ -f ./src/examples/"$ex"/syntax/mermaid.mmd ]; then
+      runjob _mmdc &
+    fi
+    if [ -f ./src/examples/"$ex"/syntax/graphviz.dot ]; then
+      [ "$ex" != 8_text ] && runjob _dot &
+    fi
+    if [ -f ./src/examples/"$ex"/syntax/plantuml.puml ]; then
+      runjob _plantuml &
+    fi
+    waitjobs
   done
-else
-  # Rendering for a specific example
-  examples+=($1)
-fi
-
-for ex in ${examples[@]}
-do
-  D2_LAYOUT=tala d2 src/examples/$ex/syntax/d2 src/examples/$ex/render/d2_tala.svg
-  D2_LAYOUT=dagre d2 src/examples/$ex/syntax/d2 src/examples/$ex/render/d2_dagre.svg
-  D2_LAYOUT=elk d2 src/examples/$ex/syntax/d2 src/examples/$ex/render/d2_elk.svg
-  mmdc -i src/examples/$ex/syntax/mermaid -o src/examples/$ex/render/mermaid_dagre.svg
-  dot -Tsvg src/examples/$ex/syntax/graphviz > src/examples/$ex/render/graphviz_dot.svg
-  dot -Kneato -Tsvg src/examples/$ex/syntax/graphviz > src/examples/$ex/render/graphviz_neato.svg
-  plantuml -Tsvg src/examples/$ex/syntax/plantuml -o ../render
-  mv src/examples/$ex/render/plantuml.svg src/examples/$ex/render/plantuml_dot.svg
-done
+}
+
+main "$@"

make.sh

@@ -7,6 +7,6 @@ if [ ! -e "$(dirname "$0")/ci/sub/.git" ]; then
 fi
 . "$(dirname "$0")/ci/sub/lib.sh"
 PATH="$(cd -- "$(dirname "$0")" && pwd)/ci/sub/bin:$PATH"
-cd "$(dirname "$0")"
+cd -- "$(dirname "$0")"
 
 _make "$@"