importmap-rails 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 271785dcc1a13f77093f95d79b7463f615754ea02129d6b7a8ff1d0fb32caf83
-  data.tar.gz: af98f4e072978fd478ae00bc80d34a9357fd2375fde1bb246125852dbd65f92b
+  metadata.gz: d76219ce916f51a755ec35408f60b5258cf63b8d8d5b5252ab04b351348cfebb
+  data.tar.gz: 9467508f9d692ce701ccf1943adf146b776be046e1eac06f60541209fe26ace7
 SHA512:
-  metadata.gz: 5775f5dd5149baa20c4cc4a9dde8caee59caffcddb2eb4c8ae65c20b5b90a7f8299957760cc6accffd192c250f37e0ec09f871a7b8354301aecf679f4a02ef8a
-  data.tar.gz: baa9e8cd92f9d5d315d65924aa4e289d3dda8a920619fc202fcbd9e797df68ea1da80cab5569ec41ed6f21c9dd1c5d3cac5c17ac2a4975c84161590d99d6b36f
+  metadata.gz: c013fde57b613a62f6f228e6ceb5f106dbbe77af14d3737e2206bcdd38e78d1a8bbdf2c21d5e292b155b03ea6069918c4083c9f913595c925dc626d91286f1ca
+  data.tar.gz: dce28047300891ecdea4b5165dd99163066676fbf3145789ac094f74a2ef2aeb5f4f5a99d6b576da66ea70cb502ba3be61d8517e6ab9e0e8d62e40269d85f06d

data/app/helpers/importmap/importmap_tags_helper.rb

@@ -2,8 +2,8 @@ module Importmap::ImportmapTagsHelper
   # Setup all script tags needed to use an importmap-powered entrypoint (which defaults to application.js)
   def javascript_importmap_tags(entry_point = "application")
     safe_join [
-      javascript_importmap_module_preload_tags,
       javascript_inline_importmap_tag,
+      javascript_importmap_module_preload_tags,
       javascript_importmap_shim_tag,
       javascript_import_module_tag(entry_point)
     ], "\n"

data/lib/importmap/map.rb

@@ -10,12 +10,12 @@ class Importmap::Map
     instance_eval(&block)
   end
 
-  def pin(name, to: nil, preload: false)
+  def pin(name, to: nil, preload: true)
     @files[name] = MappedFile.new(name: name, path: to || "#{name}.js", preload: preload)
   end
 
-  def pin_all_from(path, under: nil, preload: false)
-    @directories[path] = MappedDir.new(path: path, under: under, preload: preload)
+  def pin_all_from(dir, under: nil, to: nil, preload: true)
+    @directories[dir] = MappedDir.new(dir: dir, under: under, path: to, preload: preload)
   end
 
   def preloaded_module_paths(resolver:)
@@ -32,7 +32,7 @@ class Importmap::Map
 
   private
     MappedFile = Struct.new(:name, :path, :preload, keyword_init: true)
-    MappedDir  = Struct.new(:path, :under, :preload, keyword_init: true)
+    MappedDir  = Struct.new(:dir, :path, :under, :preload, keyword_init: true)
 
     def cache_as(name)
       if (cached && result = instance_variable_get("@cached_#{name}"))
@@ -63,11 +63,11 @@ class Importmap::Map
 
     def expand_directories_into(paths)
       @directories.values.each do |mapping|
-        if (absolute_path = absolute_root_of(mapping.path)).exist?
+        if (absolute_path = absolute_root_of(mapping.dir)).exist?
           find_javascript_files_in_tree(absolute_path).each do |filename|
             module_filename = filename.relative_path_from(absolute_path)
-            module_name     = module_name_from(module_filename, mapping.under)
-            module_path     = mapping.under ? absolute_path.basename.join(module_filename).to_s : module_filename.to_s
+            module_name     = module_name_from(module_filename, mapping)
+            module_path     = module_path_from(module_filename, mapping)
 
             paths[module_name] = MappedFile.new(name: module_name, path: module_path, preload: mapping.preload)
           end
@@ -75,18 +75,23 @@ class Importmap::Map
       end
     end
 
-    # Strip off the extension, /index, or any versioning data for an absolute module name.
-    def module_name_from(filename, under)
-      filename_without_ext = filename.to_s.remove(filename.extname)
+    def module_name_from(filename, mapping)
+      filename_without_ext_and_version = filename.to_s.remove(filename.extname).split("@").first
 
-      if filename_without_ext == "index" && under
-        under
+      case
+      when filename_without_ext_and_version == "index" && mapping.under
+        mapping.under
+      when mapping.under
+        "#{mapping.under}/#{filename_without_ext_and_version}"
       else
-        module_name = filename_without_ext.split("@").first
-        under ? "#{under}/#{module_name}" : module_name
+        module_name
       end
     end
 
+    def module_path_from(filename, mapping)
+      [ mapping.path || mapping.under, filename.to_s ].join("/")
+    end
+
     def find_javascript_files_in_tree(path)
       Dir[path.join("**/*.js{,m}")].collect { |file| Pathname.new(file) }.select(&:file?)
     end

data/lib/importmap/version.rb

@@ -1,3 +1,3 @@
 module Importmap
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: importmap-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails