diff --git a/Sources/FigmaExport/Subcommands/ExportColors.swift b/Sources/FigmaExport/Subcommands/ExportColors.swift index 1f6f782..5277e5b 100644 --- a/Sources/FigmaExport/Subcommands/ExportColors.swift +++ b/Sources/FigmaExport/Subcommands/ExportColors.swift @@ -40,28 +40,28 @@ extension FigmaExportCommand { var nameValidateRegexp: String? var nameReplaceRegexp: String? - if let colorParams = commonParams?.colors { - let loader = ColorsLoader( + if let variableParams = commonParams?.variablesColors { + let loader = ColorsVariablesLoader( client: client, figmaParams: figmaParams, - colorParams: colorParams, + variableParams: variableParams, filter: filter ) colors = try loader.load() - - nameValidateRegexp = colorParams.nameValidateRegexp - nameReplaceRegexp = colorParams.nameReplaceRegexp - } else if let variableParams = commonParams?.variablesColors { - let loader = ColorsVariablesLoader( + + nameValidateRegexp = variableParams.nameValidateRegexp + nameReplaceRegexp = variableParams.nameReplaceRegexp + } else { + let loader = ColorsLoader( client: client, figmaParams: figmaParams, - variableParams: variableParams, + colorParams: commonParams?.colors, filter: filter ) colors = try loader.load() - nameValidateRegexp = variableParams.nameValidateRegexp - nameReplaceRegexp = variableParams.nameReplaceRegexp + nameValidateRegexp = commonParams?.colors?.nameValidateRegexp + nameReplaceRegexp = commonParams?.colors?.nameReplaceRegexp } guard let colors else {