fix: fix workflow (#2)

muzix · Hoang Pham · web-flow · commit a7ed651ee1e3 · 2025-10-04T17:35:51.000+07:00
* Fix workflow

* fix workflow

---------

Co-authored-by: Hoang Pham &lt;hoangpham@swiftcode.me&gt;
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,29 +5,28 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
+  workflow_dispatch:
 
 jobs:
   test:
     name: Test SwiftUI Query
-    runs-on: macos-14
-    
+    runs-on: macos-15
+
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    
-    - name: Setup Swift
-      uses: swift-actions/setup-swift@v2
-      with:
-        swift-version: "6.2"
-    
+
     - name: Show Swift version
       run: swift --version
-    
-    - name: Run Tests
-      run: swift test --parallel
-    
+
+    - name: Install SwiftLint
+      run: brew install swiftlint
+
+    - name: Lint Code
+      run: make lint
+
     - name: Run Tests with Coverage
-      run: swift test --enable-code-coverage
+      run: swift test --parallel --enable-code-coverage
     
     - name: Generate Coverage Report
       run: |
@@ -43,17 +42,4 @@ jobs:
       with:
         file: ./coverage.lcov
         fail_ci_if_error: false
-      continue-on-error: true
-
-  lint:
-    name: Swift Format
-    runs-on: ubuntu-latest
-    
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    
-    - name: Swift Format Lint
-      uses: norio-nomura/action-swiftlint@3.2.1
-      with:
-        args: --strict
+      continue-on-error: true
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -4,10 +4,10 @@
 included:
   - Sources
   - Tests
-  - Example
 
 excluded:
   - Documentation
+  - Example
   - .build
   - .swiftpm
   - Package.swift
@@ -23,7 +23,8 @@ disabled_rules:
   - function_parameter_count # Allow functions with more than 6 parameters
   - redundant_string_enum_value # Allow explicit raw values for consistency
   - raw_value_for_camel_cased_codable_enum # Disable conflicting camel case enum rule
-
+  - closure_parameter_position
+  - optional_data_string_conversion
 # Per-path rule customization
 
 opt_in_rules:
@@ -92,6 +93,7 @@ opt_in_rules:
   - vertical_whitespace_opening_braces
   - weak_delegate
   - yoda_condition
+  - non_optional_string_data_conversion
 
 # Rule configuration
 analyzer_rules:
@@ -184,11 +186,6 @@ custom_rules:
     severity: warning
 
 
-  observable_usage:
-    name: "Observable Usage"
-    regex: 'ObservableObject'
-    message: "Consider using @Observable instead of ObservableObject for Swift 6"
-    severity: warning
 
 # Reporter type (xcode, json, csv, checkstyle, junit, html, emoji)
 reporter: "xcode"
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ install: ## Install dependencies (SwiftLint and SwiftFormat)
 
 .PHONY: lint
 lint: ## Run SwiftLint
-	swiftlint
+	swiftlint --strict
 
 .PHONY: lint-fix
 lint-fix: ## Run SwiftLint with auto-fix
@@ -40,7 +40,7 @@ fix: ## Fix all issues (lint auto-fix + format)
 
 .PHONY: build
 build: ## Build the package
-	swift build -Xswiftc -strict-concurrency=complete
+	swift build
 
 .PHONY: test
 test: ## Run tests
diff --git a/Package.swift b/Package.swift
@@ -24,18 +24,12 @@ let package = Package(
             name: "SwiftUIQuery",
             dependencies: [
                 .product(name: "Perception", package: "swift-perception")
-            ],
-            swiftSettings: [
-                .enableUpcomingFeature("StrictConcurrency")
             ]
         ),
         .testTarget(
             name: "SwiftUIQueryTests",
             dependencies: [
                 "SwiftUIQuery",
-            ],
-            swiftSettings: [
-                .enableUpcomingFeature("StrictConcurrency")
             ]
         ),
     ]
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # SwiftUI Query
 
-[![Tests](https://github.com/muzix/swiftui-query/actions/workflows/tests.yml/badge.svg)](https://github.com/muzix/swiftui-query/actions/workflows/tests.yml)
+[![Tests](https://github.com/muzix/SwiftUIQuery/actions/workflows/tests.yml/badge.svg)](https://github.com/muzix/SwiftUIQuery/actions/workflows/tests.yml)
 [![Swift 6.0](https://img.shields.io/badge/Swift-6.0-orange.svg)](https://swift.org)
 [![Platforms](https://img.shields.io/badge/Platforms-iOS%20|%20macOS%20|%20tvOS%20|%20watchOS-blue.svg)](https://swift.org)
 [![License](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
diff --git a/Sources/SwiftUIQuery/Core/GarbageCollector.swift b/Sources/SwiftUIQuery/Core/GarbageCollector.swift
@@ -49,9 +49,7 @@ public final class GarbageCollector {
 
         isRunning = true
 
-        #if DEBUG
-            print("🗑️ SwiftUI Query: Starting GarbageCollector with \(interval)s interval")
-        #endif
+        QueryLogger.shared.logGCStart(interval: interval)
 
         timer = Timer.scheduledTimer(withTimeInterval: interval, repeats: true) { [weak self] _ in
             Task { @MainActor [weak self] in
@@ -68,9 +66,7 @@ public final class GarbageCollector {
         timer?.invalidate()
         timer = nil
 
-        #if DEBUG
-            print("🗑️ SwiftUI Query: Stopping GarbageCollector")
-        #endif
+        QueryLogger.shared.logGCStop()
     }
 
     /// Register a query cache for garbage collection monitoring
@@ -132,22 +128,16 @@ public final class GarbageCollector {
             for query in inactiveQueries {
                 cache.remove(query)
                 removedQueries += 1
-
-                #if DEBUG
-                    print("🗑️ SwiftUI Query: GC removed inactive query \(query.queryHash)")
-                #endif
+                QueryLogger.shared.logGCRemoving(hash: query.queryHash, reason: "inactive query")
             }
         }
 
         let duration = Date().timeIntervalSince(startTime)
 
-        #if DEBUG
-            if removedQueries > 0 {
-                print(
-                    "🗑️ SwiftUI Query: GC completed - removed \(removedQueries)/\(totalQueries) queries in \(String(format: "%.2f", duration * 1000))ms"
-                )
-            }
-        #endif
+        if removedQueries > 0 {
+            let reason = "removed \(removedQueries)/\(totalQueries) queries in \(String(format: "%.2f", duration * 1000))ms"
+            QueryLogger.shared.logGCRemoving(hash: "GC-Complete", reason: reason)
+        }
     }
 
     /// Check if a query is eligible for garbage collection
diff --git a/Sources/SwiftUIQuery/InfiniteQuery.swift b/Sources/SwiftUIQuery/InfiniteQuery.swift
@@ -867,15 +867,11 @@ public final class InfiniteQuery<
     public func optionalRemove() {
         // Only remove if query has no observers and is eligible for GC
         guard observers.isEmpty, state.fetchStatus == .idle, isEligibleForGC else {
-            #if DEBUG
-                print("🗑️ SwiftUI Query: GC cancelled for \(queryHash) - Query is active or not eligible")
-            #endif
+            QueryLogger.shared.logGCCancelled(hash: queryHash)
             return
         }
 
-        #if DEBUG
-            print("🗑️ SwiftUI Query: Executing GC for \(queryHash)")
-        #endif
+        QueryLogger.shared.logGCExecuting(hash: queryHash)
 
         // Remove from cache (let cache handle the cleanup)
         cache?.remove(self)
diff --git a/Sources/SwiftUIQuery/Query.swift b/Sources/SwiftUIQuery/Query.swift
@@ -709,15 +709,11 @@ public final class Query<TData: Sendable, TKey: QueryKey>: AnyQuery {
     public func optionalRemove() {
         // Only remove if query has no observers and is eligible for GC
         guard observers.isEmpty, state.fetchStatus == .idle, isEligibleForGC else {
-            #if DEBUG
-                print("🗑️ SwiftUI Query: GC cancelled for \(queryHash) - Query is active or not eligible")
-            #endif
+            QueryLogger.shared.logGCCancelled(hash: queryHash)
             return
         }
 
-        #if DEBUG
-            print("🗑️ SwiftUI Query: Executing GC for \(queryHash)")
-        #endif
+        QueryLogger.shared.logGCExecuting(hash: queryHash)
 
         // Remove from cache (let cache handle the cleanup)
         cache?.remove(self)
diff --git a/Sources/SwiftUIQuery/QueryLogger.swift b/Sources/SwiftUIQuery/QueryLogger.swift
@@ -28,6 +28,9 @@ public final class QueryLogger {
     /// Enable/disable QueryObserver cache interaction logging
     public var logQueryObserver = true
 
+    /// Enable/disable GarbageCollector logging
+    public var logGarbageCollector = true
+
     private init() {}
 
     // MARK: - Logging Methods
@@ -115,6 +118,38 @@ public final class QueryLogger {
         guard isEnabled, logQueryObserver else { return }
         print("📊 QueryObserver reading query state for hash: \(hash)")
     }
+
+    // MARK: - Garbage Collector Logging
+
+    /// Log GarbageCollector starting
+    func logGCStart(interval: TimeInterval) {
+        guard isEnabled, logGarbageCollector else { return }
+        print("🗑️ SwiftUI Query: Starting GarbageCollector with \(interval)s interval")
+    }
+
+    /// Log GarbageCollector stopping
+    func logGCStop() {
+        guard isEnabled, logGarbageCollector else { return }
+        print("🗑️ SwiftUI Query: Stopping GarbageCollector")
+    }
+
+    /// Log GC cancelled for active query
+    func logGCCancelled(hash: String) {
+        guard isEnabled, logGarbageCollector else { return }
+        print("🗑️ SwiftUI Query: GC cancelled for \(hash) - Query is active or not eligible")
+    }
+
+    /// Log GC executing for query
+    func logGCExecuting(hash: String) {
+        guard isEnabled, logGarbageCollector else { return }
+        print("🗑️ SwiftUI Query: Executing GC for \(hash)")
+    }
+
+    /// Log GC removing query
+    func logGCRemoving(hash: String, reason: String) {
+        guard isEnabled, logGarbageCollector else { return }
+        print("🗑️ SwiftUI Query: GC removing \(hash) - \(reason)")
+    }
 }
 
 // MARK: - Public API Extensions
@@ -126,6 +161,7 @@ extension QueryLogger {
         logQueryClient = true
         logQuery = true
         logQueryObserver = true
+        logGarbageCollector = true
     }
 
     /// Disable all cache logging (convenience method)
@@ -157,3 +193,5 @@ extension QueryLogger {
         logQueryObserver = true
     }
 }
+
+// swiftlint:enable no_print_statements
diff --git a/Tests/SwiftUIQueryTests/KeyTupleTests.swift b/Tests/SwiftUIQueryTests/KeyTupleTests.swift
diff --git a/Tests/SwiftUIQueryTests/swiftui_queryTests.swift b/Tests/SwiftUIQueryTests/swiftui_queryTests.swift

Original file line number	Diff line number	Diff line change
`@@ -24,18 +24,12 @@ let package = Package(`
`24`	`24`	`name: "SwiftUIQuery",`
`25`	`25`	`dependencies: [`
`26`	`26`	`.product(name: "Perception", package: "swift-perception")`
`27`		`- ],`
`28`		`- swiftSettings: [`
`29`		`- .enableUpcomingFeature("StrictConcurrency")`
`30`	`27`	`]`
`31`	`28`	`),`
`32`	`29`	`.testTarget(`
`33`	`30`	`name: "SwiftUIQueryTests",`
`34`	`31`	`dependencies: [`
`35`	`32`	`"SwiftUIQuery",`
`36`		`- ],`
`37`		`- swiftSettings: [`
`38`		`- .enableUpcomingFeature("StrictConcurrency")`
`39`	`33`	`]`
`40`	`34`	`),`
`41`	`35`	`]`