Mob 35767 fix color generation

Sources/FigmaGen/Generators/Tokens/Generators/BaseColor/DefaultBaseColorTokensGenerator.swift

@@ -23,7 +23,7 @@ final class DefaultBaseColorTokensGenerator: BaseColorTokensGenerator {
 
         return BaseColorToken(
             path: token.name.components(separatedBy: "."),
-            value: try tokensResolver.resolveHexColorValue(value, tokenValues: tokenValues)
+            value: try tokensResolver.resolveHexColorValue(value, tokenValues: tokenValues, theme: .undefined)
         )
     }
 

Sources/FigmaGen/Generators/Tokens/Generators/FontFamily/DefaultFontFamilyTokensGenerator.swift

@@ -24,7 +24,7 @@ final class DefaultFontFamilyTokensGenerator: FontFamilyTokensGenerator {
 
             return FontFamilyToken(
                 path: tokenValue.name.components(separatedBy: "."),
-                value: try tokensResolver.resolveValue(value, tokenValues: tokenValues)
+                value: try tokensResolver.resolveValue(value, tokenValues: tokenValues, theme: .undefined)
             )
         }
     }
@@ -37,7 +37,7 @@ final class DefaultFontFamilyTokensGenerator: FontFamilyTokensGenerator {
 
             return FontWeightToken(
                 path: tokenValue.name.components(separatedBy: "."),
-                value: try tokensResolver.resolveValue(value, tokenValues: tokenValues)
+                value: try tokensResolver.resolveValue(value, tokenValues: tokenValues, theme: .undefined)
             )
         }
     }

Sources/FigmaGen/Generators/Tokens/Generators/Spacing/DefaultSpacingTokensGenerator.swift

@@ -23,7 +23,7 @@ final class DefaultSpacingTokensGenerator: SpacingTokensGenerator {
 
         return SpacingToken(
             path: token.name.components(separatedBy: "."),
-            value: try tokensResolver.resolveValue(value, tokenValues: tokenValues)
+            value: try tokensResolver.resolveValue(value, tokenValues: tokenValues, theme: .undefined)
         )
     }
 

Sources/FigmaGen/Generators/Tokens/Generators/Typography/DefaultTypographyTokensGenerator.swift

@@ -21,7 +21,11 @@ final class DefaultTypographyTokensGenerator: TypographyTokensGenerator {
         tokenValues: TokenValues
     ) throws -> TypographyToken.LineHeightToken {
         let lineHeightValue = value.lineHeight
-        let lineHeightResolvedValue = try tokensResolver.resolveValue(lineHeightValue, tokenValues: tokenValues)
+        let lineHeightResolvedValue = try tokensResolver.resolveValue(
+            lineHeightValue,
+            tokenValues: tokenValues,
+            theme: .undefined
+        )
 
         guard lineHeightResolvedValue.hasSuffix("%") else {
             return TypographyToken.LineHeightToken(
@@ -30,7 +34,9 @@ final class DefaultTypographyTokensGenerator: TypographyTokensGenerator {
             )
         }
 
-        let fontSize = Double(try tokensResolver.resolveValue(value.fontSize, tokenValues: tokenValues))
+        let fontSize = Double(
+            try tokensResolver.resolveValue(value.fontSize, tokenValues: tokenValues, theme: .undefined)
+        )
         let lineHeight = Double(lineHeightResolvedValue.dropLast()).map { $0 / 100.0 }
 
         guard let fontSize else {
@@ -59,12 +65,12 @@ final class DefaultTypographyTokensGenerator: TypographyTokensGenerator {
 
         let letterSpacing = Double(
             try tokensResolver
-                .resolveValue(letterSpacingValue, tokenValues: tokenValues)
+                .resolveValue(letterSpacingValue, tokenValues: tokenValues, theme: .undefined)
                 .removingFirst("%")
         ).map { $0 / 100.0 }
 
         let fontSize = Double(
-            try tokensResolver.resolveValue(value.fontSize, tokenValues: tokenValues)
+            try tokensResolver.resolveValue(value.fontSize, tokenValues: tokenValues, theme: .undefined)
         )
 
         guard let fontSize else {
@@ -86,7 +92,7 @@ final class DefaultTypographyTokensGenerator: TypographyTokensGenerator {
     private func makeContextToken(value: String, tokenValues: TokenValues) throws -> ContextToken {
         ContextToken(
             path: value.components(separatedBy: "."),
-            value: try tokensResolver.resolveValue(value, tokenValues: tokenValues)
+            value: try tokensResolver.resolveValue(value, tokenValues: tokenValues, theme: .undefined)
         )
     }
 

Sources/FigmaGen/Generators/Tokens/Providers/ColorTokensContext/DefaultColorTokensContextProvider.swift

@@ -33,7 +33,7 @@ final class DefaultColorTokensContextProvider: ColorTokensContextProvider {
             return fallbackValue
         }
 
-        return try tokensResolver.resolveHexColorValue(nightValue, tokenValues: tokenValues)
+        return try tokensResolver.resolveHexColorValue(nightValue, tokenValues: tokenValues, theme: .night)
     }
 
     private func resolveNightReference(
@@ -51,7 +51,34 @@ final class DefaultColorTokensContextProvider: ColorTokensContextProvider {
             return fallbackRefence
         }
 
-        return nightValue
+        return resolveReference(initialReferenceName: nightValue, themeColorTokenValues: tokenValues.night)
+    }
+
+    private func resolveReference(
+        initialReferenceName: String,
+        themeColorTokenValues: [TokenValue]
+    ) -> String {
+        if initialReferenceName.contains("color.base") {
+            return initialReferenceName
+        }
+
+        guard let replaceValue = themeColorTokenValues.first(where: { initialReferenceName.contains($0.name) })?
+            .type.stringValue else {
+            return initialReferenceName
+        }
+
+        let nsString = initialReferenceName as NSString
+        guard
+            let tokenRegex = try? NSRegularExpression(pattern: #"\{.*?\}"#),
+            let firstArgument = tokenRegex.firstMatch(
+                in: initialReferenceName,
+                range: NSRange(location: 0, length: initialReferenceName.count)
+            )
+        else {
+            return initialReferenceName
+        }
+
+        return nsString.replacingCharacters(in: firstArgument.range, with: replaceValue) as String
     }
 
     private func makeColorToken(
@@ -62,13 +89,14 @@ final class DefaultColorTokensContextProvider: ColorTokensContextProvider {
     ) throws -> ColorToken {
         let dayHexColorValue = try tokensResolver.resolveHexColorValue(
             dayValue,
-            tokenValues: tokenValues
+            tokenValues: tokenValues,
+            theme: .day
         )
 
         return ColorToken(
             dayTheme: ColorToken.Theme(
                 value: dayHexColorValue,
-                reference: dayValue
+                reference: resolveReference(initialReferenceName: dayValue, themeColorTokenValues: tokenValues.day)
             ),
             nightTheme: ColorToken.Theme(
                 value: try resolveNightValue(
@@ -131,7 +159,7 @@ final class DefaultColorTokensContextProvider: ColorTokensContextProvider {
 
             let path = token.name.components(separatedBy: ".")
 
-            guard path[0] != "gradient" else {
+            guard path[0] != "gradient" && !dayValue.contains("gradient") else {
                 return nil
             }
 

Sources/FigmaGen/Generators/Tokens/Resolver/DefaultTokensResolver.swift

@@ -32,7 +32,7 @@ final class DefaultTokensResolver: TokensResolver {
         return hexFloat / 255.0
     }
 
-    private func makeColor(hex: String, alpha: CGFloat) throws -> Color {
+    private func makeColor(hex: String, alpha: CGFloat, tokenName: String) throws -> Color {
         let hex = hex
             .replacingOccurrences(of: "#", with: "")
             .trimmingCharacters(in: .whitespacesAndNewlines)
@@ -60,18 +60,18 @@ final class DefaultTokensResolver: TokensResolver {
         }
     }
 
-    private func resolveColorValue(_ value: String, tokenValues: TokenValues) throws -> Color {
+    private func resolveColorValue(_ value: String, tokenValues: TokenValues, theme: Theme) throws -> Color {
         if value.hasPrefix("rgba") {
-            return try resolveRGBAColorValue(value, tokenValues: tokenValues)
+            return try resolveRGBAColorValue(value, tokenValues: tokenValues, theme: theme)
         }
 
-        return try makeColor(hex: value, alpha: 1.0)
+        return try makeColor(hex: value, alpha: 1.0, tokenName: value)
     }
 
     // MARK: - TokensResolver
 
-    func resolveValue(_ value: String, tokenValues: TokenValues) throws -> String {
-        let allTokens = tokenValues.all
+    func resolveValue(_ value: String, tokenValues: TokenValues, theme: Theme) throws -> String {
+        let themeTokens = tokenValues.getThemeTokenValues(theme: theme)
 
         let resolvedValue = try value.replacingOccurrences(matchingPattern: #"\{.*?\}"#) { referenceName in
             let referenceName = String(
@@ -80,22 +80,22 @@ final class DefaultTokensResolver: TokensResolver {
                     .dropLast()
             )
 
-            guard let token = allTokens.first(where: { $0.name == referenceName }) else {
+            guard let token = themeTokens.first(where: { $0.name == referenceName }) else {
                 throw TokensGeneratorError(code: .referenceNotFound(name: referenceName))
             }
 
             guard let value = token.type.stringValue else {
                 throw TokensGeneratorError(code: .unexpectedTokenValueType(name: referenceName))
             }
 
-            return try resolveValue(value, tokenValues: tokenValues)
+            return try resolveValue(value, tokenValues: tokenValues, theme: theme)
         }
 
         return evaluteValue(resolvedValue)
     }
 
-    func resolveRGBAColorValue(_ value: String, tokenValues: TokenValues) throws -> Color {
-        let components = try resolveValue(value, tokenValues: tokenValues)
+    func resolveRGBAColorValue(_ value: String, tokenValues: TokenValues, theme: Theme) throws -> Color {
+        let components = try resolveValue(value, tokenValues: tokenValues, theme: theme)
             .slice(from: "(", to: ")", includingBounds: false)?
             .components(separatedBy: ", ")
 
@@ -110,21 +110,20 @@ final class DefaultTokensResolver: TokensResolver {
             throw TokensGeneratorError(code: .invalidAlphaComponent(alpha: alphaPercent))
         }
 
-        return try makeColor(hex: hex, alpha: alpha / 100.0)
+        return try makeColor(hex: hex, alpha: alpha / 100.0, tokenName: value)
     }
 
-    func resolveHexColorValue(_ value: String, tokenValues: TokenValues) throws -> String {
-        let resolvedValue = try resolveValue(value, tokenValues: tokenValues)
+    func resolveHexColorValue(_ value: String, tokenValues: TokenValues, theme: Theme) throws -> String {
+        let resolvedValue = try resolveValue(value, tokenValues: tokenValues, theme: theme)
 
         if resolvedValue.hasPrefix("#") {
             return resolvedValue
         }
-
-        return try resolveColorValue(resolvedValue, tokenValues: tokenValues).hexString
+        return try resolveColorValue(resolvedValue, tokenValues: tokenValues, theme: theme).hexString
     }
 
-    func resolveLinearGradientValue(_ value: String, tokenValues: TokenValues) throws -> LinearGradient {
-        let value = try resolveValue(value, tokenValues: tokenValues)
+    func resolveLinearGradientValue(_ value: String, tokenValues: TokenValues, theme: Theme) throws -> LinearGradient {
+        let value = try resolveValue(value, tokenValues: tokenValues, theme: theme)
 
         guard let startFunctionIndex = value.firstIndex(of: "("), let endFunctionIndex = value.lastIndex(of: ")") else {
             throw TokensGeneratorError(code: .failedToExtractLinearGradientParams(linearGradient: value))
@@ -148,7 +147,7 @@ final class DefaultTokensResolver: TokensResolver {
 
                 let percentage = String(rawColorStop[separatorRange.upperBound...])
                 let rawColor = String(rawColorStop[...separatorRange.lowerBound])
-                let color = try resolveColorValue(rawColor, tokenValues: tokenValues)
+                let color = try resolveColorValue(rawColor, tokenValues: tokenValues, theme: theme)
 
                 return LinearGradient.LinearColorStop(color: color, percentage: percentage)
             }

Sources/FigmaGen/Generators/Tokens/Resolver/TokensResolver.swift

@@ -13,8 +13,9 @@ protocol TokensResolver {
     /// - Parameters:
     ///   - value: String value to resolve
     ///   - tokenValues: All token values
+    ///   - theme: Theme
     /// - Returns: Resolved value.
-    func resolveValue(_ value: String, tokenValues: TokenValues) throws -> String
+    func resolveValue(_ value: String, tokenValues: TokenValues, theme: Theme) throws -> String
 
     /// Resolving references and mathematical expressions in `value` using ``resolveValue(_:tokenValues:)``
     /// and convert `rgba()` to ``Color`` object
@@ -34,8 +35,9 @@ protocol TokensResolver {
     ///     )
     ///     ```
     ///   - tokenValues: All token values
+    ///   - theme: Theme
     /// - Returns: ``Color`` object with values resolved from `rgba()`
-    func resolveRGBAColorValue(_ value: String, tokenValues: TokenValues) throws -> Color
+    func resolveRGBAColorValue(_ value: String, tokenValues: TokenValues, theme: Theme) throws -> Color
 
     /// Resolving references and mathematical expressions in `value` using ``resolveValue(_:tokenValues:)``
     /// and convert `rgba()` to hex value
@@ -52,8 +54,9 @@ protocol TokensResolver {
     ///     ```
     ///     Or simple reference to another color: `{color.base.white}`
     ///   - tokenValues: All token values
+    ///   - theme: Theme
     /// - Returns: Hex value of the color
-    func resolveHexColorValue(_ value: String, tokenValues: TokenValues) throws -> String
+    func resolveHexColorValue(_ value: String, tokenValues: TokenValues, theme: Theme) throws -> String
 
     /// Resolving references and mathematical expressions in `value` using ``resolveValue(_:tokenValues:)``
     /// and convert `linear-gradient()` to ``LinearGradient`` object
@@ -73,6 +76,7 @@ protocol TokensResolver {
     ///     )
     ///     ```
     ///   - tokenValues: All token values
+    ///   - theme: Theme
     /// - Returns: ``LinearGradient`` object with values resolved from `linear-gradient()`
-    func resolveLinearGradientValue(_ value: String, tokenValues: TokenValues) throws -> LinearGradient
+    func resolveLinearGradientValue(_ value: String, tokenValues: TokenValues, theme: Theme) throws -> LinearGradient
 }

Sources/FigmaGen/Models/Token/Theme.swift

@@ -0,0 +1,7 @@
+import Foundation
+
+enum Theme: Codable {
+    case day
+    case night
+    case undefined
+}

Sources/FigmaGen/Models/Token/TokenValues.swift

@@ -13,7 +13,18 @@ struct TokenValues: Codable, Hashable {
 
     // MARK: - Instance Properties
 
-    var all: [TokenValue] {
-        [core, semantic, colors, typography, day, night].flatMap { $0 }
+    // Возвращает набор токенов для определенной темы.
+    // Для undefined возвращается полный набор токенов. Нужен для Spacer, Font и других независимых от темы параметров.
+    func getThemeTokenValues(theme: Theme) -> [TokenValue] {
+        switch theme {
+        case .day:
+            return [day, core, semantic, colors, typography].flatMap { $0 }
+
+        case .night:
+            return [night, core, semantic, colors, typography].flatMap { $0 }
+
+        case .undefined:
+            return [core, semantic, colors, typography, day, night].flatMap { $0 }
+        }
     }
 }