sass-embedded 1.54.9 → 1.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba4dffee35cd747cce67de5bfe4debc7ea0158fb56de27822bff9dc8cbad8e77
-  data.tar.gz: 56c4aea5b5d528746dbe96d7789058015e9af394731c3f3f6f6e347f1bb21ac2
+  metadata.gz: ee7d52b37c80905070cd65a96799ad116d6106f88cadca73059ca671b5a82927
+  data.tar.gz: 8934a78850974f0459228356bb896f354b029af6f367c7b0a70445ca90b61452
 SHA512:
-  metadata.gz: d73daef0cda8db040827b3ded905d296cc82518ac510f09ff9946c6d88b997dbc2286230ad9db9fcc8bbe0792592f8df2bf60ba9a3113bca4ad901a49afbcb94
-  data.tar.gz: 7d1cbc06c400aae621bbc6d7df4c7f56735cfbde7a906469c4c3d64403b6d3a24edd66faa0c9d5ffbf35de2b3070bf0f452d29f5067470aa23c426b07a504fc3
+  metadata.gz: f898deff1d68ddf87e339e0da3a3ef01f5dbce53ca69c439b8d92c8bd4a2fd013c623eb3443550ec2cc2be2fa6505259ad0bdbb42b76c19a768f2bf401ebec4c
+  data.tar.gz: 4bdebd4fe3e7734ff058c8f1cd9d74a492a7a654067f06ac6d5e656a3528dd75c1b2a374cc1b40e0742f2b20971dc8b5f79b80888a1f697158cb1d7041236a4f

data/README.md

@@ -3,7 +3,7 @@
 [![build](https://github.com/ntkme/sass-embedded-host-ruby/actions/workflows/build.yml/badge.svg)](https://github.com/ntkme/sass-embedded-host-ruby/actions/workflows/build.yml)
 [![gem](https://badge.fury.io/rb/sass-embedded.svg)](https://rubygems.org/gems/sass-embedded)
 
-This is a Ruby library that implements the host side of the [Embedded Sass protocol](https://github.com/sass/sass-embedded-protocol).
+This is a Ruby library that implements the host side of the [Embedded Sass protocol](https://github.com/sass/embedded-protocol).
 
 It exposes a Ruby API for Sass that's backed by a native [Dart Sass](https://sass-lang.com/dart-sass) executable.
 

data/ext/sass/Rakefile

@@ -4,7 +4,9 @@ require 'rake/clean'
 
 task default: %i[install clean]
 
-task install: %w[sass_embedded embedded.rb embedded_sass_pb.rb]
+task install: %w[embedded.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]
 
@@ -51,14 +53,59 @@ end
 # This is a FileUtils extension that defines several additional commands to be
 # added to the FileUtils utility functions.
 module FileUtils
+  # PowerShell quirks:
+  # - `powershell -Command -`:
+  #     Arguments must be part of command, thus cannot pass arguments safely without escaping.
+  # - `powershell -Command <script-block> [-args <arg-array>]`:
+  #     This only works when invoking powershell subshell in powershell.
+  # - `powershell -Command <string> [<CommandParameters>]`:
+  #     CommandParameters are joined with command and then parsed, thus cannot pass arguments safely without escaping.
+  # - `powershell -File -`:
+  #     Arguments must be part of file, thus cannot pass arguments safely without escaping.
+  # - `powershell -File <filePath> <args>`:
+  #     This is the only way to pass arguments safely without escaping.
+  def powershell(file, *args)
+    sh 'powershell', '-NoLogo', '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-File', file, *args
+  end
+
+  def junzip(archive, dest = '.')
+    require 'java'
+
+    Rake.rake_output_message "Archive:  #{archive}" if Rake::FileUtilsExt.verbose_flag
+
+    current_directory = java.nio.file.Paths.get(org.jruby.Ruby.getGlobalRuntime.getCurrentDirectory)
+    zip_file = java.util.zip.ZipFile.new(current_directory.resolve(archive).toFile)
+    dest_path = current_directory.resolve(dest).normalize
+    entries = zip_file.entries
+    while entries.hasMoreElements
+      entry = entries.nextElement
+      name = entry.getName
+      path = dest_path.resolve(name).normalize
+      raise unless path.startsWith(dest_path)
+
+      Rake.rake_output_message "  inflating: #{name}" if Rake::FileUtilsExt.verbose_flag
+
+      if entry.isDirectory
+        java.nio.file.Files.createDirectories(path)
+      else
+        java.nio.file.Files.createDirectories(path.getParent)
+        java.nio.file.Files.copy(zip_file.getInputStream(entry), path)
+      end
+    end
+  ensure
+    zip_file&.close
+  end
+
   def unarchive(archive, dest = '.')
     case archive.downcase
     when ->(name) { name.include?('.tar.') || name.end_with?('.tar') }
       mkdir_p dest
       sh 'tar', '-vxC', dest, '-f', archive
     when ->(name) { name.end_with?('.zip') }
-      if Gem.win_platform?
-        sh 'cscript', 'unzip.vbs', '//B', '//Nologo', archive, dest
+      if RUBY_PLATFORM == 'java'
+        junzip archive, dest
+      elsif Gem.win_platform?
+        powershell 'expand-archive.ps1', '-Force', '-LiteralPath', archive, '-DestinationPath', dest, '-PassThru'
       else
         sh 'unzip', '-od', dest, archive
       end

data/ext/sass/embedded_sass_pb.rb

@@ -0,0 +1,349 @@
+# 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
+    end
+  end
+end
+
+module Sass
+  module EmbeddedProtocol
+    InboundMessage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.InboundMessage").msgclass
+    InboundMessage::VersionRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.InboundMessage.VersionRequest").msgclass
+    InboundMessage::CompileRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.InboundMessage.CompileRequest").msgclass
+    InboundMessage::CompileRequest::StringInput = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.InboundMessage.CompileRequest.StringInput").msgclass
+    InboundMessage::CompileRequest::Importer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.InboundMessage.CompileRequest.Importer").msgclass
+    InboundMessage::CanonicalizeResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.InboundMessage.CanonicalizeResponse").msgclass
+    InboundMessage::ImportResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.InboundMessage.ImportResponse").msgclass
+    InboundMessage::ImportResponse::ImportSuccess = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.InboundMessage.ImportResponse.ImportSuccess").msgclass
+    InboundMessage::FileImportResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.InboundMessage.FileImportResponse").msgclass
+    InboundMessage::FunctionCallResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.InboundMessage.FunctionCallResponse").msgclass
+    OutboundMessage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.OutboundMessage").msgclass
+    OutboundMessage::VersionResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.OutboundMessage.VersionResponse").msgclass
+    OutboundMessage::CompileResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.OutboundMessage.CompileResponse").msgclass
+    OutboundMessage::CompileResponse::CompileSuccess = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.OutboundMessage.CompileResponse.CompileSuccess").msgclass
+    OutboundMessage::CompileResponse::CompileFailure = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.OutboundMessage.CompileResponse.CompileFailure").msgclass
+    OutboundMessage::LogEvent = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.OutboundMessage.LogEvent").msgclass
+    OutboundMessage::CanonicalizeRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.OutboundMessage.CanonicalizeRequest").msgclass
+    OutboundMessage::ImportRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.OutboundMessage.ImportRequest").msgclass
+    OutboundMessage::FileImportRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.OutboundMessage.FileImportRequest").msgclass
+    OutboundMessage::FunctionCallRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.OutboundMessage.FunctionCallRequest").msgclass
+    ProtocolError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.ProtocolError").msgclass
+    SourceSpan = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.SourceSpan").msgclass
+    SourceSpan::SourceLocation = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.SourceSpan.SourceLocation").msgclass
+    Value = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value").msgclass
+    Value::String = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.String").msgclass
+    Value::Number = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.Number").msgclass
+    Value::RgbColor = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.RgbColor").msgclass
+    Value::HslColor = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.HslColor").msgclass
+    Value::HwbColor = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.HwbColor").msgclass
+    Value::List = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.List").msgclass
+    Value::Map = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.Map").msgclass
+    Value::Map::Entry = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.Map.Entry").msgclass
+    Value::CompilerFunction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.CompilerFunction").msgclass
+    Value::HostFunction = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.HostFunction").msgclass
+    Value::ArgumentList = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.ArgumentList").msgclass
+    Value::Calculation = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.Calculation").msgclass
+    Value::Calculation::CalculationValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.Calculation.CalculationValue").msgclass
+    Value::Calculation::CalculationOperation = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Value.Calculation.CalculationOperation").msgclass
+    OutputStyle = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.OutputStyle").enummodule
+    Syntax = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.Syntax").enummodule
+    LogEventType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.LogEventType").enummodule
+    ProtocolErrorType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.ProtocolErrorType").enummodule
+    ListSeparator = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.ListSeparator").enummodule
+    SingletonValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.SingletonValue").enummodule
+    CalculationOperator = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("sass.embedded_protocol.CalculationOperator").enummodule
+  end
+end

data/ext/sass/expand-archive.ps1

@@ -0,0 +1 @@
+Expand-Archive @args

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass-embedded": "1.54.9"
+    "sass-embedded": "1.55.0"
   }
 }

data/lib/sass/embedded/host/importer_registry.rb

@@ -26,7 +26,7 @@ module Sass
         end
 
         def register(importer)
-          importer = Structifier.to_struct(importer)
+          importer = Structifier.to_struct(importer, :canonicalize, :load, :find_file_url)
 
           is_importer = importer.respond_to?(:canonicalize) && importer.respond_to?(:load)
           is_file_importer = importer.respond_to?(:find_file_url)
@@ -65,7 +65,7 @@ module Sass
 
         def import(import_request)
           importer = @importers_by_id[import_request.importer_id]
-          importer_result = Structifier.to_struct importer.load(import_request.url)
+          importer_result = Structifier.to_struct importer.load(import_request.url), :contents, :syntax, :source_map_url
 
           EmbeddedProtocol::InboundMessage::ImportResponse.new(
             id: import_request.id,

data/lib/sass/embedded/host/logger_registry.rb

@@ -10,7 +10,7 @@ module Sass
         attr_reader :logger
 
         def initialize(logger)
-          @logger = Structifier.to_struct(logger)
+          @logger = Structifier.to_struct(logger, :debug, :warn)
         end
 
         def log(event)

data/lib/sass/embedded/host.rb

@@ -132,7 +132,7 @@ module Sass
         yield
         @async.await
       ensure
-        @connection.disconnect
+        @connection&.disconnect
       end
     end
 

data/lib/sass/embedded/structifier.rb

@@ -8,13 +8,16 @@ module Sass
     module Structifier
       module_function
 
-      def to_struct(obj)
+      def to_struct(obj, *symbols)
         return obj unless obj.is_a? Hash
 
         struct = Object.new
-        obj.each do |key, value|
+        symbols.each do |key|
+          next unless obj.key?(key)
+
+          value = obj[key]
           if value.respond_to? :call
-            struct.define_singleton_method key.to_sym do |*args, **kwargs|
+            struct.define_singleton_method key do |*args, **kwargs|
               if kwargs.empty?
                 value.call(*args)
               else
@@ -22,7 +25,7 @@ module Sass
               end
             end
           else
-            struct.define_singleton_method key.to_sym do
+            struct.define_singleton_method key do
               value
             end
           end

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.54.9'
+    VERSION = '1.55.0'
   end
 end

data/lib/sass/script_error.rb

@@ -2,5 +2,9 @@
 
 module Sass
   # An exception thrown by Sass Script.
-  class ScriptError < StandardError; end
+  class ScriptError < StandardError
+    def initialize(message, name = nil)
+      super(name.nil? ? message : "$#{name}: #{message}")
+    end
+  end
 end

data/lib/sass/value/color.rb

@@ -44,7 +44,7 @@ module Sass
           hwb_to_rgb
           @whiteness = @blackness = nil
         else
-          raise error 'Invalid Color'
+          raise Sass::ScriptError, 'Invalid Color'
         end
       end
 

data/lib/sass/value/fuzzy_math.rb

@@ -63,8 +63,7 @@ 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 hash(number)

data/lib/sass/value/list.rb

@@ -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

data/lib/sass/value/number.rb

@@ -24,12 +24,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?
@@ -105,7 +109,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 +129,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 +142,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
@@ -271,7 +275,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
@@ -288,19 +293,21 @@ module Sass
             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

@@ -42,10 +42,10 @@ 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

data/lib/sass/value.rb

@@ -57,52 +57,52 @@ 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
 
     # @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 [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,10 +113,6 @@ module Sass
     def to_a_length
       1
     end
-
-    def error(message, name = nil)
-      Sass::ScriptError.new name.nil? ? message : "$#{name}: #{message}"
-    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.54.9
+  version: 1.55.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.13.1
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
@@ -120,8 +120,9 @@ files:
 - LICENSE
 - README.md
 - ext/sass/Rakefile
+- ext/sass/embedded_sass_pb.rb
+- ext/sass/expand-archive.ps1
 - ext/sass/package.json
-- ext/sass/unzip.vbs
 - lib/sass-embedded.rb
 - lib/sass/compile_error.rb
 - lib/sass/compile_result.rb
@@ -159,8 +160,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.54.9
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.54.9
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.55.0
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.55.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.22
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!

data/ext/sass/unzip.vbs

@@ -1,13 +0,0 @@
-path = WScript.Arguments.item(0)
-destinationPath = WScript.Arguments.item(1)
-
-Set fileSystemObject = WScript.CreateObject("Scripting.FileSystemObject")
-If NOT fileSystemObject.FolderExists(destinationPath) Then
-    fileSystemObject.CreateFolder(destinationPath)
-End If
-
-Set application = WScript.CreateObject("Shell.Application")
-Set pathNameSpace = application.NameSpace(fileSystemObject.GetAbsolutePathName(path))
-Set destinationPathNameSpace = application.NameSpace(fileSystemObject.GetAbsolutePathName(destinationPath))
-
-destinationPathNameSpace.CopyHere pathNameSpace.items, 4 + 16