importmap-node 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c5646881534b9345ec18f89096877bdf2997a54eff2ca7d398a11e7031c6cac
-  data.tar.gz: b3fb276ee1463143206de177a6b3913377980be5c4bde3e26e9da7f92b07aadb
+  metadata.gz: a600199932a9709489532ba6697f1d923fc81291f12b3af30ea53766804b4bb0
+  data.tar.gz: 5aeeeb117182c6e7316974ddf486416cb334bc007062ebfd1dda76b84601457f
 SHA512:
-  metadata.gz: 63a5f385846268bb9a4c059b2cd35371e9bd87d28f599993da8976c9de9971506e4591fda0f2680e87671e0602771b88d6d5141faa967cab8529eb1f0c8fbe60
-  data.tar.gz: fa5b2dacbd647fa39e5860ac179ecc9e92eb2b1a06c225c3bd2e3709230ac1e5ecb4cba87733797c2adb25ed40931a831471f5fb80afaf4842ef67b530cf57c2
+  metadata.gz: b785eea53cd09a655ea133038592dff31f1406252896cdd76c0d6b1bb4f7f69df3f74f48d2ccc3d2c58086746a4c0fb7390af2a40b7e9755a680f0e07558f7e2
+  data.tar.gz: 784c868a3e81b623f1b3d1845774d5783878e0d375bbd60d053013319ac4d4433a89c8b0b1b3e19755f98abc737aea20e503108175ee0a85eefca865d245696b

data/lib/importmap/node/installer.rb

@@ -17,9 +17,8 @@ module Importmap
       end
 
       def install(package)
-        yarn_add(package)
-
-        pkg_name = resolve_package_name(package)
+        resolved_name = yarn_add(package)
+        pkg_name = resolved_name || resolve_package_name(package)
         pkg_meta = read_package_meta(pkg_name)
         js_files = vendor_js(pkg_name, pkg_meta)
         pin_importmap(pkg_name, js_files)
@@ -55,17 +54,26 @@ module Importmap
       private
 
       def yarn_add(package)
-        yarn_arg = if package.start_with?('file:')
-                     path = package.sub(/^file:/, '')
-                     local_pkg_json = File.expand_path(File.join(path, 'package.json'), @root.to_s)
-                     name = JSON.parse(File.read(local_pkg_json))['name']
-                     "#{name}@#{package}"
-                   else
-                     package
-                   end
+        return yarn_add_repo(package) if repo_url?(package)
 
+        yarn_arg = package.start_with?('file:') ? file_package_arg(package) : package
         puts "Running: yarn add #{yarn_arg}"
         system("yarn add #{yarn_arg}", chdir: @root.to_s) or raise "yarn add failed for #{package}"
+        nil
+      end
+
+      def yarn_add_repo(package)
+        deps_before = current_dependencies.keys
+        puts "Running: yarn add #{package}"
+        system("yarn add #{package}", chdir: @root.to_s) or raise "yarn add failed for #{package}"
+        new_keys = current_dependencies.keys - deps_before
+        raise "Could not determine package name after yarn add #{package}" if new_keys.empty?
+
+        new_keys.first
+      end
+
+      def file_package_arg(package)
+        "#{local_package_name(package)}@#{package}"
       end
 
       def yarn_remove(pkg_name)
@@ -82,6 +90,20 @@ module Importmap
         system("yarn up #{deps.join(' ')}", chdir: @root.to_s) or raise 'yarn up failed'
       end
 
+      def repo_url?(package)
+        return false if package.start_with?('file:')
+
+        package.match?(%r{\Ahttps?://|\Agit[+:]|\Agithub:|\Abitbucket:|\Agitlab:}) ||
+          (!package.start_with?('@') && package.include?('/'))
+      end
+
+      def current_dependencies
+        pkg_json = @root.join('package.json')
+        return {} unless pkg_json.exist?
+
+        JSON.parse(pkg_json.read).fetch('dependencies', {})
+      end
+
       def revendor(package)
         pkg_name = resolve_package_name(package)
         pkg_meta = read_package_meta(pkg_name)
@@ -91,13 +113,22 @@ module Importmap
       end
 
       def resolve_package_name(package)
-        if package.start_with?('file:')
-          path = package.sub(/^file:/, '')
-          local_pkg_json = File.expand_path(File.join(path, 'package.json'), @root.to_s)
-          JSON.parse(File.read(local_pkg_json))['name']
-        else
-          package
-        end
+        return local_package_name(package) if package.start_with?('file:')
+        return repo_package_name(package) if repo_url?(package)
+
+        package
+      end
+
+      def local_package_name(package)
+        path = package.sub(/^file:/, '')
+        local_pkg_json = File.expand_path(File.join(path, 'package.json'), @root.to_s)
+        JSON.parse(File.read(local_pkg_json))['name']
+      end
+
+      def repo_package_name(package)
+        deps = current_dependencies
+        match = deps.find { |_name, spec| spec == package || spec.include?(package) || package.include?(spec) }
+        match ? match.first : package
       end
 
       def read_package_meta(pkg_name)
@@ -138,12 +169,14 @@ module Importmap
       def pin_importmap(pkg_name, js_files)
         return if js_files.empty? || !@importmap.exist?
 
-        content  = @importmap.read
         pin_line = "pin \"#{pkg_name}\", to: \"#{js_files.first}\""
+        write_pin(pkg_name, pin_line)
+      end
 
-        if content.match?(/pin ['"]#{Regexp.escape(pkg_name)}['"]/)
-          new_content = content.gsub(/pin ['"]#{Regexp.escape(pkg_name)}['"][^\n]*/, pin_line)
-          @importmap.write(new_content)
+      def write_pin(pkg_name, pin_line)
+        content = @importmap.read
+        if content.match?(/pin ['"]{1}#{Regexp.escape(pkg_name)}['"]{1}/)
+          @importmap.write(content.gsub(/pin ['"]{1}#{Regexp.escape(pkg_name)}['"]{1}[^\n]*/, pin_line))
           puts "  Updated pin: #{pin_line}"
         else
           @importmap.open('a') { |f| f.puts pin_line }

data/lib/importmap/node/version.rb

@@ -2,6 +2,6 @@
 
 module Importmap
   module Node
-    VERSION = '0.1.0'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: importmap-node
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Tien
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Install node packages as vendored assets in Rails via yarn
 test_files: []