Implement access tracking for containingUrl

sass-contrib · May 10, 2024 · 42c3c7f · 42c3c7f
1 parent 2c14553
commit 42c3c7f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/sass/canonicalize_context.rb b/lib/sass/canonicalize_context.rb
@@ -7,13 +7,17 @@ module Sass
   # @see https://sass-lang.com/documentation/js-api/interfaces/canonicalizecontext/
   class CanonicalizeContext
     # @return [String, nil]
-    attr_reader :containing_url
+    def containing_url
+      @containing_url_unused = false
+      @containing_url
+    end
 
     # @return [Boolean]
     attr_reader :from_import
 
     # @!visibility private
     def initialize(canonicalize_request)
+      @containing_url_unused = true
       @containing_url = canonicalize_request.containing_url == '' ? nil : canonicalize_request.containing_url
       @from_import = canonicalize_request.from_import
     end

diff --git a/lib/sass/compiler/host/importer_registry.rb b/lib/sass/compiler/host/importer_registry.rb
@@ -68,12 +68,14 @@ def register(importer)
 
         def canonicalize(canonicalize_request)
           importer = @importers_by_id[canonicalize_request.importer_id]
+          canonicalize_context = CanonicalizeContext.new(canonicalize_request)
           url = importer.canonicalize(canonicalize_request.url,
-                                      CanonicalizeContext.new(canonicalize_request))&.to_s
+                                      canonicalize_context)&.to_s
 
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
             id: canonicalize_request.id,
-            url:
+            url:,
+            containing_url_unused: canonicalize_context.instance_eval { @containing_url_unused }
           )
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::CanonicalizeResponse.new(
@@ -103,12 +105,14 @@ def import(import_request)
 
         def file_import(file_import_request)
           importer = @importers_by_id[file_import_request.importer_id]
+          canonicalize_context = CanonicalizeContext.new(file_import_request)
           file_url = importer.find_file_url(file_import_request.url,
-                                            CanonicalizeContext.new(file_import_request))&.to_s
+                                            canonicalize_context)&.to_s
 
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(
             id: file_import_request.id,
-            file_url:
+            file_url:,
+            containing_url_unused: canonicalize_context.instance_eval { @containing_url_unused }
           )
         rescue StandardError => e
           EmbeddedProtocol::InboundMessage::FileImportResponse.new(