sassc-embedded 1.70.1 → 1.75.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a1d6d7f744b77407d5d03ab046589505f9b33251eb8440e61a8230725ea3160
-  data.tar.gz: fb40b19e534709b43f83a26d3358efe8c7a6e0f493da6d1c2e358efc51a9c1a2
+  metadata.gz: cf373b6b88c4dcdc3c784f85965562aa6e86ffffafd8ecb2b30513f2f52d51ae
+  data.tar.gz: d29bad09cafd09e2a5953c46ec546fe9674fc022bbae0b9092d399d4902b621c
 SHA512:
-  metadata.gz: 6f300bc7794f77fb090e4264bb62f79f1836a69be5a21a4b8e2889315bfa30dc18f46b372476ff9e8c5ac39d36e867bbb63c5d994eeb45ab64f8f12ac86d5660
-  data.tar.gz: 74441eae5009812fa2058cdbe992da2ca24dd3ddb5cfb4518b7bde3544a4bfde6fc1ebbe628b671726d7da528d81e48a9d48cb663664f21e324f2824c816db4c
+  metadata.gz: c0ecd4e0d91d6890d2b9312a7f39889d46f58095299fa3160a7f133e2dc5efd51734ea0577c80271fedb0601357e9231d6beadd24dbff0e7e54a5b1a048ea74c
+  data.tar.gz: b58e4c56f4e3e41796f497885107f63765b91ec2fe81171cdc27b4d6d5d0a82909776a7453f723eee666f4e1cfedf1bedab35a75632517959e4e0cbe3b2ba909

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.70.1'
+    VERSION = '1.75.2'
   end
 end

data/lib/sassc/embedded.rb

@@ -13,11 +13,9 @@ module SassC
     def render
       return @template.dup if @template.empty?
 
-      base_importer = import_handler.setup(nil)
-
       result = ::Sass.compile_string(
         @template,
-        importer: base_importer,
+        importer: (NoopImporter unless @options[:importer].nil?),
         load_paths:,
         syntax:,
         url: file_url,
@@ -28,12 +26,15 @@ module SassC
         style: output_style,
 
         functions: functions_handler.setup(nil, functions: @functions),
-        importers: (base_importer.nil? ? [] : [base_importer]).concat(@options.fetch(:importers, [])),
+        importers: import_handler.setup(nil).concat(@options.fetch(:importers, [])),
 
         alert_ascii: @options.fetch(:alert_ascii, false),
         alert_color: @options.fetch(:alert_color, nil),
+        fatal_deprecations: @options.fetch(:fatal_deprecations, []),
+        future_deprecations: @options.fetch(:future_deprecations, []),
         logger: @options.fetch(:logger, nil),
         quiet_deps: @options.fetch(:quiet_deps, false),
+        silence_deprecations: @options.fetch(:silence_deprecations, []),
         verbose: @options.fetch(:verbose, false)
       )
 
@@ -134,11 +135,7 @@ module SassC
     end
 
     def load_paths
-      @load_paths ||= if @options[:importer].nil?
-                        (@options[:load_paths] || []) + SassC.load_paths
-                      else
-                        []
-                      end
+      @load_paths ||= (@options[:load_paths] || []) + SassC.load_paths
     end
   end
 
@@ -182,12 +179,55 @@ module SassC
     end
   end
 
+  module NoopImporter
+    module_function
+
+    def canonicalize(...); end
+
+    def load(...); end
+  end
+
+  private_constant :NoopImporter
+
   class ImportHandler
     def setup(_native_options)
-      Importer.new(@importer) if @importer
+      if @importer
+        import_cache = ImportCache.new(@importer)
+        [Importer.new(import_cache), FileImporter.new(import_cache)]
+      else
+        []
+      end
+    end
+
+    class Importer
+      def initialize(import_cache)
+        @import_cache = import_cache
+      end
+
+      def canonicalize(...)
+        @import_cache.canonicalize(...)
+      end
+
+      def load(...)
+        @import_cache.load(...)
+      end
     end
 
+    private_constant :Importer
+
     class FileImporter
+      def initialize(import_cache)
+        @import_cache = import_cache
+      end
+
+      def find_file_url(...)
+        @import_cache.find_file_url(...)
+      end
+    end
+
+    private_constant :FileImporter
+
+    class FileSystemImporter
       class << self
         def resolve_path(path, from_import)
           ext = File.extname(path)
@@ -199,15 +239,6 @@ module SassC
             return exactly_one(try_path(path))
           end
 
-          unless ext.empty?
-            if from_import
-              result = exactly_one(try_path("#{without_ext(path)}.import#{ext}"))
-              return result unless result.nil?
-            end
-            result = exactly_one(try_path(path))
-            return result unless result.nil?
-          end
-
           if from_import
             result = exactly_one(try_path_with_ext("#{path}.import"))
             return result unless result.nil?
@@ -235,7 +266,7 @@ module SassC
         end
 
         def try_path_as_dir(path, from_import)
-          return unless dir_exist? path
+          return unless dir_exist?(path)
 
           if from_import
             result = exactly_one(try_path_with_ext(File.join(path, 'index.import')))
@@ -247,7 +278,7 @@ module SassC
 
         def exactly_one(paths)
           return if paths.empty?
-          return paths.first if paths.length == 1
+          return paths.first if paths.one?
 
           raise "It's not clear which file to import. Found:\n#{paths.map { |path| "  #{path}" }.join("\n")}"
         end
@@ -267,79 +298,69 @@ module SassC
       end
     end
 
-    private_constant :FileImporter
+    private_constant :FileSystemImporter
 
-    class Importer
+    class ImportCache
       def initialize(importer)
         @importer = importer
-
-        @canonical_urls = {}
-        @id = 0
         @importer_results = {}
-        @parent_urls = [URL.path_to_file_url(File.absolute_path(@importer.options[:filename] || 'stdin'))]
+        @file_url = nil
       end
 
       def canonicalize(url, context)
-        if url.start_with?(Protocol::IMPORT)
-          canonical_url = @canonical_urls.delete(url.delete_prefix(Protocol::IMPORT))
-          unless @importer_results.key?(canonical_url)
-            canonical_url = resolve_file_url(canonical_url, @parent_urls.last, context.from_import)
-          end
-          @parent_urls.push(canonical_url)
-          canonical_url
-        elsif url.start_with?(Protocol::FILE)
-          path = URL.file_urls_to_relative_path(url, @parent_urls.last)
-          parent_path = URL.file_url_to_path(@parent_urls.last)
+        return if context.containing_url.nil?
+
+        containing_url = if context.containing_url.start_with?(Protocol::GLOB)
+                           URL.unescape(URL.parse(context.containing_url).fragment)
+                         else
+                           context.containing_url
+                         end
+
+        return unless containing_url.start_with?(Protocol::FILE)
 
+        path = URL.unescape(url)
+        parent_path = URL.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)
-          imports.each do |import|
-            import.path = File.absolute_path(import.path, File.dirname(parent_path))
+          canonical_url = imports_to_native(imports, parent_dir, context.from_import, url, context.containing_url)
+          if @importer_results.key?(canonical_url)
+            canonical_url
+          else
+            @file_url = canonical_url
+            nil
+          end
+        else
+          canonical_url = URL.path_to_file_url(File.absolute_path(path, parent_dir))
+          if @importer_results.key?(canonical_url)
+            canonical_url
+          else
+            @file_url = resolve_file_url(path, parent_dir, context.from_import)
+            nil
           end
-
-          canonical_url = "#{Protocol::IMPORT}#{next_id}"
-          @importer_results[canonical_url] = imports_to_native(imports, context.from_import)
-          canonical_url
-        elsif url.start_with?(Protocol::LOADED)
-          canonical_url = Protocol::LOADED
-          @parent_urls.pop
-          canonical_url
         end
       end
 
       def load(canonical_url)
-        if @importer_results.key?(canonical_url)
-          @importer_results.delete(canonical_url)
-        elsif canonical_url.start_with?(Protocol::FILE)
-          path = URL.file_url_to_path(canonical_url)
-          {
-            contents: File.read(path),
-            syntax: syntax(path),
-            source_map_url: canonical_url
-          }
-        elsif canonical_url.start_with?(Protocol::LOADED)
-          {
-            contents: '',
-            syntax: :scss
-          }
-        end
+        @importer_results.delete(canonical_url)
       end
 
-      private
+      def find_file_url(_url, context)
+        return if context.containing_url.nil? || @file_url.nil?
 
-      def load_paths
-        @load_paths ||= (@importer.options[:load_paths] || []) + SassC.load_paths
+        canonical_url = @file_url
+        @file_url = nil
+        canonical_url
       end
 
-      def resolve_file_url(url, parent_url, from_import)
-        path = URL.file_urls_to_relative_path(url, parent_url)
-        parent_path = URL.file_url_to_path(parent_url)
-        [File.dirname(parent_path)].concat(load_paths).each do |load_path|
-          resolved = FileImporter.resolve_path(File.absolute_path(path, load_path), from_import)
-          return URL.path_to_file_url(resolved) unless resolved.nil?
-        end
-        nil
+      private
+
+      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?
       end
 
       def syntax(path)
@@ -353,45 +374,48 @@ module SassC
         end
       end
 
-      def imports_to_native(imports, from_import)
-        {
+      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))
+          @importer_results[canonical_url] = if import.source.is_a?(Hash)
+                                               {
+                                                 contents: import.source[:contents],
+                                                 syntax: import.source[:syntax],
+                                                 source_map_url: canonical_url
+                                               }
+                                             else
+                                               {
+                                                 contents: import.source,
+                                                 syntax: syntax(import.path),
+                                                 source_map_url: canonical_url
+                                               }
+                                             end
+          return canonical_url if canonicalize
+        elsif canonicalize
+          return resolve_file_url(import.path, parent_dir, from_import)
+        end
+
+        URL.escape(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)}"
+        @importer_results[canonical_url] = {
           contents: imports.flat_map do |import|
-            id = next_id
-            canonical_url = URL.path_to_file_url(import.path)
-            @canonical_urls[id] = canonical_url
-            if import.source
-              @importer_results[canonical_url] = if import.source.is_a?(Hash)
-                                                   {
-                                                     contents: import.source[:contents],
-                                                     syntax: import.source[:syntax],
-                                                     source_map_url: canonical_url
-                                                   }
-                                                 else
-                                                   {
-                                                     contents: import.source,
-                                                     syntax: syntax(import.path),
-                                                     source_map_url: canonical_url
-                                                   }
-                                                 end
-            end
             at_rule = from_import ? '@import' : '@forward'
-            [
-              "#{at_rule} \"#{Protocol::IMPORT}#{id}\";",
-              "#{at_rule} \"#{Protocol::LOADED}#{id}\";"
-            ]
+            url = import_to_native(import, parent_dir, from_import, false)
+            "#{at_rule} #{Script::Value::String.quote(url)};"
           end.join("\n"),
           syntax: :scss
         }
-      end
 
-      def next_id
-        id = @id
-        @id = id.next
-        id.to_s
+        canonical_url
       end
     end
 
-    private_constant :Importer
+    private_constant :ImportCache
   end
 
   class Sass2Scss
@@ -543,8 +567,7 @@ module SassC
 
   module Protocol
     FILE = 'file:'
-    IMPORT = 'sassc-embedded-import:'
-    LOADED = 'sassc-embedded-loaded:'
+    GLOB = 'sassc-embedded-glob:'
   end
 
   private_constant :Protocol
@@ -556,6 +579,10 @@ module SassC
 
     module_function
 
+    def join(...)
+      URI.join(...).to_s
+    end
+
     def parse(str)
       PARSER.parse(str)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.70.1
+  version: 1.75.2
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-04-13 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.70'
+        version: '1.75'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.70'
+        version: '1.75'
 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.70.1
+  source_code_uri: https://github.com/sass-contrib/sassc-embedded-shim-ruby/tree/v1.75.2
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 post_install_message: