Merge pull request #55 from hhru/type-decoding

Исправлен декодинг типов токенов

Sources/FigmaGen/Commands/GenerateCommand.swift

@@ -18,6 +18,14 @@ final class GenerateCommand: AsyncExecutableCommand {
  """
  )
 
+ let verbose = Flag(
+ "--verbose",
+ description: """
+ Enable verbose logging for debuging.
+ By default is disabled.
+ """
+ )
+
  let generator: LibraryGenerator
 
  // MARK: - Initializers
@@ -29,6 +37,10 @@ final class GenerateCommand: AsyncExecutableCommand {
  // MARK: - Instance Methods
 
  func executeAsyncAndExit() throws {
+ if verbose.value {
+ setenv(Logger.verboseLogKey, "YES", 1)
+ }
+
  let configurationPath = self.configurationPath.value ?? .defaultConfigurationPath
 
  firstly {

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

@@ -15,7 +15,7 @@ final class DefaultColorTokensContextProvider: ColorTokensContextProvider {
  // MARK: - Instance Methods
 
  private func fallbackWarning(tokenName: String) {
- print("[⚠️] Night value for token '\(tokenName)' not found, using day value.")
+ logger.warning("Night value for token '\(tokenName)' not found, using day value.")
  }
 
  private func resolveNightValue(

Sources/FigmaGen/Logger/DefaultLoggerPrinter.swift

@@ -0,0 +1,10 @@
+import Foundation
+
+struct DefaultLoggerPrinter: LoggerPrinting {
+
+ // MARK: - LoggerPrinting
+
+ func print(_ message: String, terminator: String) {
+ Swift.print(message, terminator: terminator)
+ }
+}

Sources/FigmaGen/Logger/Logger.swift

@@ -0,0 +1,76 @@
+import Foundation
+
+struct Logger {
+
+ // MARK: - Type Properties
+
+ static let verboseLogKey = "VERBOSE_LOG"
+
+ // MARK: - Instance Properties
+
+ let isSilent: Bool
+ let printer: LoggerPrinting
+
+ var isVerbose: Bool {
+ ProcessInfo.processInfo.environment[Self.verboseLogKey] != nil
+ }
+
+ // MARK: - Initializers
+
+ init(isSilent: Bool = false, printer: LoggerPrinting = DefaultLoggerPrinter()) {
+ self.isSilent = isSilent
+ self.printer = printer
+ }
+
+ // MARK: - Instance Methods
+
+ private func print(_ message: String, terminator: String = "\n", isVerbose: Bool) {
+ guard !isSilent else {
+ return
+ }
+
+ guard !isVerbose || (isVerbose && self.isVerbose) else {
+ return
+ }
+
+ printer.print(message, terminator: terminator)
+ }
+
+ // MARK: -
+
+ func debug(_ items: Any..., separator: String = " ", terminator: String = "\n", isVerbose: Bool = true) {
+ let message = items.joinedDescription(separator: separator)
+ print(message, terminator: terminator, isVerbose: isVerbose)
+ }
+
+ func info(_ items: Any..., separator: String = " ", terminator: String = "\n", isVerbose: Bool = false) {
+ let message = items.joinedDescription(separator: separator)
+ print(message, terminator: terminator, isVerbose: isVerbose)
+ }
+
+ func warning(_ items: Any..., separator: String = " ", terminator: String = "\n", isVerbose: Bool = false) {
+ let message = "⚠️ WARNING: \(items.joinedDescription(separator: separator))".yellow
+ print(message, terminator: terminator, isVerbose: isVerbose)
+ }
+
+ func success(_ items: Any..., separator: String = " ", terminator: String = "\n", isVerbose: Bool = false) {
+ let message = "✅ \(items.joinedDescription(separator: separator))".green
+ print(message, terminator: terminator, isVerbose: isVerbose)
+ }
+
+ func error(_ items: Any..., separator: String = " ", terminator: String = "\n", isVerbose: Bool = false) {
+ let message = "🛑 ERROR: \(items.joinedDescription(separator: separator))".red
+ print(message, terminator: terminator, isVerbose: isVerbose)
+ }
+}
+
+// MARK: -
+
+extension Sequence {
+
+ // MARK: - Instance Methods
+
+ fileprivate func joinedDescription(separator: String) -> String {
+ map { "\($0)" }.joined(separator: separator)
+ }
+}

Sources/FigmaGen/Logger/LoggerPrinting.swift

@@ -0,0 +1,8 @@
+import Foundation
+
+protocol LoggerPrinting {
+
+ // MARK: - Instance Methods
+
+ func print(_ message: String, terminator: String)
+}

Sources/FigmaGen/Models/Token/TokenValue.swift

@@ -35,6 +35,7 @@ extension TokenValue: Decodable {
  case textCase
  case textDecoration
  case typography
+ case unknown
  }
 
  fileprivate enum CodingKeys: String, CodingKey {
@@ -51,7 +52,8 @@ extension TokenValue: Decodable {
 
  self.name = try container.decode(forKey: .name)
 
- let rawType = try container.decode(RawType.self, forKey: .type)
+ let rawTypeValue = try container.decode(String.self, forKey: .type)
+ let rawType = RawType(rawValue: rawTypeValue) ?? .unknown
 
  switch rawType {
  case .a11yScales:
@@ -113,6 +115,9 @@ extension TokenValue: Decodable {
 
  case .typography:
  self.type = .typography(value: try container.decode(forKey: .value))
+
+ case .unknown:
+ self.type = .unknown
  }
  }
 }
@@ -189,6 +194,9 @@ extension TokenValue: Encodable {
 
  case let .typography(value):
  try container.encode(value, forKey: .value)
+
+ case .unknown:
+ try container.encodeNil(forKey: .value)
  }
  }
 }

Sources/FigmaGen/Models/Token/TokenValueType.swift

@@ -24,6 +24,7 @@ enum TokenValueType: Hashable {
  case textCase(value: String)
  case textDecoration(value: String)
  case typography(value: TokenTypographyValue)
+ case unknown
 
  // MARK: - Instance Properties
 
@@ -48,7 +49,7 @@ enum TokenValueType: Hashable {
  let .textDecoration(value):
  return value
 
- case .animation, .boxShadow, .typography:
+ case .animation, .boxShadow, .typography, .unknown:
  return nil
  }
  }

Sources/FigmaGen/Providers/Tokens/DefaultTokensProvider.swift

@@ -36,6 +36,13 @@ final class DefaultTokensProvider: TokensProvider {
  throw TokensProviderError(code: .failedCreateData)
  }
 
+ let json = try? JSONSerialization.jsonObject(with: valuesData, options: .mutableContainers)
+ let jsonData = json.flatMap { try? JSONSerialization.data(withJSONObject: $0, options: .prettyPrinted) }
+
+ if let jsonData {
+ logger.debug(String(decoding: jsonData, as: UTF8.self))
+ }
+
  return try jsonDecoder.decode(TokenValues.self, from: valuesData)
  }
 

Sources/FigmaGen/main.swift

@@ -7,6 +7,7 @@ Path.current = Path(#file).appending("../../../Demo")
 #endif
 
 let version = "2.0.0-beta.11"
+let logger = Logger()
 
 let figmagen = CLI(
  name: "figmagen",