From 2ee5f2316f9dfe36017b845ce86f3720d24c77ec Mon Sep 17 00:00:00 2001
From: Jens Pots <jens@jenspots.com>
Date: Sun, 15 Sep 2024 18:54:04 +0200
Subject: [PATCH] refactor: reformat typescript globally

---
 .../.prettierrc.json => .prettierrc.json      |  3 ++-
 format.sh                                     | 25 +++++++++++--------
 packages/file-utils-ts/.prettierignore        |  1 -
 packages/file-utils-ts/.prettierrc.json       |  6 -----
 packages/runner-ts/.prettierignore            |  1 -
 packages/runner-ts/.prettierrc.json           |  6 -----
 packages/shacl-validator-ts/.prettierignore   |  1 -
 packages/template-ts/package-lock.json        | 13 ++++++++++
 packages/template-ts/package.json             | 11 ++++++++
 9 files changed, 41 insertions(+), 26 deletions(-)
 rename packages/shacl-validator-ts/.prettierrc.json => .prettierrc.json (54%)
 delete mode 100644 packages/file-utils-ts/.prettierignore
 delete mode 100644 packages/file-utils-ts/.prettierrc.json
 delete mode 100644 packages/runner-ts/.prettierignore
 delete mode 100644 packages/runner-ts/.prettierrc.json
 delete mode 100644 packages/shacl-validator-ts/.prettierignore
 create mode 100644 packages/template-ts/package-lock.json
 create mode 100644 packages/template-ts/package.json

diff --git a/packages/shacl-validator-ts/.prettierrc.json b/.prettierrc.json
similarity index 54%
rename from packages/shacl-validator-ts/.prettierrc.json
rename to .prettierrc.json
index c4664cb..9faccb7 100644
--- a/packages/shacl-validator-ts/.prettierrc.json
+++ b/.prettierrc.json
@@ -2,5 +2,6 @@
   "trailingComma": "all",
   "tabWidth": 2,
   "semi": true,
-  "singleQuote": false
+  "singleQuote": false,
+  "quoteProps": "consistent"
 }
diff --git a/format.sh b/format.sh
index fb1edb4..5537fbd 100755
--- a/format.sh
+++ b/format.sh
@@ -2,31 +2,36 @@
 
 TRACKED_FILES="$(git ls-files --cached --others --exclude-standard)"
 
-function find_tracked_files() {
-    echo "$TRACKED_FILES" | grep "$1$" | tee /dev/tty
+function grep_tracked_files() {
+    echo "$TRACKED_FILES" | grep "$1" | tee /dev/tty
 }
 
 echo "Formatting: Kotlin"
-find_tracked_files ".kt" | xargs ktfmt 2>/dev/null
-find_tracked_files ".kts" | xargs ktfmt 2>/dev/null
+grep_tracked_files "\.kt$" | xargs ktfmt 2>/dev/null
+grep_tracked_files "\.kts$" | xargs ktfmt 2>/dev/null
 echo ""
 
 echo "Formatting: Java"
-find_tracked_files ".java" | xargs -I "{}" google-java-format -r "{}"
+grep_tracked_files "\.java$" | xargs -I "{}" google-java-format -r "{}"
 echo ""
 
 echo "Formatting: YAML"
-find_tracked_files ".yml" | xargs -I "{}" yamlfmt "{}"
-find_tracked_files ".yaml" | xargs -I "{}" yamlfmt "{}"
+grep_tracked_files "\.yml$" | xargs -I "{}" yamlfmt "{}"
+grep_tracked_files "\.yaml$" | xargs -I "{}" yamlfmt "{}"
 echo ""
 
 echo "Formatting: Markdown"
-find_tracked_files ".md" | xargs -I "{}" mdformat "{}"
+grep_tracked_files "\.md$" | xargs -I "{}" mdformat "{}"
 echo ""
 
 echo "Formatting: Python"
-find_tracked_files ".py" | xargs black
+grep_tracked_files "\.py$" | xargs black
 echo ""
 
 echo "Formatting: Protobuf"
-find_tracked_files ".proto" | xargs -I "{}" buf format -w "{}"
+grep_tracked_files "\.proto$" | xargs -I "{}" buf format -w "{}"
+echo ""
+
+echo "Formatting: JavaScript/TypeScript"
+grep_tracked_files "\.js$" | xargs npx prettier --write >/dev/null
+grep_tracked_files "\.ts$" | xargs npx prettier --write >/dev/null
diff --git a/packages/file-utils-ts/.prettierignore b/packages/file-utils-ts/.prettierignore
deleted file mode 100644
index 3c3629e..0000000
--- a/packages/file-utils-ts/.prettierignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/packages/file-utils-ts/.prettierrc.json b/packages/file-utils-ts/.prettierrc.json
deleted file mode 100644
index c4664cb..0000000
--- a/packages/file-utils-ts/.prettierrc.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "trailingComma": "all",
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": false
-}
diff --git a/packages/runner-ts/.prettierignore b/packages/runner-ts/.prettierignore
deleted file mode 100644
index 3c3629e..0000000
--- a/packages/runner-ts/.prettierignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/packages/runner-ts/.prettierrc.json b/packages/runner-ts/.prettierrc.json
deleted file mode 100644
index c4664cb..0000000
--- a/packages/runner-ts/.prettierrc.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "trailingComma": "all",
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": false
-}
diff --git a/packages/shacl-validator-ts/.prettierignore b/packages/shacl-validator-ts/.prettierignore
deleted file mode 100644
index 3c3629e..0000000
--- a/packages/shacl-validator-ts/.prettierignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/packages/template-ts/package-lock.json b/packages/template-ts/package-lock.json
new file mode 100644
index 0000000..9261322
--- /dev/null
+++ b/packages/template-ts/package-lock.json
@@ -0,0 +1,13 @@
+{
+  "name": "template-ts",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "template-ts",
+      "version": "1.0.0",
+      "license": "MIT"
+    }
+  }
+}
diff --git a/packages/template-ts/package.json b/packages/template-ts/package.json
new file mode 100644
index 0000000..c941faa
--- /dev/null
+++ b/packages/template-ts/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "template-ts",
+  "version": "1.0.0",
+  "description": "A template for TypeScript RDF-Connect processors.",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "MIT"
+}