sass-embedded 1.62.1-aarch64-linux-gnu → 1.63.1-aarch64-linux-gnu

data/lib/sass/embedded/compiler.rb

@@ -6,17 +6,17 @@ module Sass
   class Embedded
     # The {Compiler} class.
     #
-    # It runs the `dart-sass-embedded` process.
+    # It runs the `sass --embedded` process.
     class Compiler
       def initialize
         @stdin, @stdout, @stderr, @wait_thread = begin
-          Open3.popen3(*COMMAND, chdir: __dir__)
+          Open3.popen3(*CLI::COMMAND, '--embedded', chdir: __dir__)
         rescue Errno::ENOENT
-          require_relative 'elf'
+          require_relative '../elf'
 
           raise if ELF::INTERPRETER.nil?
 
-          Open3.popen3(ELF::INTERPRETER, *COMMAND, chdir: __dir__)
+          Open3.popen3(ELF::INTERPRETER, *CLI::COMMAND, '--embedded', chdir: __dir__)
         end
 
         @stdin.binmode
@@ -49,17 +49,20 @@ module Sass
         end
       end
 
-      def write(payload)
+      def write(id, proto)
         @stdin_mutex.synchronize do
-          Varint.write(@stdin, payload.length)
-          @stdin.write(payload)
+          Varint.write(@stdin, Varint.length(id) + proto.length)
+          Varint.write(@stdin, id)
+          @stdin.write(proto)
         end
       end
 
       def read
         @stdout_mutex.synchronize do
           length = Varint.read(@stdout)
-          @stdout.read(length)
+          id = Varint.read(@stdout)
+          proto = @stdout.read(length - Varint.length(id))
+          return id, proto
         end
       end
     end

data/lib/sass/embedded/dispatcher.rb

@@ -6,23 +6,23 @@ module Sass
     #
     # It dispatches messages between mutliple instances of {Host} and a single {Compiler}.
     class Dispatcher
-      PROTOCOL_ERROR_ID = 0xffffffff
+      UINT_MAX = 0xffffffff
 
       def initialize
         @compiler = Compiler.new
         @observers = {}
-        @id = 0
+        @id = 1
         @mutex = Mutex.new
 
         Thread.new do
           loop do
-            receive_message
-          rescue IOError, Errno::EBADF => e
+            receive_proto
+          rescue IOError, Errno::EBADF, Errno::EPROTO => e
             @mutex.synchronize do
-              @id = PROTOCOL_ERROR_ID
+              @id = UINT_MAX
               @observers.values
             end.each do |observer|
-              observer.error e
+              observer.error(e)
             end
             break
           end
@@ -31,7 +31,7 @@ module Sass
 
       def subscribe(observer)
         @mutex.synchronize do
-          raise EOFError if @id == PROTOCOL_ERROR_ID
+          raise Errno::EBUSY if @id == UINT_MAX
 
           id = @id
           @id = id.next
@@ -46,10 +46,10 @@ module Sass
 
           return unless @observers.empty?
 
-          if @id == PROTOCOL_ERROR_ID
+          if @id == UINT_MAX
             close
           else
-            @id = 0
+            @id = 1
           end
         end
       end
@@ -62,33 +62,29 @@ module Sass
         @compiler.closed?
       end
 
-      def send_message(...)
-        inbound_message = EmbeddedProtocol::InboundMessage.new(...)
-        @compiler.write(inbound_message.to_proto)
+      def send_proto(...)
+        @compiler.write(...)
       end
 
       private
 
-      def receive_message
-        outbound_message = EmbeddedProtocol::OutboundMessage.decode(@compiler.read)
-        oneof = outbound_message.message
-        message = outbound_message.public_send(oneof)
-        case oneof
-        when :error
-          @mutex.synchronize do
-            @id = PROTOCOL_ERROR_ID
-            message.id == PROTOCOL_ERROR_ID ? @observers.values : [@observers[message.id]]
-          end.each do |observer|
-            observer.public_send(oneof, message)
-          end
-        when :compile_response, :version_response
+      def receive_proto
+        id, proto = @compiler.read
+        case id
+        when 1...UINT_MAX
+          @mutex.synchronize { @observers[id] }.receive_proto(proto)
+        when 0
+          outbound_message = EmbeddedProtocol::OutboundMessage.decode(proto)
+          oneof = outbound_message.message
+          message = outbound_message.public_send(oneof)
           @mutex.synchronize { @observers[message.id] }.public_send(oneof, message)
-        when :log_event, :canonicalize_request, :import_request, :file_import_request, :function_call_request
-          Thread.new(@mutex.synchronize { @observers[message.compilation_id] }) do |observer|
-            observer.public_send(oneof, message)
-          end
+        when UINT_MAX
+          outbound_message = EmbeddedProtocol::OutboundMessage.decode(proto)
+          oneof = outbound_message.message
+          message = outbound_message.public_send(oneof)
+          raise Errno::EPROTO, message.message
         else
-          raise ArgumentError, "Unknown OutboundMessage.message #{message}"
+          raise Errno::EPROTO
         end
       end
     end

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

@@ -7,41 +7,44 @@ module Sass
       #
       # It stores logger and handles log events.
       class LoggerRegistry
-        attr_reader :logger
-
         def initialize(logger)
-          @logger = Structifier.to_struct(logger, :debug, :warn)
-        end
+          logger = Structifier.to_struct(logger, :debug, :warn)
 
-        def log(event)
-          case event.type
-          when :DEBUG
-            if logger.respond_to? :debug
+          if logger.respond_to?(:debug)
+            define_singleton_method(:debug) do |event|
               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
+          end
+
+          if logger.respond_to?(:warn) # rubocop:disable Style/GuardClause
+            define_singleton_method(:warn) do |event|
               logger.warn(event.message,
-                          deprecation: false,
+                          deprecation: event.type == :DEPRECATION_WARNING,
                           span: Protofier.from_proto_source_span(event.span),
                           stack: event.stack_trace)
-            else
-              warn(event.formatted)
             end
           end
         end
+
+        def log(event)
+          case event.type
+          when :DEBUG
+            debug(event)
+          when :DEPRECATION_WARNING, :WARNING
+            warn(event)
+          end
+        end
+
+        private
+
+        def debug(event)
+          Kernel.warn(event.formatted)
+        end
+
+        def warn(event)
+          Kernel.warn(event.formatted)
+        end
       end
 
       private_constant :LoggerRegistry

data/lib/sass/embedded/host.rb

@@ -40,7 +40,6 @@ module Sass
           @logger_registry = LoggerRegistry.new(logger)
 
           send_message(compile_request: EmbeddedProtocol::InboundMessage::CompileRequest.new(
-            id: id,
             string: unless source.nil?
                       EmbeddedProtocol::InboundMessage::CompileRequest::StringInput.new(
                         source: source,
@@ -67,8 +66,8 @@ module Sass
       end
 
       def version_request
-        version_response = await do
-          send_message(version_request: EmbeddedProtocol::InboundMessage::VersionRequest.new(
+        version_response = await0 do
+          send_message0(version_request: EmbeddedProtocol::InboundMessage::VersionRequest.new(
             id: id
           ))
         end
@@ -76,16 +75,23 @@ module Sass
         "sass-embedded\t#{version_response.implementation_version}"
       end
 
-      def log_event(message)
-        @logger_registry.log(message)
-      end
-
       def compile_response(message)
-        resolve(message)
+        @result = message
+        @queue.close
       end
 
       def version_response(message)
-        resolve(message)
+        @result = message
+        @queue.close
+      end
+
+      def error(message)
+        @error = message
+        @queue.close
+      end
+
+      def log_event(message)
+        @logger_registry.log(message)
       end
 
       def canonicalize_request(message)
@@ -104,35 +110,59 @@ module Sass
         send_message(function_call_response: @function_registry.function_call(message))
       end
 
-      def error(message)
-        reject(CompileError.new(message.message, nil, nil, nil))
+      def receive_proto(proto)
+        @queue.push(proto)
       end
 
       private
 
-      def await
+      def await0
         @connection = @channel.connect(self)
-        @async = Async.new
+        @queue = Queue.new
+
         yield
-        @async.await
+
+        @queue.pop
+
+        raise @error if @error
+
+        @result
       ensure
         @connection&.disconnect
       end
 
-      def resolve(value)
-        @async.resolve(value)
-      end
+      def await
+        @connection = @channel.connect(self)
+        @queue = Queue.new
+
+        yield
 
-      def reject(reason)
-        @async.reject(reason)
+        while (proto = @queue.pop)
+          outbound_message = EmbeddedProtocol::OutboundMessage.decode(proto)
+          oneof = outbound_message.message
+          message = outbound_message.public_send(oneof)
+          public_send(oneof, message)
+        end
+
+        raise @error if @error
+
+        @result
+      ensure
+        @connection&.disconnect
       end
 
       def id
         @connection.id
       end
 
+      def send_message0(...)
+        inbound_message = EmbeddedProtocol::InboundMessage.new(...)
+        @connection.send_proto(0, inbound_message.to_proto)
+      end
+
       def send_message(...)
-        @connection.send_message(...)
+        inbound_message = EmbeddedProtocol::InboundMessage.new(...)
+        @connection.send_proto(id, inbound_message.to_proto)
       end
     end
 

data/lib/sass/embedded/protofier.rb

@@ -15,15 +15,16 @@ module Sass
         when :failure
           raise CompileError.new(
             result.message,
-            result.formatted,
-            result.stack_trace,
-            from_proto_source_span(result.span)
+            result.formatted == '' ? nil : result.formatted,
+            result.stack_trace == '' ? nil : result.stack_trace,
+            from_proto_source_span(result.span),
+            compile_response.loaded_urls
           )
         when :success
           CompileResult.new(
             result.css,
-            result.source_map,
-            result.loaded_urls
+            result.source_map == '' ? nil : result.source_map,
+            compile_response.loaded_urls
           )
         else
           raise ArgumentError, "Unknown CompileResponse.result #{result}"
@@ -36,8 +37,8 @@ module Sass
         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)
+                               source_span.url == '' ? nil : source_span.url,
+                               source_span.context == '' ? nil : source_span.context)
       end
 
       def from_proto_source_location(source_location)

data/lib/sass/embedded/varint.rb

@@ -8,6 +8,12 @@ module Sass
     module Varint
       module_function
 
+      def length(value)
+        return 1 if value < 128
+
+        (value.bit_length + 6) / 7
+      end
+
       def read(readable)
         value = bits = 0
         loop do

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.62.1'
+    VERSION = '1.63.1'
   end
 end

data/lib/sass/embedded.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../ext/sass/embedded'
+require_relative '../../ext/sass/cli'
 require_relative '../../ext/sass/embedded_sass_pb'
 require_relative 'compile_error'
 require_relative 'compile_result'
-require_relative 'embedded/async'
 require_relative 'embedded/channel'
 require_relative 'embedded/compiler'
 require_relative 'embedded/dispatcher'
@@ -80,8 +79,8 @@ module Sass
   end
   # rubocop:enable Layout/LineLength
 
-  # The {Embedded} host for using dart-sass-embedded. Each instance creates
-  # its own communication {Channel} with a dedicated compiler process.
+  # The {Embedded} host for using dart-sass. Each instance creates its own
+  # communication {Channel} with a dedicated compiler process.
   #
   # @example
   #   embedded = Sass::Embedded.new

data/lib/sass/logger/source_span.rb

@@ -19,8 +19,8 @@ module Sass
         @start = start
         @end = end_
         @text = text
-        @url = url == '' ? nil : url
-        @context = context == '' ? nil : context
+        @url = url
+        @context = context
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.62.1
+  version: 1.63.1
 platform: aarch64-linux-gnu
 authors:
 - なつき
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2023-04-26 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -16,123 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.21'
+        version: '3.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.21'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.12.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.50.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.50.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.17.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.17.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.20.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.20.0
+        version: '3.23'
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
 - i@ntk.me
-executables: []
+executables:
+- sass
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- ext/sass/embedded.rb
+- exe/sass
+- ext/sass/cli.rb
+- ext/sass/dart-sass/sass
+- ext/sass/dart-sass/src/LICENSE
+- ext/sass/dart-sass/src/dart
+- ext/sass/dart-sass/src/sass.snapshot
 - ext/sass/embedded_sass_pb.rb
-- ext/sass/sass_embedded/dart-sass-embedded
-- ext/sass/sass_embedded/src/LICENSE
-- ext/sass/sass_embedded/src/dart
-- ext/sass/sass_embedded/src/dart-sass-embedded.snapshot
 - lib/sass-embedded.rb
 - lib/sass/compile_error.rb
 - lib/sass/compile_result.rb
+- lib/sass/elf.rb
 - lib/sass/embedded.rb
-- lib/sass/embedded/async.rb
 - lib/sass/embedded/channel.rb
 - lib/sass/embedded/compiler.rb
 - lib/sass/embedded/dispatcher.rb
-- lib/sass/embedded/elf.rb
 - lib/sass/embedded/host.rb
 - lib/sass/embedded/host/function_registry.rb
 - lib/sass/embedded/host/importer_registry.rb
@@ -162,8 +79,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.62.1
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.62.1
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.63.1
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.63.1
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []
@@ -180,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.22
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!

data/ext/sass/embedded.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    class Compiler
-      COMMAND = [
-        File.absolute_path('sass_embedded/src/dart', __dir__),
-        File.absolute_path('sass_embedded/src/dart-sass-embedded.snapshot', __dir__)
-      ].freeze
-    end
-  end
-end

data/lib/sass/embedded/async.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Sass
-  class Embedded
-    # The {Async} class.
-    #
-    # It awaits until the promise is resolved or rejected.
-    class Async
-      module State
-        PENDING = 0
-        FULFILLED = 1
-        REJECTED = 2
-      end
-
-      private_constant :State
-
-      def initialize
-        @result = nil
-        @state = State::PENDING
-
-        @condition_variable = ConditionVariable.new
-        @mutex = Mutex.new
-      end
-
-      def resolve(value)
-        @mutex.synchronize do
-          return unless @state == State::PENDING
-
-          @result = value
-          @state = State::FULFILLED
-          @condition_variable.broadcast
-        end
-      end
-
-      def reject(reason)
-        @mutex.synchronize do
-          return unless @state == State::PENDING
-
-          @result = reason
-          @state = State::REJECTED
-          @condition_variable.broadcast
-        end
-      end
-
-      def await
-        @mutex.synchronize do
-          @condition_variable.wait(@mutex) if @state == State::PENDING
-
-          raise @result if @state == State::REJECTED
-
-          @result
-        end
-      end
-    end
-
-    private_constant :Async
-  end
-end