fixup! Add support to specify the integrity hash of a asset when pinning

Author: rafaelfranca

lib/importmap/map.rb

@@ -106,11 +106,7 @@ def preloaded_module_packages(resolver:, entry_point: "application", cache_key:
   def to_json(resolver:, cache_key: :json)
     cache_as(cache_key) do
       packages = expanded_packages_and_directories
-      map = { "imports" => resolve_asset_paths(packages, resolver: resolver) }
-      integrity = packages.to_h do |name, mapping|
-        [resolve_asset_path(mapping.path, resolver: resolver), mapping.integrity]
-      end.compact
-      map["integrity"] = integrity unless integrity.empty?
+      map = build_import_map(packages, resolver: resolver)
       JSON.pretty_generate(map)
     end
   end
@@ -180,6 +176,24 @@ def resolve_asset_path(path, resolver:)
       end
     end
 
+    def build_import_map(packages, resolver:)
+      map = { "imports" => resolve_asset_paths(packages, resolver: resolver) }
+      integrity = build_integrity_hash(packages, resolver: resolver)
+      map["integrity"] = integrity unless integrity.empty?
+      map
+    end
+
+    def build_integrity_hash(packages, resolver:)
+      packages.filter_map do |name, mapping|
+        next unless mapping.integrity
+
+        resolved_path = resolve_asset_path(mapping.path, resolver: resolver)
+        next unless resolved_path
+
+        [resolved_path, mapping.integrity]
+      end.to_h
+    end
+
     def expanded_preloading_packages_and_directories(entry_point:)
       expanded_packages_and_directories.select { |name, mapping| mapping.preload.in?([true, false]) ? mapping.preload : (Array(mapping.preload) & Array(entry_point)).any? }
     end

test/importmap_test.rb

@@ -6,7 +6,7 @@ def setup
       map.draw do
         pin "application", preload: false
         pin "editor", to: "rich_text.js", preload: false, integrity: "sha384-OLBgp1GsljhM2TJ+sbHjaiH9txEUvgdDTAzHv2P24donTt6/529l+9Ua0vFImLlb"
-        pin "not_there", to: "nowhere.js", preload: false
+        pin "not_there", to: "nowhere.js", preload: false, integrity: "sha384-somefakehash"
         pin "md5", to: "https://cdn.skypack.dev/md5", preload: true
         pin "leaflet", to: "https://cdn.skypack.dev/leaflet", preload: 'application'
         pin "chartkick", to: "https://cdn.skypack.dev/chartkick", preload: ['application', 'alternate']
@@ -34,6 +34,8 @@ def setup
     editor_path = generate_importmap_json["imports"]["editor"]
     assert_match %r|assets/rich_text-.*\.js|, editor_path
     assert_equal "sha384-OLBgp1GsljhM2TJ+sbHjaiH9txEUvgdDTAzHv2P24donTt6/529l+9Ua0vFImLlb", generate_importmap_json["integrity"][editor_path]
+    assert_nil generate_importmap_json["imports"]["not_there"]
+    assert_not_includes generate_importmap_json["integrity"].values, "sha384-somefakehash"
   end
 
   test "integrity is not present if there is no integrity set in the map" do
@@ -228,7 +230,6 @@ def setup
   end
 
   test "preloaded_module_packages includes package integrity when present" do
-    # Create a new importmap with a preloaded package that has integrity
     importmap = Importmap::Map.new.tap do |map|
       map.pin "editor", to: "rich_text.js", preload: true, integrity: "sha384-OLBgp1GsljhM2TJ+sbHjaiH9txEUvgdDTAzHv2P24donTt6/529l+9Ua0vFImLlb"
     end

test/reloader_test.rb

@@ -16,7 +16,7 @@ class ReloaderTest < ActiveSupport::TestCase
     Rails.application.importmap = Importmap::Map.new.draw { pin "md5", to: "https://cdn.skypack.dev/md5" }
     assert_not_predicate @reloader, :updated?
 
-    assert_changes -> { Rails.application.importmap.packages.keys }, from: %w[ md5 ], to: %w[ md5 not_there rick_text ] do
+    assert_changes -> { Rails.application.importmap.packages.keys }, from: %w[ md5 ], to: %w[ md5 not_there rich_text ] do
       touch_config
       assert @reloader.execute_if_updated
     end