Squashed commit of the following:

commit aa59ef28ea56315eb421ba044ddaf0c4066bfff8 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Mon Nov 7 10:26:28 2022 +0100 Add trailing carrier at the end of generated extension files commit e985950aa1e39d81d4938e15f8724c0f7723b003 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Fri Nov 4 16:37:34 2022 +0100 Replace installation script by script that install completion file Setup a Makefile to install resgen commit d574384c151259610a4c2f837b14068bb7716e44 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Fri Nov 4 14:33:39 2022 +0100 Refactor Improve testability Add tests on SwiftUI generated code Add tests on command commit d9e76632c3037da0ed9e1dd37056685416579da9 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Thu Nov 3 15:43:47 2022 +0100 Fixing bad merge on FontOptions commit 76b5ebfcd1cde7a7d4c83f516a4fc937841e7715 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Thu Nov 3 15:37:28 2022 +0100 Squashed commit of the following: commit 085f1ffc33 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Thu Nov 3 15:00:27 2022 +0100 Refactor SwiftUI extension generation and generation SwiftUI extension for images commit 4f7d7e18b1 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Mon Oct 31 16:21:32 2022 +0100 Génération de composant SwiftUI: Color et Image commit 0797667b25 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Mon Oct 31 16:21:12 2022 +0100 Génération de composant SwiftUI: Color et Image commit 417a2630925841dd486ae1d684d28ab7dca240e0 Author: Thibaut Schmitt <t.schmitt@openium.fr> Date: Wed Oct 19 17:13:03 2022 +0200 Update Info.plist UIAppFonts key when generating fonts (if plist path if defined)
2022-11-07 10:32:17 +01:00
parent 6203700b0c
commit 41733d2680
75 changed files with 1487 additions and 933 deletions
--- a/Tests/ResgenSwiftTests/Fonts/FontExtensionGeneratorTests.swift
+++ b/Tests/ResgenSwiftTests/Fonts/FontExtensionGeneratorTests.swift
@ -13,7 +13,7 @@ import ToolCore

 final class FontExtensionGeneratorTests: XCTestCase {
    
-    func testGeneratedExtensionContent() {
+    func test_uiKit_GeneratedExtensionContent() {
        // Given
        let fontNames: [FontName] = [
            "CircularStd-Regular",
@ -23,7 +23,8 @@ final class FontExtensionGeneratorTests: XCTestCase {
        // When
        let extensionContent = FontExtensionGenerator.getExtensionContent(fontsNames: fontNames,
                                                                          staticVar: false,
-                                                                          extensionName: "GenFonts")
+                                                                          extensionName: "GenFonts",
+                                                                          isSwiftUI: false)
        
        // Expect
        let expect = """
@ -53,5 +54,47 @@ final class FontExtensionGeneratorTests: XCTestCase {
        
        XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
    }
+
    
+    func test_swiftUI_GeneratedExtensionContent() {
+        // Given
+        let fontNames: [FontName] = [
+            "CircularStd-Regular",
+            "CircularStd-Bold"
+        ]
+        
+        // When
+        let extensionContent = FontExtensionGenerator.getExtensionContent(fontsNames: fontNames,
+                                                                          staticVar: false,
+                                                                          extensionName: "GenFonts",
+                                                                          isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        // Generated by ResgenSwift.Fonts \(ResgenSwiftVersion)
+
+        import SwiftUI
+
+        extension GenFonts {
+        
+            enum FontName: String {
+                case CircularStdRegular = "CircularStd-Regular"
+                case CircularStdBold = "CircularStd-Bold"
+            }
+        
+            // MARK: - Getter
+        
+            func CircularStdRegular(withSize size: CGFloat) -> Font {
+                Font.custom(FontName.CircularStdRegular.rawValue, size: size)
+            }
+        
+            func CircularStdBold(withSize size: CGFloat) -> Font {
+                Font.custom(FontName.CircularStdBold.rawValue, size: size)
+            }
+        
+        }
+        """
+        
+        XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
+    }
 }
--- a/Tests/ResgenSwiftTests/Fonts/FontNameTests.swift
+++ b/Tests/ResgenSwiftTests/Fonts/FontNameTests.swift
@ -12,12 +12,12 @@ import XCTest

 final class FontNameTests: XCTestCase {
 
-    func testGeneratedProperty_noForbiddenCharacter() {
+    func test_uiKit_GeneratedProperty_noForbiddenCharacter() {
        // Given
        let fontName: FontName = "CircularStdBold"
        
        // When
-        let property = fontName.staticProperty
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: false)
        
        // Expect
        let expect = """
@ -29,12 +29,12 @@ final class FontNameTests: XCTestCase {
        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
    }
    
-    func testGeneratedProperty_withForbiddenCharacter() {
+    func test_uiKit_GeneratedProperty_withForbiddenCharacter() {
        // Given
        let fontName: FontName = "[Circular_Std+Bold-Underline]"
        
        // When
-        let property = fontName.staticProperty
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: false)
        
        // Expect
        let expect = """
@ -46,12 +46,12 @@ final class FontNameTests: XCTestCase {
        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
    }
    
-    func testGeneratedMethod_noForbiddenCharacter() {
+    func test_uiKit_GeneratedMethod_noForbiddenCharacter() {
        // Given
        let fontName: FontName = "CircularStdBold"
        
        // When
-        let property = fontName.method
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: false)
        
        // Expect
        let expect = """
@ -63,12 +63,12 @@ final class FontNameTests: XCTestCase {
        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
    }
    
-    func testGeneratedMethod_withForbiddenCharacter() {
+    func test_uiKit_GeneratedMethod_withForbiddenCharacter() {
        // Given
        let fontName: FontName = "[Circular_Std+Bold-Underline]"
        
        // When
-        let property = fontName.method
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: false)
        
        // Expect
        let expect = """
@ -79,5 +79,72 @@ final class FontNameTests: XCTestCase {
            
        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
    }
+ 
+    func test_swiftUI_GeneratedProperty_noForbiddenCharacter() {
+        // Given
+        let fontName: FontName = "CircularStdBold"
+        
+        // When
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+         static let CircularStdBold: ((_ size: CGFloat) -> Font) = { size in
+             Font.custom(FontName.CircularStdBold.rawValue, size: size)
+         }
+        """
+            
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
    
+    func test_swiftUI_GeneratedProperty_withForbiddenCharacter() {
+        // Given
+        let fontName: FontName = "[Circular_Std+Bold-Underline]"
+        
+        // When
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+         static let CircularStdBoldUnderline: ((_ size: CGFloat) -> Font) = { size in
+             Font.custom(FontName.CircularStdBoldUnderline.rawValue, size: size)
+         }
+        """
+            
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
+    func test_swiftUI_GeneratedMethod_noForbiddenCharacter() {
+        // Given
+        let fontName: FontName = "CircularStdBold"
+        
+        // When
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+         func CircularStdBold(withSize size: CGFloat) -> Font {
+             Font.custom(FontName.CircularStdBold.rawValue, size: size)
+         }
+        """
+            
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
+    
+    func test_swiftUI_GeneratedMethod_withForbiddenCharacter() {
+        // Given
+        let fontName: FontName = "[Circular_Std+Bold-Underline]"
+        
+        // When
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: true)
+        
+        // Expect
+        let expect = """
+        func CircularStdBoldUnderline(withSize size: CGFloat) -> Font {
+            Font.custom(FontName.CircularStdBoldUnderline.rawValue, size: size)
+        }
+        """
+            
+        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+    }
 }
--- a/Tests/ResgenSwiftTests/Fonts/FontPlistGeneratorTests.swift
+++ b/Tests/ResgenSwiftTests/Fonts/FontPlistGeneratorTests.swift
@ -19,7 +19,7 @@ final class FontPlistGeneratorTests: XCTestCase {
        ]
        
        // When
-        let plistContent = FontPlistGenerator.generatePlistUIAppsFontContent(for: fontNames)
+        let plistContent = FontPlistGenerator.generatePlistUIAppsFontContent(for: fontNames, infoPlistPaths: [String]())
        
        // Expect
        let expect = """