sass-embedded 1.100.0-aarch64-linux-musl → 1.101.0-aarch64-linux-musl

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fbb5a8c385cf0756ac7620cad8f884509b6b95ead8fda41dbca87a5f49ff9cc
-  data.tar.gz: 50541b8def756b073f5c567e0fcadf332040cef3ee2290f613a17b81d9b25f1d
+  metadata.gz: 1086b337a006b2380d4fc38c39c920be47df72cc426ae85031d33c5df24ead16
+  data.tar.gz: af3266858ab29cf689e4cd96ee89507624467b47c058f29f779d1b072b1dd65a
 SHA512:
-  metadata.gz: f614141cc92567227d2a7062dff85df409d892306d84c1f2920a2f775930c6ddc57a4d9603d49b5fcbc0894aa8e2fdde5aba0a9c06ee39dbd03b0c3925f5b7cd
-  data.tar.gz: 6be4b18ff798493506a40d02ce279d01d792850f4461ecb9616ed771c5e9daa1033387a29b76cea0e4f287397ee23574e7d347a4b62e844f3ca1f636a114211c
+  metadata.gz: ec803caf8ba37f8e21cc92ad4c6b8805a87af555c6b78b52cc5d49cf4afd6720d294256cb419bee6875b54e5cd469cbba1be301d78af4d82b973fc0f8c614e80
+  data.tar.gz: a2d694e797e2735063d014341022cccd06d70cacc4d88ebde82a0826e5bc31222ab1401598281afa2b7de03f1eaff907c3a6bfeabbcce03cc515ad825dc4975e

data/lib/sass/compiler/channel.rb

@@ -29,24 +29,24 @@ module Sass
         end
       end
 
-      def stream(host)
+      def stream(session)
         @mutex.synchronize do
           raise IOError, 'closed compiler' if @dispatcher.nil?
 
-          Stream.new(@dispatcher, host)
+          Stream.new(@dispatcher, session)
         rescue Errno::EBUSY
           @dispatcher = Dispatcher.new(*@args, **@kwargs, &@block)
-          Stream.new(@dispatcher, host)
+          Stream.new(@dispatcher, session)
         end
       end
 
-      # The {Stream} between {Dispatcher} and {Host}.
+      # The {Stream} between {Dispatcher} and {Session}.
       class Stream
         attr_reader :id
 
-        def initialize(dispatcher, host)
+        def initialize(dispatcher, session)
           @dispatcher = dispatcher
-          @id = @dispatcher.subscribe(host)
+          @id = @dispatcher.subscribe(session)
         end
 
         def close

data/lib/sass/compiler/dispatcher.rb

@@ -4,7 +4,7 @@ module Sass
   class Compiler
     # The {Dispatcher} class.
     #
-    # It dispatches messages between multiple instances of {Host} and a single {Connection} to the compiler.
+    # It dispatches messages between multiple instances of {Session} and a single {Connection} to the compiler.
     class Dispatcher
       def initialize(idle_timeout: 0)
         @id = 1

data/lib/sass/compiler/{host → session}/function_registry.rb

@@ -2,14 +2,14 @@
 
 module Sass
   class Compiler
-    class Host
+    class Session
       # The {FunctionRegistry} class.
       #
       # It stores sass custom functions and handles function calls.
       class FunctionRegistry
         attr_reader :compile_context, :global_functions
 
-        def initialize(functions, alert_color:)
+        def initialize(functions, session:)
           @compile_context = Object.new
           @global_functions = functions.keys.map!(&:to_s)
           @functions_by_name = functions.transform_keys do |signature|
@@ -26,7 +26,7 @@ module Sass
           @functions_by_id = {}.compare_by_identity
           @ids_by_function = {}.compare_by_identity
 
-          @highlight = alert_color
+          @session = session
         end
 
         def register(function)
@@ -68,9 +68,14 @@ module Sass
             accessed_argument_lists:
           )
         rescue StandardError => e
+          @session.backtrace = e.backtrace
           EmbeddedProtocol::InboundMessage::FunctionCallResponse.new(
             id: function_call_request.id,
-            error: e.full_message(highlight: @highlight, order: :top)
+            error: if e.respond_to?(:detailed_message)
+                     e.detailed_message(highlight: false)
+                   else # TODO: remove once ruby 3.1 support is dropped
+                     "#{e.message} (#{e.class.name})"
+                   end
           )
         end
 

data/lib/sass/compiler/{host → session}/importer_registry.rb

@@ -2,14 +2,14 @@
 
 module Sass
   class Compiler
-    class Host
+    class Session
       # The {ImporterRegistry} class.
       #
       # It stores importers and handles import requests.
       class ImporterRegistry
         attr_reader :importers
 
-        def initialize(importers, load_paths, alert_color:)
+        def initialize(importers, load_paths, session:)
           @id = 0
           @importers_by_id = {}.compare_by_identity
           @importers = importers
@@ -22,7 +22,7 @@ module Sass
                          end
                        )
 
-          @highlight = alert_color
+          @session = session
         end
 
         IMPORTER_ATTRS = %i[non_canonical_scheme].freeze
@@ -79,9 +79,14 @@ module Sass
             containing_url_unused: canonicalize_context.instance_variable_get(:@containing_url_unused)
           )
         rescue StandardError => e
+          @session.backtrace = e.backtrace
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
             id: canonicalize_request.id,
-            error: e.full_message(highlight: @highlight, order: :top)
+            error: if e.respond_to?(:detailed_message)
+                     e.detailed_message(highlight: false)
+                   else # TODO: remove once ruby 3.1 support is dropped
+                     "#{e.message} (#{e.class.name})"
+                   end
           )
         end
 
@@ -103,9 +108,14 @@ module Sass
             )
           )
         rescue StandardError => e
+          @session.backtrace = e.backtrace
           EmbeddedProtocol::InboundMessage::ImportResponse.new(
             id: import_request.id,
-            error: e.full_message(highlight: @highlight, order: :top)
+            error: if e.respond_to?(:detailed_message)
+                     e.detailed_message(highlight: false)
+                   else # TODO: remove once ruby 3.1 support is dropped
+                     "#{e.message} (#{e.class.name})"
+                   end
           )
         end
 
@@ -121,9 +131,14 @@ module Sass
             containing_url_unused: canonicalize_context.instance_variable_get(:@containing_url_unused)
           )
         rescue StandardError => e
+          @session.backtrace = e.backtrace
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(
             id: file_import_request.id,
-            error: e.full_message(highlight: @highlight, order: :top)
+            error: if e.respond_to?(:detailed_message)
+                     e.detailed_message(highlight: false)
+                   else # TODO: remove once ruby 3.1 support is dropped
+                     "#{e.message} (#{e.class.name})"
+                   end
           )
         end
 

data/lib/sass/compiler/{host → session}/logger_registry.rb

@@ -2,7 +2,7 @@
 
 module Sass
   class Compiler
-    class Host
+    class Session
       # The {LoggerRegistry} class.
       #
       # It stores logger and handles log events.
@@ -24,13 +24,13 @@ module Sass
             if @logger_respond_to_debug
               @logger.debug(event.message, DebugContext.new(event))
             else
-              Kernel.warn(event.formatted)
+              Kernel.warn(Path.pretty_formatted!(+event.formatted, event.span.url))
             end
           when :DEPRECATION_WARNING, :WARNING
             if @logger_respond_to_warn
               @logger.warn(event.message, WarnContext.new(event))
             else
-              Kernel.warn(event.formatted)
+              Kernel.warn(StackTrace.pretty_formatted!(+event.formatted, event.stack_trace))
             end
           else
             raise ArgumentError, "Unknown LogEvent.type #{event.type}"

data/lib/sass/compiler/session/path.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Sass
+  class Compiler
+    class Session
+      # @see https://pub.dev/documentation/path/latest/path/
+      module Path
+        module_function
+
+        # @see https://pub.dev/documentation/path/latest/path/Context/prettyUri.html
+        def pretty_uri(uri)
+          return uri unless uri&.start_with?('file:')
+
+          absolute_path = Uri.file_uri_to_path(uri)
+          relative_path = Uri.decode_uri_component(Uri.relative(uri, Uri.pwd))
+          relative_path.count('/') > absolute_path.count('/') ? absolute_path : relative_path
+        end
+
+        def pretty_formatted!(formatted, uri)
+          index = formatted.index(uri)
+          return formatted unless index
+
+          replacement = pretty_uri(uri)
+          return formatted if uri == replacement
+
+          formatted[index, uri.length] = replacement
+          formatted
+        end
+      end
+
+      private_constant :Path
+    end
+  end
+end

data/lib/sass/compiler/{host → session}/protofier.rb

@@ -2,7 +2,7 @@
 
 module Sass
   class Compiler
-    class Host
+    class Session
       # The {Protofier} class.
       #
       # It converts Pure Ruby types and Protobuf Ruby types.

data/lib/sass/compiler/session/stack_trace.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Sass
+  class Compiler
+    class Session
+      # @see https://pub.dev/documentation/stack_trace/latest/stack_trace/
+      module StackTrace
+        module_function
+
+        # @see https://pub.dev/documentation/stack_trace/latest/stack_trace/Trace/toString.html
+        def pretty_formatted!(formatted, stack_trace)
+          longest = 0
+
+          frames = stack_trace.lines("\n", chomp: true).map do |frame|
+            location, member = frame.split(/  +/, 2)
+            uri, line_column = location.split(' ', 2)
+
+            uri = Path.pretty_uri(uri)
+            location = line_column.nil? ? uri : "#{uri} #{line_column}"
+
+            longest = location.length if location.length > longest
+            [frame, location, member]
+          end
+
+          offset = formatted.length
+
+          frames.reverse_each do |frame, location, member|
+            index = formatted.rindex(frame, offset)
+            next unless index
+
+            offset = index
+
+            replacement = "#{location.ljust(longest)}  #{member}"
+            next if frame == replacement
+
+            formatted[index, frame.length] = replacement
+          end
+
+          formatted
+        end
+      end
+
+      private_constant :StackTrace
+    end
+  end
+end

data/lib/sass/compiler/{host → session}/struct.rb

@@ -2,7 +2,7 @@
 
 module Sass
   class Compiler
-    class Host
+    class Session
       # The {Struct} class.
       #
       # It creates {::Struct}-like objects from {::Hash}.

data/lib/sass/compiler/{host.rb → session.rb}

@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
-require_relative 'host/function_registry'
-require_relative 'host/importer_registry'
-require_relative 'host/logger_registry'
-require_relative 'host/protofier'
-require_relative 'host/struct'
+require_relative 'session/function_registry'
+require_relative 'session/importer_registry'
+require_relative 'session/logger_registry'
+require_relative 'session/path'
+require_relative 'session/protofier'
+require_relative 'session/stack_trace'
+require_relative 'session/struct'
 
 module Sass
   class Compiler
-    # The {Host} class.
+    # The {Session} class.
     #
     # It communicates with {Dispatcher} and handles the host logic.
-    class Host
+    class Session
+      attr_writer :backtrace
+
       def initialize(channel)
         @channel = channel
+        @backtrace = nil
       end
 
       def compile_request(path:,
@@ -38,8 +43,8 @@ module Sass
                           verbose:)
         alert_color = Exception.to_tty? if alert_color.nil?
 
-        @function_registry = FunctionRegistry.new(functions, alert_color:)
-        @importer_registry = ImporterRegistry.new(importers, load_paths, alert_color:)
+        @function_registry = FunctionRegistry.new(functions, session: self)
+        @importer_registry = ImporterRegistry.new(importers, load_paths, session: self)
         @logger_registry = LoggerRegistry.new(logger)
 
         compile_request = EmbeddedProtocol::InboundMessage::CompileRequest.new(
@@ -83,13 +88,15 @@ module Sass
         result = compile_response.public_send(oneof)
         case oneof
         when :failure
-          raise CompileError.new(
+          compile_error = CompileError.new(
             result.message,
-            result.formatted == '' ? nil : result.formatted,
+            result.formatted == '' ? nil : StackTrace.pretty_formatted!(+result.formatted, result.stack_trace),
             result.stack_trace == '' ? nil : result.stack_trace,
             result.span.nil? ? nil : Logger::SourceSpan.new(result.span),
             compile_response.loaded_urls.to_a
           )
+          compile_error.set_backtrace(@backtrace) unless @backtrace.nil?
+          raise compile_error
         when :success
           CompileResult.new(
             result.css,
@@ -221,6 +228,6 @@ module Sass
       end
     end
 
-    private_constant :Host
+    private_constant :Session
   end
 end

data/lib/sass/compiler.rb

@@ -5,7 +5,7 @@ require_relative 'compile_result'
 require_relative 'compiler/channel'
 require_relative 'compiler/connection'
 require_relative 'compiler/dispatcher'
-require_relative 'compiler/host'
+require_relative 'compiler/session'
 require_relative 'compiler/varint'
 require_relative 'embedded/version'
 require_relative 'embedded_protocol'
@@ -17,6 +17,7 @@ require_relative 'logger/source_location'
 require_relative 'logger/source_span'
 require_relative 'node_package_importer'
 require_relative 'serializer'
+require_relative 'uri'
 require_relative 'value'
 
 module Sass
@@ -86,7 +87,7 @@ module Sass
                 verbose: false)
       raise ArgumentError, 'path must be set' if path.nil?
 
-      Host.new(@channel).compile_request(
+      Session.new(@channel).compile_request(
         path:,
         source: nil,
         importer: nil,
@@ -169,7 +170,7 @@ module Sass
                        verbose: false)
       raise ArgumentError, 'source must be set' if source.nil?
 
-      Host.new(@channel).compile_request(
+      Session.new(@channel).compile_request(
         path: nil,
         source:,
         importer:,
@@ -198,7 +199,7 @@ module Sass
     def info
       @info ||= [
         ['sass-embedded', Embedded::VERSION, '(Embedded Host)', '[Ruby]'].join("\t"),
-        Host.new(@channel).version_request.join("\t")
+        Session.new(@channel).version_request.join("\t")
       ].join("\n").freeze
     end
 

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.100.0'
+    VERSION = '1.101.0'
   end
 end

data/lib/sass/exception.rb

@@ -12,25 +12,77 @@ module Sass
     # @return [Array<String>]
     attr_reader :loaded_urls
 
-    # @!visibility private
-    def initialize(message, full_message, sass_stack, span, loaded_urls)
-      super(message)
+    if Exception.public_method_defined?(:detailed_message, false)
+      # @!visibility private
+      def initialize(message, detailed_message, sass_stack, span, loaded_urls)
+        super(message)
 
-      @full_message = full_message
-      @sass_stack = sass_stack
-      @span = span
-      @loaded_urls = loaded_urls
-    end
+        @detailed_message = detailed_message
+        @sass_stack = sass_stack
+        @span = span
+        @loaded_urls = loaded_urls
+      end
 
-    # @return [String]
-    def full_message(highlight: nil, order: nil, **)
-      return super if @full_message.nil?
-
-      highlight = Exception.to_tty? if highlight.nil?
-      if highlight
-        @full_message.dup
-      else
-        @full_message.gsub(/\e\[[0-9;]*m/, '')
+      # @!visibility private
+      def detailed_message(highlight: nil, **)
+        return super if @detailed_message.nil?
+
+        highlight = Exception.to_tty? if highlight.nil?
+
+        detailed_message = @detailed_message.sub(message, super)
+        detailed_message.gsub!(/\e\[[0-9;]*m/, '') unless highlight
+        detailed_message
+      end
+    else # TODO: remove once ruby 3.1 support is dropped
+      # @!visibility private
+      def initialize(message, detailed_message, sass_stack, span, loaded_urls)
+        super(detailed_message.nil? ? message : detailed_message)
+
+        @message = message
+        @detailed_message = detailed_message
+        @sass_stack = sass_stack
+        @span = span
+        @loaded_urls = loaded_urls
+      end
+
+      # @!visibility private
+      def message
+        return @message if @detailed_message.nil? || @full_message.nil?
+
+        @detailed_message
+      end
+
+      # @!visibility private
+      def detailed_message(highlight: nil, **)
+        highlight = Exception.to_tty? if highlight.nil?
+
+        super_ = if highlight
+                   lines = message.split("\n")
+                   lines[0] += " (\e[1;4m#{self.class.name}\e[m\e[1m)" unless lines.empty?
+                   lines.map { |line| "\e[1m#{line}\e[m" }.join("\n")
+                 else
+                   lines = message.split("\n", 2)
+                   lines[0] += " (#{self.class.name})" unless lines.empty?
+                   lines.join("\n")
+                 end
+
+        return super_ if @detailed_message.nil?
+
+        detailed_message = @detailed_message.sub(message, super_)
+        detailed_message.gsub!(/\e\[[0-9;]*m/, '') unless highlight
+        detailed_message
+      end
+
+      # @!visibility private
+      def full_message(highlight: nil, order: :top, **)
+        highlight = Exception.to_tty? if highlight.nil?
+
+        @full_message = true
+        full_message = super.force_encoding(message.encoding)
+        full_message.gsub!(/\e\[[0-9;]*m/, '') unless highlight
+        full_message
+      ensure
+        @full_message = nil
       end
     end
 

data/lib/sass/gem_package_importer.rb

@@ -2,16 +2,25 @@
 
 module Sass
   # The built-in RubyGems package importer. This loads pkg: URLs from gems.
+  #
+  # @example
+  #   require 'bundler/inline'
+  #
+  #   gemfile do
+  #     source 'https://rubygems.org'
+  #     gem 'bootstrap', require: false
+  #     gem 'sass-embedded'
+  #   end
+  #
+  #   puts Sass.compile_string('@use "pkg:bootstrap/assets/stylesheets/bootstrap";', importers: [Sass::GemPackageImporter.new]).css
   class GemPackageImporter
     # @!visibility private
     def find_file_url(url, _canonicalize_context)
       return unless url.start_with?('pkg:')
 
-      library, _, path = url[4..].partition(/[#?]/).first.partition('/')
-      gem_dir = Gem::Dependency.new(library).to_spec.gem_dir
-      gem_dir = "/#{gem_dir}" unless gem_dir.start_with?('/')
-
-      "file://#{gem_dir.gsub(/[#%?\\]/, { '#' => '%23', '%' => '%25', '?' => '%3F', '\\' => '%5C' })}/#{path}"
+      library, _, path = url[4..].partition('/')
+      gem_dir = Gem::Dependency.new(Uri.decode_uri_component(library)).to_spec.gem_dir
+      "#{Uri.path_to_file_uri(gem_dir)}/#{path}"
     rescue Gem::MissingSpecError
       nil
     end

data/lib/sass/uri.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'uri'
+
+module Sass
+  # The {Uri} class.
+  #
+  # It follows RFC3986 to match the behavior of Uri class from Dart.
+  #
+  # @see https://www.rfc-editor.org/info/rfc3986/
+  module Uri
+    module_function
+
+    def decode_uri_component(str)
+      str.b.gsub(/%\h\h/, ::URI::TBLDECWWWCOMP_).force_encoding(str.encoding)
+    end
+
+    def encode_uri_component(str)
+      str.b.gsub(/[^0-9A-Za-z\-._~]/n, ::URI::TBLENCURICOMP_).force_encoding(str.encoding)
+    end
+
+    def encode_uri_path_component(str)
+      str.b.gsub(%r{[^0-9A-Za-z\-._~!$&'()*+,;=:@/]}n, ::URI::TBLENCURICOMP_).force_encoding(str.encoding)
+    end
+
+    def encode_uri_query_component(str)
+      str.b.gsub(%r{[^0-9A-Za-z\-._~!$&'()*+,;=:@/?]}n, ::URI::TBLENCURICOMP_).force_encoding(str.encoding)
+    end
+
+    def file_uri_to_path(uri)
+      path = decode_uri_component(::URI::RFC3986_PARSER.parse(uri).path)
+      if path.start_with?('/')
+        windows_path = path[1..]
+        path = windows_path if File.absolute_path?(windows_path)
+      end
+      path
+    end
+
+    def path_to_file_uri(path)
+      path = "/#{path}" unless path.start_with?('/')
+      "file://#{encode_uri_path_component(path)}"
+    end
+
+    def pwd
+      pwd = Dir.pwd
+      pwd += '/' unless pwd.end_with?('/')
+      path_to_file_uri(pwd)
+    end
+
+    def relative(to, from)
+      ::URI::RFC3986_PARSER.parse(to).route_from(from).to_s
+    end
+  end
+
+  private_constant :Uri
+end

data/lib/sass/value/color/space/utils.rb

@@ -33,7 +33,7 @@ module Sass
 
           # The algorithm for converting a single `srgb` or `display-p3` channel to
           # linear-light form.
-          # @param [Numeric]
+          # @param channel [Numeric]
           # @return [Numeric]
           def srgb_and_display_p3_to_linear(channel)
             abs = channel.abs
@@ -42,7 +42,7 @@ module Sass
 
           # The algorithm for converting a single `srgb` or `display-p3` channel to
           # gamma-corrected form.
-          # @param [Numeric]
+          # @param channel [Numeric]
           # @return [Numeric]
           def srgb_and_display_p3_from_linear(channel)
             abs = channel.abs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.100.0
+  version: 1.101.0
 platform: aarch64-linux-musl
 authors:
 - なつき
@@ -45,12 +45,14 @@ files:
 - lib/sass/compiler/channel.rb
 - lib/sass/compiler/connection.rb
 - lib/sass/compiler/dispatcher.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/struct.rb
+- lib/sass/compiler/session.rb
+- lib/sass/compiler/session/function_registry.rb
+- lib/sass/compiler/session/importer_registry.rb
+- lib/sass/compiler/session/logger_registry.rb
+- lib/sass/compiler/session/path.rb
+- lib/sass/compiler/session/protofier.rb
+- lib/sass/compiler/session/stack_trace.rb
+- lib/sass/compiler/session/struct.rb
 - lib/sass/compiler/varint.rb
 - lib/sass/dart-sass/sass
 - lib/sass/dart-sass/src/LICENSE
@@ -69,6 +71,7 @@ files:
 - lib/sass/logger/source_span.rb
 - lib/sass/node_package_importer.rb
 - lib/sass/serializer.rb
+- lib/sass/uri.rb
 - lib/sass/value.rb
 - lib/sass/value/argument_list.rb
 - lib/sass/value/boolean.rb
@@ -113,8 +116,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/issues
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.100.0
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.100.0
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.101.0
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.101.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -131,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.14
 specification_version: 4
 summary: Use dart-sass with Ruby!
 test_files: []