tailwind_merge 0.14.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f932b04e38ec154f34a89704e726add6cc04f1e3b574dc8abe6aba954133dc8
-  data.tar.gz: af5ef994eaeaf7f71c22394938cb53d5ea6f7d145400d302f24720103bbf2008
+  metadata.gz: 3334600a104bc6b8efbe365c3be28e32944468f9cb5b1255fdefd4d106dd9540
+  data.tar.gz: 2f8c9a9b989c3e808767516bff6b040ed0c3a092a5fc427aaacaae4904523bcc
 SHA512:
-  metadata.gz: a11810739f13d68934146eac75e27f777417d886c7da28782f22a5e221f9222a9033a6c13927d3a7bbc19bd7f24c776984dcd76ac1f5d9d4f17f434fa1ff112d
-  data.tar.gz: 01a2ca26ae565752c183e711972a1d77bdf4bacdb0672c3f1e38da62da1095d4e8e33f91cc253ce0413fa5e11d26b51b0691f2b99b29e1eb9de970386c669a87
+  metadata.gz: 7f8ad1a5e8dfc2386b81cf5f528e2b1b5ded8b9644dd942e777e3b356b0807d74397400c090b52aec68d54e93bc0bd8d672f9872795dd300b7e2b06b543701af
+  data.tar.gz: 33cc99d39060f7f2e6827d48f99bce9989df5771f0174eea1994133a25e05115855de5e4f138b763f7197801595c3ab8e13802291675786f782f7246429079dd

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [v0.16.0] - 25-01-2025
+## What's Changed
+* Fix and improve implementation by @w-masahiro-ct in https://github.com/gjtorikian/tailwind_merge/pull/50
+
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.15.0...v0.16.0
+# [v0.15.0] - 23-01-2025
+## What's Changed
+* Improve gemspec by @w-masahiro-ct in https://github.com/gjtorikian/tailwind_merge/pull/41
+* Refactoring README.md by @w-masahiro-ct in https://github.com/gjtorikian/tailwind_merge/pull/42
+* Fix homepage uri by @w-masahiro-ct in https://github.com/gjtorikian/tailwind_merge/pull/45
+* Refactoring constants by @w-masahiro-ct in https://github.com/gjtorikian/tailwind_merge/pull/43
+* Fix changelog uri by @w-masahiro-ct in https://github.com/gjtorikian/tailwind_merge/pull/46
+* Uninstall lru_cache and install sin_lru_redux by @w-masahiro-ct in https://github.com/gjtorikian/tailwind_merge/pull/48
+  - Adds `ignore_empty_cache` option for saving memory
+## New Contributors
+* @w-masahiro-ct made their first contribution in https://github.com/gjtorikian/tailwind_merge/pull/41
+
+**Full Changelog**: https://github.com/gjtorikian/tailwind_merge/compare/v0.14.0...v0.15.0
 # [v0.14.0] - 19-12-2024
 ## What's Changed
 * Prevent cache tampering by freezing cached value by @david-uhlig in https://github.com/gjtorikian/tailwind_merge/pull/39

data/README.md

@@ -20,7 +20,7 @@ To use it, pass in a single string:
 require "tailwind_merge"
 
 TailwindMerge::Merger.new.merge("px-2 py-1 bg-red hover:bg-dark-red p-3 bg-[#B91C1C]")
-# → 'hover:bg-dark-red p-3 bg-[#B91C1C]'
+# → "hover:bg-dark-red p-3 bg-[#B91C1C]"
 ```
 
 Or, an array of strings:
@@ -29,7 +29,7 @@ Or, an array of strings:
 require "tailwind_merge"
 
 TailwindMerge::Merger.new.merge(["px-2 py-1", "bg-red hover:bg-dark-red", "p-3 bg-[#B91C1C]"])
-# → 'hover:bg-dark-red p-3 bg-[#B91C1C]'
+# → "hover:bg-dark-red p-3 bg-[#B91C1C]"
 ```
 
 ## What's it for?
@@ -50,10 +50,8 @@ When the `ConfirmEmailComponent` is rendered, an input with the className `borde
 This is where `tailwind_merge` comes in:
 
 ```ruby
-
 @merger = TailwindMerge::Merger.new
-@merger.merge("border rounded px-2 py-1 p-5")
-# → "border rounded p-5"
+@merger.merge("border rounded px-2 py-1 p-5") # → "border rounded p-5"
 ```
 
 tailwind-merge overrides conflicting classes and keeps everything else untouched. In the case of the implementation of `ConfirmEmailComponent`, the input now only renders the classes `border rounded p-5`.
@@ -67,30 +65,30 @@ tailwind-merge overrides conflicting classes and keeps everything else untouched
 ### Last conflicting class wins
 
 ```ruby
-@merger.merge('p-5 p-2 p-4') # → 'p-4'
+@merger.merge("p-5 p-2 p-4") # → "p-4"
 ```
 
 ### Supports refinements
 
 ```ruby
-@merger.merge('p-3 px-5') # → 'p-3 px-5'
-@merger.merge('inset-x-4 right-4') # → 'inset-x-4 right-4'
+@merger.merge("p-3 px-5") # → "p-3 px-5"
+@merger.merge("inset-x-4 right-4") # → "inset-x-4 right-4"
 ```
 
 ### Resolves non-trivial conflicts
 
 ```ruby
-@merger.merge('inset-x-px -inset-1') # → '-inset-1'
-@merger.merge('bottom-auto inset-y-6') # → 'inset-y-6'
-@merger.merge('inline block') # → 'block'
+@merger.merge("inset-x-px -inset-1") # → "-inset-1"
+@merger.merge("bottom-auto inset-y-6") # → "inset-y-6"
+@merger.merge("inline block") # → "block"
 ```
 
 ### Supports modifiers and stacked modifiers
 
 ```ruby
-@merger.merge('p-2 hover:p-4') # → 'p-2 hover:p-4'
-@merger.merge('hover:p-2 hover:p-4') # → 'hover:p-4'
-@merger.merge('hover:focus:p-2 focus:hover:p-4') # → 'focus:hover:p-4'
+@merger.merge("p-2 hover:p-4") # → "p-2 hover:p-4"
+@merger.merge("hover:p-2 hover:p-4") # → "hover:p-4"
+@merger.merge("hover:focus:p-2 focus:hover:p-4") # → "focus:hover:p-4"
 ```
 
 The order of standard modifiers does not matter for tailwind-merge.
@@ -98,8 +96,8 @@ The order of standard modifiers does not matter for tailwind-merge.
 ### Supports arbitrary values
 
 ```ruby
-@merger.merge('bg-black bg-[color:var(--mystery-var)]') # → 'bg-[color:var(--mystery-var)]'
-@merger.merge('grid-cols-[1fr,auto] grid-cols-2') # → 'grid-cols-2'
+@merger.merge("bg-black bg-[color:var(--mystery-var)]") # → "bg-[color:var(--mystery-var)]"
+@merger.merge("grid-cols-[1fr,auto] grid-cols-2") # → "grid-cols-2"
 ```
 
 > **Warning**
@@ -112,11 +110,11 @@ The order of standard modifiers does not matter for tailwind-merge.
 ### Supports arbitrary properties
 
 ```ruby
-@merger.merge('[mask-type:luminance] [mask-type:alpha]') # → '[mask-type:alpha]'
-@merger.merge('[--scroll-offset:56px] lg:[--scroll-offset:44px]') # → '[--scroll-offset:56px] lg:[--scroll-offset:44px]'
+@merger.merge("[mask-type:luminance] [mask-type:alpha]") # → "[mask-type:alpha]"
+@merger.merge("[--scroll-offset:56px] lg:[--scroll-offset:44px]") # → "[--scroll-offset:56px] lg:[--scroll-offset:44px]"
 
 #Don't actually do this!
-@merger.merge('[padding:1rem] p-8') # → '[padding:1rem] p-8'
+@merger.merge("[padding:1rem] p-8") # → "[padding:1rem] p-8"
 ```
 
 > **Warning** > `tailwind_merge` does not resolve conflicts between arbitrary properties and their matching Tailwind classes to keep the bundle size small.
@@ -124,11 +122,11 @@ The order of standard modifiers does not matter for tailwind-merge.
 ### Supports arbitrary variants
 
 ```ruby
-@merger.merge('[&:nth-child(3)]:py-0 [&:nth-child(3)]:py-4') # → '[&:nth-child(3)]:py-4'
-@merger.merge('dark:hover:[&:nth-child(3)]:py-0 hover:dark:[&:nth-child(3)]:py-4') # → 'hover:dark:[&:nth-child(3)]:py-4'
+@merger.merge("[&:nth-child(3)]:py-0 [&:nth-child(3)]:py-4") # → "[&:nth-child(3)]:py-4"
+@merger.merge("dark:hover:[&:nth-child(3)]:py-0 hover:dark:[&:nth-child(3)]:py-4") # → "hover:dark:[&:nth-child(3)]:py-4"
 
 # Don't actually do this!
-@merger.merge('[&:focus]:ring focus:ring-4') # → '[&:focus]:ring focus:ring-4'
+@merger.merge("[&:focus]:ring focus:ring-4") # → "[&:focus]:ring focus:ring-4"
 ```
 
 > **Warning**
@@ -138,26 +136,26 @@ The order of standard modifiers does not matter for tailwind-merge.
 ### Supports important modifier
 
 ```ruby
-@merger.merge('!p-3 !p-4 p-5') # → '!p-4 p-5'
-@merger.merge('!right-2 !-inset-x-1') # → '!-inset-x-1'
+@merger.merge("!p-3 !p-4 p-5") # → "!p-4 p-5"
+@merger.merge("!right-2 !-inset-x-1") # → "!-inset-x-1"
 ```
 
 ## Supports postfix modifiers
 
 ```ts
-twMerge("text-sm leading-6 text-lg/7"); // → 'text-lg/7'
+twMerge("text-sm leading-6 text-lg/7"); // → "text-lg/7"
 ```
 
 ### Preserves non-Tailwind classes
 
 ```ruby
-@merger.merge('p-5 p-2 my-non-tailwind-class p-4') # → 'my-non-tailwind-class p-4'
+@merger.merge("p-5 p-2 my-non-tailwind-class p-4") # → "my-non-tailwind-class p-4"
 ```
 
 ### Supports custom colors out of the box
 
 ```ruby
-@merger.merge('text-red text-secret-sauce') # → 'text-secret-sauce'
+@merger.merge("text-red text-secret-sauce") # → "text-secret-sauce"
 ```
 
 ## Basic usage
@@ -189,22 +187,24 @@ The `tailwind_merge` config is an object with several keys:
 
 ```ruby
 tailwind_merge_config = {
-    # ↓ *Optional* Define how many values should be stored in cache.
-    cache_size: 500,
-    # ↓ *Optional* modifier separator from Tailwind config
-    separator: ':',
-    # ↓ *Optional* prefix from Tailwind config
-    prefix: 'tw-',
-    theme: {
-        # Theme scales are defined here
-        # This is not the theme object from your Tailwind config
-    },
-    class_groups: {
-        # Class groups are defined here
-    },
-    conflicting_class_groups: {
-        # Conflicts between class groups are defined here
-    },
+  # ↓ *Optional* Define how many values should be stored in cache.
+  cache_size: 500,
+  # ↓ *Optional* Enable or disable caching nil values.
+  ignore_empty_cache: true,
+  # ↓ *Optional* modifier separator from Tailwind config
+  separator: ":",
+  # ↓ *Optional* prefix from Tailwind config
+  prefix: "tw-",
+  theme: {
+    # Theme scales are defined here
+    # This is not the theme object from your Tailwind config
+  },
+  class_groups: {
+    # Class groups are defined here
+  },
+  conflicting_class_groups: {
+    # Conflicts between class groups are defined here
+  }
 }
 ```
 
@@ -219,13 +219,13 @@ To use the custom configuration, pass it to the `TailwindMerge::Merger` initiali
 The library uses a concept of _class groups_ which is an array of Tailwind classes which all modify the same CSS property. For example, here is the position class group:
 
 ```ruby
-position_class_group = ['static', 'fixed', 'absolute', 'relative', 'sticky']
+position_class_group = ["static", "fixed", "absolute", "relative", "sticky"]
 ```
 
 `tailwind_merge` resolves conflicts between classes in a class group and only keeps the last one passed to the merge function call:
 
 ```ruby
-@merger.merge('static sticky relative') # → 'relative'
+@merger.merge("static sticky relative") # → "relative"
 ```
 
 Tailwind classes often share the beginning of the class name, so elements in a class group can also be an object with values of the same shape as a class group (the shape is recursive). In the object, each key is joined with all the elements in the corresponding array with a dash (`-`) in between.
@@ -233,7 +233,7 @@ Tailwind classes often share the beginning of the class name, so elements in a c
 For example, here is the overflow class group which results in the classes `overflow-auto`, `overflow-hidden`, `overflow-visible` and `overflow-scroll`.
 
 ```ruby
-overflow_class_group = [{ overflow: ['auto', 'hidden', 'visible', 'scroll'] }]
+overflow_class_group = [{ overflow: ["auto", "hidden", "visible", "scroll"] }]
 ```
 
 Sometimes it isn't possible to enumerate every element in a class group. Think of a Tailwind class which allows arbitrary values. In this scenario you can use a validator function which takes a _class part_ and returns a boolean indicating whether a class is part of a class group.
@@ -242,16 +242,16 @@ For example, here is the fill class group:
 
 ```ruby
 is_arbitrary_value = (class_part: string) => /^\[.+\]$/.test(class_part)
-fill_class_group = [{ fill: ['current', IS_ARBITRARY_VALUE] }]
+fill_class_group = [{ fill: ["current", IS_ARBITRARY_VALUE] }]
 ```
 
 Because the function is under the `fill` key, it will only get called for classes which start with `fill-`. Also, the function only gets passed the part of the class name which comes after `fill-`, this way you can use the same function in multiple class groups. `tailwind_merge` provides its own [validators](#validators), so you don't need to recreate them.
 
-You can use an empty string (`''`) as a class part if you want to indicate that the preceding part was the end. This is useful for defining elements which are marked as `DEFAULT` in the Tailwind config.
+You can use an empty string (`""`) as a class part if you want to indicate that the preceding part was the end. This is useful for defining elements which are marked as `DEFAULT` in the Tailwind config.
 
 ```ruby
 # ↓ Resolves to filter and filter-none
-filter_class_group = [{ filter: ['', 'none'] }]
+filter_class_group = [{ filter: ["", "none"] }]
 ```
 
 Each class group is defined under its ID in the `class_groups` object in the config. This ID is only used internally, and the only thing that matters is that it is unique among all class groups.
@@ -271,9 +271,7 @@ To summarize, `px-3` should stand in conflict with `pr-4`, but `pr-4` should not
 This is what the `conflicting_class_groups` object in the config is for. You define a key in it which is the ID of a class group which _creates_ a conflict and the value is an array of IDs of class group which _receive_ a conflict.
 
 ```ruby
-conflicting_class_groups = {
-    px: ['pr', 'pl'],
-}
+conflicting_class_groups = { px: ["pr", "pl"] }
 ```
 
 If a class group _creates_ a conflict, it means that if it appears in a class list string passed to `merge`, all preceding class groups in the string which _receive_ the conflict will be removed.
@@ -314,10 +312,10 @@ If you modified one of these theme scales in your Tailwind config, you can add a
 
 ```ruby
 merger = TailwindMerge::Merger.new(config: {
-    theme: {
+  theme: {
     "spacing" => ["my-space"],
-    "margin" => ["my-margin"],
-    },
+    "margin" => ["my-margin"]
+  }
 })
 ```
 

data/lib/tailwind_merge/class_utils.rb

@@ -16,7 +16,7 @@ module TailwindMerge
     def class_group_id(class_name)
       class_parts = class_name.split(CLASS_PART_SEPARATOR)
 
-      # Classes like `-inset-1` produce an empty string as first classPart.
+      # Classes like `-inset-1` produce an empty string as first class_part.
       # Assume that classes for negative values are used correctly and remove it from class_parts.
       class_parts.shift if class_parts.first == "" && class_parts.length != 1
 
@@ -30,9 +30,10 @@ module TailwindMerge
 
       next_class_part_object = class_part_object[:next_part][current_class_part]
 
-      class_group_from_next_class_part = next_class_part_object ? get_group_recursive(class_parts[1..-1], next_class_part_object) : nil
-
-      return class_group_from_next_class_part if class_group_from_next_class_part
+      if next_class_part_object
+        class_group_from_next_class_part = get_group_recursive(class_parts.drop(1), next_class_part_object)
+        return class_group_from_next_class_part if class_group_from_next_class_part
+      end
 
       return if class_part_object[:validators].empty?
 
@@ -40,29 +41,23 @@ module TailwindMerge
 
       result = class_part_object[:validators].find do |v|
         validator = v[:validator]
-
-        if from_theme?(validator)
-          validator.call(@config)
-        else
-          validator.call(class_rest)
-        end
+        from_theme?(validator) ? validator.call(@config) : validator.call(class_rest)
       end
 
-      result.nil? ? result : result[:class_group_id]
+      result&.fetch(:class_group_id, nil)
     end
 
     def get_conflicting_class_group_ids(class_group_id, has_postfix_modifier)
       conflicts = @config[:conflicting_class_groups][class_group_id] || []
 
       if has_postfix_modifier && @config[:conflicting_class_group_modifiers][class_group_id]
-        return [...conflicts, ...@config[:conflicting_class_group_modifiers][class_group_id]]
+        return [*conflicts, *@config[:conflicting_class_group_modifiers][class_group_id]]
       end
 
       conflicts
     end
 
     private def create_class_map(config)
-      theme = config[:theme]
       prefix = config[:prefix]
       class_map = {
         next_part: {},
@@ -70,12 +65,12 @@ module TailwindMerge
       }
 
       prefixed_class_group_entries = get_prefixed_class_group_entries(
-        config[:class_groups].map { |cg| [cg[0], cg[1]] },
+        config[:class_groups].map { |group_id, group_classes| [group_id, group_classes] },
         prefix,
       )
 
-      prefixed_class_group_entries.each do |(class_group_id, class_group)|
-        process_classes_recursively(class_group, class_map, class_group_id, theme)
+      prefixed_class_group_entries.each do |class_group_id, class_group|
+        process_classes_recursively(class_group, class_map, class_group_id)
       end
 
       class_map
@@ -84,53 +79,43 @@ module TailwindMerge
     private def get_prefixed_class_group_entries(class_group_entries, prefix)
       return class_group_entries if prefix.nil?
 
-      class_group_entries.map do |(class_group_id, class_group)|
+      class_group_entries.map do |class_group_id, class_group|
         prefixed_class_group = class_group.map do |class_definition|
-          next("#{prefix}#{class_definition}") if class_definition.is_a?(String)
-
-          next(class_definition.transform_keys { |key| "#{prefix}#{key}" }) if class_definition.is_a?(Hash)
-
-          class_definition
+          if class_definition.is_a?(String)
+            "#{prefix}#{class_definition}"
+          elsif class_definition.is_a?(Hash)
+            class_definition.transform_keys { |key| "#{prefix}#{key}" }
+          else
+            class_definition
+          end
         end
 
         [class_group_id, prefixed_class_group]
       end
     end
 
-    private def process_classes_recursively(class_group, class_part_object, class_group_id, theme)
+    private def process_classes_recursively(class_group, class_part_object, class_group_id)
       class_group.each do |class_definition|
         if class_definition.is_a?(String)
           class_part_object_to_edit = class_definition.empty? ? class_part_object : get_class_part(class_part_object, class_definition)
           class_part_object_to_edit[:class_group_id] = class_group_id
-          next
-        end
-
-        if class_definition.is_a?(Proc)
+        elsif class_definition.is_a?(Proc)
           if from_theme?(class_definition)
+            process_classes_recursively(class_definition.call(@config), class_part_object, class_group_id)
+          else
+            class_part_object[:validators] << {
+              validator: class_definition,
+              class_group_id: class_group_id,
+            }
+          end
+        else
+          class_definition.each do |key, nested_class_group|
             process_classes_recursively(
-              class_definition.call(@config),
-              class_part_object,
+              nested_class_group,
+              get_class_part(class_part_object, key),
               class_group_id,
-              theme,
             )
-            next
           end
-
-          class_part_object[:validators].push({
-            validator: class_definition,
-            class_group_id: class_group_id,
-          })
-
-          next
-        end
-
-        class_definition.each do |(key, class_group)|
-          process_classes_recursively(
-            class_group,
-            get_class_part(class_part_object, key),
-            class_group_id,
-            theme,
-          )
         end
       end
     end
@@ -153,16 +138,13 @@ module TailwindMerge
     end
 
     private def get_group_id_for_arbitrary_property(class_name)
-      if ARBITRARY_PROPERTY_REGEX.match?(class_name)
-        match = ARBITRARY_PROPERTY_REGEX.match(class_name) || ""
-        arbitrary_property_class_name = match[1] || ""
-        property = arbitrary_property_class_name[0...arbitrary_property_class_name.index(":")]
-
-        if !property.nil? && !property.empty?
-          # uses two dots here because one dot is used as prefix for class groups in plugins
-          "arbitrary..#{property}"
-        end
-      end
+      match = ARBITRARY_PROPERTY_REGEX.match(class_name)
+      return unless match
+
+      property = match[1].to_s.split(":", 2).first
+
+      # Use two dots here because one dot is used as prefix for class groups in plugins
+      "arbitrary..#{property}" if property && !property.empty?
     end
 
     private def from_theme?(validator)

data/lib/tailwind_merge/config.rb

@@ -1,66 +1,43 @@
 # frozen_string_literal: true
 
+require "set"
+
 module TailwindMerge
   module Config
     include Validators
 
-    FROM_THEME = ->(config, key) {
-      config[:theme].fetch(key, nil)
-    }
-
-    COLORS = ->(config) { FROM_THEME.call(config, "colors") }
-    SPACING = ->(config) { FROM_THEME.call(config, "spacing") }
-    BLUR = ->(config) { FROM_THEME.call(config, "blur") }
-    BRIGHTNESS = ->(config) { FROM_THEME.call(config, "brightness") }
-    BORDER_COLOR = ->(config) { FROM_THEME.call(config, "border-color") }
-    BORDER_RADIUS = ->(config) { FROM_THEME.call(config, "border-radius") }
-    BORDER_SPACING = ->(config) { FROM_THEME.call(config, "border-spacing") }
-    BORDER_WIDTH = ->(config) { FROM_THEME.call(config, "border-width") }
-    CONTRAST = ->(config) { FROM_THEME.call(config, "contrast") }
-    GRAYSCALE = ->(config) { FROM_THEME.call(config, "grayscale") }
-    HUE_ROTATE = ->(config) { FROM_THEME.call(config, "hue-rotate") }
-    INVERT = ->(config) { FROM_THEME.call(config, "invert") }
-    GAP = ->(config) { FROM_THEME.call(config, "gap") }
-    GRADIENT_COLOR_STOPS = ->(config) { FROM_THEME.call(config, "gradient-color-stops") }
-    GRADIENT_COLOR_STOP_POSITIONS = ->(config) { FROM_THEME.call(config, "gradient-color-stop-positions") }
-    INSET = ->(config) { FROM_THEME.call(config, "inset") }
-    MARGIN = ->(config) { FROM_THEME.call(config, "margin") }
-    OPACITY = ->(config) { FROM_THEME.call(config, "opacity") }
-    PADDING = ->(config) { FROM_THEME.call(config, "padding") }
-    SATURATE = ->(config) { FROM_THEME.call(config, "saturate") }
-    SCALE = ->(config) { FROM_THEME.call(config, "scale") }
-    SEPIA = ->(config) { FROM_THEME.call(config, "sepia") }
-    SKEW = ->(config) { FROM_THEME.call(config, "skew") }
-    SPACE = ->(config) { FROM_THEME.call(config, "space") }
-    TRANSLATE = ->(config) { FROM_THEME.call(config, "translate") }
+    THEME_KEYS = [
+      "colors",
+      "spacing",
+      "blur",
+      "brightness",
+      "border-color",
+      "border-radius",
+      "border-spacing",
+      "border-width",
+      "contrast",
+      "grayscale",
+      "hue-rotate",
+      "invert",
+      "gap",
+      "gradient-color-stops",
+      "gradient-color-stop-positions",
+      "inset",
+      "margin",
+      "opacity",
+      "padding",
+      "saturate",
+      "scale",
+      "sepia",
+      "skew",
+      "space",
+      "translate",
+    ].freeze
+    THEME_KEYS.each do |key|
+      const_set(key.upcase.tr("-", "_"), ->(config) { config[:theme].fetch(key, nil) })
+    end
 
-    VALID_THEME_IDS = Set.new([
-      COLORS.object_id,
-      SPACING.object_id,
-      BLUR.object_id,
-      BRIGHTNESS.object_id,
-      BORDER_COLOR.object_id,
-      BORDER_RADIUS.object_id,
-      BORDER_SPACING.object_id,
-      BORDER_WIDTH.object_id,
-      CONTRAST.object_id,
-      GRAYSCALE.object_id,
-      HUE_ROTATE.object_id,
-      INVERT.object_id,
-      GAP.object_id,
-      GRADIENT_COLOR_STOPS.object_id,
-      GRADIENT_COLOR_STOP_POSITIONS.object_id,
-      INSET.object_id,
-      MARGIN.object_id,
-      OPACITY.object_id,
-      PADDING.object_id,
-      SATURATE.object_id,
-      SCALE.object_id,
-      SEPIA.object_id,
-      SKEW.object_id,
-      SPACE.object_id,
-      TRANSLATE.object_id,
-    ]).freeze
+    VALID_THEME_IDS = Set.new(THEME_KEYS.map { |theme_key| const_get(theme_key.upcase.tr("-", "_")).object_id }).freeze
 
     OVERSCROLL = -> { ["auto", "contain", "none"] }
     OVERFLOW = -> { ["auto", "hidden", "clip", "visible", "scroll"] }
@@ -109,6 +86,7 @@ module TailwindMerge
 
     DEFAULTS = {
       cache_size: 500,
+      ignore_empty_cache: true,
       separator: ":",
       theme: {
         "colors" => [IS_ANY],

data/lib/tailwind_merge/modifier_utils.rb

@@ -4,21 +4,20 @@ module TailwindMerge
   module ModifierUtils
     IMPORTANT_MODIFIER = "!"
 
-    def split_modifiers(class_name, separator: nil)
-      separator ||= ":"
+    def split_modifiers(class_name, separator: ":")
       separator_length = separator.length
-      seperator_is_single_char = separator_length == 1
-      first_seperator_char = separator[0]
+      separator_is_single_char = (separator_length == 1)
+      first_separator_char = separator[0]
 
       modifiers = []
       bracket_depth = 0
       modifier_start = 0
-      postfix_modifier_position = 0
+      postfix_modifier_position = nil
 
       class_name.each_char.with_index do |char, index|
         if bracket_depth.zero?
-          if char == first_seperator_char && (seperator_is_single_char || class_name[index..(index + separator_length - 1)] == separator)
-            modifiers << class_name[modifier_start..index]
+          if char == first_separator_char && (separator_is_single_char || class_name[index, separator_length] == separator)
+            modifiers << class_name[modifier_start...index]
             modifier_start = index + separator_length
             next
           elsif char == "/"
@@ -27,17 +26,17 @@ module TailwindMerge
           end
         end
 
-        if char == "["
-          bracket_depth += 1
-        elsif char == "]"
-          bracket_depth -= 1
-        end
+        bracket_depth += 1 if char == "["
+        bracket_depth -= 1 if char == "]"
       end
 
-      base_class_name_with_important_modifier = modifiers.empty? ? class_name : class_name[modifier_start..-1]
+      base_class_name_with_important_modifier = modifiers.empty? ? class_name : class_name[modifier_start..]
       has_important_modifier = base_class_name_with_important_modifier.start_with?(IMPORTANT_MODIFIER)
-      base_class_name = has_important_modifier ? base_class_name_with_important_modifier[1..-1] : base_class_name_with_important_modifier
-      maybe_postfix_modifier_position = postfix_modifier_position && postfix_modifier_position > modifier_start ? postfix_modifier_position - modifier_start : false
+      base_class_name = has_important_modifier ? base_class_name_with_important_modifier[1..] : base_class_name_with_important_modifier
+
+      maybe_postfix_modifier_position = if postfix_modifier_position && postfix_modifier_position > modifier_start
+        postfix_modifier_position - modifier_start
+      end
 
       [modifiers, has_important_modifier, base_class_name, maybe_postfix_modifier_position]
     end
@@ -46,25 +45,22 @@ module TailwindMerge
     # - Predefined modifiers are sorted alphabetically
     # - When an arbitrary variant appears, it must be preserved which modifiers are before and after it
     def sort_modifiers(modifiers)
-      if modifiers.length <= 1
-        return modifiers
-      end
+      return modifiers if modifiers.size <= 1
 
       sorted_modifiers = []
       unsorted_modifiers = []
 
       modifiers.each do |modifier|
-        is_arbitrary_variant = modifier[0] == "["
-
-        if is_arbitrary_variant
-          sorted_modifiers.push(unsorted_modifiers.sort, modifier)
-          unsorted_modifiers = []
+        if modifier.start_with?("[")
+          sorted_modifiers.concat(unsorted_modifiers.sort)
+          sorted_modifiers << modifier
+          unsorted_modifiers.clear
         else
-          unsorted_modifiers.push(modifier)
+          unsorted_modifiers << modifier
         end
       end
 
-      sorted_modifiers.push(...unsorted_modifiers.sort)
+      sorted_modifiers.concat(unsorted_modifiers.sort)
 
       sorted_modifiers
     end

data/lib/tailwind_merge/validators.rb

@@ -8,12 +8,10 @@ module TailwindMerge
       def arbitrary_value?(class_part, label, test_value)
         match = ARBITRARY_VALUE_REGEX.match(class_part)
         return false unless match
+        return test_value.call(match[2]) if match[1].nil?
+        return label == match[1] if label.is_a?(String)
 
-        unless match[1].nil?
-          return label.is_a?(Set) ? label.include?(match[1]) : label == match[1]
-        end
-
-        test_value.call(match[2])
+        label.include?(match[1])
       end
 
       def numeric?(x)

data/lib/tailwind_merge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TailwindMerge
-  VERSION = "0.14.0"
+  VERSION = "0.16.0"
 end

data/lib/tailwind_merge.rb

@@ -19,23 +19,21 @@ module TailwindMerge
     SPLIT_CLASSES_REGEX = /\s+/
 
     def initialize(config: {})
-      @config = if config.fetch(:theme, nil)
+      @config = if config.key?(:theme)
         merge_configs(config)
       else
         TailwindMerge::Config::DEFAULTS.merge(config)
       end
 
       @class_utils = TailwindMerge::ClassUtils.new(@config)
-      @cache = LruRedux::Cache.new(@config[:cache_size])
+      @cache = LruRedux::Cache.new(@config[:cache_size], @config[:ignore_empty_cache])
     end
 
     def merge(classes)
-      if classes.is_a?(Array)
-        classes = classes.compact.join(" ")
-      end
+      normalized = classes.is_a?(Array) ? classes.compact.join(" ") : classes.to_s
 
-      @cache.getset(classes) do
-        merge_class_list(classes).freeze
+      @cache.getset(normalized) do
+        merge_class_list(normalized).freeze
       end
     end
 
@@ -45,37 +43,38 @@ module TailwindMerge
       # @example 'float'
       # @example 'hover:focus:bg-color'
       # @example 'md:!pr'
-      class_groups_in_conflict = []
-      class_names = class_list.strip.split(SPLIT_CLASSES_REGEX)
-
-      result = ""
+      trimmed = class_list.strip
+      return "" if trimmed.empty?
 
-      i = class_names.length - 1
+      class_groups_in_conflict = Set.new
 
-      loop do
-        break if i < 0
+      merged_classes = []
 
-        original_class_name = class_names[i]
+      trimmed.split(SPLIT_CLASSES_REGEX).reverse_each do |original_class_name|
+        modifiers, has_important_modifier, base_class_name, maybe_postfix_modifier_position =
+          split_modifiers(original_class_name, separator: @config[:separator])
 
-        modifiers, has_important_modifier, base_class_name, maybe_postfix_modifier_position = split_modifiers(original_class_name, separator: @config[:separator])
+        actual_base_class_name = if maybe_postfix_modifier_position
+          base_class_name[0...maybe_postfix_modifier_position]
+        else
+          base_class_name
+        end
 
-        actual_base_class_name = maybe_postfix_modifier_position ? base_class_name[0...maybe_postfix_modifier_position] : base_class_name
+        has_postfix_modifier = maybe_postfix_modifier_position ? true : false
         class_group_id = @class_utils.class_group_id(actual_base_class_name)
 
         unless class_group_id
-          unless maybe_postfix_modifier_position
-            # not a Tailwind class
-            result = original_class_name + (!result.empty? ? " " + result : result)
-            i -= 1
+          unless has_postfix_modifier
+            # Not a Tailwind class
+            merged_classes << original_class_name
             next
           end
 
           class_group_id = @class_utils.class_group_id(base_class_name)
 
           unless class_group_id
-            # not a Tailwind class
-            result = original_class_name + (!result.empty? ? " " + result : result)
-            i -= 1
+            # Not a Tailwind class
+            merged_classes << original_class_name
             next
           end
 
@@ -87,25 +86,20 @@ module TailwindMerge
         modifier_id = has_important_modifier ? "#{variant_modifier}#{IMPORTANT_MODIFIER}" : variant_modifier
         class_id = "#{modifier_id}#{class_group_id}"
 
-        # Tailwind class omitted due to pre-existing conflict
-        if class_groups_in_conflict.include?(class_id)
-          i -= 1
-          next
-        end
+        # Tailwind class omitted due to conflict
+        next if class_groups_in_conflict.include?(class_id)
 
-        class_groups_in_conflict.push(class_id)
+        class_groups_in_conflict << class_id
 
-        @class_utils.get_conflicting_class_group_ids(class_group_id, has_postfix_modifier).each do |group|
-          class_groups_in_conflict.push("#{modifier_id}#{group}")
+        @class_utils.get_conflicting_class_group_ids(class_group_id, has_postfix_modifier).each do |conflicting_id|
+          class_groups_in_conflict << "#{modifier_id}#{conflicting_id}"
         end
 
-        # no conflict!
-        result = original_class_name + (!result.empty? ? " " + result : result)
-
-        i -= 1
+        # Tailwind class not in conflict
+        merged_classes << original_class_name
       end
 
-      result
+      merged_classes.reverse.join(" ")
     end
   end
 end

data/tailwind_merge.gemspec

@@ -5,21 +5,24 @@ require_relative "lib/tailwind_merge/version"
 Gem::Specification.new do |spec|
   spec.name = "tailwind_merge"
   spec.version = TailwindMerge::VERSION
+  spec.summary = "Utility function to efficiently merge Tailwind CSS classes without style conflicts."
   spec.authors = ["Garen J. Torikian"]
   spec.email = ["gjtorikian@gmail.com"]
-
-  spec.summary = "Utility function to efficiently merge Tailwind CSS classes without style conflicts."
-  spec.homepage = "https://www.github.com/gjtorikian/tailwind_merge"
   spec.license = "MIT"
 
-  spec.required_ruby_version = [">= 3.1", "< 4.0"]
-
+  github_root_uri = "https://github.com/gjtorikian/tailwind_merge"
+  spec.homepage = "#{github_root_uri}/tree/v#{spec.version}"
   spec.metadata = {
-    "funding_uri" => "https://github.com/sponsors/gjtorikian/",
+    "homepage_uri" => spec.homepage,
+    "source_code_uri" => spec.homepage,
+    "changelog_uri" => "#{github_root_uri}/blob/v#{spec.version}/CHANGELOG.md",
+    "bug_tracker_uri" => "#{github_root_uri}/issues",
+    "documentation_uri" => "https://rubydoc.info/gems/#{spec.name}/#{spec.version}",
+    "funding_uri" => "https://github.com/sponsors/gjtorikian",
     "rubygems_mfa_required" => "true",
   }
 
-  spec.metadata["homepage_uri"] = spec.homepage
+  spec.required_ruby_version = [">= 3.1", "< 4.0"]
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -32,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency("lru_redux", "~> 1.1")
+  spec.add_dependency("sin_lru_redux", "~> 2.5")
 
   spec.add_development_dependency("minitest", "~> 5.6")
   spec.add_development_dependency("minitest-focus", "~> 1.1")

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-19 00:00:00.000000000 Z
+date: 2025-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: lru_redux
+  name: sin_lru_redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.5'
   force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -74,13 +74,17 @@ files:
 - lib/tailwind_merge/validators.rb
 - lib/tailwind_merge/version.rb
 - tailwind_merge.gemspec
-homepage: https://www.github.com/gjtorikian/tailwind_merge
+homepage: https://github.com/gjtorikian/tailwind_merge/tree/v0.16.0
 licenses:
 - MIT
 metadata:
-  funding_uri: https://github.com/sponsors/gjtorikian/
+  homepage_uri: https://github.com/gjtorikian/tailwind_merge/tree/v0.16.0
+  source_code_uri: https://github.com/gjtorikian/tailwind_merge/tree/v0.16.0
+  changelog_uri: https://github.com/gjtorikian/tailwind_merge/blob/v0.16.0/CHANGELOG.md
+  bug_tracker_uri: https://github.com/gjtorikian/tailwind_merge/issues
+  documentation_uri: https://rubydoc.info/gems/tailwind_merge/0.16.0
+  funding_uri: https://github.com/sponsors/gjtorikian
   rubygems_mfa_required: 'true'
-  homepage_uri: https://www.github.com/gjtorikian/tailwind_merge
 post_install_message:
 rdoc_options: []
 require_paths: