sass-embedded 1.79.2-x86_64-linux-android → 1.79.4-x86_64-linux-android

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08336f2c9fa8c6d7c67415cfd746ea085378a6921f2803b9350e1fee585f4a73'
-  data.tar.gz: 1bfc0bf695186733797f809737560811317c5af85796edf01d5e409801c2724f
+  metadata.gz: 8e7f27cd0c27171557f1c91d6bd791ef918f960fcc3603304d4a20ad2b073f89
+  data.tar.gz: dc98b80cbb35805139bd477fd915397afb94f50aa002f16a2c1f9191a2705674
 SHA512:
-  metadata.gz: ac5beb28b5137f5db41f8a25a319184549d21834c5801302a55779f81d50e03327fc5ec0272bd5d23d2583f6f04a822fa2d23f4da9cf3de1188e386eca8ded3a
-  data.tar.gz: d501c819b97b287c964b5adfd380d38eb2f67bb93f9fef4b0a8c01aa51c4ef6d018244d517658d71b098e9fc95a9f0c772eeab846b592776f8b6d94642e19c77
+  metadata.gz: f98452a366c1a032086999dadc79e1c434480d72ec68672ede9991f06b87bc9088a3cd422182182ed73677c1162604b8b3de6cae78e880ed4170ca2db1691dcb
+  data.tar.gz: 8b8ffe7532c604d86333e162b3d5733262a9fe6f280dc7da920d1ff4444ec892439996754c7112da8a3d8ae7b2591c4c9d3fff00df6ff89652a66e6cdce0cf77

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

@@ -1,8 +1,15 @@
 # frozen_string_literal: true
 
+require_relative '../../lib/sass/elf'
+
 module Sass
   module CLI
+    INTERPRETER = '/system/bin/linker64'
+
     COMMAND = [
+      *(ELF::INTERPRETER unless ELF::INTERPRETER.nil? ||
+                                ELF::INTERPRETER == INTERPRETER ||
+                                !ELF::INTERPRETER.end_with?(INTERPRETER)),
       File.absolute_path('dart-sass/src/dart', __dir__).freeze,
       File.absolute_path('dart-sass/src/sass.snapshot', __dir__).freeze
     ].freeze

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.2'
+    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