Ensure all caches are cleared when clearing

Author: David Heinemeier Hansson

lib/importmap/map.rb

@@ -87,13 +87,21 @@ def cache_as(name)
       if result = instance_variable_get("@cached_#{name}")
         result
       else
+        remember_cache_key(name)
         instance_variable_set("@cached_#{name}", yield)
       end
     end
 
+    def remember_cache_key(name)
+      @cache_keys ||= Set.new
+      @cache_keys.add name
+    end
+
+
     def clear_cache
-      @cached_json = nil
-      @cached_preloaded_module_paths = nil
+      @cache_keys&.each do |name|
+        instance_variable_set("@cached_#{name}", nil)
+      end
     end
 
     def rescuable_asset_error?(error)

test/importmap_test.rb

@@ -67,6 +67,28 @@ def setup
     assert_match /^\w{40}$/, @importmap.digest(resolver: ApplicationController.helpers)
   end
 
+  test "separate caches" do
+    set_one = @importmap.preloaded_module_paths(resolver: ApplicationController.helpers, cache_key: "1").to_s
+
+    ActionController::Base.asset_host = "http://assets.example.com"
+
+    set_two = @importmap.preloaded_module_paths(resolver: ActionController::Base.helpers, cache_key: "2").to_s
+
+    assert_not_equal set_one, set_two
+  ensure
+    ActionController::Base.asset_host = nil
+  end
+
+  test "all caches reset" do
+    set_one = @importmap.preloaded_module_paths(resolver: ApplicationController.helpers, cache_key: "1").to_s
+    set_two = @importmap.preloaded_module_paths(resolver: ApplicationController.helpers, cache_key: "2").to_s
+
+    @importmap.pin "something", to: "https://cdn.example.com/somewhere.js", preload: true
+
+    assert_not_equal set_one, @importmap.preloaded_module_paths(resolver: ApplicationController.helpers, cache_key: "1").to_s
+    assert_not_equal set_two, @importmap.preloaded_module_paths(resolver: ApplicationController.helpers, cache_key: "2").to_s
+  end
+
   private
     def generate_importmap_json
       JSON.parse @importmap.to_json(resolver: ApplicationController.helpers)