sass-embedded 1.79.3 → 1.79.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31cfb8ec747af7e5d755f61dd9bd5d8ff9318b5c357ba5eb8b314377ae7f345f
-  data.tar.gz: 9af64e39fecc2bdd5678412be80f8d600461edd2e3e5f5b927cb33a3ec54b02f
+  metadata.gz: 8db358ac19921c383272d4a02ff53e84248977328b6de28a79b5ff59712751e7
+  data.tar.gz: 4e7775f23fdc5ca6bfa6c9f2f662cc4604af0bb518f4ae9271508885475f6a2b
 SHA512:
-  metadata.gz: fc936183c3a246211baa54eb1dfd4dc29662d960223f31435eefc59f2ae9067680d7f3337efbafa050f6ed4c12deba9c4badd61f5714801d142aa71cd1c8fb18
-  data.tar.gz: e9722d935946af7fffc630689d3b4ca0bd57cf4af7917f432075327ed3e08c8b0a19db304708f8d8c40b2cfb589bd51b28f50155e3e58e5ec207528c45710307
+  metadata.gz: f351bf7361aad437a59aee2e0f664b5feace00cd2fc51d0b3f8b054ed2fc123dd4a65ea9c1b35924260c0254d0c2e62483f0dd0bb891c4f5e55fdd5b0c5b756a
+  data.tar.gz: 9f2a9ed11b03a09c0bc989101a10293add16ffb062cbd43fa6482a12b6699d7f720974c586489a4641c8e52549d846af9b70040aff500b13fe4b242ae4f8f535

data/exe/sass

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

data/ext/sass/Rakefile

@@ -30,6 +30,8 @@ rescue StandardError
 end
 
 file 'cli.rb' => %w[dart-sass] do |t|
+  require_relative '../../lib/sass/elf'
+
   exe = 'dart-sass/sass'
   exe = "#{exe}#{['', '.bat', '.exe'].find { |ext| File.exist?("#{exe}#{ext}") }}"
 
@@ -40,27 +42,58 @@ file 'cli.rb' => %w[dart-sass] do |t|
   snapshot = 'dart-sass/src/sass.snapshot'
 
   command = if File.exist?(runtime) && File.exist?(snapshot)
-              "
-      File.absolute_path('#{runtime}', __dir__).freeze,
-      File.absolute_path('#{snapshot}', __dir__).freeze
-    "
+              [runtime, snapshot]
             else
-              "
-      File.absolute_path('#{exe}', __dir__).freeze
-    "
+              [exe]
             end
 
-  File.write(t.name, <<~CLI_RB)
-    # frozen_string_literal: true
+  interpreter = File.open(command[0], 'rb') do |file|
+    Sass.const_get(:ELF).new(file).interpreter
+  rescue ArgumentError
+    nil
+  end
 
-    module Sass
-      module CLI
-        COMMAND = [#{command}].freeze
-      end
+  command_source = command.map do |argument|
+    "File.absolute_path('#{argument}', __dir__).freeze"
+  end.join(',
+      ')
 
-      private_constant :CLI
-    end
-  CLI_RB
+  if interpreter.nil?
+    File.write(t.name, <<~CLI_RB)
+      # frozen_string_literal: true
+
+      module Sass
+        module CLI
+          COMMAND = [
+            #{command_source}
+          ].freeze
+        end
+
+        private_constant :CLI
+      end
+    CLI_RB
+  else
+    File.write(t.name, <<~CLI_RB)
+      # frozen_string_literal: true
+
+      require_relative '../../lib/sass/elf'
+
+      module Sass
+        module CLI
+          INTERPRETER = '#{interpreter}'
+
+          COMMAND = [
+            *(ELF::INTERPRETER unless ELF::INTERPRETER.nil? ||
+                                      ELF::INTERPRETER == INTERPRETER ||
+                                      !ELF::INTERPRETER.end_with?(INTERPRETER)),
+            #{command_source}
+          ].freeze
+        end
+
+        private_constant :CLI
+      end
+    CLI_RB
+  end
 end
 
 file 'embedded_sass.proto' => %w[cli.rb] do |t|

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass": "1.79.3"
+    "sass": "1.79.4"
   }
 }

data/lib/sass/compiler/connection.rb

@@ -12,15 +12,7 @@ module Sass
     class Connection
       def initialize
         @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, @stdout, @stderr, @wait_thread = Open3.popen3(*CLI::COMMAND, '--embedded', chdir: __dir__)
 
         @stdin.binmode
 

data/lib/sass/compiler/host/protofier.rb

@@ -25,37 +25,15 @@ module Sass
               number: Number.to_proto(obj)
             )
           when Sass::Value::Color
-            if obj.instance_eval { !defined?(@hue) }
-              EmbeddedProtocol::Value.new(
-                color: EmbeddedProtocol::Value::Color.new(
-                  channel1: obj.red,
-                  channel2: obj.green,
-                  channel3: obj.blue,
-                  alpha: obj.alpha.to_f,
-                  space: 'rgb'
-                )
-              )
-            elsif obj.instance_eval { !defined?(@saturation) }
-              EmbeddedProtocol::Value.new(
-                color: EmbeddedProtocol::Value::Color.new(
-                  channel1: obj.hue.to_f,
-                  channel2: obj.whiteness.to_f,
-                  channel3: obj.blackness.to_f,
-                  alpha: obj.alpha.to_f,
-                  space: 'hwb'
-                )
-              )
-            else
-              EmbeddedProtocol::Value.new(
-                color: EmbeddedProtocol::Value::Color.new(
-                  channel1: obj.hue.to_f,
-                  channel2: obj.saturation.to_f,
-                  channel3: obj.lightness.to_f,
-                  alpha: obj.alpha.to_f,
-                  space: 'hsl'
-                )
+            EmbeddedProtocol::Value.new(
+              color: EmbeddedProtocol::Value::Color.new(
+                channel1: obj.send(:channel0_or_nil),
+                channel2: obj.send(:channel1_or_nil),
+                channel3: obj.send(:channel2_or_nil),
+                alpha: obj.send(:alpha_or_nil),
+                space: obj.space
               )
-            end
+            )
           when Sass::Value::ArgumentList
             EmbeddedProtocol::Value.new(
               argument_list: EmbeddedProtocol::Value::ArgumentList.new(
@@ -134,31 +112,14 @@ module Sass
           when :number
             Number.from_proto(obj)
           when :color
-            case obj.space
-            when 'rgb'
-              Sass::Value::Color.new(
-                red: obj.channel1,
-                green: obj.channel2,
-                blue: obj.channel3,
-                alpha: obj.alpha
-              )
-            when 'hsl'
-              Sass::Value::Color.new(
-                hue: obj.channel1,
-                saturation: obj.channel2,
-                lightness: obj.channel3,
-                alpha: obj.alpha
-              )
-            when 'hwb'
-              Sass::Value::Color.new(
-                hue: obj.channel1,
-                whiteness: obj.channel2,
-                blackness: obj.channel3,
-                alpha: obj.alpha
-              )
-            else
-              raise NotImplementedError, 'CSS Color Level 4 will be supported in a future release'
-            end
+            Sass::Value::Color.send(
+              :for_space,
+              obj.space,
+              obj.channel1,
+              obj.channel2,
+              obj.channel3,
+              obj.alpha
+            )
           when :argument_list
             Sass::Value::ArgumentList.new(
               obj.contents.map do |element|

data/lib/sass/elf.rb

@@ -147,7 +147,7 @@ module Sass
         elf_ehdr = :Elf64_Ehdr
         elf_phdr = :Elf64_Phdr
       else
-        raise ArgumentError
+        raise EncodingError
       end
 
       case @ehdr[:e_ident][EI_DATA]
@@ -156,7 +156,7 @@ module Sass
       when ELFDATA2MSB
         little_endian = false
       else
-        raise ArgumentError
+        raise EncodingError
       end
 
       @ehdr.merge!(read(elf_ehdr, little_endian))
@@ -189,7 +189,7 @@ module Sass
 
       @buffer.seek(phdr[:p_offset], IO::SEEK_SET)
       interpreter = @buffer.read(phdr[:p_filesz])
-      raise ArgumentError unless interpreter.end_with?("\0")
+      raise EncodingError unless interpreter.end_with?("\0")
 
       interpreter.chomp!("\0")
     end
@@ -215,7 +215,7 @@ module Sass
           end
         end
       end
-    end
+    end.freeze
   end
 
   private_constant :ELF

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.79.3'
+    VERSION = '1.79.4'
   end
 end

data/lib/sass/value/color/channel.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module Sass
+  module Value
+    class Color
+      # @see https://github.com/sass/dart-sass/blob/main/lib/src/value/color/channel.dart
+      class ColorChannel
+        # @return [::String]
+        attr_reader :name
+
+        # @return [::Boolean]
+        def polar_angle?
+          @polar_angle
+        end
+
+        # @return [::String, nil]
+        attr_reader :associated_unit
+
+        # @param name [::String]
+        # @param polar_angle [::Boolean]
+        # @param associated_unit [::String]
+        def initialize(name, polar_angle:, associated_unit: nil)
+          @name = name
+          @polar_angle = polar_angle
+          @associated_unit = associated_unit
+        end
+
+        # @return [::Boolean]
+        def analogous?(other)
+          case [name, other.name]
+          in ['red' | 'x', 'red' | 'x'] |
+             ['green' | 'y', 'green' | 'y'] |
+             ['blue' | 'z', 'blue' | 'z'] |
+             ['chroma' | 'saturation', 'chroma' | 'saturation'] |
+             ['lightness', 'lightness'] |
+             ['hue', 'hue']
+            true
+          else
+            false
+          end
+        end
+      end
+
+      private_constant :ColorChannel
+
+      # @see https://github.com/sass/dart-sass/blob/main/lib/src/value/color/channel.dart
+      class LinearChannel < ColorChannel
+        # @return [Numeric]
+        attr_reader :min, :max
+
+        # @return [::Boolean]
+        attr_reader :requires_percent, :lower_clamped, :upper_clamped
+
+        # @param name [::String]
+        # @param min [Numeric]
+        # @param max [Numeric]
+        # @param requires_percent [::Boolean]
+        # @param lower_clamped [::Boolean]
+        # @param upper_clamped [::Boolean]
+        # @param conventionally_percent [::Boolean]
+        def initialize(name, min, max, requires_percent: false, lower_clamped: false, upper_clamped: false,
+                       conventionally_percent: nil)
+          super(name,
+                polar_angle: false,
+                associated_unit: if conventionally_percent.nil? ? (min.zero? && max == 100) : conventionally_percent
+                                   '%'
+                                 end)
+          @min = min
+          @max = max
+          @requires_percent = requires_percent
+          @lower_clamped = lower_clamped
+          @upper_clamped = upper_clamped
+        end
+      end
+
+      private_constant :LinearChannel
+    end
+  end
+end