sass-embedded 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74339d550d532d1edc9ecb2cb8894a514c5519c71af3eb4a6e3066f09c3d02e4
-  data.tar.gz: b93e64c9e33a7a684a4cb4767e2bdd62b2a81f0dd636483d31b174ba16c0a088
+  metadata.gz: 3d3305290374a056f10b9d2cb5df79a8bf3d262e8dd7e2528e8ded8b53658bc6
+  data.tar.gz: 2a5826eefe6eef8aadc3a4beba40c85a573b9fe3f8f4ac36e0d923a02b6264c6
 SHA512:
-  metadata.gz: a0aaddbc0bf954095bfa061e270eaa86e37409935ae180d1c13e97e3034eb89a913cce63f57c3d0dff2076ba17d03bd4516b058b809c702f31fc08fd40d6780c
-  data.tar.gz: 8a2317cbc80f5f6040e8d341e1f0eee67448547d2dd47b32e94caa5d869cfafc0a0b903e52b63a44f3bbec84178e072424a8a938dc0f568c42d3bffb1ee107ad
+  metadata.gz: 74777ec7d2869d83a1cf27dbc5b6751126f73ff4ed01c0af16b85162fd3456f46b73ba8ad64dd758c36b2819d2ccf3a958a951b4615e2dfa73db758a39fff21e
+  data.tar.gz: a648b472413cbb7063dd6cf9a988034bd0da668ab4c06c16f02c395a26d09d064dd46f57c6f99487ed4998bc0de35806f2f5f49a83487436efb8ff6ab459d2a9

data/ext/sass/extconf.rb

@@ -5,8 +5,7 @@ require 'fileutils'
 require 'json'
 require 'mkmf'
 require 'open-uri'
-require_relative '../../lib/sass/embedded/compiler/path'
-require_relative '../../lib/sass/embedded/compiler/requirements'
+require_relative '../../lib/sass/embedded/compiler'
 
 module Sass
   class Embedded
@@ -123,56 +122,12 @@ module Sass
         raise
       end
 
-      def resolve_tag_name(repo, *requirements, gh_release: true)
-        requirements = Gem::Requirement.create(*requirements)
-
-        satisfied = lambda { |version|
-          Gem::Version.correct?(version) && requirements.satisfied_by?(Gem::Version.new(version))
-        }
-
-        headers = {}
-        headers['Authorization'] = "token #{ENV['GITHUB_TOKEN']}" if ENV['GITHUB_TOKEN']
-
-        begin
-          if gh_release
-            releases_uri = "https://github.com/#{repo}/releases"
-            uri = "#{releases_uri}/latest"
-            tag_name = URI.parse(uri).open do |file|
-              return nil if file.base_uri == releases_uri
-
-              latest = File.basename file.base_uri.to_s
-              latest if satisfied.call latest
-            end
-
-            return tag_name unless tag_name.nil?
-
-            uri = "https://api.github.com/repos/#{repo}/releases?per_page=100"
-            tag_name = URI.parse(uri).open(headers) do |file|
-              JSON.parse(file.read).map { |release| release['tag_name'] }
-            end
-                          .find(satisfied)&.peek
-          else
-            uri = "https://api.github.com/repos/#{repo}/tags?per_page=100"
-            tag_name = URI.parse(uri).open(headers) do |file|
-              JSON.parse(file.read).map { |tag| tag['name'] }
-            end
-                          .find(satisfied)&.peek
-          end
-
-          return tag_name unless tag_name.nil?
-        rescue OpenURI::HTTPError => e
-          warn "WARNING:  Error fetching #{uri}: #{e}"
-        end
-
-        requirements.requirements
-                    .map { |requirement| requirement.last.to_s.gsub('.pre.', '-') }
-                    .find(satisfied)&.peek
-      end
-
       def default_sass_embedded
         repo = 'sass/dart-sass-embedded'
 
-        tag_name = resolve_tag_name(repo, Compiler::REQUIREMENTS)
+        spec = JSON.parse(File.read(File.absolute_path('package.json', __dir__)))
+
+        tag_name = spec['dependencies']['sass-embedded']
 
         os = case Platform::OS
              when 'darwin'

data/ext/sass/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "sass-embedded": "1.49.8"
+  }
+}

data/lib/sass/compile_error.rb

@@ -3,13 +3,21 @@
 module Sass
   # An exception thrown because a Sass compilation failed.
   class CompileError < StandardError
-    attr_accessor :sass_message, :sass_stack, :span
+    attr_accessor :sass_stack, :span
 
-    def initialize(message, sass_message, sass_stack, span)
+    def initialize(message, full_message, sass_stack, span)
       super(message)
-      @sass_message = sass_message
+      @full_message = full_message
       @sass_stack = sass_stack
       @span = span
     end
+
+    def full_message(**kwargs)
+      if @full_message.nil?
+        super.full_message(**kwargs)
+      else
+        @full_message
+      end
+    end
   end
 end

data/lib/sass/embedded/compile_context/function_registry.rb

@@ -7,7 +7,9 @@ module Sass
       class FunctionRegistry
         attr_reader :global_functions
 
-        def initialize(functions)
+        def initialize(functions, highlight:)
+          functions = functions.transform_keys(&:to_s)
+
           @global_functions = functions.keys
           @functions_by_name = functions.transform_keys do |signature|
             signature = signature.chomp
@@ -18,9 +20,12 @@ module Sass
               signature
             end
           end
+
+          @id = 0
           @functions_by_id = {}
           @ids_by_function = {}
-          @id = 0
+
+          @highlight = highlight
         end
 
         def register(function)
@@ -37,10 +42,10 @@ module Sass
 
         def function_call(function_call_request)
           arguments = function_call_request.arguments.map do |argument|
-            protofier.from_proto_value(argument)
+            value_protofier.from_proto(argument)
           end
 
-          success = protofier.to_proto_value(get(function_call_request).call(arguments))
+          success = value_protofier.to_proto(get(function_call_request).call(arguments))
           accessed_argument_lists = arguments
                                     .filter do |argument|
                                       argument.is_a?(Sass::Value::ArgumentList) && argument.instance_eval do
@@ -57,7 +62,7 @@ module Sass
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::FunctionCallResponse.new(
             id: function_call_request.id,
-            error: e.message
+            error: e.full_message(highlight: @highlight, order: :top)
           )
         end
 
@@ -72,8 +77,8 @@ module Sass
           end
         end
 
-        def protofier
-          @protofier ||= Protofier.new(self)
+        def value_protofier
+          @value_protofier ||= ValueProtofier.new(self)
         end
       end
 

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

@@ -7,7 +7,7 @@ module Sass
       class ImporterRegistry
         attr_reader :importers
 
-        def initialize(importers, load_paths)
+        def initialize(importers, load_paths, highlight:)
           @id = 0
           @importers_by_id = {}
           @importers = importers
@@ -17,9 +17,13 @@ module Sass
                                    path: File.absolute_path(load_path)
                                  )
                                end)
+
+          @highlight = highlight
         end
 
         def register(importer)
+          importer = Structifier.to_struct(importer)
+
           is_importer = importer.respond_to?(:canonicalize) && importer.respond_to?(:load)
           is_file_importer = importer.respond_to?(:find_file_url)
 
@@ -50,13 +54,13 @@ module Sass
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
             id: canonicalize_request.id,
-            error: e.message
+            error: e.full_message(highlight: @highlight, order: :top)
           )
         end
 
         def import(import_request)
           importer = @importers_by_id[import_request.importer_id]
-          importer_result = Protofier.to_struct importer.load(import_request.url)
+          importer_result = Structifier.to_struct importer.load(import_request.url)
 
           EmbeddedProtocol::InboundMessage::ImportResponse.new(
             id: import_request.id,
@@ -69,7 +73,7 @@ module Sass
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::ImportResponse.new(
             id: import_request.id,
-            error: e.message
+            error: e.full_message(highlight: @highlight, order: :top)
           )
         end
 
@@ -86,7 +90,7 @@ module Sass
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(
             id: file_import_request.id,
-            error: e.message
+            error: e.full_message(highlight: @highlight, order: :top)
           )
         end
       end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    class CompileContext
+      # The {LoggerRegistry} for {CompileContext}.
+      class LoggerRegistry
+        attr_reader :logger
+
+        def initialize(logger)
+          @logger = Structifier.to_struct(logger)
+        end
+
+        def log(event)
+          case event.type
+          when :DEBUG
+            if logger.respond_to? :debug
+              logger.debug(event.message, span: Protofier.from_proto_source_span(event.span))
+            else
+              warn(event.formatted)
+            end
+          when :DEPRECATION_WARNING
+            if logger.respond_to? :warn
+              logger.warn(event.message, deprecation: true,
+                                         span: Protofier.from_proto_source_span(event.span),
+                                         stack: event.stack_trace)
+            else
+              warn(event.formatted)
+            end
+          when :WARNING
+            if logger.respond_to? :warn
+              logger.warn(event.message, deprecation: false,
+                                         span: Protofier.from_proto_source_span(event.span),
+                                         stack: event.stack_trace)
+            else
+              warn(event.formatted)
+            end
+          end
+        end
+      end
+
+      private_constant :LoggerRegistry
+    end
+  end
+end

data/lib/sass/embedded/compile_context/value_protofier.rb

@@ -0,0 +1,237 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    class CompileContext
+      # The {ValueProtofier} between Pure Ruby types and Protobuf Ruby types.
+      class ValueProtofier
+        def initialize(function_registry)
+          @function_registry = function_registry
+        end
+
+        def to_proto(obj)
+          case obj
+          when Sass::Value::String
+            Sass::EmbeddedProtocol::Value.new(
+              string: Sass::EmbeddedProtocol::Value::String.new(
+                text: obj.text,
+                quoted: obj.quoted?
+              )
+            )
+          when Sass::Value::Number
+            Sass::EmbeddedProtocol::Value.new(
+              number: Sass::EmbeddedProtocol::Value::Number.new(
+                value: obj.value.to_f,
+                numerators: obj.numerator_units,
+                denominators: obj.denominator_units
+              )
+            )
+          when Sass::Value::Color
+            if obj.instance_eval { @hue.nil? }
+              Sass::EmbeddedProtocol::Value.new(
+                rgb_color: Sass::EmbeddedProtocol::Value::RgbColor.new(
+                  red: obj.red,
+                  green: obj.green,
+                  blue: obj.blue,
+                  alpha: obj.alpha.to_f
+                )
+              )
+            elsif obj.instance_eval { @saturation.nil? }
+              Sass::EmbeddedProtocol::Value.new(
+                hwb_color: Sass::EmbeddedProtocol::Value::HwbColor.new(
+                  hue: obj.hue.to_f,
+                  whiteness: obj.whiteness.to_f,
+                  blackness: obj.blackness.to_f,
+                  alpha: obj.alpha.to_f
+                )
+              )
+            else
+              Sass::EmbeddedProtocol::Value.new(
+                hsl_color: Sass::EmbeddedProtocol::Value::HslColor.new(
+                  hue: obj.hue.to_f,
+                  saturation: obj.saturation.to_f,
+                  lightness: obj.lightness.to_f,
+                  alpha: obj.alpha.to_f
+                )
+              )
+            end
+          when Sass::Value::ArgumentList
+            Sass::EmbeddedProtocol::Value.new(
+              argument_list: Sass::EmbeddedProtocol::Value::ArgumentList.new(
+                id: obj.instance_eval { @id },
+                contents: obj.contents.map { |element| to_proto(element) },
+                keywords: obj.keywords.transform_values { |value| to_proto(value) },
+                separator: ListSeparator.to_proto(obj.separator)
+              )
+            )
+          when Sass::Value::List
+            Sass::EmbeddedProtocol::Value.new(
+              list: Sass::EmbeddedProtocol::Value::List.new(
+                contents: obj.contents.map { |element| to_proto(element) },
+                separator: ListSeparator.to_proto(obj.separator),
+                has_brackets: obj.bracketed?
+              )
+            )
+          when Sass::Value::Map
+            Sass::EmbeddedProtocol::Value.new(
+              map: Sass::EmbeddedProtocol::Value::Map.new(
+                entries: obj.contents.map do |key, value|
+                  Sass::EmbeddedProtocol::Value::Map::Entry.new(
+                    key: to_proto(key),
+                    value: to_proto(value)
+                  )
+                end
+              )
+            )
+          when Sass::Value::Function
+            if obj.id
+              Sass::EmbeddedProtocol::Value.new(
+                compiler_function: Sass::EmbeddedProtocol::Value::CompilerFunction.new(
+                  id: obj.id
+                )
+              )
+            else
+              Sass::EmbeddedProtocol::Value.new(
+                host_function: Sass::EmbeddedProtocol::Value::HostFunction.new(
+                  id: @function_registry.register(obj.callback),
+                  signature: obj.signature
+                )
+              )
+            end
+          when Sass::Value::Boolean
+            Sass::EmbeddedProtocol::Value.new(
+              singleton: obj.value ? :TRUE : :FALSE
+            )
+          when Sass::Value::Null
+            Sass::EmbeddedProtocol::Value.new(
+              singleton: :NULL
+            )
+          else
+            raise Sass::ScriptError, "Unknown Sass::Value #{obj}"
+          end
+        end
+
+        def from_proto(proto)
+          obj = proto.method(proto.value).call
+          case proto.value
+          when :string
+            Sass::Value::String.new(
+              obj.text,
+              quoted: obj.quoted
+            )
+          when :number
+            Sass::Value::Number.new(
+              obj.value,
+              obj.numerators,
+              obj.denominators
+            )
+          when :rgb_color
+            Sass::Value::Color.new(
+              red: obj.red,
+              green: obj.green,
+              blue: obj.blue,
+              alpha: obj.alpha
+            )
+          when :hsl_color
+            Sass::Value::Color.new(
+              hue: obj.hue,
+              saturation: obj.saturation,
+              lightness: obj.lightness,
+              alpha: obj.alpha
+            )
+          when :hwb_color
+            Sass::Value::Color.new(
+              hue: obj.hue,
+              whiteness: obj.whiteness,
+              blackness: obj.blackness,
+              alpha: obj.alpha
+            )
+          when :argument_list
+            Sass::Value::ArgumentList.new(
+              obj.contents.map do |element|
+                from_proto(element)
+              end,
+              obj.keywords.entries.to_h do |entry|
+                [entry.first, from_proto(entry.last)]
+              end,
+              ListSeparator.from_proto(obj.separator)
+            ).instance_eval do
+              @id = obj.id
+              self
+            end
+          when :list
+            Sass::Value::List.new(
+              obj.contents.map do |element|
+                from_proto(element)
+              end,
+              separator: ListSeparator.from_proto(obj.separator),
+              bracketed: obj.has_brackets
+            )
+          when :map
+            Sass::Value::Map.new(
+              obj.entries.to_h do |entry|
+                [from_proto(entry.key), from_proto(entry.value)]
+              end
+            )
+          when :compiler_function
+            Sass::Value::Function.new(obj.id)
+          when :host_function
+            raise ProtocolError, 'The compiler may not send Value.host_function to host'
+          when :singleton
+            case obj
+            when :TRUE
+              Sass::Value::Boolean::TRUE
+            when :FALSE
+              Sass::Value::Boolean::FALSE
+            when :NULL
+              Sass::Value::Null::NULL
+            else
+              raise Sass::ScriptError, "Unknown Value.singleton #{obj}"
+            end
+          else
+            raise Sass::ScriptError, "Unknown Value.value #{obj}"
+          end
+        end
+
+        # The {ListSeparator} Protofier.
+        module ListSeparator
+          module_function
+
+          def to_proto(separator)
+            case separator
+            when ','
+              :COMMA
+            when ' '
+              :SPACE
+            when '/'
+              :SLASH
+            when nil
+              :UNDECIDED
+            else
+              raise Sass::ScriptError, "Unknown ListSeparator #{separator}"
+            end
+          end
+
+          def from_proto(separator)
+            case separator
+            when :COMMA
+              ','
+            when :SPACE
+              ' '
+            when :SLASH
+              '/'
+            when :UNDECIDED
+              nil
+            else
+              raise Sass::ScriptError, "Unknown ListSeparator #{separator}"
+            end
+          end
+        end
+
+        private_constant :ListSeparator
+      end
+
+      private_constant :ValueProtofier
+    end
+  end
+end

data/lib/sass/embedded/compile_context.rb

@@ -27,34 +27,33 @@ module Sass
                      logger:,
                      quiet_deps:,
                      verbose:)
-        @path = path
-        @source = source
-
-        @load_paths = load_paths
-        @syntax = syntax
-        @url = url
-
-        @source_map = source_map
-        @source_map_include_sources = source_map_include_sources
-        @style = style
-
-        @function_registery = FunctionRegistry.new(functions.transform_keys(&:to_s))
-        @importer_registery = ImporterRegistry.new(importers.map do |obj|
-          Protofier.to_struct(obj)
-        end, load_paths)
-        @importer = importer.nil? ? nil : @importer_registery.register(Protofier.to_struct(importer))
-
-        @alert_ascii = alert_ascii
-        @alert_color = alert_color
-
-        @logger = Protofier.to_struct(logger)
-
-        @quiet_deps = quiet_deps
-        @verbose = verbose
+        @function_registery = FunctionRegistry.new(functions, highlight: alert_color)
+        @importer_registery = ImporterRegistry.new(importers, load_paths, highlight: alert_color)
+        @logger_registery = LoggerRegistry.new(logger)
 
         super(channel)
 
-        send_message compile_request
+        send_message EmbeddedProtocol::InboundMessage::CompileRequest.new(
+          id: id,
+          string: unless source.nil?
+                    EmbeddedProtocol::InboundMessage::CompileRequest::StringInput.new(
+                      source: source,
+                      url: url&.to_s,
+                      syntax: Protofier.to_proto_syntax(syntax),
+                      importer: importer.nil? ? nil : @importer_registery.register(importer)
+                    )
+                  end,
+          path: path,
+          style: Protofier.to_proto_output_style(style),
+          source_map: source_map,
+          source_map_include_sources: source_map_include_sources,
+          importers: @importer_registery.importers,
+          global_functions: @function_registery.global_functions,
+          alert_ascii: alert_ascii,
+          alert_color: alert_color,
+          quiet_deps: quiet_deps,
+          verbose: verbose
+        )
       end
 
       def update(error, message)
@@ -70,7 +69,7 @@ module Sass
         when EmbeddedProtocol::OutboundMessage::LogEvent
           return unless message.compilation_id == id
 
-          log message
+          @logger_registery.log message
         when EmbeddedProtocol::OutboundMessage::CanonicalizeRequest
           return unless message.compilation_id == id
 
@@ -101,57 +100,6 @@ module Sass
           super(e, nil)
         end
       end
-
-      private
-
-      def log(event)
-        case event.type
-        when :DEBUG
-          if @logger.respond_to? :debug
-            @logger.debug(event.message, span: Protofier.from_proto_source_span(event.span))
-          else
-            Kernel.warn(event.formatted)
-          end
-        when :DEPRECATION_WARNING
-          if @logger.respond_to? :warn
-            @logger.warn(event.message, deprecation: true,
-                                        span: Protofier.from_proto_source_span(event.span),
-                                        stack: event.stack_trace)
-          else
-            Kernel.warn(event.formatted)
-          end
-        when :WARNING
-          if @logger.respond_to? :warn
-            @logger.warn(event.message, deprecation: false,
-                                        span: Protofier.from_proto_source_span(event.span),
-                                        stack: event.stack_trace)
-          else
-            Kernel.warn(event.formatted)
-          end
-        end
-      end
-
-      def compile_request
-        EmbeddedProtocol::InboundMessage::CompileRequest.new(
-          id: id,
-          string: unless @source.nil?
-                    EmbeddedProtocol::InboundMessage::CompileRequest::StringInput.new(
-                      source: @source,
-                      url: @url&.to_s,
-                      syntax: Protofier.to_proto_syntax(@syntax),
-                      importer: @importer
-                    )
-                  end,
-          path: @path,
-          style: Protofier.to_proto_output_style(@style),
-          source_map: @source_map,
-          source_map_include_sources: @source_map_include_sources,
-          importers: @importer_registery.importers,
-          global_functions: @function_registery.global_functions,
-          alert_ascii: @alert_ascii,
-          alert_color: @alert_color
-        )
-      end
     end
 
     private_constant :CompileContext

data/lib/sass/embedded/compiler.rb

@@ -11,6 +11,10 @@ module Sass
     class Compiler
       include Observable
 
+      PATH = File.absolute_path(
+        "../../../ext/sass/sass_embedded/dart-sass-embedded#{Gem.win_platform? ? '.bat' : ''}", __dir__
+      )
+
       PROTOCOL_ERROR_ID = 4_294_967_295
 
       def initialize
@@ -106,36 +110,15 @@ module Sass
       end
 
       def read
-        length = read_varint(@stdout)
+        length = Varint.read(@stdout)
         @stdout.read(length)
       end
 
       def write(payload)
         @stdin_mutex.synchronize do
-          write_varint(@stdin, payload.length)
-          @stdin.write payload
-        end
-      end
-
-      def read_varint(readable)
-        value = bits = 0
-        loop do
-          byte = readable.readbyte
-          value |= (byte & 0x7f) << bits
-          bits += 7
-          break if byte < 0x80
-        end
-        value
-      end
-
-      def write_varint(writeable, value)
-        bytes = []
-        until value < 0x80
-          bytes << (0x80 | (value & 0x7f))
-          value >>= 7
+          Varint.write(@stdin, payload.length)
+          @stdin.write(payload)
         end
-        bytes << value
-        writeable.write bytes.pack('C*')
       end
     end
 

data/lib/sass/embedded/protofier.rb

@@ -3,7 +3,7 @@
 module Sass
   class Embedded
     # The {Protofier} between Pure Ruby types and Protobuf Ruby types.
-    class Protofier
+    module Protofier
       ONEOF_MESSAGE = EmbeddedProtocol::InboundMessage
                       .descriptor
                       .lookup_oneof('message')
@@ -13,313 +13,75 @@ module Sass
 
       private_constant :ONEOF_MESSAGE
 
-      def initialize(function_registry)
-        @function_registry = function_registry
-      end
+      module_function
 
-      def to_proto_value(obj)
-        case obj
-        when Sass::Value::String
-          Sass::EmbeddedProtocol::Value.new(
-            string: Sass::EmbeddedProtocol::Value::String.new(
-              text: obj.text,
-              quoted: obj.quoted?
-            )
-          )
-        when Sass::Value::Number
-          Sass::EmbeddedProtocol::Value.new(
-            number: Sass::EmbeddedProtocol::Value::Number.new(
-              value: obj.value.to_f,
-              numerators: obj.numerator_units,
-              denominators: obj.denominator_units
-            )
-          )
-        when Sass::Value::Color
-          if obj.instance_eval { @hue.nil? }
-            Sass::EmbeddedProtocol::Value.new(
-              rgb_color: Sass::EmbeddedProtocol::Value::RgbColor.new(
-                red: obj.red,
-                green: obj.green,
-                blue: obj.blue,
-                alpha: obj.alpha.to_f
-              )
-            )
-          elsif obj.instance_eval { @saturation.nil? }
-            Sass::EmbeddedProtocol::Value.new(
-              hwb_color: Sass::EmbeddedProtocol::Value::HwbColor.new(
-                hue: obj.hue.to_f,
-                whiteness: obj.whiteness.to_f,
-                blackness: obj.blackness.to_f,
-                alpha: obj.alpha.to_f
-              )
-            )
-          else
-            Sass::EmbeddedProtocol::Value.new(
-              hsl_color: Sass::EmbeddedProtocol::Value::HslColor.new(
-                hue: obj.hue.to_f,
-                saturation: obj.saturation.to_f,
-                lightness: obj.lightness.to_f,
-                alpha: obj.alpha.to_f
-              )
-            )
-          end
-        when Sass::Value::ArgumentList
-          Sass::EmbeddedProtocol::Value.new(
-            argument_list: Sass::EmbeddedProtocol::Value::ArgumentList.new(
-              id: obj.instance_eval { @id },
-              contents: obj.contents.map { |element| to_proto_value(element) },
-              keywords: obj.keywords.transform_values { |value| to_proto_value(value) },
-              separator: to_proto_separator(obj.separator)
-            )
-          )
-        when Sass::Value::List
-          Sass::EmbeddedProtocol::Value.new(
-            list: Sass::EmbeddedProtocol::Value::List.new(
-              contents: obj.contents.map { |element| to_proto_value(element) },
-              separator: to_proto_separator(obj.separator),
-              has_brackets: obj.bracketed?
-            )
-          )
-        when Sass::Value::Map
-          Sass::EmbeddedProtocol::Value.new(
-            map: Sass::EmbeddedProtocol::Value::Map.new(
-              entries: obj.contents.map do |key, value|
-                Sass::EmbeddedProtocol::Value::Map::Entry.new(
-                  key: to_proto_value(key),
-                  value: to_proto_value(value)
-                )
-              end
-            )
-          )
-        when Sass::Value::Function
-          if obj.id
-            Sass::EmbeddedProtocol::Value.new(
-              compiler_function: Sass::EmbeddedProtocol::Value::CompilerFunction.new(
-                id: obj.id
-              )
-            )
-          else
-            Sass::EmbeddedProtocol::Value.new(
-              host_function: Sass::EmbeddedProtocol::Value::HostFunction.new(
-                id: @function_registry.register(obj.callback),
-                signature: obj.signature
-              )
-            )
-          end
-        when Sass::Value::Boolean
-          Sass::EmbeddedProtocol::Value.new(
-            singleton: obj.value ? :TRUE : :FALSE
+      def from_proto_compile_response(compile_response)
+        if compile_response.result == :failure
+          raise CompileError.new(
+            compile_response.failure.message,
+            compile_response.failure.formatted,
+            compile_response.failure.stack_trace,
+            from_proto_source_span(compile_response.failure.span)
           )
-        when Sass::Value::Null
-          Sass::EmbeddedProtocol::Value.new(
-            singleton: :NULL
-          )
-        else
-          raise Sass::ScriptError, "Unknown Sass::Value #{obj}"
         end
-      end
 
-      def from_proto_value(proto)
-        value = proto.method(proto.value).call
-        case proto.value
-        when :string
-          Sass::Value::String.new(
-            value.text,
-            quoted: value.quoted
-          )
-        when :number
-          Sass::Value::Number.new(
-            value.value,
-            value.numerators,
-            value.denominators
-          )
-        when :rgb_color
-          Sass::Value::Color.new(
-            red: value.red,
-            green: value.green,
-            blue: value.blue,
-            alpha: value.alpha
-          )
-        when :hsl_color
-          Sass::Value::Color.new(
-            hue: value.hue,
-            saturation: value.saturation,
-            lightness: value.lightness,
-            alpha: value.alpha
-          )
-        when :hwb_color
-          Sass::Value::Color.new(
-            hue: value.hue,
-            whiteness: value.whiteness,
-            blackness: value.blackness,
-            alpha: value.alpha
-          )
-        when :argument_list
-          Sass::Value::ArgumentList.new(
-            value.contents.map do |i|
-              from_proto_value(i)
-            end,
-            value.keywords.entries.to_h do |entry|
-              [entry.first, from_proto_value(entry.last)]
-            end,
-            from_proto_separator(value.separator)
-          ).instance_eval do
-            @id = value.id
-            self
-          end
-        when :list
-          Sass::Value::List.new(
-            value.contents.map do |element|
-              from_proto_value(element)
-            end,
-            separator: from_proto_separator(value.separator),
-            bracketed: value.has_brackets
-          )
-        when :map
-          Sass::Value::Map.new(
-            value.entries.to_h do |entry|
-              [from_proto_value(entry.key), from_proto_value(entry.value)]
-            end
-          )
-        when :compiler_function
-          Sass::Value::Function.new(value.id)
-        when :host_function
-          raise ProtocolError, 'The compiler may not send Value.host_function to host'
-        when :singleton
-          case value
-          when :TRUE
-            Sass::Value::Boolean::TRUE
-          when :FALSE
-            Sass::Value::Boolean::FALSE
-          when :NULL
-            Sass::Value::Null::NULL
-          else
-            raise Sass::ScriptError "Unknown Value.singleton #{value}"
-          end
-        else
-          raise Sass::ScriptError, "Unknown Value.value #{value}"
-        end
+        CompileResult.new(
+          compile_response.success.css,
+          compile_response.success.source_map,
+          compile_response.success.loaded_urls
+        )
       end
 
-      private
+      def from_proto_source_span(source_span)
+        return nil if source_span.nil?
 
-      def to_proto_separator(separator)
-        case separator
-        when ','
-          :COMMA
-        when ' '
-          :SPACE
-        when '/'
-          :SLASH
-        when nil
-          :UNDECIDED
-        else
-          raise Sass::ScriptError, "Unknown ListSeparator #{separator}"
-        end
+        Logger::SourceSpan.new(from_proto_source_location(source_span.start),
+                               from_proto_source_location(source_span.end),
+                               source_span.text,
+                               source_span.url,
+                               source_span.context)
       end
 
-      def from_proto_separator(separator)
-        case separator
-        when :COMMA
-          ','
-        when :SPACE
-          ' '
-        when :SLASH
-          '/'
-        when :UNDECIDED
-          nil
-        else
-          raise Sass::ScriptError, "Unknown ListSeparator #{separator}"
-        end
-      end
-
-      class << self
-        def from_proto_compile_response(compile_response)
-          if compile_response.result == :failure
-            raise CompileError.new(
-              compile_response.failure.formatted || compile_response.failure.message,
-              compile_response.failure.message,
-              compile_response.failure.stack_trace,
-              from_proto_source_span(compile_response.failure.span)
-            )
-          end
-
-          CompileResult.new(
-            compile_response.success.css,
-            compile_response.success.source_map,
-            compile_response.success.loaded_urls
-          )
-        end
-
-        def from_proto_source_span(source_span)
-          return nil if source_span.nil?
-
-          Logger::SourceSpan.new(from_proto_source_location(source_span.start),
-                                 from_proto_source_location(source_span.end),
-                                 source_span.text,
-                                 source_span.url,
-                                 source_span.context)
-        end
-
-        def from_proto_source_location(source_location)
-          return nil if source_location.nil?
-
-          Logger::SourceLocation.new(source_location.offset,
-                                     source_location.line,
-                                     source_location.column)
-        end
+      def from_proto_source_location(source_location)
+        return nil if source_location.nil?
 
-        def from_proto_message(proto)
-          message = EmbeddedProtocol::OutboundMessage.decode(proto)
-          message.method(message.message).call
-        end
+        Logger::SourceLocation.new(source_location.offset,
+                                   source_location.line,
+                                   source_location.column)
+      end
 
-        def to_proto_message(message)
-          EmbeddedProtocol::InboundMessage.new(
-            ONEOF_MESSAGE[message.class.descriptor] => message
-          ).to_proto
-        end
+      def from_proto_message(proto)
+        message = EmbeddedProtocol::OutboundMessage.decode(proto)
+        message.method(message.message).call
+      end
 
-        def to_proto_syntax(syntax)
-          case syntax&.to_sym
-          when :scss
-            EmbeddedProtocol::Syntax::SCSS
-          when :indented
-            EmbeddedProtocol::Syntax::INDENTED
-          when :css
-            EmbeddedProtocol::Syntax::CSS
-          else
-            raise ArgumentError, 'syntax must be one of :scss, :indented, :css'
-          end
-        end
+      def to_proto_message(message)
+        EmbeddedProtocol::InboundMessage.new(
+          ONEOF_MESSAGE[message.class.descriptor] => message
+        ).to_proto
+      end
 
-        def to_proto_output_style(style)
-          case style&.to_sym
-          when :expanded
-            EmbeddedProtocol::OutputStyle::EXPANDED
-          when :compressed
-            EmbeddedProtocol::OutputStyle::COMPRESSED
-          else
-            raise ArgumentError, 'style must be one of :expanded, :compressed'
-          end
+      def to_proto_syntax(syntax)
+        case syntax&.to_sym
+        when :scss
+          EmbeddedProtocol::Syntax::SCSS
+        when :indented
+          EmbeddedProtocol::Syntax::INDENTED
+        when :css
+          EmbeddedProtocol::Syntax::CSS
+        else
+          raise ArgumentError, 'syntax must be one of :scss, :indented, :css'
         end
+      end
 
-        def to_struct(obj)
-          return obj unless obj.is_a? Hash
-
-          struct = Object.new
-          obj.each do |key, value|
-            if value.respond_to? :call
-              struct.define_singleton_method key.to_sym do |*args, **kwargs|
-                value.call(*args, **kwargs)
-              end
-            else
-              struct.define_singleton_method key.to_sym do
-                value
-              end
-            end
-          end
-          struct
+      def to_proto_output_style(style)
+        case style&.to_sym
+        when :expanded
+          EmbeddedProtocol::OutputStyle::EXPANDED
+        when :compressed
+          EmbeddedProtocol::OutputStyle::COMPRESSED
+        else
+          raise ArgumentError, 'style must be one of :expanded, :compressed'
         end
       end
     end

data/lib/sass/embedded/structifier.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    # The {Structifier} that convert {::Hash} to {Struct}-like object.
+    module Structifier
+      module_function
+
+      def to_struct(obj)
+        return obj unless obj.is_a? Hash
+
+        struct = Object.new
+        obj.each do |key, value|
+          if value.respond_to? :call
+            struct.define_singleton_method key.to_sym do |*args, **kwargs|
+              if kwargs.empty?
+                value.call(*args)
+              else
+                value.call(*args, **kwargs)
+              end
+            end
+          else
+            struct.define_singleton_method key.to_sym do
+              value
+            end
+          end
+        end
+        struct
+      end
+    end
+
+    private_constant :Structifier
+  end
+end

data/lib/sass/embedded/varint.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Sass
+  class Embedded
+    # Read and write {Varint} from {::IO}.
+    module Varint
+      module_function
+
+      def read(readable)
+        value = bits = 0
+        loop do
+          byte = readable.readbyte
+          value |= (byte & 0x7f) << bits
+          bits += 7
+          break if byte < 0x80
+        end
+        value
+      end
+
+      def write(writeable, value)
+        bytes = []
+        until value < 0x80
+          bytes << (0x80 | (value & 0x7f))
+          value >>= 7
+        end
+        bytes << value
+        writeable.write bytes.pack('C*')
+      end
+    end
+
+    private_constant :Varint
+  end
+end

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '0.16.0'
+    VERSION = '0.18.0'
   end
 end

data/lib/sass/value.rb

@@ -27,7 +27,7 @@ module Sass
       false
     end
 
-    def sass_index_to_list_index(sass_index, name = nil)
+    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?
 

data/lib/sass.rb

@@ -8,12 +8,15 @@ require_relative 'sass/embedded/observer'
 require_relative 'sass/embedded/compile_context'
 require_relative 'sass/embedded/compile_context/function_registry'
 require_relative 'sass/embedded/compile_context/importer_registry'
+require_relative 'sass/embedded/compile_context/logger_registry'
+require_relative 'sass/embedded/compile_context/value_protofier'
 require_relative 'sass/embedded/compiler'
-require_relative 'sass/embedded/compiler/path'
 require_relative 'sass/embedded_protocol'
 require_relative 'sass/embedded/legacy'
 require_relative 'sass/embedded/protocol_error'
 require_relative 'sass/embedded/protofier'
+require_relative 'sass/embedded/structifier'
+require_relative 'sass/embedded/varint'
 require_relative 'sass/embedded/version'
 require_relative 'sass/embedded/version_context'
 require_relative 'sass/logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - なつき
@@ -121,6 +121,7 @@ files:
 - README.md
 - ext/sass/Makefile
 - ext/sass/extconf.rb
+- ext/sass/package.json
 - ext/sass/unzip.vbs
 - lib/sass-embedded.rb
 - lib/sass.rb
@@ -131,13 +132,15 @@ files:
 - lib/sass/embedded/compile_context.rb
 - lib/sass/embedded/compile_context/function_registry.rb
 - lib/sass/embedded/compile_context/importer_registry.rb
+- lib/sass/embedded/compile_context/logger_registry.rb
+- lib/sass/embedded/compile_context/value_protofier.rb
 - lib/sass/embedded/compiler.rb
-- lib/sass/embedded/compiler/path.rb
-- lib/sass/embedded/compiler/requirements.rb
 - lib/sass/embedded/legacy.rb
 - lib/sass/embedded/observer.rb
 - lib/sass/embedded/protocol_error.rb
 - lib/sass/embedded/protofier.rb
+- lib/sass/embedded/structifier.rb
+- lib/sass/embedded/varint.rb
 - lib/sass/embedded/version.rb
 - lib/sass/embedded/version_context.rb
 - lib/sass/embedded_protocol.rb
@@ -161,8 +164,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.16.0
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.16.0
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.18.0
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.18.0
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []
@@ -172,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    class Compiler
-      PATH = File.absolute_path(
-        "../../../../ext/sass/sass_embedded/dart-sass-embedded#{Gem.win_platform? ? '.bat' : ''}", __dir__
-      )
-    end
-  end
-end

data/lib/sass/embedded/compiler/requirements.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    class Compiler
-      REQUIREMENTS = '~> 1.49.8'
-    end
-  end
-end