sass-embedded 1.69.4 → 1.69.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b75bdfda99382f0e6be135736c4a395606d1f3c113511a4c678f3d8ad7b9340
-  data.tar.gz: 02eb7dc20e74ca76ffd6aae45bf42fcc04a77781a18436cba415f699a4833cb8
+  metadata.gz: 4f5aca7429ea164cf789851aadd9cf704c044e32a47283ad5a6f0ad39e535f7c
+  data.tar.gz: 8f0b68119c27970e5013d147e12ee9fecebc7e28b169e1d6be5cb170cc17d901
 SHA512:
-  metadata.gz: b572dd621a3d86ead89f664b9c0f86d7cc50504816ab61c1c31b0259250796f5ea5d6ceed7ccc5e3f1e695cfdb1dd55660a05c3833b3043a63dbc5aa16d485ff
-  data.tar.gz: 77a1fbc37314e99ad0d8e8cb95359c9a7aba9ac3799351b36c495e476db290f48ab920bc4e0f56671e6fd2c2ceaf1acae8324d42d72042fb19966d548ee39ba0
+  metadata.gz: 2f95ca5d66e45a2f8928465824de7fb9c5830c84fcab7b00a2c0fb520e9c0cd8cb1c2112c24b08f0f978e0e4c9d88206fcab209a97e3875a948fb034da4ac006
+  data.tar.gz: dd63a5e0eec736eef021087120a5d03a8b60c17189380d466c7467fc989859a173c57480d4490dfb6d8fc82e61dd08bcc7703adf098a846f81e79f7742fec11b

data/README.md

@@ -1,6 +1,6 @@
 # Embedded Sass Host for Ruby
 
-[![build](https://github.com/ntkme/sass-embedded-host-ruby/actions/workflows/build.yml/badge.svg)](https://github.com/ntkme/sass-embedded-host-ruby/actions/workflows/build.yml)
+[![build](https://github.com/sass-contrib/sass-embedded-host-ruby/actions/workflows/build.yml/badge.svg)](https://github.com/sass-contrib/sass-embedded-host-ruby/actions/workflows/build.yml)
 [![gem](https://badge.fury.io/rb/sass-embedded.svg)](https://rubygems.org/gems/sass-embedded)
 
 This is a Ruby library that implements the host side of the [Embedded Sass protocol](https://github.com/sass/sass/blob/HEAD/spec/embedded-protocol.md).

data/exe/sass

@@ -7,13 +7,13 @@ module Sass
   # The `sass` command line interface
   class CLI
     begin
-      exec(*COMMAND, *ARGV)
+      Kernel.exec(*COMMAND, *ARGV)
     rescue Errno::ENOENT
       require_relative '../lib/sass/elf'
 
       raise if ELF::INTERPRETER.nil?
 
-      exec(ELF::INTERPRETER, *COMMAND, *ARGV)
+      Kernel.exec(ELF::INTERPRETER, *COMMAND, *ARGV)
     end
   end
 

data/ext/sass/Rakefile

@@ -164,7 +164,7 @@ module FileUtils
       cp source_path, dest_path
     else
       fetcher = Gem::RemoteFetcher.fetcher
-      symbol = "fetch_#{scheme}".to_sym
+      symbol = :"fetch_#{scheme}"
       raise ArgumentError, "Unsupported URI scheme #{scheme}" unless fetcher.respond_to?(symbol)
 
       if Rake::FileUtilsExt.verbose_flag
@@ -207,10 +207,10 @@ module FileUtils
     raise if spec.nil? || source.nil?
 
     if Rake::FileUtilsExt.nowrite_flag
-      installer = Gem::Installer.for_spec(spec, { force: true, install_dir: install_dir })
+      installer = Gem::Installer.for_spec(spec, { force: true, install_dir: })
     else
       path = source.download(spec, install_dir)
-      installer = Gem::Installer.at(path, { force: true, install_dir: install_dir })
+      installer = Gem::Installer.at(path, { force: true, install_dir: })
       installer.install
     end
 
@@ -251,27 +251,13 @@ module SassConfig
             'arm'
           when /ppc64le|powerpc64le/
             'powerpc64le'
-          when /s390x/
-            's390x'
           else
             RbConfig::CONFIG['host_cpu']
           end
 
     ARCH = "#{CPU}-#{OS}".freeze
 
-    EMULATION = if ARCH == 'aarch64-windows'
-                  begin
-                    require_relative 'win32_api'
-
-                    if Win32API.x64?
-                      'x86_64'
-                    elsif Win32API.x86?
-                      'i386'
-                    end
-                  rescue LoadError
-                    'i386'
-                  end
-                end
+    EMULATION = ('x86_64' if ARCH == 'aarch64-windows')
   end
 
   private_constant :Platform
@@ -299,11 +285,9 @@ module SassConfig
          when 'linux'
            'linux'
          when 'linux-android'
-           repo = 'https://github.com/dart-android/dart-sass'
            'android'
          when 'linux-musl'
-           repo = 'https://github.com/dart-musl/dart-sass'
-           'linux'
+           'linux-musl'
          when 'windows'
            'windows'
          else

data/ext/sass/embedded_sass_pb.rb

@@ -11,7 +11,7 @@ pool = Google::Protobuf::DescriptorPool.generated_pool
 
 begin
   pool.add_serialized_file(descriptor_data)
-rescue TypeError => e
+rescue TypeError
   # Compatibility code: will be removed in the next major version.
   require 'google/protobuf/descriptor_pb'
   parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass": "1.69.4"
+    "sass": "1.69.6"
   }
 }

data/lib/sass/compiler/connection.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require 'open3'
+
+require_relative '../../../ext/sass/cli'
+
+module Sass
+  class Compiler
+    # The stdio based {Connection} between the {Dispatcher} and the compiler.
+    #
+    # It runs the `sass --embedded` command.
+    class Connection
+      def initialize(dispatcher)
+        @mutex = Mutex.new
+        @stdin, @stdout, @stderr, @wait_thread = begin
+          Open3.popen3(*CLI::COMMAND, '--embedded', chdir: __dir__)
+        rescue Errno::ENOENT
+          require_relative '../elf'
+
+          raise if ELF::INTERPRETER.nil?
+
+          Open3.popen3(ELF::INTERPRETER, *CLI::COMMAND, '--embedded', chdir: __dir__)
+        end
+
+        @stdin.binmode
+
+        Thread.new do
+          Thread.current.name = "sass-embedded-process-stdout-poller-#{@wait_thread.pid}"
+
+          # # https://dart.dev/tools/dart-devtools
+          # if 'dart' == File.basename(CLI::COMMAND.first, '.exe') && CLI::COMMAND.include?('--observe')
+          #   Kernel.warn(@stdout.readline, uplevel: 0)
+          #   Kernel.warn(@stdout.readline, uplevel: 0)
+          # end
+
+          @stdout.binmode
+
+          loop do
+            length = Varint.read(@stdout)
+            id = Varint.read(@stdout)
+            proto = @stdout.read(length - Varint.length(id))
+            dispatcher.receive_proto(id, proto)
+          end
+        rescue IOError, Errno::EBADF, Errno::EPROTO => e
+          dispatcher.error(e)
+          @mutex.synchronize do
+            @stdout.close
+          end
+        end
+
+        Thread.new do
+          Thread.current.name = "sass-embedded-process-stderr-poller-#{@wait_thread.pid}"
+          loop do
+            Kernel.warn(@stderr.readline, uplevel: 0)
+          end
+        rescue IOError, Errno::EBADF
+          @mutex.synchronize do
+            @stderr.close
+          end
+        end
+
+        @wait_thread.name = "sass-embedded-process-waiter-#{@wait_thread.pid}"
+      end
+
+      def close
+        @mutex.synchronize do
+          @stdin.close
+          @wait_thread.join
+          @stdout.close
+          @stderr.close
+        end
+      end
+
+      def closed?
+        @mutex.synchronize do
+          @stdin.closed? && !@wait_thread.alive?
+        end
+      end
+
+      def write(id, proto)
+        buffer = []
+        Varint.write(buffer, Varint.length(id) + proto.length)
+        Varint.write(buffer, id)
+        @mutex.synchronize do
+          @stdin.write(buffer.pack('C*'), proto)
+        end
+      end
+    end
+
+    private_constant :Connection
+  end
+end

data/lib/sass/{embedded → compiler}/dispatcher.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  class Embedded
+  class Compiler
     # The {Dispatcher} class.
     #
     # It dispatches messages between mutliple instances of {Host} and a single {Connection} to the compiler.
@@ -11,11 +11,12 @@ module Sass
         @observers = {}
         @mutex = Mutex.new
         @connection = Connection.new(self)
+        ForkTracker.add(self)
       end
 
       def subscribe(observer)
         @mutex.synchronize do
-          raise Errno::EBUSY if @id == 0xffffffff
+          raise Errno::EBUSY if _closed?
 
           id = @id
           @id = id.next
@@ -30,12 +31,12 @@ module Sass
 
           return unless @observers.empty?
 
-          if @id == 0xffffffff
+          if _closed?
             Thread.new do
               close
             end
           else
-            @id = 1
+            _idle
           end
         end
       end
@@ -45,7 +46,11 @@ module Sass
       end
 
       def close
+        @mutex.synchronize do
+          _close
+        end
         @connection.close
+        ForkTracker.delete(self)
       end
 
       def closed?
@@ -54,7 +59,7 @@ module Sass
 
       def error(error)
         observers = @mutex.synchronize do
-          @id = 0xffffffff
+          _close
           @observers.values
         end
 
@@ -70,12 +75,12 @@ module Sass
       def receive_proto(id, proto)
         case id
         when 1...0xffffffff
-          @mutex.synchronize { @observers[id] }.receive_proto(proto)
+          @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)
+          @mutex.synchronize { @observers[message.id] }&.public_send(oneof, message)
         when 0xffffffff
           outbound_message = EmbeddedProtocol::OutboundMessage.decode(proto)
           oneof = outbound_message.message
@@ -90,6 +95,24 @@ module Sass
         @connection.write(...)
       end
 
+      private
+
+      def _close
+        @id = 0xffffffff
+      end
+
+      def _closed?
+        @id == 0xffffffff
+      end
+
+      def _idle
+        @id = 1
+      end
+
+      def _idle?
+        @id == 1
+      end
+
       # The {Channel} between {Dispatcher} and {Host}.
       class Channel
         attr_reader :id
@@ -104,9 +127,7 @@ module Sass
         end
 
         def error(...)
-          Thread.new do
-            @dispatcher.error(...)
-          end
+          @dispatcher.error(...)
         end
 
         def send_proto(...)

data/lib/sass/{embedded → compiler}/host/function_registry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  class Embedded
+  class Compiler
     class Host
       # The {FunctionRegistry} class.
       #
@@ -55,8 +55,8 @@ module Sass
 
           EmbeddedProtocol::InboundMessage::FunctionCallResponse.new(
             id: function_call_request.id,
-            success: success,
-            accessed_argument_lists: accessed_argument_lists
+            success:,
+            accessed_argument_lists:
           )
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::FunctionCallResponse.new(

data/lib/sass/{embedded → compiler}/host/importer_registry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  class Embedded
+  class Compiler
     class Host
       # The {ImporterRegistry} class.
       #
@@ -65,7 +65,7 @@ module Sass
 
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
             id: canonicalize_request.id,
-            url: url
+            url:
           )
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
@@ -100,7 +100,7 @@ module Sass
 
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(
             id: file_import_request.id,
-            file_url: file_url
+            file_url:
           )
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(

data/lib/sass/{embedded → compiler}/host/logger_registry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  class Embedded
+  class Compiler
     class Host
       # The {LoggerRegistry} class.
       #

data/lib/sass/{embedded → compiler}/host/protofier.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  class Embedded
+  class Compiler
     class Host
       # The {Protofier} module.
       #

data/lib/sass/{embedded → compiler}/host/structifier.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  class Embedded
+  class Compiler
     class Host
       # The {Structifier} module.
       #
@@ -10,14 +10,14 @@ module Sass
         module_function
 
         def to_struct(obj, *symbols)
-          return obj unless obj.is_a? Hash
+          return obj unless obj.is_a?(Hash)
 
           struct = Object.new
           symbols.each do |key|
             next unless obj.key?(key)
 
             value = obj[key]
-            if value.respond_to? :call
+            if value.respond_to?(:call)
               struct.define_singleton_method key do |*args, **kwargs|
                 value.call(*args, **kwargs)
               end

data/lib/sass/{embedded → compiler}/host/value_protofier.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  class Embedded
+  class Compiler
     class Host
       # The {ValueProtofier} class.
       #

data/lib/sass/{embedded → compiler}/host.rb

@@ -8,7 +8,7 @@ require_relative 'host/structifier'
 require_relative 'host/value_protofier'
 
 module Sass
-  class Embedded
+  class Compiler
     # The {Host} class.
     #
     # It communicates with {Dispatcher} and handles the host logic.
@@ -35,16 +35,16 @@ module Sass
                           quiet_deps:,
                           verbose:)
         compile_response = await do
-          alert_color = $stderr.tty? if alert_color.nil?
+          alert_color = Exception.respond_to?(:to_tty?) && Exception.to_tty? if alert_color.nil?
 
-          @function_registry = FunctionRegistry.new(functions, alert_color: alert_color)
-          @importer_registry = ImporterRegistry.new(importers, load_paths, alert_color: alert_color)
+          @function_registry = FunctionRegistry.new(functions, alert_color:)
+          @importer_registry = ImporterRegistry.new(importers, load_paths, alert_color:)
           @logger_registry = LoggerRegistry.new(logger)
 
           send_message(compile_request: EmbeddedProtocol::InboundMessage::CompileRequest.new(
             string: unless source.nil?
                       EmbeddedProtocol::InboundMessage::CompileRequest::StringInput.new(
-                        source: source,
+                        source:,
                         url: url&.to_s,
                         syntax: Protofier.to_proto_syntax(syntax),
                         importer: (@importer_registry.register(importer) unless importer.nil?)
@@ -52,15 +52,15 @@ module Sass
                     end,
             path: (File.absolute_path(path) unless path.nil?),
             style: Protofier.to_proto_output_style(style),
-            charset: charset,
-            source_map: source_map,
-            source_map_include_sources: source_map_include_sources,
+            charset:,
+            source_map:,
+            source_map_include_sources:,
             importers: @importer_registry.importers,
             global_functions: @function_registry.global_functions,
-            alert_ascii: alert_ascii,
-            alert_color: alert_color,
-            quiet_deps: quiet_deps,
-            verbose: verbose
+            alert_ascii:,
+            alert_color:,
+            quiet_deps:,
+            verbose:
           ))
         end
 
@@ -70,7 +70,7 @@ module Sass
       def version_request
         version_response = await0 do
           send_message0(version_request: EmbeddedProtocol::InboundMessage::VersionRequest.new(
-            id: id
+            id:
           ))
         end
 
@@ -100,6 +100,8 @@ module Sass
 
       def log_event(message)
         @logger_registry.log(message)
+      rescue StandardError => e
+        @channel.error(e)
       end
 
       def canonicalize_request(message)

data/lib/sass/{embedded → compiler}/resilient_dispatcher.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 module Sass
-  class Embedded
+  class Compiler
     # The {ResilientDispatcher} class.
     #
     # It recovers from failures and continues to function.
     class ResilientDispatcher
-      def initialize
-        @dispatcher = Dispatcher.new
+      def initialize(dispatcher_class)
+        @dispatcher_class = dispatcher_class
+        @dispatcher = @dispatcher_class.new
         @mutex = Mutex.new
       end
 
@@ -29,7 +30,7 @@ module Sass
         @mutex.synchronize do
           @dispatcher.connect(...)
         rescue Errno::EBUSY
-          @dispatcher = Dispatcher.new
+          @dispatcher = @dispatcher_class.new
           @dispatcher.connect(...)
         end
       end

data/lib/sass/{embedded → compiler}/varint.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  class Embedded
+  class Compiler
     # The {Varint} module.
     #
     # It reads and writes varints.