sass-embedded 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ecdaedc0510249bc9b8e7da46e0b786a607153db705b5224214d5a2ef407f2a
-  data.tar.gz: 91ea0069f066bad0693367290eee7242f10b2514ba6502b3682bdfccfd3fe9d5
+  metadata.gz: bc4a584b02baef5fc270ec2ce84d7843c01f3656e64aa0c30e303a1d4c123313
+  data.tar.gz: d2230700daf1964f727ca1e5d5c695244cdb1d304700ad15997526ccb62ad31c
 SHA512:
-  metadata.gz: 1549a6a67863a7d3f3604a3f084fea4721540cbe9ffc9919505b0e71e6eac751eb5e6fa096673234307c6930962cef79ab5ba796c9c9c690fe157a8a3c580857
-  data.tar.gz: d98d4678e005203209feb31d1af90b842aef964dc7771cfd3ebc22a2e7558a9929cb014d750c8b9bfb9b8725c3d9764ac3da93bab0695ea9a46c32879f93ff77
+  metadata.gz: 9fc031920618a3bc5b40a5c146b7ef8fc56b9d048b5c481b214425f3e17b72d05651ef1645b29ac08a15c5504d0c48b4f6605e6e5c13224560a9b26d212b13e9
+  data.tar.gz: e2a1e112ab8241f2a5393d01b237d1a9d41dcca7f386fdaa42a287c5a9cd82d4a6ec909775598a4235a373573ff76381df302f07f16861399ecad35734ea9913

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

@@ -8,6 +8,8 @@ module Sass
         attr_reader :global_functions
 
         def initialize(functions)
+          functions = functions.transform_keys(&:to_s)
+
           @global_functions = functions.keys
           @functions_by_name = functions.transform_keys do |signature|
             signature = signature.chomp
@@ -37,10 +39,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
@@ -72,8 +74,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

@@ -20,6 +20,8 @@ module Sass
         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)
 
@@ -56,7 +58,7 @@ module Sass
 
         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,

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)
+        @importer_registery = ImporterRegistry.new(importers, load_paths)
+        @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

@@ -106,37 +106,16 @@ 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
+          Varint.write(@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
-        end
-        bytes << value
-        writeable.write bytes.pack('C*')
-      end
     end
 
     private_constant :Compiler

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.formatted || compile_response.failure.message,
+            compile_response.failure.message,
+            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,30 @@
+# 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|
+              value.call(*args, **kwargs)
+            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.1'
+    VERSION = '0.16.2'
   end
 end

data/lib/sass.rb

@@ -8,12 +8,16 @@ 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.1
+  version: 0.16.2
 platform: ruby
 authors:
 - なつき
@@ -131,6 +131,8 @@ 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
@@ -138,6 +140,8 @@ files:
 - 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 +165,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.16.1
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.16.1
+  documentation_uri: https://www.rubydoc.info/gems/sass-embedded/0.16.2
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v0.16.2
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []