Merge branch 'experimental/swift-format'

Author: maximkrouk

.github/workflows/Format.yml

@@ -8,9 +8,8 @@ on:
 jobs:
   swift_format:
     if: |
-      !startsWith(github.event.head_commit.message, '[ci skip]') &&
-      !startsWith(github.event.head_commit.message, '[ci skip format]') &&
-      !startsWith(github.event.head_commit.message, '[ci skip swift_format]')
+      !contains(github.event.head_commit.message, '[ci skip]') &&
+      !contains(github.event.head_commit.message, '[ci skip format]')
     name: swift-format
     runs-on: macos-12
     steps:
@@ -21,7 +20,7 @@ jobs:
         run: make format
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: 'ci: swift-format'
+          commit_message: 'style(ci): run swiftformat'
           branch: 'main'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.swift-format

@@ -0,0 +1,76 @@
+--acronyms ID,URL,URI,UUID,ULID,SPM,XML,YAML,JSON,IDFA
+--allman false
+--assetliterals visual-width
+--binarygrouping none
+--categorymark "MARK: %c"
+--classthreshold 0
+--closingparen balanced
+--closurevoid remove
+--commas always
+--conflictmarkers reject
+--decimalgrouping none
+--elseposition same-line
+--emptybraces no-space
+--enumnamespaces always
+--enumthreshold 0
+--exponentcase lowercase
+--exponentgrouping disabled
+--extensionacl on-declarations
+--extensionlength 0
+--extensionmark "MARK: - %t + %c"
+--fractiongrouping disabled
+--fragment false
+--funcattributes preserve
+--generictypes 
+--groupedextension "MARK: %c"
+--guardelse auto
+--header ignore
+--hexgrouping none
+--hexliteralcase uppercase
+--ifdef indent
+--importgrouping alpha
+--indent 2
+--indentcase false
+--indentstrings false
+--lifecycle 
+--lineaftermarks true
+--linebreaks lf
+--markcategories true
+--markextensions always
+--marktypes always
+--maxwidth none
+--modifierorder 
+--nevertrailing 
+--nospaceoperators 
+--nowrapoperators 
+--octalgrouping none
+--operatorfunc spaced
+--organizetypes actor,class,enum,struct
+--patternlet hoist
+--ranges spaced
+--redundanttype infer-locals-only
+--self init-only
+--selfrequired 
+--semicolons never
+--shortoptionals always
+--smarttabs enabled
+--someAny true
+--stripunusedargs always
+--structthreshold 0
+--tabwidth unspecified
+--trailingclosures 
+--trimwhitespace always
+--typeattributes preserve
+--typeblanklines remove
+--typemark "MARK: - %t"
+--varattributes preserve
+--voidtype void
+--wraparguments before-first
+--wrapcollections before-first
+--wrapconditions preserve
+--wrapparameters before-first
+--wrapreturntype preserve
+--wrapternary default
+--wraptypealiases preserve
+--xcodeindentation disabled
+--yodaswap always

.swiftformat

@@ -1,10 +1,14 @@
 install_formatter:
-	./scripts/install_swift-format
+	@chmod +x ./scripts/install_swift-format.sh
+	@./scripts/install_swift-format.sh
+
+update_formatter:
+	@rm ./scripts/.bin/swift-format
+	@make install_formatter
 
 format:
-	./Scripts/.bin/swift-format \
-		--in-place --recursive \
-		./Package.swift ./Sources ./Tests
+	@chmod +x ./scripts/format.sh
+	@./scripts/format.sh
 
 test:
-	swift test --enable-test-discovery
+	@swift test --enable-test-discovery

Makefile

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+_get_parent_dir_abs_path() {
+  echo "$(cd "$(dirname "$1")" && pwd)"
+}
+
+# ––––––––––––––––––––––––– Constants ––––––––––––––––––––––––––
+
+SCRIPT_DIR=$(_get_parent_dir_abs_path $0)
+TOOLS_DIR="${SCRIPT_DIR}/.bin/"
+TOOL_NAME="swiftformat"
+TOOL="${TOOLS_DIR}/${TOOL_NAME}"
+
+# ––––––––––––––––––––––––––– Script –––––––––––––––––––––––––––
+
+cd ${SCRIPT_DIR}
+cd ..
+
+${TOOL} . \
+  --config .swiftformat

Scripts/format.sh

@@ -6,31 +6,34 @@ _get_parent_dir_abs_path() {
 
 # ––––––––––––––––––––––––––– Config –––––––––––––––––––––––––––
 
-TOOL_NAME="swift-format"
-TOOL_OWNER="apple"
-TOOL_VERSION="0.50600.1"
+TOOL_NAME="swiftformat"
+TOOL_OWNER="nicklockwood"
+TOOL_VERSION="0.50.5"
 
 # ––––––––––––––––––––––––– Constants ––––––––––––––––––––––––––
 
 SCRIPT_DIR=$(_get_parent_dir_abs_path $0)
 TOOLS_INSTALL_PATH="${SCRIPT_DIR}/.bin"
 TOOL_INSTALL_PATH="${TOOLS_INSTALL_PATH}/${TOOL_NAME}"
-TEMP_INSTALL_PATH="${TOOLS_INSTALL_PATH}/install-${TOOL_NAME}"
+TOOL_DOWNLOAD_DIR="${TOOLS_INSTALL_PATH}/_${TOOL_NAME}"
+
+TOOL=${TOOL_INSTALL_PATH}
+TOOL_REPO="https://github.com/${TOOL_OWNER}/${TOOL_NAME}"
+ARCHIVE_NAME="${TOOL_NAME}.artifactbundle"
+ARCHIVE_URL="${TOOL_REPO}/releases/download/${TOOL_VERSION}/${ARCHIVE_NAME}.zip"
 
 # ––––––––––––––––––––––––––– Steps ––––––––––––––––––––––––––––
 
 tool_fetch() {
-  git clone "https://github.com/${TOOL_OWNER}/${TOOL_NAME}.git"
-  cd "${TOOL_NAME}"
-  git checkout "tags/${TOOL_VERSION}"
+  curl -L ${ARCHIVE_URL} -o "${TOOL_DOWNLOAD_DIR}/${ARCHIVE_NAME}.zip"
 }
 
-tool_build() {
-  swift build --product="${TOOL_NAME}" -c release --disable-sandbox --build-path '.build'
+tool_extract() {
+  unzip "${TOOL_DOWNLOAD_DIR}/${ARCHIVE_NAME}.zip" -d ${TOOL_DOWNLOAD_DIR}
 }
 
 tool_install() {
-  install "${TEMP_INSTALL_PATH}/${TOOL_NAME}/.build/release/${TOOL_NAME}" "${TOOLS_INSTALL_PATH}"
+  install "${TOOL_DOWNLOAD_DIR}/${ARCHIVE_NAME}/${TOOL_NAME}-${TOOL_VERSION}-macos/bin/${TOOL_NAME}" "${TOOLS_INSTALL_PATH}"
 }
 
 # ––––––––––––––––––––––––––– Script –––––––––––––––––––––––––––
@@ -42,20 +45,20 @@ log() {
   printf "\n$1 ${set_bold}$2${set_normal}\n"
 }
 
-_trap_exit() {
-  rm -rf "${TEMP_INSTALL_PATH}"
+clean_up() {
+  rm -rf "${TOOL_DOWNLOAD_DIR}"
 }
 
 set -e
-trap _trap_exit err exit SIGTERM SIGINT
+trap clean_up err exit SIGTERM SIGINT
 
 if [ -f "${TOOL_INSTALL_PATH}" ]; then
   log "⚠️" " ${TOOL_NAME} already installed"
   exit 0
 fi
 
-if [ ! -d "${TEMP_INSTALL_PATH}" ]; then
-  mkdir -p "${TEMP_INSTALL_PATH}"
+if [ ! -d "${TOOL_DOWNLOAD_DIR}" ]; then
+  mkdir -p "${TOOL_DOWNLOAD_DIR}"
 fi
 
 cd "${TEMP_INSTALL_PATH}"
@@ -64,16 +67,16 @@ log "⬇️" " Fetching ${TOOL_NAME}...\n"
 
 tool_fetch
 
-log "🔨" "Building ${TOOL_NAME}...\n"
+log "📦" " Extracting ${TOOL_NAME}...\n"
 
-tool_build
+tool_extract
 
 log "♻️" " Installing ${TOOL_NAME}..."
 
 tool_install
 
 log "💧" "Performing cleanup..."
-rm -rf "${TEMP_INSTALL_PATH}"
+clean_up
 
 if [ -f "${TOOL_INSTALL_PATH}" ]; then
   log "✅" "${TOOL_NAME} successfully installed"