sass-embedded 1.69.7 → 1.70.0

data/lib/sass/serializer.rb

@@ -5,31 +5,26 @@ module Sass
   module Serializer
     module_function
 
-    def serialize_quoted_string(string, ascii_only: false)
-      buffer = [0x22]
-      string.each_codepoint do |codepoint|
-        if codepoint.zero?
-          # If the character is NULL (U+0000), then the REPLACEMENT CHARACTER (U+FFFD).
-          buffer << 0xFFFD
-        elsif codepoint == 0x22
-          # If the character is '"' (U+0022) or "\" (U+005C), then the escaped character.
-          buffer << 0x5C << 0x22
-        elsif codepoint == 0x5C
-          # If the character is '"' (U+0022) or "\" (U+005C), then the escaped character.
-          buffer << 0x5C << 0x5C
-        elsif codepoint < 0x20 || (ascii_only ? codepoint >= 0x7F : codepoint == 0x7F)
-          # If the character is in the range [\1-\1f] (U+0001 to U+001F) or is U+007F,
-          # then the character escaped as code point.
-          buffer << 0x5C
-          buffer.concat(codepoint.to_s(16).codepoints)
-          buffer << 0x20
-        else
-          # Otherwise, the character itself.
-          buffer << codepoint
-        end
+    CSS_ESCAPE = {
+      "\0" => "\uFFFD",
+      '\\' => '\\\\',
+      '"' => '\\"',
+      "'" => "\\'",
+      **[*"\x01".."\x08", *"\x0A".."\x1F", "\x7F"].product(
+        [*'0'..'9', *'a'..'f', *'A'..'F', "\t", ' ', nil]
+      ).to_h do |c, x|
+        ["#{c}#{x}".freeze, "\\#{c.ord.to_s(16)}#{" #{x}" if x}".freeze]
+      end
+    }.freeze
+
+    private_constant :CSS_ESCAPE
+
+    def serialize_quoted_string(string)
+      if !string.include?('"') || string.include?("'")
+        %("#{string.gsub(/[\0\\"]|[\x01-\x08\x0A-\x1F\x7F][\h\t ]?/, CSS_ESCAPE)}")
+      else
+        %('#{string.gsub(/[\0\\']|[\x01-\x08\x0A-\x1F\x7F][\h\t ]?/, CSS_ESCAPE)}')
       end
-      buffer << 0x22
-      buffer.pack('U*')
     end
 
     def serialize_unquoted_string(string)

data/lib/sass/value/argument_list.rb

@@ -10,17 +10,17 @@ module Sass
     # @see https://sass-lang.com/documentation/js-api/classes/sassargumentlist/
     class ArgumentList < List
       # @param contents [Array<Value>]
-      # @param keywords [Hash<::String, Value>]
+      # @param keywords [Hash<Symbol, Value>]
       # @param separator [::String]
       def initialize(contents = [], keywords = {}, separator = ',')
         super(contents, separator:)
 
         @id = 0
         @keywords_accessed = false
-        @keywords = keywords.transform_keys(&:to_s).freeze
+        @keywords = keywords.freeze
       end
 
-      # @return [Hash<::String, Value>]
+      # @return [Hash<Symbol, Value>]
       def keywords
         @keywords_accessed = true
         @keywords

data/lib/sass/value/list.rb

@@ -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/number.rb

@@ -63,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]

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.69.7
+  version: 1.70.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-protobuf
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.25'
+        version: 13.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.25'
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: '3.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: '3.25'
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
@@ -70,7 +70,6 @@ files:
 - lib/sass/compiler/host/logger_registry.rb
 - lib/sass/compiler/host/protofier.rb
 - lib/sass/compiler/host/structifier.rb
-- lib/sass/compiler/host/value_protofier.rb
 - lib/sass/compiler/varint.rb
 - lib/sass/elf.rb
 - lib/sass/embedded.rb
@@ -100,8 +99,9 @@ homepage: https://github.com/sass-contrib/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.69.7
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.69.7
+  bug_tracker_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/issues
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.70.0
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.70.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 post_install_message: 
@@ -112,14 +112,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.3
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.4
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!

data/lib/sass/compiler/host/value_protofier.rb

@@ -1,390 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Compiler
-    class Host
-      # The {ValueProtofier} class.
-      #
-      # It converts Pure Ruby types and Protobuf Ruby types.
-      class ValueProtofier
-        def initialize(function_registry)
-          @function_registry = function_registry
-        end
-
-        def to_proto(obj)
-          case obj
-          when Sass::Value::String
-            EmbeddedProtocol::Value.new(
-              string: EmbeddedProtocol::Value::String.new(
-                text: obj.text.to_str,
-                quoted: obj.quoted?
-              )
-            )
-          when Sass::Value::Number
-            EmbeddedProtocol::Value.new(
-              number: Number.to_proto(obj)
-            )
-          when Sass::Value::Color
-            if obj.instance_eval { !defined?(@hue) }
-              EmbeddedProtocol::Value.new(
-                rgb_color: EmbeddedProtocol::Value::RgbColor.new(
-                  red: obj.red,
-                  green: obj.green,
-                  blue: obj.blue,
-                  alpha: obj.alpha.to_f
-                )
-              )
-            elsif obj.instance_eval { !defined?(@saturation) }
-              EmbeddedProtocol::Value.new(
-                hwb_color: EmbeddedProtocol::Value::HwbColor.new(
-                  hue: obj.hue.to_f,
-                  whiteness: obj.whiteness.to_f,
-                  blackness: obj.blackness.to_f,
-                  alpha: obj.alpha.to_f
-                )
-              )
-            else
-              EmbeddedProtocol::Value.new(
-                hsl_color: EmbeddedProtocol::Value::HslColor.new(
-                  hue: obj.hue.to_f,
-                  saturation: obj.saturation.to_f,
-                  lightness: obj.lightness.to_f,
-                  alpha: obj.alpha.to_f
-                )
-              )
-            end
-          when Sass::Value::ArgumentList
-            EmbeddedProtocol::Value.new(
-              argument_list: EmbeddedProtocol::Value::ArgumentList.new(
-                id: obj.instance_eval { @id },
-                contents: obj.contents.map { |element| to_proto(element) },
-                keywords: obj.keywords.transform_values { |value| to_proto(value) },
-                separator: ListSeparator.to_proto(obj.separator)
-              )
-            )
-          when Sass::Value::List
-            EmbeddedProtocol::Value.new(
-              list: EmbeddedProtocol::Value::List.new(
-                contents: obj.contents.map { |element| to_proto(element) },
-                separator: ListSeparator.to_proto(obj.separator),
-                has_brackets: obj.bracketed?
-              )
-            )
-          when Sass::Value::Map
-            EmbeddedProtocol::Value.new(
-              map: EmbeddedProtocol::Value::Map.new(
-                entries: obj.contents.map do |key, value|
-                  EmbeddedProtocol::Value::Map::Entry.new(
-                    key: to_proto(key),
-                    value: to_proto(value)
-                  )
-                end
-              )
-            )
-          when Sass::Value::Function
-            if obj.instance_eval { @id }
-              EmbeddedProtocol::Value.new(
-                compiler_function: EmbeddedProtocol::Value::CompilerFunction.new(
-                  id: obj.instance_eval { @id }
-                )
-              )
-            else
-              EmbeddedProtocol::Value.new(
-                host_function: EmbeddedProtocol::Value::HostFunction.new(
-                  id: @function_registry.register(obj.callback),
-                  signature: obj.signature
-                )
-              )
-            end
-          when Sass::Value::Mixin
-            EmbeddedProtocol::Value.new(
-              compiler_mixin: EmbeddedProtocol::Value::CompilerMixin.new(
-                id: obj.instance_eval { @id }
-              )
-            )
-          when Sass::Value::Calculation
-            EmbeddedProtocol::Value.new(
-              calculation: Calculation.to_proto(obj)
-            )
-          when Sass::Value::Boolean
-            EmbeddedProtocol::Value.new(
-              singleton: obj.value ? :TRUE : :FALSE
-            )
-          when Sass::Value::Null
-            EmbeddedProtocol::Value.new(
-              singleton: :NULL
-            )
-          else
-            raise Sass::ScriptError, "Unknown Sass::Value #{obj}"
-          end
-        end
-
-        def from_proto(proto)
-          oneof = proto.value
-          obj = proto.public_send(oneof)
-          case oneof
-          when :string
-            Sass::Value::String.new(
-              obj.text,
-              quoted: obj.quoted
-            )
-          when :number
-            Number.from_proto(obj)
-          when :rgb_color
-            Sass::Value::Color.new(
-              red: obj.red,
-              green: obj.green,
-              blue: obj.blue,
-              alpha: obj.alpha
-            )
-          when :hsl_color
-            Sass::Value::Color.new(
-              hue: obj.hue,
-              saturation: obj.saturation,
-              lightness: obj.lightness,
-              alpha: obj.alpha
-            )
-          when :hwb_color
-            Sass::Value::Color.new(
-              hue: obj.hue,
-              whiteness: obj.whiteness,
-              blackness: obj.blackness,
-              alpha: obj.alpha
-            )
-          when :argument_list
-            Sass::Value::ArgumentList.new(
-              obj.contents.map do |element|
-                from_proto(element)
-              end,
-              obj.keywords.entries.to_h.transform_values! do |value|
-                from_proto(value)
-              end,
-              ListSeparator.from_proto(obj.separator)
-            ).instance_eval do
-              @id = obj.id
-              self
-            end
-          when :list
-            Sass::Value::List.new(
-              obj.contents.map do |element|
-                from_proto(element)
-              end,
-              separator: ListSeparator.from_proto(obj.separator),
-              bracketed: obj.has_brackets
-            )
-          when :map
-            Sass::Value::Map.new(
-              obj.entries.to_h do |entry|
-                [from_proto(entry.key), from_proto(entry.value)]
-              end
-            )
-          when :compiler_function
-            Sass::Value::Function.new(nil).instance_eval do
-              @id = obj.id
-              self
-            end
-          when :host_function
-            raise Sass::ScriptError, 'The compiler may not send Value.host_function to host'
-          when :compiler_mixin
-            Sass::Value::Mixin.send(:new).instance_eval do
-              @id = obj.id
-              self
-            end
-          when :calculation
-            Calculation.from_proto(obj)
-          when :singleton
-            case obj
-            when :TRUE
-              Sass::Value::Boolean::TRUE
-            when :FALSE
-              Sass::Value::Boolean::FALSE
-            when :NULL
-              Sass::Value::Null::NULL
-            else
-              raise Sass::ScriptError, "Unknown Value.singleton #{obj}"
-            end
-          else
-            raise Sass::ScriptError, "Unknown Value.value #{obj}"
-          end
-        end
-
-        # The {Number} Protofier.
-        module Number
-          module_function
-
-          def to_proto(obj)
-            EmbeddedProtocol::Value::Number.new(
-              value: obj.value.to_f,
-              numerators: obj.numerator_units,
-              denominators: obj.denominator_units
-            )
-          end
-
-          def from_proto(obj)
-            Sass::Value::Number.new(
-              obj.value, {
-                numerator_units: obj.numerators.to_a,
-                denominator_units: obj.denominators.to_a
-              }
-            )
-          end
-        end
-
-        private_constant :Number
-
-        # The {Calculation} Protofier.
-        module Calculation
-          module_function
-
-          def to_proto(obj)
-            EmbeddedProtocol::Value::Calculation.new(
-              name: obj.name,
-              arguments: obj.arguments.map { |argument| CalculationValue.to_proto(argument) }
-            )
-          end
-
-          def from_proto(obj)
-            Sass::Value::Calculation.send(
-              :new,
-              obj.name,
-              obj.arguments.map { |argument| CalculationValue.from_proto(argument) }
-            )
-          end
-        end
-
-        private_constant :Calculation
-
-        # The {CalculationValue} Protofier.
-        module CalculationValue
-          module_function
-
-          def to_proto(value)
-            case value
-            when Sass::Value::Number
-              EmbeddedProtocol::Value::Calculation::CalculationValue.new(
-                number: Number.to_proto(value)
-              )
-            when Sass::Value::Calculation
-              EmbeddedProtocol::Value::Calculation::CalculationValue.new(
-                calculation: Calculation.to_proto(value)
-              )
-            when Sass::Value::String
-              EmbeddedProtocol::Value::Calculation::CalculationValue.new(
-                string: value.text
-              )
-            when Sass::CalculationValue::CalculationOperation
-              EmbeddedProtocol::Value::Calculation::CalculationValue.new(
-                operation: EmbeddedProtocol::Value::Calculation::CalculationOperation.new(
-                  operator: CalculationOperator.to_proto(value.operator),
-                  left: to_proto(value.left),
-                  right: to_proto(value.right)
-                )
-              )
-            else
-              raise Sass::ScriptError, "Unknown CalculationValue #{value}"
-            end
-          end
-
-          def from_proto(value)
-            oneof = value.value
-            obj = value.public_send(oneof)
-            case oneof
-            when :number
-              Number.from_proto(obj)
-            when :calculation
-              Calculation.from_proto(obj)
-            when :string
-              Sass::Value::String.new(obj, quoted: false)
-            when :operation
-              Sass::CalculationValue::CalculationOperation.new(
-                CalculationOperator.from_proto(obj.operator),
-                from_proto(obj.left),
-                from_proto(obj.right)
-              )
-            else
-              raise Sass::ScriptError, "Unknown CalculationValue #{value}"
-            end
-          end
-        end
-
-        private_constant :CalculationValue
-
-        # The {CalculationOperator} Protofier.
-        module CalculationOperator
-          module_function
-
-          def to_proto(operator)
-            case operator
-            when '+'
-              :PLUS
-            when '-'
-              :MINUS
-            when '*'
-              :TIMES
-            when '/'
-              :DIVIDE
-            else
-              raise Sass::ScriptError, "Unknown CalculationOperator #{separator}"
-            end
-          end
-
-          def from_proto(operator)
-            case operator
-            when :PLUS
-              '+'
-            when :MINUS
-              '-'
-            when :TIMES
-              '*'
-            when :DIVIDE
-              '/'
-            else
-              raise Sass::ScriptError, "Unknown CalculationOperator #{separator}"
-            end
-          end
-        end
-
-        private_constant :CalculationOperator
-
-        # The {ListSeparator} Protofier.
-        module ListSeparator
-          module_function
-
-          def to_proto(separator)
-            case separator
-            when ','
-              :COMMA
-            when ' '
-              :SPACE
-            when '/'
-              :SLASH
-            when nil
-              :UNDECIDED
-            else
-              raise Sass::ScriptError, "Unknown ListSeparator #{separator}"
-            end
-          end
-
-          def from_proto(separator)
-            case separator
-            when :COMMA
-              ','
-            when :SPACE
-              ' '
-            when :SLASH
-              '/'
-            when :UNDECIDED
-              nil
-            else
-              raise Sass::ScriptError, "Unknown ListSeparator #{separator}"
-            end
-          end
-        end
-
-        private_constant :ListSeparator
-      end
-
-      private_constant :ValueProtofier
-    end
-  end
-end