tailwind_merge 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2172641fe28ddf9f88555cf7a54250764302bf663520fc3c8a4484170ca7cba6
-  data.tar.gz: fa592d858008e0263da927249fc274ade28ba77b9ba981dd3c1dd48110305108
+  metadata.gz: a91c2b0d982a08fffeb7f7a7de91124c386db75de621884d8dbe8370cba39943
+  data.tar.gz: 8f8ddc04bb758faf1f051ac90f3c5fb5020b1d54c1d87aedbfaf6c3eb6eb81f5
 SHA512:
-  metadata.gz: 50a80cf7b15e4a30921acefa91b8536d61ad3af5e695222c50e87ea922827f30c2af0514931d358c33417272d2c8e5912dad32e1b35117abda095def540e84bc
-  data.tar.gz: e9e644a0a018627203a0fa515ab3c543b2e85ed7a202a6f2c067228ae1f1f9799fd3ddfaef23a6d63c35bd5f91727c7e021929921e9a35d1429dc5347b78ee4b
+  metadata.gz: aec2902cd4796a3170b2806316cbbb8fb33f5d08a3bd8d9f34bbcdaec71b336ef9cd4c7404d8b307dd65c6db3501902bc17f65d651c0069cc08f44358fd92e7e
+  data.tar.gz: 8d8d0953a43e780061d462962cca27a4ade00fba4d19be6d23e299704173e3676db47c0cfb369c35dcd07a0f480a3a968916209a6f747609990d19042d2ba989

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [v0.5.1](https://github.com/gjtorikian/tailwind_merge/tree/v0.5.1) (2023-02-05)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.5.0...v0.5.1)
+
+**Merged pull requests:**
+
+- Fix arbitrary value merging [\#7](https://github.com/gjtorikian/tailwind_merge/pull/7) ([gjtorikian](https://github.com/gjtorikian))
+
+## [v0.5.0](https://github.com/gjtorikian/tailwind_merge/tree/v0.5.0) (2023-01-30)
+
+[Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.4.1...v0.5.0)
+
+**Merged pull requests:**
+
+- Support decimals [\#6](https://github.com/gjtorikian/tailwind_merge/pull/6) ([gjtorikian](https://github.com/gjtorikian))
+
 ## [v0.4.1](https://github.com/gjtorikian/tailwind_merge/tree/v0.4.1) (2022-12-23)
 
 [Full Changelog](https://github.com/gjtorikian/tailwind_merge/compare/v0.4.0...v0.4.1)

data/Gemfile

@@ -12,3 +12,8 @@ gem "minitest", "~> 5.0"
 gem "rubocop", "~> 1.21"
 
 gem "github_changelog_generator", "~> 1.16"
+
+gem "rubocop-standard"
+
+gem "amazing_print"
+gem "debug"

data/lib/tailwind_merge/config.rb

@@ -64,7 +64,7 @@ module TailwindMerge
     OVERFLOW = -> { ["auto", "hidden", "clip", "visible", "scroll"] }
     SPACING_WITH_AUTO = -> { ["auto", SPACING] }
     LENGTH_WITH_EMPTY = -> { ["", IS_LENGTH] }
-    INTEGER_WITH_AUTO = -> { ["auto", IS_INTEGER] }
+    NUMBER_WITH_AUTO_AND_ARBITRARY = -> { ["auto", IS_NUMBER, IS_ARBITRARY_VALUE] }
     POSITIONS = -> {
       [
         "bottom",
@@ -103,6 +103,8 @@ module TailwindMerge
     ALIGN = -> { ["start", "end", "center", "between", "around", "evenly"] }
     ZERO_AND_EMPTY = -> { ["", "0", IS_ARBITRARY_VALUE] }
     BREAKS = -> { ["auto", "avoid", "all", "avoid-page", "page", "left", "right", "column"] }
+    NUMBER = -> { [IS_NUMBER, IS_ARBITRARY_NUMBER] }
+    NUMBER_AND_ARBITRARY = -> { [IS_NUMBER, IS_ARBITRARY_VALUE] }
 
     DEFAULTS = {
       cache_size: 500,
@@ -111,25 +113,25 @@ module TailwindMerge
         "colors" => [IS_ANY],
         "spacing" => [IS_LENGTH],
         "blur" => ["none", "", IS_TSHIRT_SIZE, IS_ARBITRARY_LENGTH],
-        "brightness" => [IS_INTEGER],
+        "brightness" => NUMBER.call,
         "border-color" => [COLORS],
         "border-radius" => ["none", "", "full", IS_TSHIRT_SIZE, IS_ARBITRARY_LENGTH],
         "border-spacing" => [SPACING],
         "border-width" => LENGTH_WITH_EMPTY.call,
-        "contrast" => [IS_INTEGER],
+        "contrast" => NUMBER.call,
         "grayscale" => ZERO_AND_EMPTY.call,
-        "hue-rotate" => [IS_INTEGER],
+        "hue-rotate" => NUMBER_AND_ARBITRARY.call,
         "invert" => ZERO_AND_EMPTY.call,
         "gap" => [SPACING],
         "gradient-color-stops" => [COLORS],
         "inset" => SPACING_WITH_AUTO.call,
         "margin" => SPACING_WITH_AUTO.call,
-        "opacity" => [IS_INTEGER],
+        "opacity" => NUMBER.call,
         "padding" => [SPACING],
-        "saturate" => [IS_INTEGER],
-        "scale" => [IS_INTEGER],
+        "saturate" => NUMBER.call,
+        "scale" => NUMBER.call,
         "sepia" => ZERO_AND_EMPTY.call,
-        "skew" => [IS_INTEGER, IS_ARBITRARY_VALUE],
+        "skew" => NUMBER_AND_ARBITRARY.call,
         "space" => [SPACING],
         "translate" => [SPACING],
       },
@@ -306,7 +308,7 @@ module TailwindMerge
         # Z-Index
         # @see https://tailwindcss.com/docs/z-index
         ##
-        "z" => [{ "z" => [IS_INTEGER] }],
+        "z" => [{ "z" => ["auto", IS_INTEGER] }],
         # Flexbox and Grid
         ##
         # Flex Basis
@@ -352,17 +354,17 @@ module TailwindMerge
         # Grid Column Start / End
         # @see https://tailwindcss.com/docs/grid-column
         ##
-        "col-start-end" => [{ "col" => ["auto", { "span" => [IS_INTEGER] }] }],
+        "col-start-end" => [{ "col" => ["auto", { "span" => [IS_INTEGER, IS_ARBITRARY_VALUE] }] }],
         ##
         # Grid Column Start
         # @see https://tailwindcss.com/docs/grid-column
         ##
-        "col-start" => [{ "col-start" => INTEGER_WITH_AUTO.call }],
+        "col-start" => [{ "col-start" => NUMBER_WITH_AUTO_AND_ARBITRARY.call }],
         ##
         # Grid Column End
         # @see https://tailwindcss.com/docs/grid-column
         ##
-        "col-end" => [{ "col-end" => INTEGER_WITH_AUTO.call }],
+        "col-end" => [{ "col-end" => NUMBER_WITH_AUTO_AND_ARBITRARY.call }],
         ##
         # Grid Template Rows
         # @see https://tailwindcss.com/docs/grid-template-rows
@@ -377,12 +379,12 @@ module TailwindMerge
         # Grid Row Start
         # @see https://tailwindcss.com/docs/grid-row
         ##
-        "row-start" => [{ "row-start" => INTEGER_WITH_AUTO.call }],
+        "row-start" => [{ "row-start" => NUMBER_WITH_AUTO_AND_ARBITRARY.call }],
         ##
         # Grid Row End
         # @see https://tailwindcss.com/docs/grid-row
         ##
-        "row-end" => [{ "row-end" => INTEGER_WITH_AUTO.call }],
+        "row-end" => [{ "row-end" => NUMBER_WITH_AUTO_AND_ARBITRARY.call }],
         ##
         # Grid Auto Flow
         # @see https://tailwindcss.com/docs/grid-auto-flow
@@ -1259,7 +1261,7 @@ module TailwindMerge
         # Transition Duration
         # @see https://tailwindcss.com/docs/transition-duration
         ##
-        "duration" => [{ "duration" => [IS_INTEGER] }],
+        "duration" => [{ "duration" => [NUMBER_AND_ARBITRARY] }],
         ##
         # Transition Timing Function
         # @see https://tailwindcss.com/docs/transition-timing-function
@@ -1269,7 +1271,7 @@ module TailwindMerge
         # Transition Delay
         # @see https://tailwindcss.com/docs/transition-delay
         ##
-        "delay" => [{ "delay" => [IS_INTEGER] }],
+        "delay" => [{ "delay" => [NUMBER_AND_ARBITRARY] }],
         ##
         # Animation
         # @see https://tailwindcss.com/docs/animation

data/lib/tailwind_merge/validators.rb

@@ -5,6 +5,15 @@ require "set"
 module TailwindMerge
   module Validators
     class << self
+      def arbitrary_value?(class_part, label, test_value)
+        match = ARBITRARY_VALUE_REGEX.match(class_part)
+        return false unless match
+
+        return match[1] == label if match[1]
+
+        test_value.call(match[2])
+      end
+
       def numeric?(x)
         Float(x, exception: false).is_a?(Numeric)
       end
@@ -16,84 +25,82 @@ module TailwindMerge
 
     STRING_LENGTHS = Set.new(["px", "full", "screen"]).freeze
 
-    ARBITRARY_VALUE_REGEX = /^\[(.+)\]$/
+    ARBITRARY_VALUE_REGEX = /^\[(?:([a-z-]+):)?(.+)\]$/i
     FRACTION_REGEX = %r{^\d+/\d+$}
     LENGTH_UNIT_REGEX = /\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|ch|ex|r?lh)/
-    TSHIRT_UNIT_REGEX = /^(\d+)?(xs|sm|md|lg|xl)$/
+    TSHIRT_UNIT_REGEX = /^(\d+(\.\d+)?)?(xs|sm|md|lg|xl)$/
     # Shadow always begins with x and y offset separated by underscore
     SHADOW_REGEX = /^-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/
 
-    IS_ANY = ->(_) { return true }
-
-    IS_LENGTH = ->(class_part) {
-      numeric?(class_part) || \
-        STRING_LENGTHS.include?(class_part) || \
-        FRACTION_REGEX.match?(class_part) || \
-        IS_ARBITRARY_LENGTH.call(class_part)
+    is_length_only = ->(value) {
+      LENGTH_UNIT_REGEX.match?(value)
     }
 
-    IS_ARBITRARY_LENGTH = ->(class_part) {
-      if (match = ARBITRARY_VALUE_REGEX.match(class_part))
-        return match[1].start_with?("length:") || LENGTH_UNIT_REGEX.match?(class_part)
-      end
+    is_never = ->(_) { false }
 
-      false
+    is_url = ->(value) {
+      value.start_with?("url(")
     }
 
-    IS_ARBITRARY_SIZE = ->(class_part) {
-      if (match = ARBITRARY_VALUE_REGEX.match(class_part))
-        return match[1].start_with?("size:")
-      end
+    is_number = ->(value) {
+      numeric?(value)
+    }
 
-      false
+    is_integer_only = ->(value) {
+      integer?(value)
     }
 
-    IS_ARBITRARY_POSITION = ->(class_part) {
-      if (match = ARBITRARY_VALUE_REGEX.match(class_part))
-        return match[1].start_with?("position:")
-      end
+    is_shadow = ->(value) {
+      SHADOW_REGEX.match?(value)
+    }
 
-      false
+    IS_LENGTH = ->(value) {
+      numeric?(value) || \
+        STRING_LENGTHS.include?(value) || \
+        FRACTION_REGEX.match?(value) || \
+        IS_ARBITRARY_LENGTH.call(value)
     }
 
-    IS_ARBITRARY_VALUE = ->(class_part) {
-      ARBITRARY_VALUE_REGEX.match(class_part)
+    IS_ARBITRARY_LENGTH = ->(value) {
+      arbitrary_value?(value, "length", is_length_only)
     }
 
-    IS_ARBITRARY_URL = ->(class_part) {
-      if (match = ARBITRARY_VALUE_REGEX.match(class_part))
-        return match[1].start_with?("url(", "url:")
-      end
+    IS_ARBITRARY_SIZE = ->(value) {
+      arbitrary_value?(value, "size", is_never)
+    }
 
-      false
+    IS_ARBITRARY_POSITION = ->(value) {
+      arbitrary_value?(value, "position", is_never)
     }
 
-    IS_ARBITRARY_NUMBER = ->(class_part) {
-      if (match = ARBITRARY_VALUE_REGEX.match(class_part))
-        return match[1].start_with?("number:") || numeric?(match[1])
-      end
+    IS_ARBITRARY_URL = ->(value) {
+      arbitrary_value?(value, "url", is_url)
+    }
 
-      false
+    IS_ARBITRARY_NUMBER = ->(value) {
+      arbitrary_value?(value, "number", is_number)
     }
 
-    IS_TSHIRT_SIZE = ->(class_part) {
-      TSHIRT_UNIT_REGEX.match?(class_part)
+    IS_NUMBER = ->(value) {
+      is_number.call(value)
     }
 
-    IS_INTEGER = ->(class_part) {
-      if (match = ARBITRARY_VALUE_REGEX.match(class_part))
-        return integer?(match[1])
-      end
+    IS_INTEGER = ->(value) {
+      is_integer_only.call(value) || arbitrary_value?(value, "number", is_integer_only)
+    }
 
-      integer?(class_part)
+    IS_ARBITRARY_VALUE = ->(value) {
+      ARBITRARY_VALUE_REGEX.match(value)
     }
 
-    IS_ARBITRARY_SHADOW = ->(class_part) {
-      if (match = ARBITRARY_VALUE_REGEX.match(class_part))
-        return SHADOW_REGEX.match?(match[1])
-      end
+    IS_ANY = ->(_) { return true }
+
+    IS_TSHIRT_SIZE = ->(value) {
+      TSHIRT_UNIT_REGEX.match?(value)
+    }
 
-      return false
+    IS_ARBITRARY_SHADOW = ->(value) {
+      arbitrary_value?(value, "", is_shadow)
     }
   end
 end

data/lib/tailwind_merge/version.rb

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

data/script/generate_changelog

@@ -1,3 +1,3 @@
 #!/bin/sh
 
- CHANGELOG_GITHUB_TOKEN="$GITHUB_TOKEN" bundle exec github_changelog_generator -u gjtorikian -p tailwind_merge
+bundle exec github_changelog_generator --token $GITHUB_TOKEN -u gjtorikian -p tailwind_merge

data/tailwind_merge.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://www.github.com/gjtorikian/tailwind_merge"
   spec.license = "MIT"
 
-  spec.required_ruby_version = [">= 3.0", "< 4.0"]
+  spec.required_ruby_version = [">= 3.1", "< 4.0"]
 
   spec.metadata = {
     "funding_uri" => "https://github.com/sponsors/gjtorikian/",
@@ -34,11 +34,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency("lru_redux", "~> 1.1")
 
-  spec.add_development_dependency("amazing_print")
-  spec.add_development_dependency("debug") if "#{RbConfig::CONFIG["MAJOR"]}.#{RbConfig::CONFIG["MINOR"]}".to_f >= 3.1
   spec.add_development_dependency("minitest", "~> 5.6")
   spec.add_development_dependency("minitest-focus", "~> 1.1")
-  spec.add_development_dependency("rake")
-  spec.add_development_dependency("redcarpet")
-  spec.add_development_dependency("rubocop-standard")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_merge
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -24,34 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: amazing_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,48 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - gjtorikian@gmail.com
@@ -158,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4.0'