perf: Improve performance of build_style method

stephannv · Sep 29, 2024 · fe32ae3 · fe32ae3
1 parent 4185c5d
commit fe32ae3
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/phlex/variants.rb b/lib/phlex/variants.rb
@@ -27,14 +27,19 @@ def build_style(**variants)
 
       # @api private
       def build_variants_style(variants)
-        self::STYLE_DEFAULTS.merge(variants.compact).map do |variant, option|
-          value = self::STYLE_VARIANTS.dig(variant, option)
+        variants = variants.compact
+        variants = self::STYLE_DEFAULTS.merge(variants) unless self::STYLE_DEFAULTS.empty?
 
-          if value.nil?
-            raise VariantNotFoundError, "Variant `#{variant}: #{option.inspect}` doesn't exist"
+        variants.map do |variant, option|
+          options = self::STYLE_VARIANTS[variant]
+
+          if options
+            value = options[option]
+
+            next value if value
           end
 
-          value
+          raise VariantNotFoundError, "Variant `#{variant}: #{option.inspect}` doesn't exist"
         end
       end
     end