sass-embedded 1.69.5-x86_64-linux-gnu → 1.69.6-x86_64-linux-gnu

data/lib/sass/embedded/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sass
-  class Embedded
-    VERSION = '1.69.5'
+  module Embedded
+    VERSION = '1.69.6'
   end
 end

data/lib/sass/embedded.rb

@@ -1,19 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'canonicalize_context'
-require_relative 'compile_error'
-require_relative 'compile_result'
-require_relative 'embedded/connection'
-require_relative 'embedded/dispatcher'
-require_relative 'embedded/host'
-require_relative 'embedded/resilient_dispatcher'
-require_relative 'embedded/varint'
+require_relative 'compiler'
 require_relative 'embedded/version'
-require_relative 'embedded_protocol'
-require_relative 'logger/silent'
-require_relative 'logger/source_location'
-require_relative 'logger/source_span'
-require_relative 'value'
 
 # The Sass module.
 #
@@ -25,223 +13,96 @@ require_relative 'value'
 # @example
 #   Sass.compile_string('h1 { font-size: 40px; }')
 module Sass
-  @instance = nil
+  @compiler = nil
   @mutex = Mutex.new
 
   # rubocop:disable Layout/LineLength
   class << self
     # Compiles the Sass file at +path+ to CSS.
     # @overload compile(path, load_paths: [], charset: true, source_map: false, source_map_include_sources: false, style: :expanded, functions: {}, importers: [], alert_ascii: false, alert_color: nil, logger: nil, quiet_deps: false, verbose: false)
-    # @param (see Embedded#compile)
-    # @return (see Embedded#compile)
-    # @raise (see Embedded#compile)
-    # @see Embedded#compile
+    # @param (see Compiler#compile)
+    # @return (see Compiler#compile)
+    # @raise (see Compiler#compile)
+    # @see Compiler#compile
     def compile(...)
-      instance.compile(...)
+      compiler.compile(...)
     end
 
     # Compiles a stylesheet whose contents is +source+ to CSS.
     # @overload compile_string(source, importer: nil, load_paths: [], syntax: :scss, url: nil, charset: true, source_map: false, source_map_include_sources: false, style: :expanded, functions: {}, importers: [], alert_ascii: false, alert_color: nil, logger: nil, quiet_deps: false, verbose: false)
-    # @param (see Embedded#compile_string)
-    # @return (see Embedded#compile_string)
-    # @raise (see Embedded#compile_string)
-    # @see Embedded#compile_string
+    # @param (see Compiler#compile_string)
+    # @return (see Compiler#compile_string)
+    # @raise (see Compiler#compile_string)
+    # @see Compiler#compile_string
     def compile_string(...)
-      instance.compile_string(...)
+      compiler.compile_string(...)
     end
 
-    # @param (see Embedded#info)
-    # @return (see Embedded#info)
-    # @raise (see Embedded#info)
-    # @see Embedded#info
+    # @param (see Compiler#info)
+    # @return (see Compiler#info)
+    # @raise (see Compiler#info)
+    # @see Compiler#info
     def info
-      instance.info
+      compiler.info
     end
 
     private
 
-    def instance
-      return @instance if @instance
+    def compiler
+      return @compiler if @compiler
 
       @mutex.synchronize do
-        return @instance if @instance
+        return @compiler if @compiler
+
+        compiler = Class.new(Compiler) do
+          def initialize
+            @dispatcher = Compiler.const_get(:ResilientDispatcher).new(Class.new(Compiler.const_get(:Dispatcher)) do
+              def initialize
+                super
+
+                idle_timeout = 10
+                @last_accessed_time = current_time
+
+                Thread.new do
+                  Thread.current.name = 'sass-embedded-process-reaper'
+                  duration = idle_timeout
+                  loop do
+                    sleep(duration.negative? ? idle_timeout : duration)
+                    break if @mutex.synchronize do
+                      raise Errno::EBUSY if _closed?
+
+                      duration = idle_timeout - (current_time - @last_accessed_time)
+                      duration.negative? && _idle? && _close
+                    end
+                  end
+                  close
+                rescue Errno::EBUSY
+                  # do nothing
+                end
+              end
+
+              private
+
+              def _idle
+                super
+
+                @last_accessed_time = current_time
+              end
+
+              def current_time
+                Process.clock_gettime(Process::CLOCK_MONOTONIC)
+              end
+            end)
+          end
+        end.new
 
-        @instance = Embedded.new
         at_exit do
-          @instance.close
+          compiler.close
         end
-        @instance
+
+        @compiler = compiler
       end
     end
   end
   # rubocop:enable Layout/LineLength
-
-  # The {Embedded} host for using dart-sass. Each instance creates its own
-  # communication {Dispatcher} with a dedicated compiler process.
-  #
-  # @example
-  #   embedded = Sass::Embedded.new
-  #   result = embedded.compile_string('h1 { font-size: 40px; }')
-  #   result = embedded.compile('style.scss')
-  #   embedded.close
-  class Embedded
-    def initialize
-      @dispatcher = ResilientDispatcher.new
-    end
-
-    # Compiles the Sass file at +path+ to CSS.
-    # @param path [String]
-    # @param load_paths [Array<String>] Paths in which to look for stylesheets loaded by rules like
-    #   {@use}[https://sass-lang.com/documentation/at-rules/use/] and {@import}[https://sass-lang.com/documentation/at-rules/import/].
-    # @param charset [Boolean] By default, if the CSS document contains non-ASCII characters, Sass adds a +@charset+
-    #   declaration (in expanded output mode) or a byte-order mark (in compressed mode) to indicate its encoding to
-    #   browsers or other consumers. If +charset+ is +false+, these annotations are omitted.
-    # @param source_map [Boolean] Whether or not Sass should generate a source map.
-    # @param source_map_include_sources [Boolean] Whether Sass should include the sources in the generated source map.
-    # @param style [String, Symbol] The OutputStyle of the compiled CSS.
-    # @param functions [Hash<String, Proc>] Additional built-in Sass functions that are available in all stylesheets.
-    # @param importers [Array<Object>] Custom importers that control how Sass resolves loads from rules like
-    #   {@use}[https://sass-lang.com/documentation/at-rules/use/] and {@import}[https://sass-lang.com/documentation/at-rules/import/].
-    # @param alert_ascii [Boolean] If this is +true+, the compiler will exclusively use ASCII characters in its error
-    #   and warning messages. Otherwise, it may use non-ASCII Unicode characters as well.
-    # @param alert_color [Boolean] If this is +true+, the compiler will use ANSI color escape codes in its error and
-    #   warning messages. If it's +false+, it won't use these. If it's +nil+, the compiler will determine whether or
-    #   not to use colors depending on whether the user is using an interactive terminal.
-    # @param logger [Object] An object to use to handle warnings and/or debug messages from Sass.
-    # @param quiet_deps [Boolean] If this option is set to +true+, Sass won’t print warnings that are caused by
-    #   dependencies. A “dependency” is defined as any file that’s loaded through +load_paths+ or +importer+.
-    #   Stylesheets that are imported relative to the entrypoint are not considered dependencies.
-    # @param verbose [Boolean] By default, Dart Sass will print only five instances of the same deprecation warning per
-    #   compilation to avoid deluging users in console noise. If you set verbose to +true+, it will instead print every
-    #   deprecation warning it encounters.
-    # @return [CompileResult]
-    # @raise [ArgumentError, CompileError]
-    # @see https://sass-lang.com/documentation/js-api/functions/compile/
-    def compile(path,
-                load_paths: [],
-
-                charset: true,
-                source_map: false,
-                source_map_include_sources: false,
-                style: :expanded,
-
-                functions: {},
-                importers: [],
-
-                alert_ascii: false,
-                alert_color: nil,
-                logger: nil,
-                quiet_deps: false,
-                verbose: false)
-      raise ArgumentError, 'path must be set' if path.nil?
-
-      Host.new(@dispatcher).compile_request(
-        path: path,
-        source: nil,
-        importer: nil,
-        load_paths: load_paths,
-        syntax: nil,
-        url: nil,
-        charset: charset,
-        source_map: source_map,
-        source_map_include_sources: source_map_include_sources,
-        style: style,
-        functions: functions,
-        importers: importers,
-        alert_color: alert_color,
-        alert_ascii: alert_ascii,
-        logger: logger,
-        quiet_deps: quiet_deps,
-        verbose: verbose
-      )
-    end
-
-    # Compiles a stylesheet whose contents is +source+ to CSS.
-    # @param source [String]
-    # @param importer [Object] The importer to use to handle loads that are relative to the entrypoint stylesheet.
-    # @param load_paths [Array<String>] Paths in which to look for stylesheets loaded by rules like
-    #   {@use}[https://sass-lang.com/documentation/at-rules/use/] and {@import}[https://sass-lang.com/documentation/at-rules/import/].
-    # @param syntax [String, Symbol] The Syntax to use to parse the entrypoint stylesheet.
-    # @param url [String] The canonical URL of the entrypoint stylesheet. If this is passed along with +importer+, it's
-    #   used to resolve relative loads in the entrypoint stylesheet.
-    # @param charset [Boolean] By default, if the CSS document contains non-ASCII characters, Sass adds a +@charset+
-    #   declaration (in expanded output mode) or a byte-order mark (in compressed mode) to indicate its encoding to
-    #   browsers or other consumers. If +charset+ is +false+, these annotations are omitted.
-    # @param source_map [Boolean] Whether or not Sass should generate a source map.
-    # @param source_map_include_sources [Boolean] Whether Sass should include the sources in the generated source map.
-    # @param style [String, Symbol] The OutputStyle of the compiled CSS.
-    # @param functions [Hash<String, Proc>] Additional built-in Sass functions that are available in all stylesheets.
-    # @param importers [Array<Object>] Custom importers that control how Sass resolves loads from rules like
-    #   {@use}[https://sass-lang.com/documentation/at-rules/use/] and {@import}[https://sass-lang.com/documentation/at-rules/import/].
-    # @param alert_ascii [Boolean] If this is +true+, the compiler will exclusively use ASCII characters in its error
-    #   and warning messages. Otherwise, it may use non-ASCII Unicode characters as well.
-    # @param alert_color [Boolean] If this is +true+, the compiler will use ANSI color escape codes in its error and
-    #   warning messages. If it's +false+, it won't use these. If it's +nil+, the compiler will determine whether or
-    #   not to use colors depending on whether the user is using an interactive terminal.
-    # @param logger [Object] An object to use to handle warnings and/or debug messages from Sass.
-    # @param quiet_deps [Boolean] If this option is set to +true+, Sass won’t print warnings that are caused by
-    #   dependencies. A “dependency” is defined as any file that’s loaded through +load_paths+ or +importer+.
-    #   Stylesheets that are imported relative to the entrypoint are not considered dependencies.
-    # @param verbose [Boolean] By default, Dart Sass will print only five instances of the same deprecation warning per
-    #   compilation to avoid deluging users in console noise. If you set verbose to +true+, it will instead print every
-    #   deprecation warning it encounters.
-    # @return [CompileResult]
-    # @raise [ArgumentError, CompileError]
-    # @see https://sass-lang.com/documentation/js-api/functions/compilestring/
-    def compile_string(source,
-                       importer: nil,
-                       load_paths: [],
-                       syntax: :scss,
-                       url: nil,
-
-                       charset: true,
-                       source_map: false,
-                       source_map_include_sources: false,
-                       style: :expanded,
-
-                       functions: {},
-                       importers: [],
-
-                       alert_ascii: false,
-                       alert_color: nil,
-                       logger: nil,
-                       quiet_deps: false,
-                       verbose: false)
-      raise ArgumentError, 'source must be set' if source.nil?
-
-      Host.new(@dispatcher).compile_request(
-        path: nil,
-        source: source,
-        importer: importer,
-        load_paths: load_paths,
-        syntax: syntax,
-        url: url,
-        charset: charset,
-        source_map: source_map,
-        source_map_include_sources: source_map_include_sources,
-        style: style,
-        functions: functions,
-        importers: importers,
-        alert_color: alert_color,
-        alert_ascii: alert_ascii,
-        logger: logger,
-        quiet_deps: quiet_deps,
-        verbose: verbose
-      )
-    end
-
-    # @return [String] Information about the Sass implementation.
-    # @see https://sass-lang.com/documentation/js-api/variables/info/
-    def info
-      @info ||= Host.new(@dispatcher).version_request
-    end
-
-    def close
-      @dispatcher.close
-    end
-
-    def closed?
-      @dispatcher.closed?
-    end
-  end
 end

data/lib/sass/exception.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Sass
+  # An exception thrown because a Sass compilation failed.
+  class CompileError < StandardError
+    # @return [String, nil]
+    attr_reader :sass_stack
+
+    # @return [Logger::SourceSpan, nil]
+    attr_reader :span
+
+    # @return [Array<String>]
+    attr_reader :loaded_urls
+
+    # @!visibility private
+    def initialize(message, full_message, sass_stack, span, loaded_urls)
+      super(message)
+
+      @full_message = full_message
+      @sass_stack = sass_stack
+      @span = span
+      @loaded_urls = loaded_urls
+    end
+
+    # @return [String]
+    def full_message(highlight: nil, order: nil, **)
+      return super if @full_message.nil?
+
+      highlight = Exception.respond_to?(:to_tty?) && Exception.to_tty? if highlight.nil?
+      if highlight
+        +@full_message
+      else
+        @full_message.gsub(/\e\[[0-9;]*m/, '')
+      end
+    end
+
+    # @return [String]
+    def to_css
+      content = full_message(highlight: false, order: :top)
+
+      <<~CSS
+        /* #{content.gsub('*/', "*\u2060/").gsub("\r\n", "\n").split("\n").join("\n * ")} */
+
+        body::before {
+          position: static;
+          display: block;
+          padding: 1em;
+          margin: 0 0 1em;
+          border-width: 0 0 2px;
+          border-bottom-style: solid;
+          font-family: monospace, monospace;
+          white-space: pre;
+          content: #{Serializer.dump_quoted_string(content)};
+        }
+      CSS
+    end
+  end
+
+  # An exception thrown by Sass Script.
+  class ScriptError < StandardError
+    def initialize(message, name = nil)
+      super(name.nil? ? message : "$#{name}: #{message}")
+    end
+  end
+end

data/lib/sass/fork_tracker.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Sass
+  # The {ForkTracker} module.
+  #
+  # It tracks objects that need to be closed after `Process.fork`.
+  module ForkTracker
+    HASH = {}.compare_by_identity
+
+    MUTEX = Mutex.new
+
+    private_constant :HASH, :MUTEX
+
+    module_function
+
+    def add(obj)
+      MUTEX.synchronize do
+        HASH[obj] = true
+      end
+    end
+
+    def delete(obj)
+      MUTEX.synchronize do
+        HASH.delete(obj)
+      end
+    end
+
+    def each(...)
+      MUTEX.synchronize do
+        HASH.keys
+      end.each(...)
+    end
+
+    # The {CoreExt} module.
+    #
+    # It closes objects after `Process.fork`.
+    module CoreExt
+      def _fork
+        pid = super
+        ForkTracker.each(&:close) if pid.zero?
+        pid
+      end
+    end
+
+    private_constant :CoreExt
+
+    Process.singleton_class.prepend(CoreExt)
+  end
+
+  private_constant :ForkTracker
+end

data/lib/sass/serializer.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Sass
+  # The {Serializer} module.
+  module Serializer
+    module_function
+
+    def dump_quoted_string(string)
+      include_double_quote = false
+      include_single_quote = false
+      buffer = [34]
+      string.each_codepoint do |codepoint|
+        case codepoint
+        when 34
+          return dump_double_quoted_string(string) if include_single_quote
+
+          include_double_quote = true
+          buffer << 34
+        when 39
+          return dump_double_quoted_string(string) if include_double_quote
+
+          include_single_quote = true
+          buffer << 39
+        when 92
+          buffer << 92 << 92
+        when 9
+          buffer << 9
+        else
+          if codepoint < 32 || codepoint > 126
+            buffer << 92
+            buffer.concat(codepoint.to_s(16).codepoints)
+            buffer << 32
+          else
+            buffer << codepoint
+          end
+        end
+      end
+      if include_double_quote
+        buffer[0] = 39
+        buffer << 39
+      else
+        buffer << 34
+      end
+      buffer.pack('U*')
+    end
+
+    def dump_double_quoted_string(string)
+      buffer = [34]
+      string.each_codepoint do |codepoint|
+        case codepoint
+        when 34
+          buffer << 92 << 34
+        when 92
+          buffer << 92 << 92
+        when 9
+          buffer << 9
+        else
+          if codepoint < 32 || codepoint > 126
+            buffer << 92
+            buffer.concat(codepoint.to_s(16).codepoints)
+            buffer << 32
+          else
+            buffer << codepoint
+          end
+        end
+      end
+      buffer << 34
+      buffer.pack('U*')
+    end
+  end
+
+  private_constant :Serializer
+end

data/lib/sass/value/argument_list.rb

@@ -13,7 +13,7 @@ module Sass
       # @param keywords [Hash<::String, Value>]
       # @param separator [::String]
       def initialize(contents = [], keywords = {}, separator = ',')
-        super(contents, separator: separator)
+        super(contents, separator:)
 
         @id = 0
         @keywords_accessed = false

data/lib/sass/value/number.rb

@@ -183,7 +183,7 @@ module Sass
       def convert_value(new_numerator_units, new_denominator_units, name = nil)
         coerce_or_convert_value(new_numerator_units, new_denominator_units,
                                 coerce_unitless: false,
-                                name: name)
+                                name:)
       end
 
       # @param other [Number]
@@ -200,9 +200,9 @@ module Sass
       def convert_value_to_match(other, name = nil, other_name = nil)
         coerce_or_convert_value(other.numerator_units, other.denominator_units,
                                 coerce_unitless: false,
-                                name: name,
-                                other: other,
-                                other_name: other_name)
+                                name:,
+                                other:,
+                                other_name:)
       end
 
       # @param new_numerator_units [Array<::String>]
@@ -221,7 +221,7 @@ module Sass
       def coerce_value(new_numerator_units, new_denominator_units, name = nil)
         coerce_or_convert_value(new_numerator_units, new_denominator_units,
                                 coerce_unitless: true,
-                                name: name)
+                                name:)
       end
 
       # @param unit [::String]
@@ -244,9 +244,9 @@ module Sass
       def coerce_value_to_match(other, name = nil, other_name = nil)
         coerce_or_convert_value(other.numerator_units, other.denominator_units,
                                 coerce_unitless: true,
-                                name: name,
-                                other: other,
-                                other_name: other_name)
+                                name:,
+                                other:,
+                                other_name:)
       end
 
       # @return [Number]

data/lib/sass/value.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'calculation_value'
-require_relative 'script_error'
 
 module Sass
   # The abstract base class of Sass's value types.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.69.5
+  version: 1.69.6
 platform: x86_64-linux-gnu
 authors:
 - なつき
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.25'
 description: A Ruby library that will communicate with Embedded Dart Sass using the
   Embedded Sass protocol.
 email:
@@ -46,27 +46,29 @@ files:
 - lib/sass/calculation_value.rb
 - lib/sass/calculation_value/calculation_operation.rb
 - lib/sass/canonicalize_context.rb
-- lib/sass/compile_error.rb
 - lib/sass/compile_result.rb
+- lib/sass/compiler.rb
+- lib/sass/compiler/connection.rb
+- lib/sass/compiler/dispatcher.rb
+- lib/sass/compiler/host.rb
+- lib/sass/compiler/host/function_registry.rb
+- lib/sass/compiler/host/importer_registry.rb
+- lib/sass/compiler/host/logger_registry.rb
+- lib/sass/compiler/host/protofier.rb
+- lib/sass/compiler/host/structifier.rb
+- lib/sass/compiler/host/value_protofier.rb
+- lib/sass/compiler/resilient_dispatcher.rb
+- lib/sass/compiler/varint.rb
 - lib/sass/elf.rb
 - lib/sass/embedded.rb
-- lib/sass/embedded/connection.rb
-- lib/sass/embedded/dispatcher.rb
-- lib/sass/embedded/host.rb
-- lib/sass/embedded/host/function_registry.rb
-- lib/sass/embedded/host/importer_registry.rb
-- lib/sass/embedded/host/logger_registry.rb
-- lib/sass/embedded/host/protofier.rb
-- lib/sass/embedded/host/structifier.rb
-- lib/sass/embedded/host/value_protofier.rb
-- lib/sass/embedded/resilient_dispatcher.rb
-- lib/sass/embedded/varint.rb
 - lib/sass/embedded/version.rb
 - lib/sass/embedded_protocol.rb
+- lib/sass/exception.rb
+- lib/sass/fork_tracker.rb
 - lib/sass/logger/silent.rb
 - lib/sass/logger/source_location.rb
 - lib/sass/logger/source_span.rb
-- lib/sass/script_error.rb
+- lib/sass/serializer.rb
 - lib/sass/value.rb
 - lib/sass/value/argument_list.rb
 - lib/sass/value/boolean.rb
@@ -81,12 +83,12 @@ files:
 - lib/sass/value/number.rb
 - lib/sass/value/number/unit.rb
 - lib/sass/value/string.rb
-homepage: https://github.com/ntkme/sass-embedded-host-ruby
+homepage: https://github.com/sass-contrib/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.69.5
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.69.5
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.69.6
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.69.6
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []
@@ -96,14 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.22
+      version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with Ruby!