sass-embedded 1.77.5 → 1.100.0

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

@@ -25,43 +25,31 @@ module Sass
               number: Number.to_proto(obj)
             )
           when Sass::Value::Color
-            if obj.instance_eval { !defined?(@hue) }
-              EmbeddedProtocol::Value.new(
-                rgb_color: EmbeddedProtocol::Value::RgbColor.new(
-                  red: obj.red,
-                  green: obj.green,
-                  blue: obj.blue,
-                  alpha: obj.alpha.to_f
-                )
+            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
               )
-            elsif obj.instance_eval { !defined?(@saturation) }
+            )
+          when Sass::Value::ArgumentList
+            if obj.instance_variable_get(:@compile_context) == @function_registry.compile_context
               EmbeddedProtocol::Value.new(
-                hwb_color: EmbeddedProtocol::Value::HwbColor.new(
-                  hue: obj.hue.to_f,
-                  whiteness: obj.whiteness.to_f,
-                  blackness: obj.blackness.to_f,
-                  alpha: obj.alpha.to_f
+                argument_list: EmbeddedProtocol::Value::ArgumentList.new(
+                  id: obj.instance_variable_get(:@id)
                 )
               )
             else
               EmbeddedProtocol::Value.new(
-                hsl_color: EmbeddedProtocol::Value::HslColor.new(
-                  hue: obj.hue.to_f,
-                  saturation: obj.saturation.to_f,
-                  lightness: obj.lightness.to_f,
-                  alpha: obj.alpha.to_f
+                argument_list: EmbeddedProtocol::Value::ArgumentList.new(
+                  contents: obj.to_a.map { |element| to_proto(element) },
+                  keywords: obj.keywords.each_with_object({}) { |(key, value), hash| hash[key.to_s] = to_proto(value) },
+                  separator: ListSeparator.to_proto(obj.separator)
                 )
               )
             end
-          when Sass::Value::ArgumentList
-            EmbeddedProtocol::Value.new(
-              argument_list: EmbeddedProtocol::Value::ArgumentList.new(
-                id: obj.instance_eval { @id },
-                contents: obj.to_a.map { |element| to_proto(element) },
-                keywords: obj.keywords.to_h { |key, value| [key.to_s, to_proto(value)] },
-                separator: ListSeparator.to_proto(obj.separator)
-              )
-            )
           when Sass::Value::List
             EmbeddedProtocol::Value.new(
               list: EmbeddedProtocol::Value::List.new(
@@ -82,10 +70,10 @@ module Sass
               )
             )
           when Sass::Value::Function
-            if obj.instance_eval { @id }
+            if obj.instance_variable_defined?(:@id)
               EmbeddedProtocol::Value.new(
                 compiler_function: EmbeddedProtocol::Value::CompilerFunction.new(
-                  id: obj.instance_eval { @id }
+                  id: assert_compiler_value(obj).instance_variable_get(:@id)
                 )
               )
             else
@@ -99,7 +87,7 @@ module Sass
           when Sass::Value::Mixin
             EmbeddedProtocol::Value.new(
               compiler_mixin: EmbeddedProtocol::Value::CompilerMixin.new(
-                id: obj.instance_eval { @id }
+                id: assert_compiler_value(obj).instance_variable_get(:@id)
               )
             )
           when Sass::Value::Calculation
@@ -130,40 +118,28 @@ module Sass
             )
           when :number
             Number.from_proto(obj)
-          when :rgb_color
-            Sass::Value::Color.new(
-              red: obj.red,
-              green: obj.green,
-              blue: obj.blue,
-              alpha: obj.alpha
-            )
-          when :hsl_color
-            Sass::Value::Color.new(
-              hue: obj.hue,
-              saturation: obj.saturation,
-              lightness: obj.lightness,
-              alpha: obj.alpha
-            )
-          when :hwb_color
-            Sass::Value::Color.new(
-              hue: obj.hue,
-              whiteness: obj.whiteness,
-              blackness: obj.blackness,
-              alpha: obj.alpha
+          when :color
+            Sass::Value::Color.send(
+              :for_space,
+              obj.space,
+              obj.has_channel1? ? obj.channel1 : nil,
+              obj.has_channel2? ? obj.channel2 : nil,
+              obj.has_channel3? ? obj.channel3 : nil,
+              obj.has_alpha? ? obj.alpha : nil
             )
           when :argument_list
-            Sass::Value::ArgumentList.new(
-              obj.contents.map do |element|
-                from_proto(element)
-              end,
-              obj.keywords.entries.to_h do |key, value|
-                [key.to_sym, from_proto(value)]
-              end,
-              ListSeparator.from_proto(obj.separator)
-            ).instance_eval do
-              @id = obj.id
-              self
-            end
+            compiler_value(
+              Sass::Value::ArgumentList.new(
+                obj.contents.map do |element|
+                  from_proto(element)
+                end,
+                obj.keywords.to_enum.with_object({}) do |(key, value), hash|
+                  hash[key.to_sym] = from_proto(value)
+                end,
+                ListSeparator.from_proto(obj.separator)
+              ),
+              obj.id
+            )
           when :list
             Sass::Value::List.new(
               obj.contents.map do |element|
@@ -174,22 +150,16 @@ module Sass
             )
           when :map
             Sass::Value::Map.new(
-              obj.entries.to_h do |entry|
-                [from_proto(entry.key), from_proto(entry.value)]
+              obj.entries.to_enum.with_object({}) do |entry, hash|
+                hash[from_proto(entry.key)] = from_proto(entry.value)
               end
             )
           when :compiler_function
-            Sass::Value::Function.new(nil).instance_eval do
-              @id = obj.id
-              self
-            end
+            compiler_value(Sass::Value::Function.allocate, obj.id)
           when :host_function
             raise Sass::ScriptError, 'The compiler may not send Value.host_function to host'
           when :compiler_mixin
-            Sass::Value::Mixin.send(:new).instance_eval do
-              @id = obj.id
-              self
-            end
+            compiler_value(Sass::Value::Mixin.allocate, obj.id)
           when :calculation
             Calculation.from_proto(obj)
           when :singleton
@@ -208,6 +178,22 @@ module Sass
           end
         end
 
+        private
+
+        def assert_compiler_value(value)
+          unless value.instance_variable_get(:@compile_context) == @function_registry.compile_context
+            raise Sass::ScriptError, "Value #{value} does not belong to this compilation"
+          end
+
+          value
+        end
+
+        def compiler_value(value, id)
+          value.instance_variable_set(:@compile_context, @function_registry.compile_context)
+          value.instance_variable_set(:@id, id)
+          value
+        end
+
         # The {Number} Protofier.
         module Number
           module_function

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Sass
+  class Compiler
+    class Host
+      # The {Struct} class.
+      #
+      # It creates {::Struct}-like objects from {::Hash}.
+      class Struct
+        def initialize(hash, attrs: nil, methods: nil)
+          @hash = hash
+          @attrs = attrs
+          @methods = methods
+        end
+
+        def method_missing(symbol, ...)
+          return super unless @hash.key?(symbol)
+
+          if @attrs&.include?(symbol)
+            @hash.send(:[], symbol, ...)
+          elsif @methods&.include?(symbol)
+            @hash[symbol].call(...)
+          else
+            super
+          end
+        end
+
+        def respond_to_missing?(symbol, _include_all)
+          @hash.key?(symbol) && (@attrs&.include?(symbol) || @methods&.include?(symbol))
+        end
+      end
+
+      private_constant :Struct
+    end
+  end
+end

data/lib/sass/compiler/host.rb

@@ -4,7 +4,7 @@ require_relative 'host/function_registry'
 require_relative 'host/importer_registry'
 require_relative 'host/logger_registry'
 require_relative 'host/protofier'
-require_relative 'host/structifier'
+require_relative 'host/struct'
 
 module Sass
   class Compiler
@@ -116,7 +116,7 @@ module Sass
 
         case version_response.implementation_name
         when 'dart-sass'
-          info << '[Dart]'
+          info << (File.basename(CLI::COMMAND.first, '.exe') == 'node' ? '[JavaScript]' : '[Dart]')
         end
 
         info

data/lib/sass/compiler.rb

@@ -11,6 +11,7 @@ require_relative 'embedded/version'
 require_relative 'embedded_protocol'
 require_relative 'exception'
 require_relative 'fork_tracker'
+require_relative 'gem_package_importer'
 require_relative 'logger/silent'
 require_relative 'logger/source_location'
 require_relative 'logger/source_span'
@@ -30,7 +31,7 @@ module Sass
   # @see https://sass-lang.com/documentation/js-api/classes/compiler/
   class Compiler
     def initialize
-      @channel = Channel.new(Dispatcher)
+      @channel = Channel.new
     end
 
     # Compiles the Sass file at +path+ to CSS.
@@ -62,7 +63,7 @@ module Sass
     #   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]
+    # @raise [ArgumentError, CompileError, IOError]
     # @see https://sass-lang.com/documentation/js-api/functions/compile/
     def compile(path,
                 load_paths: [],
@@ -142,7 +143,7 @@ module Sass
     #   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]
+    # @raise [ArgumentError, CompileError, IOError]
     # @see https://sass-lang.com/documentation/js-api/functions/compilestring/
     def compile_string(source,
                        importer: nil,