sassc-embedded 1.76.0 → 1.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f24ea775d0adc29dba8cf3b768bdf8971291a149b87268c6bd458f8f591c9d5a
-  data.tar.gz: 77a1ea85d8d417ae42df42b3cea656fef5f565656f36b9a083b08eebf9dde7ec
+  metadata.gz: d513301805669f2944f1dcc4f6ee8775554122531c7d41abca281c05acbb8351
+  data.tar.gz: 4a1576efa981b9c3e9b56a201793675d4764bb66b03cae8ea3f369eba9ed9f3f
 SHA512:
-  metadata.gz: 54ab5857d5198e676d6467edd4c65973d0f29b80917f2c79b3a331b3e59551aa990b6b89f2b170576db644d86b3659f1abd98b9ce74dfe357d5738b4ca76e9ca
-  data.tar.gz: ab2d3db860f54f72c5aed4b5c5271183856ef3831542c13a57304b04ed052896c87c46e6e154b7cb7a521241e8d7eebb3e7a8f6fec1a373d368cca8b301cc54f
+  metadata.gz: 10bf726fb6e87dabcdb0003c8dd104675233fc56800bac7b27b13ce936e568bf0c24ec7638325aa30bba01320b5e8b2f0bb95d93a69126fdd60df515382edf65
+  data.tar.gz: 4998fcb9dd6b735b93802d32ea5067834e75dedcfd2ba6ee32debc3ec24bbe8dc6f6cb0347a265596f2ae0b3f00b78e436282f264f144bd9ee7e401f1fed3395

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.76.0'
+    VERSION = '1.77.0'
   end
 end

data/lib/sassc/embedded.rb

@@ -46,11 +46,11 @@ module SassC
       css = result.css
       css += "\n" unless css.empty?
       unless @source_map.nil? || omit_source_map_url?
-        url = URL.parse(output_url || file_url)
+        url = URI.parse(output_url || file_url)
         source_mapping_url = if source_map_embed?
                                "data:application/json;base64,#{[@source_map].pack('m0')}"
                              else
-                               URL.file_urls_to_relative_url(source_map_file_url, url)
+                               URI.file_urls_to_relative_url(source_map_file_url, url)
                              end
         css += "\n/*# sourceMappingURL=#{source_mapping_url} */"
       end
@@ -61,9 +61,7 @@ module SassC
       line = e.span&.start&.line
       line += 1 unless line.nil?
       url = e.span&.url
-      path = if url&.start_with?(Protocol::FILE)
-               URL.file_urls_to_relative_path(url, URL.path_to_file_url("#{Dir.pwd}/"))
-             end
+      path = (URI.file_urls_to_relative_path(url, URI.path_to_file_url("#{Dir.pwd}/")) if url&.start_with?('file:'))
       raise SyntaxError.new(e.full_message, filename: path, line:)
     end
 
@@ -71,19 +69,19 @@ module SassC
       raise NotRenderedError unless @loaded_urls
 
       Dependency.from_filenames(@loaded_urls.filter_map do |url|
-        URL.file_url_to_path(url) if url.start_with?(Protocol::FILE) && url != file_url
+        URI.file_url_to_path(url) if url.start_with?('file:') && !url.include?('?') && url != file_url
       end)
     end
 
     def source_map
       raise NotRenderedError unless @source_map
 
-      url = URL.parse(source_map_file_url || file_url)
+      url = URI.parse(source_map_file_url || file_url)
       data = JSON.parse(@source_map)
-      data['file'] = URL.file_urls_to_relative_url(output_url, url) if output_url
+      data['file'] = URI.file_urls_to_relative_url(output_url, url) if output_url
       data['sources'].map! do |source|
-        if source.start_with?(Protocol::FILE)
-          URL.file_urls_to_relative_url(source, url)
+        if source.start_with?('file:')
+          URI.file_urls_to_relative_url(source, url)
         else
           source
         end
@@ -95,7 +93,7 @@ module SassC
     private
 
     def file_url
-      @file_url ||= URL.path_to_file_url(File.absolute_path(filename || 'stdin'))
+      @file_url ||= URI.path_to_file_url(File.absolute_path(filename || 'stdin'))
     end
 
     def output_path
@@ -105,11 +103,18 @@ module SassC
     end
 
     def output_url
-      @output_url ||= (URL.path_to_file_url(File.absolute_path(output_path)) if output_path)
+      @output_url ||= (URI.path_to_file_url(File.absolute_path(output_path)) if output_path)
     end
 
     def source_map_file_url
-      @source_map_file_url ||= (URL.path_to_file_url(File.absolute_path(source_map_file)) if source_map_file)
+      @source_map_file_url ||= if source_map_file
+                                 # https://github.com/sass-contrib/sassc-embedded-shim-ruby/pull/69
+                                 # SassC does not encode path as uri for sourceMappingURL, which is technically wrong.
+                                 # However, this behavior has been abused to append query string to sourceMappingURL.
+                                 components = source_map_file.split('?', 2)
+                                 components[0] = URI.path_to_file_url(File.absolute_path(components[0]))
+                                 components.join('?')
+                               end
     end
 
     def output_style
@@ -308,37 +313,31 @@ module SassC
       end
 
       def canonicalize(url, context)
-        return if context.containing_url.nil?
+        return unless context.containing_url&.start_with?('file:')
 
-        containing_url = if context.containing_url.start_with?(Protocol::GLOB)
-                           URL.unescape(URL.parse(context.containing_url).fragment)
-                         else
-                           context.containing_url
-                         end
+        containing_url = context.containing_url
 
-        return unless containing_url.start_with?(Protocol::FILE)
-
-        path = URL.unescape(url)
-        parent_path = URL.file_url_to_path(containing_url)
+        path = URI.decode_uri_component(url)
+        parent_path = URI.file_url_to_path(containing_url)
         parent_dir = File.dirname(parent_path)
 
-        if containing_url == context.containing_url
-          imports = @importer.imports(path, parent_path)
-          imports = [SassC::Importer::Import.new(path)] if imports.nil?
-          imports = [imports] unless imports.is_a?(Array)
-          canonical_url = imports_to_native(imports, parent_dir, context.from_import, url, context.containing_url)
+        if containing_url.include?('?')
+          canonical_url = URI.path_to_file_url(File.absolute_path(path, parent_dir))
           if @importer_results.key?(canonical_url)
             canonical_url
           else
-            @file_url = canonical_url
+            @file_url = resolve_file_url(path, parent_dir, context.from_import)
             nil
           end
         else
-          canonical_url = URL.path_to_file_url(File.absolute_path(path, parent_dir))
+          imports = @importer.imports(path, parent_path)
+          imports = [SassC::Importer::Import.new(path)] if imports.nil?
+          imports = [imports] unless imports.is_a?(Array)
+          canonical_url = imports_to_native(imports, parent_dir, context.from_import, url, containing_url)
           if @importer_results.key?(canonical_url)
             canonical_url
           else
-            @file_url = resolve_file_url(path, parent_dir, context.from_import)
+            @file_url = canonical_url
             nil
           end
         end
@@ -360,7 +359,7 @@ module SassC
 
       def resolve_file_url(path, parent_dir, from_import)
         resolved = FileSystemImporter.resolve_path(File.absolute_path(path, parent_dir), from_import)
-        URL.path_to_file_url(resolved) unless resolved.nil?
+        URI.path_to_file_url(resolved) unless resolved.nil?
       end
 
       def syntax(path)
@@ -376,7 +375,7 @@ module SassC
 
       def import_to_native(import, parent_dir, from_import, canonicalize)
         if import.source
-          canonical_url = URL.path_to_file_url(File.absolute_path(import.path, parent_dir))
+          canonical_url = URI.path_to_file_url(File.absolute_path(import.path, parent_dir))
           @importer_results[canonical_url] = if import.source.is_a?(Hash)
                                                {
                                                  contents: import.source[:contents],
@@ -395,13 +394,13 @@ module SassC
           return resolve_file_url(import.path, parent_dir, from_import)
         end
 
-        URL.escape(import.path)
+        URI.encode_uri_path_component(import.path)
       end
 
       def imports_to_native(imports, parent_dir, from_import, url, containing_url)
         return import_to_native(imports.first, parent_dir, from_import, true) if imports.one?
 
-        canonical_url = "#{Protocol::GLOB}?#{URL.escape(url)}##{URL.escape(containing_url)}"
+        canonical_url = "#{containing_url}?url=#{URI.encode_uri_query_component(url)}&from_import=#{from_import}"
         @importer_results[canonical_url] = {
           contents: imports.flat_map do |import|
             at_rule = from_import ? '@import' : '@forward'
@@ -565,34 +564,39 @@ module SassC
     end
   end
 
-  module Protocol
-    FILE = 'file:'
-    GLOB = 'sassc-embedded-glob:'
-  end
-
-  private_constant :Protocol
-
-  module URL
-    PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
-
-    private_constant :PARSER
-
+  module URI
     module_function
 
     def join(...)
-      URI.join(...).to_s
+      ::URI.join(...).to_s
     end
 
     def parse(str)
-      PARSER.parse(str)
+      ::URI.parse(str)
+    end
+
+    def encode_uri_path_component(str)
+      str.b.gsub(%r{[^0-9A-Za-z\-._~!$&'()*+,;=:@/]}n) do |match|
+        format('%%%02X', match.unpack1('C'))
+      end.force_encoding(str.encoding)
+    end
+
+    def encode_uri_query_component(str)
+      str.b.gsub(%r{[^0-9A-Za-z\-._~!$&'()*+,;=:@/?]}n) do |match|
+        format('%%%02X', match.unpack1('C'))
+      end.force_encoding(str.encoding)
     end
 
-    def escape(str)
-      PARSER.escape(str)
+    def encode_uri_component(str)
+      str.b.gsub(/[^0-9A-Za-z\-._~]/n) do |match|
+        format('%%%02X', match.unpack1('C'))
+      end.force_encoding(str.encoding)
     end
 
-    def unescape(str)
-      PARSER.unescape(str)
+    def decode_uri_component(str)
+      str.gsub(/%[0-9A-Fa-f]{2}/) do |match|
+        [match[1, 2]].pack('H2')
+      end
     end
 
     def file_urls_to_relative_url(url, from_url)
@@ -600,24 +604,24 @@ module SassC
     end
 
     def file_urls_to_relative_path(url, from_url)
-      unescape(file_urls_to_relative_url(url, from_url))
+      decode_uri_component(file_urls_to_relative_url(url, from_url))
     end
 
     def file_url_to_path(url)
-      return if url.nil?
-
-      path = unescape(parse(url).path)
-      path = path[1..] if Gem.win_platform? && path[0].chr == '/' && path[1].chr =~ /[a-z]/i && path[2].chr == ':'
+      path = decode_uri_component(parse(url).path)
+      if path.start_with?('/')
+        windows_path = path[1..]
+        path = windows_path if File.absolute_path?(windows_path)
+      end
       path
     end
 
     def path_to_file_url(path)
-      return if path.nil?
-
       path = "/#{path}" unless path.start_with?('/')
-      "file://#{escape(path)}"
+
+      "file://#{encode_uri_path_component(path)}"
     end
   end
 
-  private_constant :URL
+  private_constant :URI
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.76.0
+  version: 1.77.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-01 00:00:00.000000000 Z
+date: 2024-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-embedded
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.76'
+        version: '1.77'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.76'
+        version: '1.77'
 description: An embedded sass shim for SassC.
 email:
 - i@ntk.me
@@ -79,7 +79,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/sass-contrib/sassc-embedded-shim-ruby/issues
   documentation_uri: https://rubydoc.info/gems/sassc
-  source_code_uri: https://github.com/sass-contrib/sassc-embedded-shim-ruby/tree/v1.76.0
+  source_code_uri: https://github.com/sass-contrib/sassc-embedded-shim-ruby/tree/v1.77.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 post_install_message: 
@@ -91,14 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Use dart-sass with SassC!