@@ -40,28 +40,28 @@ extension FigmaExportCommand {
4040 var nameValidateRegexp : String ?
4141 var nameReplaceRegexp : String ?
4242
43- if let colorParams = commonParams? . colors {
44- let loader = ColorsLoader (
43+ if let variableParams = commonParams? . variablesColors {
44+ let loader = ColorsVariablesLoader (
4545 client: client,
4646 figmaParams: figmaParams,
47- colorParams : colorParams ,
47+ variableParams : variableParams ,
4848 filter: filter
4949 )
5050 colors = try loader. load ( )
51-
52- nameValidateRegexp = colorParams . nameValidateRegexp
53- nameReplaceRegexp = colorParams . nameReplaceRegexp
54- } else if let variableParams = commonParams ? . variablesColors {
55- let loader = ColorsVariablesLoader (
51+
52+ nameValidateRegexp = variableParams . nameValidateRegexp
53+ nameReplaceRegexp = variableParams . nameReplaceRegexp
54+ } else {
55+ let loader = ColorsLoader (
5656 client: client,
5757 figmaParams: figmaParams,
58- variableParams : variableParams ,
58+ colorParams : commonParams ? . colors ,
5959 filter: filter
6060 )
6161 colors = try loader. load ( )
6262
63- nameValidateRegexp = variableParams . nameValidateRegexp
64- nameReplaceRegexp = variableParams . nameReplaceRegexp
63+ nameValidateRegexp = commonParams ? . colors ? . nameValidateRegexp
64+ nameReplaceRegexp = commonParams ? . colors ? . nameReplaceRegexp
6565 }
6666
6767 guard let colors else {
0 commit comments