sass-embedded 1.6.2 → 1.83.1

data/lib/sass/value/function.rb

@@ -4,26 +4,21 @@ module Sass
   module Value
     # Sass's function type.
     #
-    # @see https://sass-lang.com/documentation/js-api/classes/SassFunction
+    # @see https://sass-lang.com/documentation/js-api/classes/sassfunction/
     class Function
       include Value
 
-      # @overload initialize(id)
-      #   @param id [Numeric]
-      # @overload initialize(signature, callback)
-      #   @param signature [::String]
-      #   @param callback [Proc]
-      def initialize(id_or_signature, callback = nil)
-        if id_or_signature.is_a? Numeric
-          @id = id_or_signature
-        else
-          @signature = id_or_signature
-          @callback = callback
-        end
+      # @param signature [::String]
+      # @param callback [Proc]
+      def initialize(signature, &callback)
+        raise Sass::ScriptError, 'no block given' unless signature.nil? || callback
+
+        @signature = signature.freeze
+        @callback = callback.freeze
       end
 
       # @return [Integer, nil]
-      attr_reader :id
+      protected attr_reader :id
 
       # @return [::String, nil]
       attr_reader :signature
@@ -34,7 +29,7 @@ module Sass
       # @return [::Boolean]
       def ==(other)
         if id.nil?
-          other.equal? self
+          other.equal?(self)
         else
           other.is_a?(Sass::Value::Function) && other.id == id
         end
@@ -42,7 +37,7 @@ module Sass
 
       # @return [Integer]
       def hash
-        id.nil? ? signature.hash : id.hash
+        @hash ||= id.nil? ? signature.hash : id.hash
       end
 
       # @return [Function]

data/lib/sass/value/fuzzy_math.rb

@@ -6,14 +6,27 @@ module Sass
     module FuzzyMath
       PRECISION = 10
 
-      EPSILON = 10.pow(-PRECISION - 1)
+      EPSILON = 10**(-PRECISION - 1)
 
-      INVERSE_EPSILON = 1 / EPSILON
+      INVERSE_EPSILON = 10**(PRECISION + 1)
 
       module_function
 
       def equals(number1, number2)
-        (number1 - number2).abs < EPSILON
+        return true if number1 == number2
+
+        (number1 - number2).abs <= EPSILON &&
+          (number1 * INVERSE_EPSILON).round ==
+            (number2 * INVERSE_EPSILON).round
+      end
+
+      def equals_nilable(number1, number2)
+        return true if number1 == number2
+        return false if number1.nil? || number2.nil?
+
+        (number1 - number2).abs <= EPSILON &&
+          (number1 * INVERSE_EPSILON).round ==
+            (number2 * INVERSE_EPSILON).round
       end
 
       def less_than(number1, number2)
@@ -34,23 +47,14 @@ module Sass
 
       def integer?(number)
         return false unless number.finite?
-        return true if number.integer?
 
-        equals((number - 0.5).abs % 1, 0.5)
+        equals(number, number.round)
       end
 
       def to_i(number)
         integer?(number) ? number.round : nil
       end
 
-      def round(number)
-        if number.positive?
-          less_than(number % 1, 0.5) ? number.floor : number.ceil
-        else
-          less_than_or_equals(number % 1, 0.5) ? number.floor : number.ceil
-        end
-      end
-
       def between(number, min, max)
         return min if equals(number, min)
         return max if equals(number, max)
@@ -63,16 +67,15 @@ module Sass
         result = between(number, min, max)
         return result unless result.nil?
 
-        message = "#{number} must be between #{min} and #{max}."
-        raise Sass::ScriptError, name.nil? ? message : "$#{name}: #{message}"
+        raise Sass::ScriptError.new("#{number} must be between #{min} and #{max}.", name)
+      end
+
+      def _clamp_like_css(number, lower_bound, upper_bound)
+        number.to_f.nan? ? lower_bound : number.clamp(lower_bound, upper_bound)
       end
 
-      def hash(number)
-        @hash ||= if number.finite?
-                    (number * INVERSE_EPSILON).round.hash
-                  else
-                    number.hash
-                  end
+      def _hash(number)
+        number&.finite? ? (number * INVERSE_EPSILON).round : number
       end
     end
 

data/lib/sass/value/list.rb

@@ -4,7 +4,7 @@ module Sass
   module Value
     # Sass's list type.
     #
-    # @see https://sass-lang.com/documentation/js-api/classes/SassList
+    # @see https://sass-lang.com/documentation/js-api/classes/sasslist/
     class List
       include Value
 
@@ -13,7 +13,7 @@ module Sass
       # @param bracketed [::Boolean]
       def initialize(contents = [], separator: ',', bracketed: false)
         if separator.nil? && contents.length > 1
-          raise error 'A list with more than one element must have an explicit separator'
+          raise Sass::ScriptError, 'A list with more than one element must have an explicit separator'
         end
 
         @contents = contents.freeze
@@ -21,9 +21,6 @@ module Sass
         @bracketed = bracketed.freeze
       end
 
-      # @return [Array<Value>]
-      attr_reader :contents
-
       # @return [::String, nil]
       attr_reader :separator
 
@@ -35,7 +32,7 @@ module Sass
       # @return [::Boolean]
       def ==(other)
         (other.is_a?(Sass::Value::List) &&
-         other.contents == contents &&
+         other.to_a == to_a &&
          other.separator == separator &&
          other.bracketed? == bracketed?) ||
           (to_a.empty? && other.is_a?(Sass::Value::Map) && other.to_a.empty?)
@@ -56,7 +53,10 @@ module Sass
         @hash ||= contents.hash
       end
 
-      alias to_a contents
+      # @return [Array<Value>]
+      def to_a
+        @contents
+      end
 
       # @return [Map, nil]
       def to_map

data/lib/sass/value/map.rb

@@ -4,7 +4,7 @@ module Sass
   module Value
     # Sass's map type.
     #
-    # @see https://sass-lang.com/documentation/js-api/classes/SassMap
+    # @see https://sass-lang.com/documentation/js-api/classes/sassmap/
     class Map
       include Value
 
@@ -30,12 +30,12 @@ module Sass
       # @param index [Numeric, Value]
       # @return [List<(Value, Value)>, Value]
       def at(index)
-        if index.is_a? Numeric
+        if index.is_a?(Numeric)
           index = index.floor
-          index = to_a.length + index if index.negative?
-          return nil if index.negative? || index >= to_a.length
+          index = to_a_length + index if index.negative?
+          return nil if index.negative? || index >= to_a_length
 
-          to_a[index]
+          Sass::Value::List.new(contents.to_a[index], separator: ' ')
         else
           contents[index]
         end
@@ -48,7 +48,7 @@ module Sass
 
       # @return [Array<List<(Value, Value)>>]
       def to_a
-        contents.to_a.map { |entry| Sass::Value::List.new(entry, separator: ' ') }
+        contents.map { |key, value| Sass::Value::List.new([key, value], separator: ' ') }
       end
 
       # @return [Map]

data/lib/sass/value/mixin.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Sass
+  module Value
+    # Sass's mixin type.
+    #
+    # @see https://sass-lang.com/documentation/js-api/classes/sassmixin/
+    class Mixin
+      include Value
+
+      class << self
+        private :new
+      end
+
+      # @return [Integer]
+      protected attr_reader :id
+
+      # @return [::Boolean]
+      def ==(other)
+        other.is_a?(Sass::Value::Mixin) && other.id == id
+      end
+
+      # @return [Integer]
+      def hash
+        @hash ||= id.hash
+      end
+
+      # @return [Mixin]
+      def assert_mixin(_name = nil)
+        self
+      end
+    end
+  end
+end

data/lib/sass/value/null.rb

@@ -4,7 +4,7 @@ module Sass
   module Value
     # Sass's null type.
     #
-    # @see https://sass-lang.com/documentation/js-api/modules#sassNull
+    # @see https://sass-lang.com/documentation/js-api/variables/sassnull/
     class Null
       include Value
 

data/lib/sass/value/number/unit.rb

@@ -88,12 +88,12 @@ module Sass
             'deg' => Rational(Math::PI, 180),
             'grad' => Rational(Math::PI, 200),
             'rad' => Rational(1),
-            'turn' => Rational(2 * Math::PI)
+            'turn' => Rational(Math::PI * 2)
           },
           'turn' => {
             'deg' => Rational(1, 360),
             'grad' => Rational(1, 400),
-            'rad' => Rational(1, 2 * Math::PI),
+            'rad' => Rational(1, Math::PI * 2),
             'turn' => Rational(1)
           },
 
@@ -141,10 +141,11 @@ module Sass
           'pixel density': %w[dpi dpcm dppx]
         }.freeze
 
-        TYPES_BY_UNIT = UNITS_BY_TYPE.invert
-                                     .to_a
-                                     .flat_map { |pair| pair[0].map { |key| [key, pair[1]] } }
-                                     .to_h
+        TYPES_BY_UNIT = UNITS_BY_TYPE.each_with_object({}) do |(key, values), hash|
+          values.each do |value|
+            hash[value] = key
+          end
+        end
 
         module_function
 

data/lib/sass/value/number.rb

@@ -6,9 +6,10 @@ module Sass
   module Value
     # Sass's number type.
     #
-    # @see https://sass-lang.com/documentation/js-api/classes/SassNumber
+    # @see https://sass-lang.com/documentation/js-api/classes/sassnumber/
     class Number
       include Value
+      include CalculationValue
 
       # @param value [Numeric]
       # @param unit [::String, Hash]
@@ -24,12 +25,16 @@ module Sass
           denominator_units = []
         when ::Hash
           numerator_units = unit.fetch(:numerator_units, [])
-          raise error "invalid numerator_units #{numerator_units.inspect}" unless numerator_units.is_a? Array
+          unless numerator_units.is_a?(Array)
+            raise Sass::ScriptError, "invalid numerator_units #{numerator_units.inspect}"
+          end
 
           denominator_units = unit.fetch(:denominator_units, [])
-          raise error "invalid denominator_units #{denominator_units.inspect}" unless denominator_units.is_a? Array
+          unless denominator_units.is_a?(Array)
+            raise Sass::ScriptError, "invalid denominator_units #{denominator_units.inspect}"
+          end
         else
-          raise error "invalid unit #{unit.inspect}"
+          raise Sass::ScriptError, "invalid unit #{unit.inspect}"
         end
 
         unless denominator_units.empty? && numerator_units.empty?
@@ -58,8 +63,8 @@ module Sass
         end
 
         @value = value.freeze
-        @numerator_units = numerator_units.freeze
-        @denominator_units = denominator_units.freeze
+        @numerator_units = numerator_units.each(&:freeze).freeze
+        @denominator_units = denominator_units.each(&:freeze).freeze
       end
 
       # @return [Numeric]
@@ -70,7 +75,7 @@ module Sass
 
       # @return [::Boolean]
       def ==(other)
-        return false unless other.is_a? Sass::Value::Number
+        return false unless other.is_a?(Sass::Value::Number)
 
         return false if numerator_units.length != other.numerator_units.length ||
                         denominator_units.length != other.denominator_units.length
@@ -94,7 +99,7 @@ module Sass
 
       # @return [Integer]
       def hash
-        @hash ||= FuzzyMath.hash(canonical_units_value)
+        @hash ||= FuzzyMath._hash(canonical_units_value).hash
       end
 
       # @return [::Boolean]
@@ -105,7 +110,7 @@ module Sass
       # @return [Number]
       # @raise [ScriptError]
       def assert_unitless(name = nil)
-        raise error "Expected #{self} to have no units", name unless unitless?
+        raise Sass::ScriptError.new("Expected #{self} to have no units", name) unless unitless?
 
         self
       end
@@ -125,7 +130,7 @@ module Sass
       # @return [Number]
       # @raise [ScriptError]
       def assert_unit(unit, name = nil)
-        raise error "Expected #{self} to have unit #{unit.inspect}", name unless unit?(unit)
+        raise Sass::ScriptError.new("Expected #{self} to have unit #{unit.inspect}", name) unless unit?(unit)
 
         self
       end
@@ -138,7 +143,7 @@ module Sass
       # @return [Integer]
       # @raise [ScriptError]
       def assert_integer(name = nil)
-        raise error "#{self} is not an integer", name unless integer?
+        raise Sass::ScriptError.new("#{self} is not an integer", name) unless integer?
 
         to_i
       end
@@ -178,7 +183,7 @@ module Sass
       def convert_value(new_numerator_units, new_denominator_units, name = nil)
         coerce_or_convert_value(new_numerator_units, new_denominator_units,
                                 coerce_unitless: false,
-                                name: name)
+                                name:)
       end
 
       # @param other [Number]
@@ -195,9 +200,9 @@ module Sass
       def convert_value_to_match(other, name = nil, other_name = nil)
         coerce_or_convert_value(other.numerator_units, other.denominator_units,
                                 coerce_unitless: false,
-                                name: name,
-                                other: other,
-                                other_name: other_name)
+                                name:,
+                                other:,
+                                other_name:)
       end
 
       # @param new_numerator_units [Array<::String>]
@@ -216,7 +221,7 @@ module Sass
       def coerce_value(new_numerator_units, new_denominator_units, name = nil)
         coerce_or_convert_value(new_numerator_units, new_denominator_units,
                                 coerce_unitless: true,
-                                name: name)
+                                name:)
       end
 
       # @param unit [::String]
@@ -239,9 +244,9 @@ module Sass
       def coerce_value_to_match(other, name = nil, other_name = nil)
         coerce_or_convert_value(other.numerator_units, other.denominator_units,
                                 coerce_unitless: true,
-                                name: name,
-                                other: other,
-                                other_name: other_name)
+                                name:,
+                                other:,
+                                other_name:)
       end
 
       # @return [Number]
@@ -249,7 +254,7 @@ module Sass
         self
       end
 
-      protected
+      private
 
       def single_unit?
         numerator_units.length == 1 && denominator_units.empty?
@@ -271,7 +276,8 @@ module Sass
                                   other: nil,
                                   other_name: nil)
         if other && (other.numerator_units != new_denominator_units && other.denominator_units != new_denominator_units)
-          raise error "Expect #{other} to have units #{unit_string(new_numerator_units, new_denominator_units).inspect}"
+          raise Sass::ScriptError, "Expect #{other} to have units #{unit_string(new_numerator_units,
+                                                                                new_denominator_units).inspect}"
         end
 
         return value if numerator_units == new_numerator_units && denominator_units == new_denominator_units
@@ -284,23 +290,25 @@ module Sass
 
         compatibility_error = lambda {
           unless other.nil?
-            message = +"#{self} and"
+            message = "#{self} and"
             message << " $#{other_name}:" unless other_name.nil?
             message << " #{other} have incompatible units"
             message << " (one has units and the other doesn't)" if unitless? || other_unitless
-            return error message, name
+            return Sass::ScriptError.new(message, name)
           end
 
-          return error "Expected #{self} to have no units", name unless other_unitless
+          return Sass::ScriptError.new("Expected #{self} to have no units", name) unless other_unitless
 
           if new_numerator_units.length == 1 && new_denominator_units.empty?
             type = Unit::TYPES_BY_UNIT[new_numerator_units.first]
-            return error "Expected #{self} to have a #{type} unit (#{Unit::UNITS_BY_TYPE[type].join(', ')})", name
+            return Sass::ScriptError.new(
+              "Expected #{self} to have a #{type} unit (#{Unit::UNITS_BY_TYPE[type].join(', ')})", name
+            )
           end
 
           unit_length = new_numerator_units.length + new_denominator_units.length
           units = unit_string(new_numerator_units, new_denominator_units)
-          error "Expected #{self} to have unit#{unit_length > 1 ? 's' : ''} #{units}", name
+          Sass::ScriptError.new("Expected #{self} to have unit#{unit_length > 1 ? 's' : ''} #{units}", name)
         }
 
         result = value

data/lib/sass/value/string.rb

@@ -4,9 +4,10 @@ module Sass
   module Value
     # Sass's string type.
     #
-    # @see https://sass-lang.com/documentation/js-api/classes/SassString
+    # @see https://sass-lang.com/documentation/js-api/classes/sassstring/
     class String
       include Value
+      include CalculationValue
 
       # @param text [::String]
       # @param quoted [::Boolean]
@@ -42,14 +43,19 @@ module Sass
       # @return [Integer]
       def sass_index_to_string_index(sass_index, name = nil)
         index = sass_index.assert_number(name).assert_integer(name)
-        raise error('String index may not be 0', name) if index.zero?
+        raise Sass::ScriptError.new('String index may not be 0', name) if index.zero?
 
         if index.abs > text.length
-          raise error("Invalid index #{sass_index} for a string with #{text.length} characters", name)
+          raise Sass::ScriptError.new("Invalid index #{sass_index} for a string with #{text.length} characters", name)
         end
 
         index.negative? ? text.length + index : index - 1
       end
+
+      # @return [::String]
+      def to_s
+        @quoted ? Serializer.serialize_quoted_string(@text) : Serializer.serialize_unquoted_string(@text)
+      end
     end
   end
 end

data/lib/sass/value.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'script_error'
-
 module Sass
   # The abstract base class of Sass's value types.
   #
-  # @see https://sass-lang.com/documentation/js-api/classes/Value
+  # @see https://sass-lang.com/documentation/js-api/classes/value/
   module Value
     # @return [::String, nil]
     def separator
@@ -57,52 +55,59 @@ module Sass
     # @return [Boolean]
     # @raise [ScriptError]
     def assert_boolean(name = nil)
-      raise error("#{self} is not a boolean", name)
+      raise Sass::ScriptError.new("#{self} is not a boolean", name)
     end
 
+    # @return [Calculation]
     # @raise [ScriptError]
     def assert_calculation(name = nil)
-      raise error("#{self} is not a calculation", name)
+      raise Sass::ScriptError.new("#{self} is not a calculation", name)
     end
 
     # @return [Color]
     # @raise [ScriptError]
     def assert_color(name = nil)
-      raise error("#{self} is not a color", name)
+      raise Sass::ScriptError.new("#{self} is not a color", name)
     end
 
     # @return [Function]
     # @raise [ScriptError]
     def assert_function(name = nil)
-      raise error("#{self} is not a function", name)
+      raise Sass::ScriptError.new("#{self} is not a function", name)
     end
 
     # @return [Map]
     # @raise [ScriptError]
     def assert_map(name = nil)
-      raise error("#{self} is not a map", name)
+      raise Sass::ScriptError.new("#{self} is not a map", name)
+    end
+
+    # @return [Mixin]
+    # @raise [ScriptError]
+    def assert_mixin(name = nil)
+      raise Sass::ScriptError.new("#{self} is not a mixin", name)
     end
 
     # @return [Number]
     # @raise [ScriptError]
     def assert_number(name = nil)
-      raise error("#{self} is not a number", name)
+      raise Sass::ScriptError.new("#{self} is not a number", name)
     end
 
     # @return [String]
     # @raise [ScriptError]
     def assert_string(name = nil)
-      raise error("#{self} is not a string", name)
+      raise Sass::ScriptError.new("#{self} is not a string", name)
     end
 
     # @param sass_index [Number]
     # @return [Integer]
     def sass_index_to_array_index(sass_index, name = nil)
       index = sass_index.assert_number(name).assert_integer(name)
-      raise error('List index may not be 0', name) if index.zero?
+      raise Sass::ScriptError.new('List index may not be 0', name) if index.zero?
 
       if index.abs > to_a_length
-        raise error("Invalid index #{sass_index} for a list with #{to_a_length} elements", name)
+        raise Sass::ScriptError.new("Invalid index #{sass_index} for a list with #{to_a_length} elements", name)
       end
 
       index.negative? ? to_a_length + index : index - 1
@@ -113,20 +118,19 @@ module Sass
     def to_a_length
       1
     end
-
-    def error(message, name = nil)
-      Sass::ScriptError.new name.nil? ? message : "$#{name}: #{message}"
-    end
   end
 end
 
+require_relative 'calculation_value'
 require_relative 'value/list'
 require_relative 'value/argument_list'
 require_relative 'value/boolean'
+require_relative 'value/calculation'
 require_relative 'value/color'
 require_relative 'value/function'
 require_relative 'value/fuzzy_math'
 require_relative 'value/map'
+require_relative 'value/mixin'
 require_relative 'value/null'
 require_relative 'value/number'
 require_relative 'value/string'