sass-embedded 1.62.0 → 1.63.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b3d0d1ba450405b09e53f216d1e0997dcb5474b8fc4b28bd0995d9af22dffe2
-  data.tar.gz: 8ac843704ab8d7ab5a4468e9f7783e78aa0ea9f66eaf2193b315505fef01f1d0
+  metadata.gz: e9d032c70d15ccdee68d59c6c96bea5447c7fe9909ba0d626de15ae1f5063945
+  data.tar.gz: 0c935046d3735b39d978ce9678354c4bdc057234c10b40ef26511e560674f7cf
 SHA512:
-  metadata.gz: 2e832441f74f534c8598b3da5eba98c0b693c808b6834c7d194f3694642b58607aa4c55e21dd69905a64ed730b599addce1262bf22935fec63dc068380ebf951
-  data.tar.gz: 66dfe65efef95810ad39f5143e6abca7c918158db3d782c5a811fba9ad5e673a299b23f2111282c3daa95ab3eebb013d97fb9ab25ba7f3b1f825b0e59604499e
+  metadata.gz: 21f2a1ce8e24ae0bf50d17c412ebcba3efc45bca99faba61743e0d4694a4d4c01ff1698d2761a8ea4d870923def03d17ad3b0828bd1746e76e36e075dbc5f84e
+  data.tar.gz: 509663362c14b15f4a1b69244828283e88a477277d2eceb2a9718b288e966dfa6a5aad92d63b8b4637619eef7b22a78b167e8f412de2255c67b2446d55fed92f

data/README.md

@@ -24,6 +24,9 @@ require 'sass-embedded'
 
 result = Sass.compile('style.scss')
 puts result.css
+
+compressed = Sass.compile('style.scss', style: :compressed)
+puts compressed.css
 ```
 
 - `Sass.compile_string` takes a string that represents the contents of a Sass file and return the result of compiling that file to CSS.
@@ -33,9 +36,12 @@ require 'sass-embedded'
 
 result = Sass.compile_string('h1 { font-size: 40px; }')
 puts result.css
+
+compressed = Sass.compile_string('h1 { font-size: 40px; }', style: :compressed)
+puts compressed.css
 ```
 
-See [rubydoc.info/gems/sass-embedded](https://rubydoc.info/gems/sass-embedded) for full API documentation.
+See [rubydoc.info/gems/sass-embedded/Sass](https://rubydoc.info/gems/sass-embedded/Sass) for full API documentation.
 
 ---
 

data/exe/sass

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../ext/sass/cli'
+
+module Sass
+  # The `sass` command line interface
+  class CLI
+    begin
+      exec(*COMMAND, *ARGV)
+    rescue Errno::ENOENT
+      require_relative '../lib/sass/elf'
+
+      raise if ELF::INTERPRETER.nil?
+
+      exec(ELF::INTERPRETER, *COMMAND, *ARGV)
+    end
+  end
+
+  private_constant :CLI
+end

data/ext/sass/Rakefile

@@ -4,67 +4,61 @@ require 'rake/clean'
 
 task default: %i[install clean]
 
-task install: %w[embedded.rb] do
+task install: %w[cli.rb] do
   Rake::Task['embedded_sass_pb.rb'].invoke unless File.exist?('embedded_sass_pb.rb')
 end
 
 CLEAN.include %w[protoc.exe *.proto *.tar.gz *.zip]
 
-CLOBBER.include %w[sass_embedded embedded.rb embedded_sass_pb.rb]
+CLOBBER.include %w[dart-sass cli.rb embedded_sass_pb.rb]
 
 file 'protoc.exe' do |t|
   fetch(ENV.fetch('PROTOC_BIN') { Configuration.default_protoc }, t.name)
   chmod 'a+x', t.name
 end
 
-file 'sass_embedded' do |t|
-  archive = fetch(ENV.fetch(t.name.upcase) { Configuration.default_sass_embedded })
+file 'dart-sass' do |t|
+  archive = fetch(ENV.fetch(t.name.tr('-', '_').upcase) { Configuration.default_dart_sass })
   unarchive archive
   rm archive
-
-  if ENV.key?('NIX_BINTOOLS')
-    sh 'patchelf',
-       '--set-interpreter', File.read("#{ENV.fetch('NIX_BINTOOLS')}/nix-support/dynamic-linker").chomp,
-       (['sass_embedded/src/dart', 'sass_embedded/dart-sass-embedded'].find { |exe| File.exist?(exe) })
-  end
 end
 
-file 'embedded.rb' => %w[sass_embedded] do |t|
-  exe = 'sass_embedded/dart-sass-embedded'
+file 'cli.rb' => %w[dart-sass] do |t|
+  exe = 'dart-sass/sass'
   exe = "#{exe}#{['', '.bat', '.exe'].find { |ext| File.exist?("#{exe}#{ext}") }}"
 
   raise "#{exe} not found" unless File.exist?(exe)
 
-  runtime = 'sass_embedded/src/dart'
+  runtime = 'dart-sass/src/dart'
   runtime = "#{runtime}#{['', '.exe'].find { |ext| File.exist?("#{runtime}#{ext}") }}"
-  snapshot = 'sass_embedded/src/dart-sass-embedded.snapshot'
+  snapshot = 'dart-sass/src/sass.snapshot'
 
   command = if File.exist?(runtime) && File.exist?(snapshot)
               "
-        File.absolute_path('#{runtime}', __dir__),
-        File.absolute_path('#{snapshot}', __dir__)
-      "
+      File.absolute_path('#{runtime}', __dir__),
+      File.absolute_path('#{snapshot}', __dir__)
+    "
             else
               "
-        File.absolute_path('#{exe}', __dir__)
-      "
+      File.absolute_path('#{exe}', __dir__)
+    "
             end
 
-  File.write(t.name, <<~EMBEDDED_RB)
+  File.write(t.name, <<~CLI_RB)
     # frozen_string_literal: true
 
     module Sass
-      class Embedded
-        class Compiler
-          COMMAND = [#{command}].freeze
-        end
+      class CLI
+        COMMAND = [#{command}].freeze
       end
+
+      private_constant :CLI
     end
-  EMBEDDED_RB
+  CLI_RB
 end
 
-file 'embedded_sass.proto' => %w[embedded.rb] do |t|
-  fetch(ENV.fetch('SASS_EMBEDDED_PROTOCOL') { Configuration.default_sass_embedded_protocol }, t.name)
+file 'embedded_sass.proto' => %w[cli.rb] do |t|
+  fetch(ENV.fetch('EMBEDDED_SASS_PROTOCOL') { Configuration.default_embedded_sass_protocol }, t.name)
 end
 
 rule '_pb.rb' => %w[.proto protoc.exe] do |t|
@@ -227,16 +221,16 @@ module Configuration
 
   module_function
 
-  def default_sass_embedded
+  def default_dart_sass
     require 'json'
 
-    repo = 'https://github.com/sass/dart-sass-embedded'
+    repo = 'https://github.com/sass/dart-sass'
 
     spec = JSON.parse(File.read(File.absolute_path('package.json', __dir__)))
 
-    tag_name = spec['dependencies']['sass-embedded']
+    tag_name = spec['dependencies']['sass']
 
-    message = "sass_embedded for #{Platform::ARCH} not available at #{repo}/releases/tag/#{tag_name}"
+    message = "dart-sass for #{Platform::ARCH} not available at #{repo}/releases/tag/#{tag_name}"
 
     os = case Platform::OS
          when 'darwin'
@@ -244,10 +238,10 @@ module Configuration
          when 'linux'
            'linux'
          when 'linux-android'
-           repo = 'https://github.com/dart-android/dart-sass-embedded'
+           repo = 'https://github.com/dart-android/dart-sass'
            'android'
          when 'linux-musl'
-           repo = 'https://github.com/dart-musl/dart-sass-embedded'
+           repo = 'https://github.com/dart-musl/dart-sass'
            'linux'
          when 'windows'
            'windows'
@@ -270,7 +264,7 @@ module Configuration
 
     ext = Platform::OS == 'windows' ? 'zip' : 'tar.gz'
 
-    "#{repo}/releases/download/#{tag_name}/sass_embedded-#{tag_name}-#{os}-#{cpu}.#{ext}"
+    "#{repo}/releases/download/#{tag_name}/dart-sass-#{tag_name}-#{os}-#{cpu}.#{ext}"
   end
 
   def default_protoc
@@ -309,17 +303,19 @@ module Configuration
     "#{repo}/#{version}/protoc-#{version}-#{os}-#{cpu}.exe"
   end
 
-  def default_sass_embedded_protocol
+  def default_embedded_sass_protocol
     require 'json'
     require 'open3'
-    require_relative 'embedded'
 
-    stdout, stderr, status = Open3.capture3(*Sass::Embedded::Compiler::COMMAND, '--version')
+    stdout, stderr, status = Open3.capture3(RbConfig.ruby,
+                                            File.absolute_path('../../exe/sass', __dir__),
+                                            '--embedded',
+                                            '--version')
 
     raise stderr unless status.success?
 
     tag_name = JSON.parse(stdout)['protocolVersion']
 
-    "https://github.com/sass/embedded-protocol/raw/#{tag_name}/embedded_sass.proto"
+    "https://github.com/sass/sass/raw/embedded-protocol-#{tag_name}/spec/embedded_sass.proto"
   end
 end

data/ext/sass/embedded_sass_pb.rb

@@ -1,301 +1,34 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: embedded_sass.proto
 
 require 'google/protobuf'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("embedded_sass.proto", :syntax => :proto3) do
-    add_message "sass.embedded_protocol.InboundMessage" do
-      oneof :message do
-        optional :compile_request, :message, 2, "sass.embedded_protocol.InboundMessage.CompileRequest"
-        optional :canonicalize_response, :message, 3, "sass.embedded_protocol.InboundMessage.CanonicalizeResponse"
-        optional :import_response, :message, 4, "sass.embedded_protocol.InboundMessage.ImportResponse"
-        optional :file_import_response, :message, 5, "sass.embedded_protocol.InboundMessage.FileImportResponse"
-        optional :function_call_response, :message, 6, "sass.embedded_protocol.InboundMessage.FunctionCallResponse"
-        optional :version_request, :message, 7, "sass.embedded_protocol.InboundMessage.VersionRequest"
-      end
-    end
-    add_message "sass.embedded_protocol.InboundMessage.VersionRequest" do
-      optional :id, :uint32, 1
-    end
-    add_message "sass.embedded_protocol.InboundMessage.CompileRequest" do
-      optional :id, :uint32, 1
-      optional :style, :enum, 4, "sass.embedded_protocol.OutputStyle"
-      optional :source_map, :bool, 5
-      repeated :importers, :message, 6, "sass.embedded_protocol.InboundMessage.CompileRequest.Importer"
-      repeated :global_functions, :string, 7
-      optional :alert_color, :bool, 8
-      optional :alert_ascii, :bool, 9
-      optional :verbose, :bool, 10
-      optional :quiet_deps, :bool, 11
-      optional :source_map_include_sources, :bool, 12
-      optional :charset, :bool, 13
-      oneof :input do
-        optional :string, :message, 2, "sass.embedded_protocol.InboundMessage.CompileRequest.StringInput"
-        optional :path, :string, 3
-      end
-    end
-    add_message "sass.embedded_protocol.InboundMessage.CompileRequest.StringInput" do
-      optional :source, :string, 1
-      optional :url, :string, 2
-      optional :syntax, :enum, 3, "sass.embedded_protocol.Syntax"
-      optional :importer, :message, 4, "sass.embedded_protocol.InboundMessage.CompileRequest.Importer"
-    end
-    add_message "sass.embedded_protocol.InboundMessage.CompileRequest.Importer" do
-      oneof :importer do
-        optional :path, :string, 1
-        optional :importer_id, :uint32, 2
-        optional :file_importer_id, :uint32, 3
-      end
-    end
-    add_message "sass.embedded_protocol.InboundMessage.CanonicalizeResponse" do
-      optional :id, :uint32, 1
-      oneof :result do
-        optional :url, :string, 2
-        optional :error, :string, 3
-      end
-    end
-    add_message "sass.embedded_protocol.InboundMessage.ImportResponse" do
-      optional :id, :uint32, 1
-      oneof :result do
-        optional :success, :message, 2, "sass.embedded_protocol.InboundMessage.ImportResponse.ImportSuccess"
-        optional :error, :string, 3
-      end
-    end
-    add_message "sass.embedded_protocol.InboundMessage.ImportResponse.ImportSuccess" do
-      optional :contents, :string, 1
-      optional :syntax, :enum, 2, "sass.embedded_protocol.Syntax"
-      optional :source_map_url, :string, 3
-    end
-    add_message "sass.embedded_protocol.InboundMessage.FileImportResponse" do
-      optional :id, :uint32, 1
-      oneof :result do
-        optional :file_url, :string, 2
-        optional :error, :string, 3
-      end
-    end
-    add_message "sass.embedded_protocol.InboundMessage.FunctionCallResponse" do
-      optional :id, :uint32, 1
-      repeated :accessed_argument_lists, :uint32, 4
-      oneof :result do
-        optional :success, :message, 2, "sass.embedded_protocol.Value"
-        optional :error, :string, 3
-      end
-    end
-    add_message "sass.embedded_protocol.OutboundMessage" do
-      oneof :message do
-        optional :error, :message, 1, "sass.embedded_protocol.ProtocolError"
-        optional :compile_response, :message, 2, "sass.embedded_protocol.OutboundMessage.CompileResponse"
-        optional :log_event, :message, 3, "sass.embedded_protocol.OutboundMessage.LogEvent"
-        optional :canonicalize_request, :message, 4, "sass.embedded_protocol.OutboundMessage.CanonicalizeRequest"
-        optional :import_request, :message, 5, "sass.embedded_protocol.OutboundMessage.ImportRequest"
-        optional :file_import_request, :message, 6, "sass.embedded_protocol.OutboundMessage.FileImportRequest"
-        optional :function_call_request, :message, 7, "sass.embedded_protocol.OutboundMessage.FunctionCallRequest"
-        optional :version_response, :message, 8, "sass.embedded_protocol.OutboundMessage.VersionResponse"
-      end
-    end
-    add_message "sass.embedded_protocol.OutboundMessage.VersionResponse" do
-      optional :id, :uint32, 5
-      optional :protocol_version, :string, 1
-      optional :compiler_version, :string, 2
-      optional :implementation_version, :string, 3
-      optional :implementation_name, :string, 4
-    end
-    add_message "sass.embedded_protocol.OutboundMessage.CompileResponse" do
-      optional :id, :uint32, 1
-      oneof :result do
-        optional :success, :message, 2, "sass.embedded_protocol.OutboundMessage.CompileResponse.CompileSuccess"
-        optional :failure, :message, 3, "sass.embedded_protocol.OutboundMessage.CompileResponse.CompileFailure"
-      end
-    end
-    add_message "sass.embedded_protocol.OutboundMessage.CompileResponse.CompileSuccess" do
-      optional :css, :string, 1
-      optional :source_map, :string, 2
-      repeated :loaded_urls, :string, 3
-    end
-    add_message "sass.embedded_protocol.OutboundMessage.CompileResponse.CompileFailure" do
-      optional :message, :string, 1
-      optional :span, :message, 2, "sass.embedded_protocol.SourceSpan"
-      optional :stack_trace, :string, 3
-      optional :formatted, :string, 4
-    end
-    add_message "sass.embedded_protocol.OutboundMessage.LogEvent" do
-      optional :compilation_id, :uint32, 1
-      optional :type, :enum, 2, "sass.embedded_protocol.LogEventType"
-      optional :message, :string, 3
-      optional :span, :message, 4, "sass.embedded_protocol.SourceSpan"
-      optional :stack_trace, :string, 5
-      optional :formatted, :string, 6
-    end
-    add_message "sass.embedded_protocol.OutboundMessage.CanonicalizeRequest" do
-      optional :id, :uint32, 1
-      optional :compilation_id, :uint32, 2
-      optional :importer_id, :uint32, 3
-      optional :url, :string, 4
-      optional :from_import, :bool, 5
-    end
-    add_message "sass.embedded_protocol.OutboundMessage.ImportRequest" do
-      optional :id, :uint32, 1
-      optional :compilation_id, :uint32, 2
-      optional :importer_id, :uint32, 3
-      optional :url, :string, 4
-    end
-    add_message "sass.embedded_protocol.OutboundMessage.FileImportRequest" do
-      optional :id, :uint32, 1
-      optional :compilation_id, :uint32, 2
-      optional :importer_id, :uint32, 3
-      optional :url, :string, 4
-      optional :from_import, :bool, 5
-    end
-    add_message "sass.embedded_protocol.OutboundMessage.FunctionCallRequest" do
-      optional :id, :uint32, 1
-      optional :compilation_id, :uint32, 2
-      repeated :arguments, :message, 5, "sass.embedded_protocol.Value"
-      oneof :identifier do
-        optional :name, :string, 3
-        optional :function_id, :uint32, 4
-      end
-    end
-    add_message "sass.embedded_protocol.ProtocolError" do
-      optional :type, :enum, 1, "sass.embedded_protocol.ProtocolErrorType"
-      optional :id, :uint32, 2
-      optional :message, :string, 3
-    end
-    add_message "sass.embedded_protocol.SourceSpan" do
-      optional :text, :string, 1
-      optional :start, :message, 2, "sass.embedded_protocol.SourceSpan.SourceLocation"
-      optional :end, :message, 3, "sass.embedded_protocol.SourceSpan.SourceLocation"
-      optional :url, :string, 4
-      optional :context, :string, 5
-    end
-    add_message "sass.embedded_protocol.SourceSpan.SourceLocation" do
-      optional :offset, :uint32, 1
-      optional :line, :uint32, 2
-      optional :column, :uint32, 3
-    end
-    add_message "sass.embedded_protocol.Value" do
-      oneof :value do
-        optional :string, :message, 1, "sass.embedded_protocol.Value.String"
-        optional :number, :message, 2, "sass.embedded_protocol.Value.Number"
-        optional :rgb_color, :message, 3, "sass.embedded_protocol.Value.RgbColor"
-        optional :hsl_color, :message, 4, "sass.embedded_protocol.Value.HslColor"
-        optional :list, :message, 5, "sass.embedded_protocol.Value.List"
-        optional :map, :message, 6, "sass.embedded_protocol.Value.Map"
-        optional :singleton, :enum, 7, "sass.embedded_protocol.SingletonValue"
-        optional :compiler_function, :message, 8, "sass.embedded_protocol.Value.CompilerFunction"
-        optional :host_function, :message, 9, "sass.embedded_protocol.Value.HostFunction"
-        optional :argument_list, :message, 10, "sass.embedded_protocol.Value.ArgumentList"
-        optional :hwb_color, :message, 11, "sass.embedded_protocol.Value.HwbColor"
-        optional :calculation, :message, 12, "sass.embedded_protocol.Value.Calculation"
-      end
-    end
-    add_message "sass.embedded_protocol.Value.String" do
-      optional :text, :string, 1
-      optional :quoted, :bool, 2
-    end
-    add_message "sass.embedded_protocol.Value.Number" do
-      optional :value, :double, 1
-      repeated :numerators, :string, 2
-      repeated :denominators, :string, 3
-    end
-    add_message "sass.embedded_protocol.Value.RgbColor" do
-      optional :red, :uint32, 1
-      optional :green, :uint32, 2
-      optional :blue, :uint32, 3
-      optional :alpha, :double, 4
-    end
-    add_message "sass.embedded_protocol.Value.HslColor" do
-      optional :hue, :double, 1
-      optional :saturation, :double, 2
-      optional :lightness, :double, 3
-      optional :alpha, :double, 4
-    end
-    add_message "sass.embedded_protocol.Value.HwbColor" do
-      optional :hue, :double, 1
-      optional :whiteness, :double, 2
-      optional :blackness, :double, 3
-      optional :alpha, :double, 4
-    end
-    add_message "sass.embedded_protocol.Value.List" do
-      optional :separator, :enum, 1, "sass.embedded_protocol.ListSeparator"
-      optional :has_brackets, :bool, 2
-      repeated :contents, :message, 3, "sass.embedded_protocol.Value"
-    end
-    add_message "sass.embedded_protocol.Value.Map" do
-      repeated :entries, :message, 1, "sass.embedded_protocol.Value.Map.Entry"
-    end
-    add_message "sass.embedded_protocol.Value.Map.Entry" do
-      optional :key, :message, 1, "sass.embedded_protocol.Value"
-      optional :value, :message, 2, "sass.embedded_protocol.Value"
-    end
-    add_message "sass.embedded_protocol.Value.CompilerFunction" do
-      optional :id, :uint32, 1
-    end
-    add_message "sass.embedded_protocol.Value.HostFunction" do
-      optional :id, :uint32, 1
-      optional :signature, :string, 2
-    end
-    add_message "sass.embedded_protocol.Value.ArgumentList" do
-      optional :id, :uint32, 1
-      optional :separator, :enum, 2, "sass.embedded_protocol.ListSeparator"
-      repeated :contents, :message, 3, "sass.embedded_protocol.Value"
-      map :keywords, :string, :message, 4, "sass.embedded_protocol.Value"
-    end
-    add_message "sass.embedded_protocol.Value.Calculation" do
-      optional :name, :string, 1
-      repeated :arguments, :message, 2, "sass.embedded_protocol.Value.Calculation.CalculationValue"
-    end
-    add_message "sass.embedded_protocol.Value.Calculation.CalculationValue" do
-      oneof :value do
-        optional :number, :message, 1, "sass.embedded_protocol.Value.Number"
-        optional :string, :string, 2
-        optional :interpolation, :string, 3
-        optional :operation, :message, 4, "sass.embedded_protocol.Value.Calculation.CalculationOperation"
-        optional :calculation, :message, 5, "sass.embedded_protocol.Value.Calculation"
-      end
-    end
-    add_message "sass.embedded_protocol.Value.Calculation.CalculationOperation" do
-      optional :operator, :enum, 1, "sass.embedded_protocol.CalculationOperator"
-      optional :left, :message, 2, "sass.embedded_protocol.Value.Calculation.CalculationValue"
-      optional :right, :message, 3, "sass.embedded_protocol.Value.Calculation.CalculationValue"
-    end
-    add_enum "sass.embedded_protocol.OutputStyle" do
-      value :EXPANDED, 0
-      value :COMPRESSED, 1
-    end
-    add_enum "sass.embedded_protocol.Syntax" do
-      value :SCSS, 0
-      value :INDENTED, 1
-      value :CSS, 2
-    end
-    add_enum "sass.embedded_protocol.LogEventType" do
-      value :WARNING, 0
-      value :DEPRECATION_WARNING, 1
-      value :DEBUG, 2
-    end
-    add_enum "sass.embedded_protocol.ProtocolErrorType" do
-      value :PARSE, 0
-      value :PARAMS, 1
-      value :INTERNAL, 2
-    end
-    add_enum "sass.embedded_protocol.ListSeparator" do
-      value :COMMA, 0
-      value :SPACE, 1
-      value :SLASH, 2
-      value :UNDECIDED, 3
-    end
-    add_enum "sass.embedded_protocol.SingletonValue" do
-      value :TRUE, 0
-      value :FALSE, 1
-      value :NULL, 2
-    end
-    add_enum "sass.embedded_protocol.CalculationOperator" do
-      value :PLUS, 0
-      value :MINUS, 1
-      value :TIMES, 2
-      value :DIVIDE, 3
+
+descriptor_data = "\n\x13\x65mbedded_sass.proto\x12\x16sass.embedded_protocol\"\xd9\x0e\n\x0eInboundMessage\x12P\n\x0f\x63ompile_request\x18\x02 \x01(\x0b\x32\x35.sass.embedded_protocol.InboundMessage.CompileRequestH\x00\x12\\\n\x15\x63\x61nonicalize_response\x18\x03 \x01(\x0b\x32;.sass.embedded_protocol.InboundMessage.CanonicalizeResponseH\x00\x12P\n\x0fimport_response\x18\x04 \x01(\x0b\x32\x35.sass.embedded_protocol.InboundMessage.ImportResponseH\x00\x12Y\n\x14\x66ile_import_response\x18\x05 \x01(\x0b\x32\x39.sass.embedded_protocol.InboundMessage.FileImportResponseH\x00\x12]\n\x16\x66unction_call_response\x18\x06 \x01(\x0b\x32;.sass.embedded_protocol.InboundMessage.FunctionCallResponseH\x00\x12P\n\x0fversion_request\x18\x07 \x01(\x0b\x32\x35.sass.embedded_protocol.InboundMessage.VersionRequestH\x00\x1a\x1c\n\x0eVersionRequest\x12\n\n\x02id\x18\x01 \x01(\r\x1a\xc7\x05\n\x0e\x43ompileRequest\x12S\n\x06string\x18\x02 \x01(\x0b\x32\x41.sass.embedded_protocol.InboundMessage.CompileRequest.StringInputH\x00\x12\x0e\n\x04path\x18\x03 \x01(\tH\x00\x12\x32\n\x05style\x18\x04 \x01(\x0e\x32#.sass.embedded_protocol.OutputStyle\x12\x12\n\nsource_map\x18\x05 \x01(\x08\x12Q\n\timporters\x18\x06 \x03(\x0b\x32>.sass.embedded_protocol.InboundMessage.CompileRequest.Importer\x12\x18\n\x10global_functions\x18\x07 \x03(\t\x12\x13\n\x0b\x61lert_color\x18\x08 \x01(\x08\x12\x13\n\x0b\x61lert_ascii\x18\t \x01(\x08\x12\x0f\n\x07verbose\x18\n \x01(\x08\x12\x12\n\nquiet_deps\x18\x0b \x01(\x08\x12\"\n\x1asource_map_include_sources\x18\x0c \x01(\x08\x12\x0f\n\x07\x63harset\x18\r \x01(\x08\x1a\xac\x01\n\x0bStringInput\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\x0b\n\x03url\x18\x02 \x01(\t\x12.\n\x06syntax\x18\x03 \x01(\x0e\x32\x1e.sass.embedded_protocol.Syntax\x12P\n\x08importer\x18\x04 \x01(\x0b\x32>.sass.embedded_protocol.InboundMessage.CompileRequest.Importer\x1aY\n\x08Importer\x12\x0e\n\x04path\x18\x01 \x01(\tH\x00\x12\x15\n\x0bimporter_id\x18\x02 \x01(\rH\x00\x12\x1a\n\x10\x66ile_importer_id\x18\x03 \x01(\rH\x00\x42\n\n\x08importerB\x07\n\x05inputJ\x04\x08\x01\x10\x02\x1aL\n\x14\x43\x61nonicalizeResponse\x12\n\n\x02id\x18\x01 \x01(\r\x12\r\n\x03url\x18\x02 \x01(\tH\x00\x12\x0f\n\x05\x65rror\x18\x03 \x01(\tH\x00\x42\x08\n\x06result\x1a\x93\x02\n\x0eImportResponse\x12\n\n\x02id\x18\x01 \x01(\r\x12V\n\x07success\x18\x02 \x01(\x0b\x32\x43.sass.embedded_protocol.InboundMessage.ImportResponse.ImportSuccessH\x00\x12\x0f\n\x05\x65rror\x18\x03 \x01(\tH\x00\x1a\x81\x01\n\rImportSuccess\x12\x10\n\x08\x63ontents\x18\x01 \x01(\t\x12.\n\x06syntax\x18\x02 \x01(\x0e\x32\x1e.sass.embedded_protocol.Syntax\x12\x1b\n\x0esource_map_url\x18\x03 \x01(\tH\x00\x88\x01\x01\x42\x11\n\x0f_source_map_urlB\x08\n\x06result\x1aO\n\x12\x46ileImportResponse\x12\n\n\x02id\x18\x01 \x01(\r\x12\x12\n\x08\x66ile_url\x18\x02 \x01(\tH\x00\x12\x0f\n\x05\x65rror\x18\x03 \x01(\tH\x00\x42\x08\n\x06result\x1a\x90\x01\n\x14\x46unctionCallResponse\x12\n\n\x02id\x18\x01 \x01(\r\x12\x30\n\x07success\x18\x02 \x01(\x0b\x32\x1d.sass.embedded_protocol.ValueH\x00\x12\x0f\n\x05\x65rror\x18\x03 \x01(\tH\x00\x12\x1f\n\x17\x61\x63\x63\x65ssed_argument_lists\x18\x04 \x03(\rB\x08\n\x06resultB\t\n\x07message\"\xb5\x0e\n\x0fOutboundMessage\x12\x36\n\x05\x65rror\x18\x01 \x01(\x0b\x32%.sass.embedded_protocol.ProtocolErrorH\x00\x12S\n\x10\x63ompile_response\x18\x02 \x01(\x0b\x32\x37.sass.embedded_protocol.OutboundMessage.CompileResponseH\x00\x12\x45\n\tlog_event\x18\x03 \x01(\x0b\x32\x30.sass.embedded_protocol.OutboundMessage.LogEventH\x00\x12[\n\x14\x63\x61nonicalize_request\x18\x04 \x01(\x0b\x32;.sass.embedded_protocol.OutboundMessage.CanonicalizeRequestH\x00\x12O\n\x0eimport_request\x18\x05 \x01(\x0b\x32\x35.sass.embedded_protocol.OutboundMessage.ImportRequestH\x00\x12X\n\x13\x66ile_import_request\x18\x06 \x01(\x0b\x32\x39.sass.embedded_protocol.OutboundMessage.FileImportRequestH\x00\x12\\\n\x15\x66unction_call_request\x18\x07 \x01(\x0b\x32;.sass.embedded_protocol.OutboundMessage.FunctionCallRequestH\x00\x12S\n\x10version_response\x18\x08 \x01(\x0b\x32\x37.sass.embedded_protocol.OutboundMessage.VersionResponseH\x00\x1a\x8e\x01\n\x0fVersionResponse\x12\n\n\x02id\x18\x05 \x01(\r\x12\x18\n\x10protocol_version\x18\x01 \x01(\t\x12\x18\n\x10\x63ompiler_version\x18\x02 \x01(\t\x12\x1e\n\x16implementation_version\x18\x03 \x01(\t\x12\x1b\n\x13implementation_name\x18\x04 \x01(\t\x1a\xa2\x03\n\x0f\x43ompileResponse\x12Y\n\x07success\x18\x02 \x01(\x0b\x32\x46.sass.embedded_protocol.OutboundMessage.CompileResponse.CompileSuccessH\x00\x12Y\n\x07\x66\x61ilure\x18\x03 \x01(\x0b\x32\x46.sass.embedded_protocol.OutboundMessage.CompileResponse.CompileFailureH\x00\x12\x13\n\x0bloaded_urls\x18\x04 \x03(\t\x1a\x37\n\x0e\x43ompileSuccess\x12\x0b\n\x03\x63ss\x18\x01 \x01(\t\x12\x12\n\nsource_map\x18\x02 \x01(\tJ\x04\x08\x03\x10\x04\x1a{\n\x0e\x43ompileFailure\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\x30\n\x04span\x18\x02 \x01(\x0b\x32\".sass.embedded_protocol.SourceSpan\x12\x13\n\x0bstack_trace\x18\x03 \x01(\t\x12\x11\n\tformatted\x18\x04 \x01(\tB\x08\n\x06resultJ\x04\x08\x01\x10\x02\x1a\xbd\x01\n\x08LogEvent\x12\x32\n\x04type\x18\x02 \x01(\x0e\x32$.sass.embedded_protocol.LogEventType\x12\x0f\n\x07message\x18\x03 \x01(\t\x12\x35\n\x04span\x18\x04 \x01(\x0b\x32\".sass.embedded_protocol.SourceSpanH\x00\x88\x01\x01\x12\x13\n\x0bstack_trace\x18\x05 \x01(\t\x12\x11\n\tformatted\x18\x06 \x01(\tB\x07\n\x05_spanJ\x04\x08\x01\x10\x02\x1a^\n\x13\x43\x61nonicalizeRequest\x12\n\n\x02id\x18\x01 \x01(\r\x12\x13\n\x0bimporter_id\x18\x03 \x01(\r\x12\x0b\n\x03url\x18\x04 \x01(\t\x12\x13\n\x0b\x66rom_import\x18\x05 \x01(\x08J\x04\x08\x02\x10\x03\x1a\x43\n\rImportRequest\x12\n\n\x02id\x18\x01 \x01(\r\x12\x13\n\x0bimporter_id\x18\x03 \x01(\r\x12\x0b\n\x03url\x18\x04 \x01(\tJ\x04\x08\x02\x10\x03\x1a\\\n\x11\x46ileImportRequest\x12\n\n\x02id\x18\x01 \x01(\r\x12\x13\n\x0bimporter_id\x18\x03 \x01(\r\x12\x0b\n\x03url\x18\x04 \x01(\t\x12\x13\n\x0b\x66rom_import\x18\x05 \x01(\x08J\x04\x08\x02\x10\x03\x1a\x8e\x01\n\x13\x46unctionCallRequest\x12\n\n\x02id\x18\x01 \x01(\r\x12\x0e\n\x04name\x18\x03 \x01(\tH\x00\x12\x15\n\x0b\x66unction_id\x18\x04 \x01(\rH\x00\x12\x30\n\targuments\x18\x05 \x03(\x0b\x32\x1d.sass.embedded_protocol.ValueB\x0c\n\nidentifierJ\x04\x08\x02\x10\x03\x42\t\n\x07message\"e\n\rProtocolError\x12\x37\n\x04type\x18\x01 \x01(\x0e\x32).sass.embedded_protocol.ProtocolErrorType\x12\n\n\x02id\x18\x02 \x01(\r\x12\x0f\n\x07message\x18\x03 \x01(\t\"\x87\x02\n\nSourceSpan\x12\x0c\n\x04text\x18\x01 \x01(\t\x12@\n\x05start\x18\x02 \x01(\x0b\x32\x31.sass.embedded_protocol.SourceSpan.SourceLocation\x12\x43\n\x03\x65nd\x18\x03 \x01(\x0b\x32\x31.sass.embedded_protocol.SourceSpan.SourceLocationH\x00\x88\x01\x01\x12\x0b\n\x03url\x18\x04 \x01(\t\x12\x0f\n\x07\x63ontext\x18\x05 \x01(\t\x1a>\n\x0eSourceLocation\x12\x0e\n\x06offset\x18\x01 \x01(\r\x12\x0c\n\x04line\x18\x02 \x01(\r\x12\x0e\n\x06\x63olumn\x18\x03 \x01(\rB\x06\n\x04_end\"\xd4\x12\n\x05Value\x12\x36\n\x06string\x18\x01 \x01(\x0b\x32$.sass.embedded_protocol.Value.StringH\x00\x12\x36\n\x06number\x18\x02 \x01(\x0b\x32$.sass.embedded_protocol.Value.NumberH\x00\x12;\n\trgb_color\x18\x03 \x01(\x0b\x32&.sass.embedded_protocol.Value.RgbColorH\x00\x12;\n\thsl_color\x18\x04 \x01(\x0b\x32&.sass.embedded_protocol.Value.HslColorH\x00\x12\x32\n\x04list\x18\x05 \x01(\x0b\x32\".sass.embedded_protocol.Value.ListH\x00\x12\x30\n\x03map\x18\x06 \x01(\x0b\x32!.sass.embedded_protocol.Value.MapH\x00\x12;\n\tsingleton\x18\x07 \x01(\x0e\x32&.sass.embedded_protocol.SingletonValueH\x00\x12K\n\x11\x63ompiler_function\x18\x08 \x01(\x0b\x32..sass.embedded_protocol.Value.CompilerFunctionH\x00\x12\x43\n\rhost_function\x18\t \x01(\x0b\x32*.sass.embedded_protocol.Value.HostFunctionH\x00\x12\x43\n\rargument_list\x18\n \x01(\x0b\x32*.sass.embedded_protocol.Value.ArgumentListH\x00\x12;\n\thwb_color\x18\x0b \x01(\x0b\x32&.sass.embedded_protocol.Value.HwbColorH\x00\x12@\n\x0b\x63\x61lculation\x18\x0c \x01(\x0b\x32).sass.embedded_protocol.Value.CalculationH\x00\x1a&\n\x06String\x12\x0c\n\x04text\x18\x01 \x01(\t\x12\x0e\n\x06quoted\x18\x02 \x01(\x08\x1a\x41\n\x06Number\x12\r\n\x05value\x18\x01 \x01(\x01\x12\x12\n\nnumerators\x18\x02 \x03(\t\x12\x14\n\x0c\x64\x65nominators\x18\x03 \x03(\t\x1a\x43\n\x08RgbColor\x12\x0b\n\x03red\x18\x01 \x01(\r\x12\r\n\x05green\x18\x02 \x01(\r\x12\x0c\n\x04\x62lue\x18\x03 \x01(\r\x12\r\n\x05\x61lpha\x18\x04 \x01(\x01\x1aM\n\x08HslColor\x12\x0b\n\x03hue\x18\x01 \x01(\x01\x12\x12\n\nsaturation\x18\x02 \x01(\x01\x12\x11\n\tlightness\x18\x03 \x01(\x01\x12\r\n\x05\x61lpha\x18\x04 \x01(\x01\x1aL\n\x08HwbColor\x12\x0b\n\x03hue\x18\x01 \x01(\x01\x12\x11\n\twhiteness\x18\x02 \x01(\x01\x12\x11\n\tblackness\x18\x03 \x01(\x01\x12\r\n\x05\x61lpha\x18\x04 \x01(\x01\x1a\x87\x01\n\x04List\x12\x38\n\tseparator\x18\x01 \x01(\x0e\x32%.sass.embedded_protocol.ListSeparator\x12\x14\n\x0chas_brackets\x18\x02 \x01(\x08\x12/\n\x08\x63ontents\x18\x03 \x03(\x0b\x32\x1d.sass.embedded_protocol.Value\x1a\xa2\x01\n\x03Map\x12\x38\n\x07\x65ntries\x18\x01 \x03(\x0b\x32\'.sass.embedded_protocol.Value.Map.Entry\x1a\x61\n\x05\x45ntry\x12*\n\x03key\x18\x01 \x01(\x0b\x32\x1d.sass.embedded_protocol.Value\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.sass.embedded_protocol.Value\x1a\x1e\n\x10\x43ompilerFunction\x12\n\n\x02id\x18\x01 \x01(\r\x1a-\n\x0cHostFunction\x12\n\n\x02id\x18\x01 \x01(\r\x12\x11\n\tsignature\x18\x02 \x01(\t\x1a\xa1\x02\n\x0c\x41rgumentList\x12\n\n\x02id\x18\x01 \x01(\r\x12\x38\n\tseparator\x18\x02 \x01(\x0e\x32%.sass.embedded_protocol.ListSeparator\x12/\n\x08\x63ontents\x18\x03 \x03(\x0b\x32\x1d.sass.embedded_protocol.Value\x12J\n\x08keywords\x18\x04 \x03(\x0b\x32\x38.sass.embedded_protocol.Value.ArgumentList.KeywordsEntry\x1aN\n\rKeywordsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.sass.embedded_protocol.Value:\x02\x38\x01\x1a\xef\x04\n\x0b\x43\x61lculation\x12\x0c\n\x04name\x18\x01 \x01(\t\x12M\n\targuments\x18\x02 \x03(\x0b\x32:.sass.embedded_protocol.Value.Calculation.CalculationValue\x1a\x95\x02\n\x10\x43\x61lculationValue\x12\x36\n\x06number\x18\x01 \x01(\x0b\x32$.sass.embedded_protocol.Value.NumberH\x00\x12\x10\n\x06string\x18\x02 \x01(\tH\x00\x12\x17\n\rinterpolation\x18\x03 \x01(\tH\x00\x12S\n\toperation\x18\x04 \x01(\x0b\x32>.sass.embedded_protocol.Value.Calculation.CalculationOperationH\x00\x12@\n\x0b\x63\x61lculation\x18\x05 \x01(\x0b\x32).sass.embedded_protocol.Value.CalculationH\x00\x42\x07\n\x05value\x1a\xea\x01\n\x14\x43\x61lculationOperation\x12=\n\x08operator\x18\x01 \x01(\x0e\x32+.sass.embedded_protocol.CalculationOperator\x12H\n\x04left\x18\x02 \x01(\x0b\x32:.sass.embedded_protocol.Value.Calculation.CalculationValue\x12I\n\x05right\x18\x03 \x01(\x0b\x32:.sass.embedded_protocol.Value.Calculation.CalculationValueB\x07\n\x05value*+\n\x0bOutputStyle\x12\x0c\n\x08\x45XPANDED\x10\x00\x12\x0e\n\nCOMPRESSED\x10\x01*)\n\x06Syntax\x12\x08\n\x04SCSS\x10\x00\x12\x0c\n\x08INDENTED\x10\x01\x12\x07\n\x03\x43SS\x10\x02*?\n\x0cLogEventType\x12\x0b\n\x07WARNING\x10\x00\x12\x17\n\x13\x44\x45PRECATION_WARNING\x10\x01\x12\t\n\x05\x44\x45\x42UG\x10\x02*8\n\x11ProtocolErrorType\x12\t\n\x05PARSE\x10\x00\x12\n\n\x06PARAMS\x10\x01\x12\x0c\n\x08INTERNAL\x10\x02*?\n\rListSeparator\x12\t\n\x05\x43OMMA\x10\x00\x12\t\n\x05SPACE\x10\x01\x12\t\n\x05SLASH\x10\x02\x12\r\n\tUNDECIDED\x10\x03*/\n\x0eSingletonValue\x12\x08\n\x04TRUE\x10\x00\x12\t\n\x05\x46\x41LSE\x10\x01\x12\x08\n\x04NULL\x10\x02*A\n\x13\x43\x61lculationOperator\x12\x08\n\x04PLUS\x10\x00\x12\t\n\x05MINUS\x10\x01\x12\t\n\x05TIMES\x10\x02\x12\n\n\x06\x44IVIDE\x10\x03\x62\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError => e
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
   end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Sass

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass-embedded": "1.62.0"
+    "sass": "1.63.1"
   }
 }

data/lib/sass/compile_error.rb

@@ -4,25 +4,27 @@ module Sass
   # An exception thrown because a Sass compilation failed.
   class CompileError < StandardError
     # @return [String, nil]
-    attr_accessor :sass_stack
+    attr_reader :sass_stack
 
     # @return [Logger::SourceSpan, nil]
-    attr_accessor :span
+    attr_reader :span
 
-    def initialize(message, full_message, sass_stack, span)
+    # @return [Array<String>]
+    attr_reader :loaded_urls
+
+    def initialize(message, full_message, sass_stack, span, loaded_urls)
       super(message)
-      @full_message = full_message == '' ? nil : full_message.dup
-      @sass_stack = sass_stack == '' ? nil : sass_stack
+      @full_message = full_message
+      @sass_stack = sass_stack
       @span = span
+      @loaded_urls = loaded_urls
     end
 
     # @return [String]
     def full_message(...)
-      if @full_message.nil?
-        super(...)
-      else
-        @full_message
-      end
+      return super(...) if @full_message.nil?
+
+      @full_message = +@full_message
     end
   end
 end

data/lib/sass/compile_result.rb

@@ -16,7 +16,7 @@ module Sass
 
     def initialize(css, source_map, loaded_urls)
       @css = css
-      @source_map = source_map == '' ? nil : source_map
+      @source_map = source_map
       @loaded_urls = loaded_urls
     end
   end