Merge branch 'main' into supportMint

Author: BarredEwe

.github/workflows/swift.yml

@@ -20,13 +20,16 @@ jobs:
         include:
           - xcode: "Xcode_16.0"
             runsOn: macos-15
-          - xcode: "Xcode_16.2"
+          - xcode: "Xcode_26.0"
             runsOn: macos-15
     steps:
       - uses: actions/checkout@v4
+      
       - name: Select Xcode
         run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
+        
       - name: Build Prefire
         run: make build
+        
       - name: Run PrefireExecutable Tests
         run: make test

Binaries/PrefireBinary.artifactbundle/info.json

@@ -3,10 +3,10 @@
     "artifacts": {
         "PrefireBinary": {
             "type": "executable",
-            "version": "5.0.1",
+            "version": "5.1.0",
             "variants": [
                 {
-                    "path": "prefire-5.0.1-macos/bin/prefire",
+                    "path": "prefire-5.1.0-macos/bin/prefire",
                     "supportedTriples": ["x86_64-apple-macosx", "arm64-apple-macosx"]
                 },
             ]

…ctbundle/prefire-5.0.1-macos/bin/prefire …ctbundle/prefire-5.1.0-macos/bin/prefireBinaries/PrefireBinary.artifactbundle/prefire-5.0.1-macos/bin/prefire renamed to Binaries/PrefireBinary.artifactbundle/prefire-5.1.0-macos/bin/prefire Binaries/PrefireBinary.artifactbundle/prefire-5.0.1-macos/bin/prefire renamed to Binaries/PrefireBinary.artifactbundle/prefire-5.1.0-macos/bin/prefire

@@ -13,6 +13,7 @@ test_configuration:
   simulator_device: "iPhone15,2"
   required_os: 16
   preview_default_enabled: true
+  use_grouped_snapshots: true
   sources:
     - ${PROJECT_DIR}/Sources/
   snapshot_devices:
@@ -40,17 +41,18 @@ playbook_configuration:
 
 | Key                       | Description                                                                                                                                      |
 | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `target`                  | Target name used for snapshot generation.Default: *FirstTarget*                                                                                  |
-| `test_target_path`        | Path to unit test directory. Snapshots will be written to its `__Snapshots__` folder.Default: target name folder                                 |
-| `test_file_path`          | Output file path for generated tests.Default: DerivedData or resolved via plugin                                                                 |
-| `template_file_path`      | Custom template path relative to target. Optional.Defaults:‣ *PreviewTests.stencil* for test plugin‣ *PreviewModels.stencil* for playbook plugin |
-| `simulator_device`        | Device identifier used to run tests (e.g. `iPhone15,2`). Optional                                                                                |
-| `required_os`             | Minimal iOS version required for preview rendering. Optional                                                                                     |
-| `snapshot_devices`        | List of logical snapshot "targets" (used as trait collections).Each will snapshot separately. Optional                                           |
-| `preview_default_enabled` | Should all detected previews be included by default?Set `false` if you want to require `.prefireEnabled()` manually.Default: `true`              |
-| `sources`                 | List of Swift files or folders to scan for previews.Defaults to inferred from the target                                                         |
-| `imports`                 | Extra imports added to the generated test or playbook file                                                                                       |
-| `testable_imports`        | Extra `@testable` imports added to allow test visibility                                                                                         |
+| `target`                  | Target name used for snapshot generation. Default: *FirstTarget*                                                                                 |
+| `test_target_path`        | Path to unit test directory. Snapshots will be written to its `__Snapshots__` folder. Default: target name folder                                |
+| `test_file_path`          | Output file path for generated tests. Default: DerivedData or resolved via plugin                                                                |
+| `template_file_path`      | Custom template path relative to target. Optional. Defaults:‣ *PreviewTests.stencil* for test plugin‣ *PreviewModels.stencil* for playbook plugin|
+| `simulator_device`        | Device identifier used to run tests (e.g. `iPhone15,2`). Optional                                                                               |
+| `required_os`             | Minimal iOS version required for preview rendering. Optional                                                                                    |
+| `snapshot_devices`        | List of logical snapshot "targets" (used as trait collections). Each will snapshot separately. Optional                                         |
+| `preview_default_enabled` | Should all detected previews be included by default? Set `false` if you want to require `.prefireEnabled()` manually. Default: `true`           |
+| `use_grouped_snapshots`   | Generate a single test file with all previews (`true`) or separate test files per source file (`false`). When `false`, use `{PREVIEW_FILE_NAME}` placeholder in `test_file_path`. Default: `true` |
+| `sources`                 | List of Swift files or folders to scan for previews. Defaults to inferred from the target                                                        |
+| `imports`                 | Extra imports added to the generated test or playbook file                                                                                      |
+| `testable_imports`        | Extra `@testable` imports added to allow test visibility                                                                                        |
 
 ---
 
@@ -61,4 +63,4 @@ Prefire will use these settings when generating files either via:
 - CLI: `prefire tests`, `prefire playbook`
 - Plugin: attached to test or main targets in Xcode/SwiftPM
 
-To support different configurations per module, you may also use multiple `.prefire.yml` files — one per package, if needed.
+To support different configurations per module, you may also use multiple `.prefire.yml` files — one per package, if needed.

Configuration.md

@@ -8,6 +8,7 @@ test_configuration:
   - imports:
       - UIKit
       - Foundation
+  - use_grouped_snapshots: false
 
 playbook_configuration:
   - imports:

Example/.prefire.yml

@@ -3,4 +3,6 @@ import Prefire
 
 // MARK: - Generated Tests
 
-let tests = PreviewTests.self
+private let tests = _TestFile.self
+
+private struct _TestFile { }

Example/PrefireExampleTests/PrefireExampleTests.swift

@@ -1,9 +1,19 @@
 MAKEFLAGS += --silent
+
 FOLDER=$(shell cd Binaries/PrefireBinary.artifactbundle/; ls -d */|head -n 1)
 CUR_VERSION=$(shell echo $(FOLDER) | cut -d "-" -f 2)
 
+.PHONY: build binary test update archive
+
 build:
-	set -o pipefail && xcodebuild -scheme Prefire -destination 'generic/platform=iOS'
+	set -o pipefail && xcodebuild \
+		-scheme Prefire \
+		-sdk iphonesimulator \
+		-destination 'generic/platform=iOS Simulator' \
+		-configuration Release \
+		-skipMacroValidation \
+		-skipPackagePluginValidation \
+		build
 
 binary:
 	(cd PrefireExecutable; swift build -c release --arch arm64 --arch x86_64)

Makefile

@@ -14,7 +14,8 @@ public enum PrefireGenerator {
         arguments: [String: NSObject],
         inlineTemplate: String,
         defaultEnabled: Bool,
-        cacheDir: Path? = nil
+        cacheDir: Path? = nil,
+        useGroupedSnapshots: Bool
     ) async throws {
         startTime = Date()
 
@@ -34,6 +35,9 @@ public enum PrefireGenerator {
 
         let fileContents: [(Path, String)] = try swiftFiles.map { ($0, try $0.read(.utf8)) }
 
+        // If use grouped is false, we geneate one file per tests
+        // and use the template as output replacing the "{PREVIEW_FILE_NAME}" with the name of the file
+
         let manager = PrefireCacheManager(version: version, cacheBasePath: cacheDir)
         let (types, previews) = try await manager.loadOrGenerate(
             sources: fileContents.map { $0.0 },
@@ -71,18 +75,93 @@ public enum PrefireGenerator {
 
         let previewModels = previews
             .sorted { $0.key > $1.key }
-            .compactMap { RawPreviewModel(from: $0.value, filename: $0.key) }
-            .map { $0.makeStencilDict() }
-
-        var arguments = arguments
-        arguments["previewsMacrosDict"] = previewModels as NSArray
+            .compactMap { entry -> [String: Any?]? in
+                guard let model = RawPreviewModel(from: entry.value, filename: entry.key) else { return nil }
+                var dict = model.makeStencilDict()
+                // Add the source filename for ungrouped generation
+                dict["sourceFileName"] = extractFileNameFromKey(entry.key)
+                return dict
+            }
 
         let parserResult = FileParserResult(path: nil, module: nil, types: types.types, functions: [], typealiases: [])
-
-        try renderAndWrite(parserResult: parserResult, inlineTemplate: inlineTemplate, output: output, arguments: arguments)
+        
+        if useGroupedSnapshots {
+            // Generate one file with all previews
+            var arguments = arguments
+            arguments["previewsMacrosDict"] = previewModels as NSArray
+            
+            // For grouped snapshots, replace {PREVIEW_FILE_NAME} with "Preview" to maintain current class name
+            let customizedTemplate = inlineTemplate.replacingOccurrences(of: "{PREVIEW_FILE_NAME}", with: "Preview")
+            
+            try renderAndWrite(parserResult: parserResult, inlineTemplate: customizedTemplate, output: output, arguments: arguments)
+        } else {
+            // Generate one file per source file containing previews
+            try generateUngroupedFiles(
+                previewModels: previewModels,
+                parserResult: parserResult,
+                inlineTemplate: inlineTemplate,
+                output: output,
+                arguments: arguments
+            )
+        }
 
         Logger.info("✅ Generation completed in \(startTime.distance(to: Date()).formatted())")
     }
+    
+    private static func generateUngroupedFiles(
+        previewModels: [[String: Any?]],
+        parserResult: FileParserResult,
+        inlineTemplate: String,
+        output: Path,
+        arguments: [String: NSObject]
+    ) throws {
+        // Group preview models by their source file name
+        let groupedByFile = Dictionary(grouping: previewModels) { previewModel -> String in
+            return previewModel["sourceFileName"] as? String ?? "Unknown"
+        }
+        
+        Logger.info("📝 Generating \(groupedByFile.count) separate test files...")
+        
+        for (fileName, models) in groupedByFile {
+            guard fileName != "Unknown" else { continue }
+            
+            // Replace the placeholder in the output path
+            let outputPath = replacePreviewFileName(in: output, with: fileName)
+            
+            var fileArguments = arguments
+            fileArguments["previewsMacrosDict"] = models as NSArray
+            
+            // Replace the placeholder in the template as well
+            let customizedTemplate = inlineTemplate.replacingOccurrences(of: "{PREVIEW_FILE_NAME}", with: fileName)
+            
+            Logger.info("🖋 Rendering template for \(fileName)...")
+            try renderAndWrite(
+                parserResult: parserResult,
+                inlineTemplate: customizedTemplate,
+                output: outputPath,
+                arguments: fileArguments
+            )
+        }
+    }
+    
+    private static func extractFileNameFromKey(_ key: String) -> String {
+        // Key format is "FileName_index", extract just the file name part
+        let components = key.components(separatedBy: "_")
+        guard !components.isEmpty else { return key }
+        
+        // If the last component is a number, it's likely an index
+        if components.count > 1 && Int(components.last!) != nil {
+            return components.dropLast().joined(separator: "_")
+        }
+        
+        return key
+    }
+    
+    private static func replacePreviewFileName(in path: Path, with fileName: String) -> Path {
+        let pathString = path.string
+        let updatedPath = pathString.replacingOccurrences(of: "{PREVIEW_FILE_NAME}", with: fileName)
+        return Path(updatedPath)
+    }
 
     private static func renderAndWrite(
         parserResult: FileParserResult,

PrefireExecutable/Sources/PrefireCore/PrefireGenerator.swift

@@ -2,12 +2,12 @@ import Foundation
 
 struct RawPreviewModel {
     var displayName: String
-    var traits: String
+    var traits: [String]
     var body: String
     var properties: String?
 
     var isScreen: Bool {
-        traits == Constants.defaultTrait
+        traits.contains(Constants.defaultTrait)
     }
 }
 
@@ -44,11 +44,15 @@ extension RawPreviewModel {
         var previewTrait: String?
         if let range = firstLine.range(of: Markers.traits) {
             let substring = firstLine[range.upperBound...]
-            if let endIndex = substring.firstIndex(of: ")") {
+            let endIndex = Self.findTraitsEndIndex(in: substring)
+            if let endIndex = endIndex {
                 previewTrait = String(substring[..<endIndex])
             }
         }
-        self.traits = previewTrait ?? Constants.defaultTrait
+
+        // Traits can be functions like .myTraitt("one", 2), .device
+        // We can have both at the same time separated by comma
+        self.traits = Self.parseTraits(from: previewTrait)
 
         for (index, line) in lines.enumerated() {
             // Search for the line with `@Previewable` macro
@@ -64,6 +68,116 @@ extension RawPreviewModel {
 
         self.body = lines.joined(separator: "\n")
     }
+    
+    /// Parse traits from the raw trait string
+    /// Handles single traits, comma-separated traits, and function-style traits
+    private static func parseTraits(from rawTraits: String?) -> [String] {
+        guard let rawTraits = rawTraits?.trimmingCharacters(in: .whitespacesAndNewlines), 
+              !rawTraits.isEmpty else {
+            return [Constants.defaultTrait]
+        }
+        
+        // Pre-allocate array with estimated capacity for better performance
+        var traits: [String] = []
+        traits.reserveCapacity(4) // Most common case: 1-3 traits
+
+        let startIndex = rawTraits.startIndex
+        let endIndex = rawTraits.endIndex
+        var currentStart = startIndex
+        var currentIndex = startIndex
+        var parenthesesDepth = 0
+        var insideQuotes = false
+        var quoteChar: Character?
+        
+        while currentIndex < endIndex {
+            let char = rawTraits[currentIndex]
+            
+            switch char {
+            case "\"", "'":
+                if !insideQuotes {
+                    insideQuotes = true
+                    quoteChar = char
+                } else if char == quoteChar {
+                    insideQuotes = false
+                    quoteChar = nil
+                }
+            case "(":
+                if !insideQuotes {
+                    parenthesesDepth += 1
+                }
+            case ")":
+                if !insideQuotes {
+                    parenthesesDepth -= 1
+                }
+            case ",":
+                if !insideQuotes && parenthesesDepth == 0 {
+                    // This comma is a trait separator
+                    let traitSubstring = rawTraits[currentStart..<currentIndex]
+                    let trimmedTrait = traitSubstring.trimmingCharacters(in: .whitespacesAndNewlines)
+                    if !trimmedTrait.isEmpty {
+                        traits.append(String(trimmedTrait))
+                    }
+                    currentStart = rawTraits.index(after: currentIndex)
+                }
+            default:
+                break
+            }
+            
+            currentIndex = rawTraits.index(after: currentIndex)
+        }
+        
+        // Add the last trait
+        let lastTraitSubstring = rawTraits[currentStart..<endIndex]
+        let trimmedLastTrait = lastTraitSubstring.trimmingCharacters(in: .whitespacesAndNewlines)
+        if !trimmedLastTrait.isEmpty {
+            traits.append(String(trimmedLastTrait))
+        }
+        
+        return traits.isEmpty ? [Constants.defaultTrait] : traits
+    }
+    
+    /// Find the correct end index for traits, respecting parentheses balance
+    private static func findTraitsEndIndex(in substring: Substring) -> String.Index? {
+        var parenthesesDepth = 0
+        var insideQuotes = false
+        var quoteChar: Character?
+        var currentIndex = substring.startIndex
+        let endIndex = substring.endIndex
+        
+        while currentIndex < endIndex {
+            let char = substring[currentIndex]
+            
+            switch char {
+            case "\"", "'":
+                if !insideQuotes {
+                    insideQuotes = true
+                    quoteChar = char
+                } else if char == quoteChar {
+                    insideQuotes = false
+                    quoteChar = nil
+                }
+            case "(":
+                if !insideQuotes {
+                    parenthesesDepth += 1
+                }
+            case ")":
+                if !insideQuotes {
+                    if parenthesesDepth == 0 {
+                        // This is the closing parenthesis of the #Preview call
+                        return currentIndex
+                    }
+                    parenthesesDepth -= 1
+                }
+            default:
+                break
+            }
+            
+            currentIndex = substring.index(after: currentIndex)
+        }
+        
+        // If we didn't find a balanced closing parenthesis, return nil
+        return nil
+    }
 }
 
 extension RawPreviewModel {
@@ -79,7 +193,8 @@ extension RawPreviewModel {
             "componentTestName": componentTestName,
             "isScreen": isScreen,
             "body": body,
-            "properties": properties
+            "properties": properties,
+            "traits": traits
         ].filter({ $0.value != nil })
     }
 }