sassc-embedded 1.74.1 → 1.75.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 411e788cd6cc17fd4f63773757f4f5b57aca396fd20218a6b2f3b3f15d1a1c9a
-  data.tar.gz: df11ec77342a51c7283da1cd8f3d20f1a4b779752e09ec56baadd321e3baa974
+  metadata.gz: cf373b6b88c4dcdc3c784f85965562aa6e86ffffafd8ecb2b30513f2f52d51ae
+  data.tar.gz: d29bad09cafd09e2a5953c46ec546fe9674fc022bbae0b9092d399d4902b621c
 SHA512:
-  metadata.gz: fd6134bfefa373e58bc505ab03e55764a10c970d052a66d9138dc61bd46d1bf143093e3d5ca4d8279936f110d6b3d5485f679d5893035d5da630f15c87acb304
-  data.tar.gz: 7e072a1950cf8a5de7ee5e980f42fa590bc05140259315e87a0389f45b73827add28a0b9f5314c4ce7357b233b9911690d41a1e33a7cf21ac1bba2f912a48eec
+  metadata.gz: c0ecd4e0d91d6890d2b9312a7f39889d46f58095299fa3160a7f133e2dc5efd51734ea0577c80271fedb0601357e9231d6beadd24dbff0e7e54a5b1a048ea74c
+  data.tar.gz: b58e4c56f4e3e41796f497885107f63765b91ec2fe81171cdc27b4d6d5d0a82909776a7453f723eee666f4e1cfedf1bedab35a75632517959e4e0cbe3b2ba909

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.74.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?
 
-      importers = import_handler.setup(nil)
-
       result = ::Sass.compile_string(
         @template,
-        importer: importers.first,
+        importer: (NoopImporter unless @options[:importer].nil?),
         load_paths:,
         syntax:,
         url: file_url,
@@ -28,7 +26,7 @@ module SassC
         style: output_style,
 
         functions: functions_handler.setup(nil, functions: @functions),
-        importers: importers.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),
@@ -137,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
 
@@ -185,6 +179,16 @@ module SassC
     end
   end
 
+  module NoopImporter
+    module_function
+
+    def canonicalize(...); end
+
+    def load(...); end
+  end
+
+  private_constant :NoopImporter
+
   class ImportHandler
     def setup(_native_options)
       if @importer
@@ -235,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 warn_deprecation_ext(result) unless result.nil?
-            end
-            result = exactly_one(try_path(path))
-            return warn_deprecation_ext(result) unless result.nil?
-          end
-
           if from_import
             result = exactly_one(try_path_with_ext("#{path}.import"))
             return result unless result.nil?
@@ -300,21 +295,6 @@ module SassC
           ext = File.extname(path)
           path.delete_suffix(ext)
         end
-
-        def warn_deprecation_ext(path)
-          basename = File.basename(path)
-          warn <<~WARNING
-            Deprecation Warning: Importing files with extensions other than `.scss`, `.sass`, `.css` from relative path or load paths without custom SassC::Importer is deprecated.
-
-            Recommandation: Rename #{basename} to #{basename}.scss
-
-            More info: https://github.com/sass-contrib/sassc-embedded-shim-ruby/pull/86
-
-            #{path}
-            #{' ' * (path.length - basename.length)}#{'^' * basename.length}
-          WARNING
-          path
-        end
       end
     end
 
@@ -323,87 +303,64 @@ module SassC
     class ImportCache
       def initialize(importer)
         @importer = importer
-        @canonical_urls = {}
-        @id = 0
         @importer_results = {}
-        @load_paths = (@importer.options[:load_paths] || []) + SassC.load_paths
-        @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)
-          unless @importer_results.key?(canonical_url)
-            path = URL.unescape(canonical_url)
-            parent_path = URL.file_url_to_path(@parent_urls.last)
-            canonical_url = resolve_file_url(path, parent_path, context.from_import)
-            return unless canonical_url
-
-            # Temporarily disable FileImporter optimization
-            # https://github.com/sass/dart-sass/issues/2208
-            #
-            # if ['.sass', '.scss', '.css'].include?(File.extname(URL.file_url_to_path(canonical_url)))
-            #   @canonical_urls[url] = canonical_url
-            #   return nil
-            # end
-          end
-          @parent_urls.push(canonical_url)
-          canonical_url
-        elsif url.start_with?(Protocol::LOADED)
-          @parent_urls.pop
-          Protocol::LOADED
-        else
-          parent_url = @parent_urls.last
-          url = URL.join(parent_url, url)
-          return unless url.start_with?(Protocol::FILE)
+        return if context.containing_url.nil?
 
-          path = URL.file_urls_to_relative_path(url, parent_url)
-          parent_path = URL.file_url_to_path(parent_url)
+        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)
-
-          canonical_url = "#{Protocol::IMPORT}#{url}"
-          @importer_results[canonical_url] = imports_to_native(imports, File.dirname(parent_path), context.from_import)
-          canonical_url
+          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
         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
 
-      def find_file_url(url, _context)
-        canonical_url = @canonical_urls.delete(url)
-        return unless canonical_url
+      def find_file_url(_url, context)
+        return if context.containing_url.nil? || @file_url.nil?
 
-        @parent_urls.push(canonical_url)
+        canonical_url = @file_url
+        @file_url = nil
         canonical_url
       end
 
       private
 
-      def resolve_file_url(path, parent_path, from_import)
-        [File.dirname(parent_path)].concat(@load_paths).each do |load_path|
-          resolved = FileSystemImporter.resolve_path(File.absolute_path(path, load_path), from_import)
-          return URL.path_to_file_url(resolved) unless resolved.nil?
-        end
-        nil
+      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)
@@ -417,44 +374,44 @@ module SassC
         end
       end
 
-      def imports_to_native(imports, parent_dir, 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|
-            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
-            else
-              canonical_url = URL.escape(import.path)
-            end
-            import_url = "#{Protocol::IMPORT}#{next_id}"
-            loaded_url = "#{Protocol::LOADED}#{next_id}"
-            @canonical_urls[import_url] = canonical_url
             at_rule = from_import ? '@import' : '@forward'
-            <<~SCSS
-              #{at_rule} #{Script::Value::String.quote(import_url)};
-              #{at_rule} #{Script::Value::String.quote(loaded_url)};
-            SCSS
+            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
+        canonical_url
       end
     end
 
@@ -610,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.74.1
+  version: 1.75.2
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-04 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.74'
+        version: '1.75'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.74'
+        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.74.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: