sass-embedded 1.63.4 → 1.63.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf1de1df747848d2132aad0dcd24b00b71fe8032ad67037ff7808dac28961687
-  data.tar.gz: 287e69467756ff9fb35eefd18b7a0035c1143160e0eb1220ef9ac2135fe906c9
+  metadata.gz: c463495ed448856ecec61dd708f275713908553dfac183dbe5e006617701b501
+  data.tar.gz: dd1b24b9d4f5a68b666b18455bd8a67649be1d931dab12ea74fc9083de2c6fa1
 SHA512:
-  metadata.gz: 1476feae1559c8c1d6e27736912fd05c438ac2fde873eb8c0b79fd855bd5b9343b6cc99bbfeedab3ac82b40388140e5796c9d2e156d6be517157da544c3010bd
-  data.tar.gz: 69008ddf5695e6cc79b6a4adfd6ddf605c36568ffb31d822dde498dc2f0ba400f1d8dc4671223bf192914319bd09d6b38bc21b362d4c9285197186e38ea6e0e4
+  metadata.gz: 24fb32bbe970020cad694e98b453266b442dfb8622e74b54cec053b5ecd1a26ed8696a95a4d1a1f9ec5497665a521722c9fd8a7d8d0ce1fc1007c7e4e3e9272a
+  data.tar.gz: ec326d600ded86c87acc834c59a584ae024c9496a169d943e807fd678790c64aca94a77d3bc5bba2c9a8dd9c6732c45b7f995e55927fe1ecefce5df58f41ec52

data/README.md

@@ -3,7 +3,7 @@
 [![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)
 [![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/embedded-protocol).
+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).
 
 It exposes a Ruby API for Sass that's backed by a native [Dart Sass](https://sass-lang.com/dart-sass) executable.
 

data/ext/sass/Rakefile

@@ -255,7 +255,24 @@ module Configuration
           when 'x86_64'
             'x64'
           when 'aarch64'
-            'arm64'
+            if Platform::OS == 'windows'
+              begin
+                require_relative 'win32_api'
+
+                if Win32API.x64?
+                  'x64'
+                elsif Win32API.x86?
+                  'ia32'
+                else
+                  raise NotImplementedError, message
+                end
+              rescue LoadError
+                # TODO: remove begin/rescue once jruby/jffi support windows aarch64
+                'ia32'
+              end
+            else
+              'arm64'
+            end
           when 'arm'
             'arm'
           else
@@ -295,7 +312,24 @@ module Configuration
           when 'x86_64'
             'x86_64'
           when 'aarch64'
-            'aarch_64'
+            if Platform::OS == 'windows'
+              begin
+                require_relative 'win32_api'
+
+                if Win32API.x64?
+                  'x86_64'
+                elsif Win32API.x86?
+                  'x86_32'
+                else
+                  raise NotImplementedError, message
+                end
+              rescue LoadError
+                # TODO: remove begin/rescue once jruby/jffi support windows aarch64
+                'x86_32'
+              end
+            else
+              'aarch_64'
+            end
           when 'powerpc64le'
             'ppcle_64'
           when 's390x'

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass": "1.63.4"
+    "sass": "1.63.5"
   }
 }

data/ext/sass/win32_api.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require 'fiddle'
+
+# @!visibility private
+# @see https://learn.microsoft.com/en-us/windows/win32/api/
+module Win32API
+  Kernel32 = Fiddle.dlopen('Kernel32.dll')
+
+  # @see https://learn.microsoft.com/en-us/windows/win32/sysinfo/image-file-machine-constants
+  module ImageFileMachineConstants
+    IMAGE_FILE_MACHINE_I386 = 0x014c
+    IMAGE_FILE_MACHINE_ARMNT = 0x01c4
+    IMAGE_FILE_MACHINE_AMD64 = 0x8664
+    IMAGE_FILE_MACHINE_ARM64 = 0xaa64
+  end
+
+  private_constant :ImageFileMachineConstants
+
+  # @see https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/ne-processthreadsapi-machine_attributes
+  module MachineAttributes
+    USER_ENABLED = 0x00000001
+    KERNEL_ENABLED = 0x00000002
+    WOW64_CONTAINER = 0x00000004
+  end
+
+  private_constant :MachineAttributes
+
+  # Specifies the ways in which an architecture of code can run on a host operating system.
+  class MachineTypeAttributes
+    def initialize(machine_type_attributes)
+      @machine_type_attributes = machine_type_attributes
+    end
+
+    # The specified architecture of code can run in user mode.
+    def user_enabled?
+      @machine_type_attributes & MachineAttributes::USER_ENABLED == MachineAttributes::USER_ENABLED
+    end
+
+    # The specified architecture of code can run in kernel mode.
+    def kernel_enabled?
+      @machine_type_attributes & MachineAttributes::KERNEL_ENABLED == MachineAttributes::KERNEL_ENABLED
+    end
+
+    # The specified architecture of code runs on WOW64.
+    def wow64_container?
+      @machine_type_attributes & MachineAttributes::WOW64_CONTAINER == MachineAttributes::WOW64_CONTAINER
+    end
+  end
+
+  private_constant :MachineTypeAttributes
+
+  class << self
+    def x86?
+      get_machine_type_attributes(ImageFileMachineConstants::IMAGE_FILE_MACHINE_I386).user_enabled?
+    end
+
+    def arm?
+      get_machine_type_attributes(ImageFileMachineConstants::IMAGE_FILE_MACHINE_ARMNT).user_enabled?
+    end
+
+    def x64?
+      get_machine_type_attributes(ImageFileMachineConstants::IMAGE_FILE_MACHINE_AMD64).user_enabled?
+    end
+
+    def arm64?
+      get_machine_type_attributes(ImageFileMachineConstants::IMAGE_FILE_MACHINE_ARM64).user_enabled?
+    end
+
+    private
+
+    begin
+      # @see https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-getmachinetypeattributes
+      GetMachineTypeAttributes = Fiddle::Function.new(
+        Kernel32['GetMachineTypeAttributes'],
+        [-Fiddle::TYPE_SHORT, Fiddle::TYPE_VOIDP],
+        Fiddle::TYPE_LONG
+      )
+
+      def get_machine_type_attributes(machine)
+        p_machine_type_attributes = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT, Fiddle::RUBY_FREE)
+        raise Fiddle.win32_last_error unless GetMachineTypeAttributes.call(machine, p_machine_type_attributes).zero?
+
+        MachineTypeAttributes.new(p_machine_type_attributes.to_str.unpack1('i'))
+      end
+    rescue Fiddle::DLError
+      # @see https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-getcurrentprocess
+      GetCurrentProcess = Fiddle::Function.new(
+        Kernel32['GetCurrentProcess'],
+        [],
+        Fiddle::TYPE_VOIDP
+      )
+
+      # @see https://learn.microsoft.com/en-us/windows/win32/api/wow64apiset/nf-wow64apiset-iswow64process2
+      IsWow64Process2 = Fiddle::Function.new(
+        Kernel32['IsWow64Process2'],
+        [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP],
+        Fiddle::TYPE_CHAR
+      )
+
+      # @see https://learn.microsoft.com/en-us/windows/win32/api/wow64apiset/nf-wow64apiset-iswow64guestmachinesupported
+      IsWow64GuestMachineSupported = Fiddle::Function.new(
+        Kernel32['IsWow64GuestMachineSupported'],
+        [-Fiddle::TYPE_SHORT, Fiddle::TYPE_VOIDP],
+        Fiddle::TYPE_LONG
+      )
+
+      def get_machine_type_attributes(machine)
+        h_process = GetCurrentProcess.call
+        p_process_machine = Fiddle::Pointer.malloc(Fiddle::SIZEOF_SHORT, Fiddle::RUBY_FREE)
+        p_native_machine = Fiddle::Pointer.malloc(Fiddle::SIZEOF_SHORT, Fiddle::RUBY_FREE)
+        raise Fiddle.win32_last_error if IsWow64Process2.call(h_process, p_process_machine, p_native_machine).zero?
+
+        if p_native_machine.to_str.unpack1('S!') == machine
+          return MachineTypeAttributes.new(MachineAttributes::USER_ENABLED | MachineAttributes::KERNEL_ENABLED)
+        end
+
+        p_machine_is_supported = Fiddle::Pointer.malloc(Fiddle::SIZEOF_CHAR, Fiddle::RUBY_FREE)
+        raise Fiddle.win32_last_error unless IsWow64GuestMachineSupported.call(machine, p_machine_is_supported).zero?
+
+        if p_machine_is_supported.to_str.unpack1('c').zero?
+          MachineTypeAttributes.new(0)
+        else
+          MachineTypeAttributes.new(MachineAttributes::USER_ENABLED | MachineAttributes::WOW64_CONTAINER)
+        end
+      end
+    end
+  end
+end

data/lib/sass/embedded/dispatcher.rb

@@ -46,15 +46,11 @@ module Sass
 
           return unless @observers.empty?
 
-          # if @id == UINT_MAX
-          #   close
-          # else
-          #   @id = 1
-          # end
-
-          # Resetting @id can cause a race condition in compiler
-          # See: https://github.com/sass/dart-sass/issues/2004
-          close if @id == UINT_MAX
+          if @id == UINT_MAX
+            close
+          else
+            @id = 1
+          end
         end
       end
 

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   class Embedded
-    VERSION = '1.63.4'
+    VERSION = '1.63.5'
   end
 end

data/lib/sass/embedded.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../../ext/sass/cli'
-require_relative '../../ext/sass/embedded_sass_pb'
 require_relative 'compile_error'
 require_relative 'compile_result'
 require_relative 'embedded/connection'
@@ -12,6 +11,7 @@ require_relative 'embedded/resilient_dispatcher'
 require_relative 'embedded/structifier'
 require_relative 'embedded/varint'
 require_relative 'embedded/version'
+require_relative 'embedded_protocol'
 require_relative 'logger/silent'
 require_relative 'logger/source_location'
 require_relative 'logger/source_span'
@@ -247,6 +247,4 @@ module Sass
       @dispatcher.closed?
     end
   end
-
-  private_constant :EmbeddedProtocol
 end

data/lib/sass/embedded_protocol.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Sass
+  # @see https://github.com/sass/sass/blob/HEAD/spec/embedded-protocol.md
+  module EmbeddedProtocol
+    require_relative '../../ext/sass/embedded_sass_pb'
+  end
+
+  private_constant :EmbeddedProtocol
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.63.4
+  version: 1.63.5
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -55,6 +55,7 @@ files:
 - ext/sass/embedded_sass_pb.rb
 - ext/sass/expand-archive.ps1
 - ext/sass/package.json
+- ext/sass/win32_api.rb
 - lib/sass-embedded.rb
 - lib/sass/compile_error.rb
 - lib/sass/compile_result.rb
@@ -72,6 +73,7 @@ files:
 - lib/sass/embedded/structifier.rb
 - lib/sass/embedded/varint.rb
 - lib/sass/embedded/version.rb
+- lib/sass/embedded_protocol.rb
 - lib/sass/logger/silent.rb
 - lib/sass/logger/source_location.rb
 - lib/sass/logger/source_span.rb
@@ -92,8 +94,8 @@ homepage: https://github.com/ntkme/sass-embedded-host-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.63.4
-  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.63.4
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.63.5
+  source_code_uri: https://github.com/ntkme/sass-embedded-host-ruby/tree/v1.63.5
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []