sass-embedded 1.69.7 → 1.71.0

data/lib/sass/embedded.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'compiler'
-require_relative 'embedded/version'
 
 # The Sass module.
 #
@@ -56,7 +55,7 @@ module Sass
 
         compiler = Class.new(Compiler) do
           def initialize
-            @dispatcher = Compiler.const_get(:DispatcherManager).new(Class.new(Compiler.const_get(:Dispatcher)) do
+            @channel = Compiler.const_get(:Channel).new(Class.new(Compiler.const_get(:Dispatcher)) do
               def initialize
                 super
 

data/lib/sass/exception.rb

@@ -28,7 +28,7 @@ module Sass
 
       highlight = Exception.respond_to?(:to_tty?) && Exception.to_tty? if highlight.nil?
       if highlight
-        +@full_message
+        @full_message.dup
       else
         @full_message.gsub(/\e\[[0-9;]*m/, '')
       end
@@ -38,7 +38,7 @@ module Sass
     def to_css
       content = full_message(highlight: false, order: :top)
 
-      <<~CSS
+      <<~CSS.freeze
         /* #{content.gsub('*/', "*\u2060/").gsub("\r\n", "\n").split("\n").join("\n * ")} */
 
         body::before {
@@ -50,7 +50,11 @@ module Sass
           border-bottom-style: solid;
           font-family: monospace, monospace;
           white-space: pre;
-          content: #{Serializer.serialize_quoted_string(content, ascii_only: true)};
+          content: #{Serializer.serialize_quoted_string(content).gsub(/[^[:ascii:]][\h\t ]?/) do |match|
+            replacement = "\\#{match.ord.to_s(16)}"
+            replacement << " #{match[1]}" if match.length > 1
+            replacement
+          end};
         }
       CSS
     end

data/lib/sass/logger/source_location.rb

@@ -12,10 +12,10 @@ module Sass
       attr_reader :offset, :line, :column
 
       # @!visibility private
-      def initialize(offset, line, column)
-        @offset = offset
-        @line = line
-        @column = column
+      def initialize(source_location)
+        @offset = source_location.offset
+        @line = source_location.line
+        @column = source_location.column
       end
     end
   end

data/lib/sass/logger/source_span.rb

@@ -16,12 +16,12 @@ module Sass
       attr_reader :url, :context
 
       # @!visibility private
-      def initialize(start, end_, text, url, context)
-        @start = start
-        @end = end_
-        @text = text
-        @url = url
-        @context = context
+      def initialize(source_span)
+        @start = source_span.start.nil? ? nil : Logger::SourceLocation.new(source_span.start)
+        @end = source_span.end.nil? ? nil : Logger::SourceLocation.new(source_span.end)
+        @text = source_span.text
+        @url = source_span.url == '' ? nil : source_span.url
+        @context = source_span.context == '' ? nil : source_span.context
       end
     end
   end

data/lib/sass/node_package_importer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Sass
+  # The built-in Node.js package importer. This loads pkg: URLs from node_modules
+  # according to the standard Node.js resolution algorithm.
+  #
+  # @see https://sass-lang.com/documentation/js-api/classes/nodepackageimporter/
+  class NodePackageImporter
+    def initialize(entry_point_directory)
+      raise ArgumentError, 'entry_point_directory must be set' if entry_point_directory.nil?
+
+      @entry_point_directory = File.absolute_path(entry_point_directory)
+    end
+  end
+end

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.71.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-02-16 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:
@@ -61,16 +61,15 @@ files:
 - lib/sass/canonicalize_context.rb
 - lib/sass/compile_result.rb
 - lib/sass/compiler.rb
+- lib/sass/compiler/channel.rb
 - lib/sass/compiler/connection.rb
 - lib/sass/compiler/dispatcher.rb
-- lib/sass/compiler/dispatcher_manager.rb
 - lib/sass/compiler/host.rb
 - lib/sass/compiler/host/function_registry.rb
 - lib/sass/compiler/host/importer_registry.rb
 - 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
@@ -81,6 +80,7 @@ files:
 - lib/sass/logger/silent.rb
 - lib/sass/logger/source_location.rb
 - lib/sass/logger/source_span.rb
+- lib/sass/node_package_importer.rb
 - lib/sass/serializer.rb
 - lib/sass/value.rb
 - lib/sass/value/argument_list.rb
@@ -100,8 +100,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.71.0
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.71.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 post_install_message: 
@@ -112,14 +113,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.6
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!