sassc-embedded 1.70.0 → 1.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c255de6b5398fbe5a3297b2e0102089a3a4feb4536abf882a14ccb2c422b0743
-  data.tar.gz: 956dd771d4345eaf8c6f71f594e3e8e03ff929648c5796e1243cd5a2b18e9b0e
+  metadata.gz: f2035f16da9c3d02bf4fce8ac06465db89afbee4b1ece61dfd3213b4fec4a150
+  data.tar.gz: 1ec55533d5a8949ed2ab53266b52abf963a2be427d228605e0c7147974490856
 SHA512:
-  metadata.gz: d279064506b4c9a19efa377d4ec14534d6dc04d6110d6a05616b969b4d2e8de17eaffce8b0ceb2f6abf4189929cff1ce35388a7c9dae9ac189963ed0fb661237
-  data.tar.gz: a482c18cc65d5d440d86be9b8d1df5a82f4a11bb428b1f3fb141aa22b72c04895206a33cb16a2e600fb80a21a22069734ab3e2a9c6b8537cd3810567e72e57d6
+  metadata.gz: 4f0d03db8a9d0848c96c21bcc340ee8fc15993f7b56697649fee823bb4e6a398a992b6245c4b6d274a12cf846c6aa8ee59bf56cc19c1b11081d251ae4509e05e
+  data.tar.gz: 40760cf8ab3aa85a459b83f2b41e5513b96fea52fc000fa435dd4f4115526914e3665388305962fdd91da1c454a326f64acb27bd47fd6ddd566a6e428bfb1b9f

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.70.0'
+    VERSION = '1.74.0'
   end
 end

data/lib/sassc/embedded.rb

@@ -13,11 +13,11 @@ module SassC
     def render
       return @template.dup if @template.empty?
 
-      base_importer = import_handler.setup(nil)
+      importers = import_handler.setup(nil)
 
       result = ::Sass.compile_string(
         @template,
-        importer: base_importer,
+        importer: importers.first,
         load_paths:,
         syntax:,
         url: file_url,
@@ -28,12 +28,15 @@ module SassC
         style: output_style,
 
         functions: functions_handler.setup(nil, functions: @functions),
-        importers: (base_importer.nil? ? [] : [base_importer]).concat(@options.fetch(:importers, [])),
+        importers: importers.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)
       )
 
@@ -180,35 +183,47 @@ module SassC
         Script::ValueConversion.from_native(native_value, @options)
       end
     end
-
-    begin
-      begin
-        raise RuntimeError
-      rescue StandardError
-        raise ::Sass::ScriptError
-      end
-    rescue StandardError => e
-      unless e.full_message.include?(e.cause.full_message)
-        ::Sass::ScriptError.class_eval do
-          def full_message(...)
-            full_message = super(...)
-            if cause
-              "#{full_message}\n#{cause.full_message(...)}"
-            else
-              full_message
-            end
-          end
-        end
-      end
-    end
   end
 
   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)
@@ -223,10 +238,10 @@ module SassC
           unless ext.empty?
             if from_import
               result = exactly_one(try_path("#{without_ext(path)}.import#{ext}"))
-              return result unless result.nil?
+              return warn_deprecation_ext(result) unless result.nil?
             end
             result = exactly_one(try_path(path))
-            return result unless result.nil?
+            return warn_deprecation_ext(result) unless result.nil?
           end
 
           if from_import
@@ -256,7 +271,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')))
@@ -268,7 +283,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
@@ -285,46 +300,71 @@ 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
 
-    private_constant :FileImporter
+    private_constant :FileSystemImporter
 
-    class Importer
+    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'))]
       end
 
       def canonicalize(url, context)
         if url.start_with?(Protocol::IMPORT)
-          canonical_url = @canonical_urls.delete(url.delete_prefix(Protocol::IMPORT))
+          canonical_url = @canonical_urls.delete(url)
           unless @importer_results.key?(canonical_url)
-            canonical_url = resolve_file_url(canonical_url, @parent_urls.last, context.from_import)
+            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::FILE)
-          path = URL.file_urls_to_relative_path(url, @parent_urls.last)
-          parent_path = URL.file_url_to_path(@parent_urls.last)
+        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)
+
+          path = URL.file_urls_to_relative_path(url, parent_url)
+          parent_path = URL.file_url_to_path(parent_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))
-          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 = "#{Protocol::IMPORT}#{url}"
+          @importer_results[canonical_url] = imports_to_native(imports, File.dirname(parent_path), context.from_import)
           canonical_url
         end
       end
@@ -347,17 +387,19 @@ module SassC
         end
       end
 
-      private
+      def find_file_url(url, _context)
+        canonical_url = @canonical_urls.delete(url)
+        return unless canonical_url
 
-      def load_paths
-        @load_paths ||= (@importer.options[:load_paths] || []) + SassC.load_paths
+        @parent_urls.push(canonical_url)
+        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)
+      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
@@ -374,13 +416,11 @@ module SassC
         end
       end
 
-      def imports_to_native(imports, from_import)
+      def imports_to_native(imports, parent_dir, from_import)
         {
           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
+              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],
@@ -394,25 +434,24 @@ module SassC
                                                      source_map_url: canonical_url
                                                    }
                                                  end
+            else
+              canonical_url = URL.escape(import.path)
             end
+            import_url = "#{Protocol::IMPORT}#{canonical_url}"
+            loaded_url = "#{Protocol::LOADED}#{canonical_url}"
+            @canonical_urls[import_url] = canonical_url
             at_rule = from_import ? '@import' : '@forward'
-            [
-              "#{at_rule} \"#{Protocol::IMPORT}#{id}\";",
-              "#{at_rule} \"#{Protocol::LOADED}#{id}\";"
-            ]
+            <<~SCSS
+              #{at_rule} #{Script::Value::String.quote(import_url)};
+              #{at_rule} #{Script::Value::String.quote(loaded_url)};
+            SCSS
           end.join("\n"),
           syntax: :scss
         }
       end
-
-      def next_id
-        id = @id
-        @id = id.next
-        id.to_s
-      end
     end
 
-    private_constant :Importer
+    private_constant :ImportCache
   end
 
   class Sass2Scss
@@ -577,6 +616,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.0
+  version: 1.74.0
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2024-04-04 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.74'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.70'
+        version: '1.74'
 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.0
+  source_code_uri: https://github.com/sass-contrib/sassc-embedded-shim-ruby/tree/v1.74.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 post_install_message: