prepare v2 for main merge

Author: fatbobman

.githooks/pre-commit

@@ -1,46 +1,41 @@
 #!/bin/bash
 
+set -euo pipefail
+
 # Pre-commit hook for Swift code formatting
 # 在提交前自动格式化 Swift 代码
 
-# 获取所有待提交的 Swift 文件
-SWIFT_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep '\.swift$')
-
-if [ -z "$SWIFT_FILES" ]; then
-    # 没有 Swift 文件变更，直接退出
-    exit 0
-fi
-
-echo "🔍 检测到 Swift 文件变更，开始格式化..."
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+CONFIG_FILE="$REPO_ROOT/.swift-format"
 
-# 检查是否安装了 swift-format (Apple 官方)
-if ! command -v swift-format &> /dev/null; then
+if ! command -v swift-format >/dev/null 2>&1; then
     echo "⚠️  未找到 swift-format，跳过格式化"
     echo "   安装方法: brew install swift-format"
     echo ""
     echo "   或者跳过此检查: git commit --no-verify"
     exit 0
 fi
 
-# swift-format 使用默认规则或项目根目录的 .swift-format 配置
+SWIFT_FILES=()
+while IFS= read -r -d '' file; do
+    SWIFT_FILES+=("$file")
+done < <(git diff --cached --name-only --diff-filter=ACM -z -- '*.swift')
+
+if [ "${#SWIFT_FILES[@]}" -eq 0 ]; then
+    exit 0
+fi
+
+echo "🔍 检测到 Swift 文件变更，开始格式化..."
 
-# 格式化每个文件
 FORMATTED_COUNT=0
-for file in $SWIFT_FILES; do
+for file in "${SWIFT_FILES[@]}"; do
     if [ -f "$file" ]; then
         echo "  📝 格式化: $file"
-
-        # 格式化文件 (swift-format 会自动查找 .swift-format 配置)
-        swift-format format --in-place "$file"
-
-        # 重新暂存格式化后的文件
+        swift-format format --configuration "$CONFIG_FILE" --in-place "$file"
         git add "$file"
-
         FORMATTED_COUNT=$((FORMATTED_COUNT + 1))
     fi
 done
 
 echo "✅ 格式化完成 ($FORMATTED_COUNT 个文件)"
 echo ""
-
-exit 0

.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - version2-beta
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build-and-test:
+    name: Build and Test
+    runs-on: macos-15
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Show Swift Version
+        run: swift --version
+
+      - name: Build
+        run: swift build
+
+      - name: Test
+        run: swift test --no-parallel

.gitignore

@@ -1,9 +1,11 @@
 .DS_Store
 /.build
 /Packages
+/.swiftpm
+Package.resolved
 /*.xcodeproj
 xcuserdata/
 DerivedData/
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 /.vscode
-/.claude
+/.claude

.swift-format

@@ -0,0 +1,23 @@
+{
+  "version" : 1,
+  "indentation" : {
+    "spaces" : 2
+  },
+  "lineLength" : 100,
+  "maximumBlankLines" : 1,
+  "multiElementCollectionTrailingCommas" : true,
+  "respectsExistingLineBreaks" : true,
+  "indentConditionalCompilationBlocks" : true,
+  "lineBreakBeforeControlFlowKeywords" : false,
+  "lineBreakBeforeEachArgument" : false,
+  "spacesAroundRangeFormationOperators" : false,
+  "rules" : {
+    "DoNotUseSemicolons" : true,
+    "NoEmptyTrailingClosureParentheses" : true,
+    "NoParensAroundConditions" : true,
+    "OrderedImports" : true,
+    "ReturnVoidInsteadOfEmptyTuple" : true,
+    "UseShorthandTypeNames" : true,
+    "UseTripleSlashForDocumentationComments" : true
+  }
+}