importmap-node 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a600199932a9709489532ba6697f1d923fc81291f12b3af30ea53766804b4bb0
-  data.tar.gz: 5aeeeb117182c6e7316974ddf486416cb334bc007062ebfd1dda76b84601457f
+  metadata.gz: 3e925ec7f4c661a624c66ce1116e572cd72ac61edab43aaf81bd8b13e73eb20c
+  data.tar.gz: 5b87af166955a82bb11fac6300ed087539a90a5dcb9c9d6dc64cf1c000f9cb7d
 SHA512:
-  metadata.gz: b785eea53cd09a655ea133038592dff31f1406252896cdd76c0d6b1bb4f7f69df3f74f48d2ccc3d2c58086746a4c0fb7390af2a40b7e9755a680f0e07558f7e2
-  data.tar.gz: 784c868a3e81b623f1b3d1845774d5783878e0d375bbd60d053013319ac4d4433a89c8b0b1b3e19755f98abc737aea20e503108175ee0a85eefca865d245696b
+  metadata.gz: 513deae74ee355a739069b4632d216da7225153a98fa7ef8d15651ca71f7357476d6a3238f01d7b848d2da0b6fa0c63cec03e30dd1acc2db2dd39369e6adf33b
+  data.tar.gz: d2838be955254448255bd04fb1c107f7236d0b5697ce72b05e332f9570c60561400d8fd5cd05e69bfec7f52885a4b5b7d0207be75d4a72782265503df290416b

data/lib/importmap/node/installer.rb

@@ -93,8 +93,18 @@ module Importmap
       def repo_url?(package)
         return false if package.start_with?('file:')
 
-        package.match?(%r{\Ahttps?://|\Agit[+:]|\Agithub:|\Abitbucket:|\Agitlab:}) ||
-          (!package.start_with?('@') && package.include?('/'))
+        spec = spec_part(package)
+        spec.match?(%r{\Ahttps?://|\Agit[+:]|\Agithub:|\Abitbucket:|\Agitlab:}) ||
+          (!spec.start_with?('@') && spec.include?('/'))
+      end
+
+      # Returns the URL/spec portion of a Yarn 4 "name@url" argument.
+      # Scoped packages starting with "@" are returned unchanged.
+      def spec_part(package)
+        return package if package.start_with?('@')
+
+        idx = package.index('@')
+        idx ? package[(idx + 1)..] : package
       end
 
       def current_dependencies
@@ -114,7 +124,14 @@ module Importmap
 
       def resolve_package_name(package)
         return local_package_name(package) if package.start_with?('file:')
-        return repo_package_name(package) if repo_url?(package)
+
+        if repo_url?(package)
+          unless package.start_with?('@')
+            idx = package.index('@')
+            return package[0, idx] if idx
+          end
+          return repo_package_name(package)
+        end
 
         package
       end

data/lib/importmap/node/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: importmap-node
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tien