sass-embedded 1.69.5-x64-mingw-ucrt → 1.69.7-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86db1a07bf51e2ea2f5c35ad903a2f22ba2cc22607ab5a9581910574d0e0a8f6
-  data.tar.gz: 4fd55dbb2f7ca24807a122d4d64709fbfe37a5b40676373a22c3278b67223095
+  metadata.gz: 6b8c1c737a9861eeb61b9fd44c74b73bc663e8dc3164b48624661e505610f224
+  data.tar.gz: 194ad076f70334df60ed1d385a4c4aa9371b47d96b22f8cb9086ae5c578b7d09
 SHA512:
-  metadata.gz: d34aa3fb8c1645145f8adb8fbd0f6244e691d8908ee9c20cb6fe1d7b046537fe4baaefcb07641fbe2c52b205a3c4ea9548cb2086da17c31843c98c15506e9f76
-  data.tar.gz: c386a81c7b152bda94e5d78dc44e076e93717edb223ac321ce9f5c717f3fa50ea5a778574566742f4d947aee3814d72cd0ecacbc8fdf78f6ebc39201621156d6
+  metadata.gz: 3976ecec5cae49bdb698045914925fe1d51c062aa16b7803e223e3c96cbe57c8b7ffb30d0f250d4e9e9462e862ce56be6d093495f46a547de194a1fad7ef9aeb
+  data.tar.gz: b0706218c9b8d6163afa7f158f4725ffc83e9bf1d7a1dfa27984e762e918134e54a441c6380b03f1185b7b3014a95c4dbc8aab497650cd039854ecc793f4c118

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/cli.rb

@@ -3,8 +3,8 @@
 module Sass
   class CLI
     COMMAND = [
-      File.absolute_path('dart-sass/src/dart.exe', __dir__),
-      File.absolute_path('dart-sass/src/sass.snapshot', __dir__)
+      File.absolute_path('dart-sass/src/dart.exe', __dir__).freeze,
+      File.absolute_path('dart-sass/src/sass.snapshot', __dir__).freeze
     ].freeze
   end
 

data/ext/sass/dart-sass/src/LICENSE

@@ -1570,6 +1570,38 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+--------------------------------------------------------------------------------
+
+web license:
+
+Copyright 2023, the Dart project authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 --------------------------------------------------------------------------------
 
 yaml license:

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/lib/sass/calculation_value/calculation_operation.rb

@@ -18,12 +18,9 @@ module Sass
       def initialize(operator, left, right)
         raise Sass::ScriptError, "Invalid operator: #{operator}" unless OPERATORS.include?(operator)
 
-        left.assert_calculation_value
-        right.assert_calculation_value
-
         @operator = operator.freeze
-        @left = left.freeze
-        @right = right.freeze
+        @left = assert_calculation_value(left, 'left')
+        @right = assert_calculation_value(right, 'right')
       end
 
       # @return [::String]

data/lib/sass/calculation_value.rb

@@ -5,10 +5,16 @@ module Sass
   #
   # @see https://sass-lang.com/documentation/js-api/types/calculationvalue/
   module CalculationValue
-    # @return [CalculationValue]
-    # @raise [ScriptError]
-    def assert_calculation_value(_name = nil)
-      self
+    private
+
+    def assert_calculation_value(value, name = nil)
+      if !value.is_a?(Sass::CalculationValue) || (value.is_a?(Sass::Value::String) && value.quoted?)
+        raise Sass::ScriptError.new(
+          "#{value} must be one of SassNumber, unquoted SassString, SassCalculation, CalculationOperation", name
+        )
+      end
+
+      value
     end
   end
 end

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
@@ -100,13 +123,11 @@ module Sass
         end
 
         def disconnect
-          @dispatcher.unsubscribe(id)
+          @dispatcher.unsubscribe(@id)
         end
 
         def error(...)
-          Thread.new do
-            @dispatcher.error(...)
-          end
+          @dispatcher.error(...)
         end
 
         def send_proto(...)

data/lib/sass/compiler/dispatcher_manager.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Sass
+  class Compiler
+    # The {DispatcherManager} class.
+    #
+    # It manages the lifecycle of {Dispatcher}.
+    class DispatcherManager
+      def initialize(dispatcher_class)
+        @dispatcher_class = dispatcher_class
+        @dispatcher = @dispatcher_class.new
+        @mutex = Mutex.new
+      end
+
+      def close
+        @mutex.synchronize do
+          unless @dispatcher.nil?
+            @dispatcher.close
+            @dispatcher = nil
+          end
+        end
+      end
+
+      def closed?
+        @mutex.synchronize do
+          @dispatcher.nil?
+        end
+      end
+
+      def connect(...)
+        @mutex.synchronize do
+          raise IOError, 'closed compiler' if @dispatcher.nil?
+
+          @dispatcher.connect(...)
+        rescue Errno::EBUSY
+          @dispatcher = @dispatcher_class.new
+          @dispatcher.connect(...)
+        end
+      end
+    end
+
+    private_constant :DispatcherManager
+  end
+end

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(
@@ -81,7 +81,7 @@ module Sass
           EmbeddedProtocol::InboundMessage::ImportResponse.new(
             id: import_request.id,
             success: EmbeddedProtocol::InboundMessage::ImportResponse::ImportSuccess.new(
-              contents: importer_result.contents,
+              contents: importer_result.contents.to_str,
               syntax: Protofier.to_proto_syntax(importer_result.syntax),
               source_map_url: (importer_result.source_map_url&.to_s if importer_result.respond_to?(:source_map_url))
             )
@@ -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.
       #

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.
       #
@@ -16,7 +16,7 @@ module Sass
           when Sass::Value::String
             EmbeddedProtocol::Value.new(
               string: EmbeddedProtocol::Value::String.new(
-                text: obj.text,
+                text: obj.text.to_str,
                 quoted: obj.quoted?
               )
             )
@@ -179,7 +179,7 @@ module Sass
               end
             )
           when :compiler_function
-            Sass::Value::Function.new(nil, nil).instance_eval do
+            Sass::Value::Function.new(nil).instance_eval do
               @id = obj.id
               self
             end

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: source.to_str,
                         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,11 +70,18 @@ module Sass
       def version_request
         version_response = await0 do
           send_message0(version_request: EmbeddedProtocol::InboundMessage::VersionRequest.new(
-            id: id
+            id:
           ))
         end
 
-        "sass-embedded\t#{version_response.implementation_version}"
+        lang = case version_response.implementation_name
+               when /\bdart\b/i
+                 '[Dart]'
+               else
+                 '[?]'
+               end
+
+        "#{version_response.implementation_name}\t#{version_response.implementation_version}\t(Sass Compiler)\t#{lang}"
       end
 
       def compile_response(message)
@@ -100,6 +107,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}/varint.rb

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