bug #50206 [AssetMapper] Fix import map package parsing with an @ namespace (weaverryan)

nicolas-grekas · nicolas-grekas · commit 2757c2fe264b · 2023-05-02T13:52:16.000+02:00
This PR was merged into the 6.3 branch. Discussion ---------- [AssetMapper] Fix import map package parsing with an @ namespace | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | None | License | MIT | Doc PR | Not needed This method is used with the `importmap:require` command - e.g. ``` ./bin/console importmap:require `@hotwired`/stimulus ``` It parses the string into the package name and potential version (and something called a "registry" which is specific to jspm). The original regex didn't account for namespaced packages. Cheers! Commits ------- 4cc0a8c [AssetMapper] Fix import map package parsing with an @ namespace
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
@@ -111,8 +111,8 @@ public function update(): array
      */
     public static function parsePackageName(string $packageName): ?array
     {
-        // https://regex101.com/r/58bl9L/1
-        $regex = '/(?:(?P<registry>[^:\n]+):)?(?P<package>[^@\n]+)(?:@(?P<version>[^\s\n]+))?/';
+        // https://regex101.com/r/d99BEc/1
+        $regex = '/(?:(?P<registry>[^:\n]+):)?((?P<package>@?[^@\n]+))(?:@(?P<version>[^\s\n]+))?/';
 
         return preg_match($regex, $packageName, $matches) ? $matches : null;
     }
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
@@ -422,6 +422,40 @@ public static function getPackageNameTests(): iterable
                 'version' => '^1.2.3',
             ],
         ];
+
+        yield 'namespaced_package_simple' => [
+            '@hotwired/stimulus',
+            [
+                'package' => '@hotwired/stimulus',
+                'registry' => '',
+            ],
+        ];
+
+        yield 'namespaced_package_with_version_constraint' => [
+            '@hotwired/stimulus@^1.2.3',
+            [
+                'package' => '@hotwired/stimulus',
+                'registry' => '',
+                'version' => '^1.2.3',
+            ],
+        ];
+
+        yield 'namespaced_package_with_registry' => [
+            'npm:@hotwired/stimulus',
+            [
+                'package' => '@hotwired/stimulus',
+                'registry' => 'npm',
+            ],
+        ];
+
+        yield 'namespaced_package_with_registry_and_version' => [
+            'npm:@hotwired/stimulus@^1.2.3',
+            [
+                'package' => '@hotwired/stimulus',
+                'registry' => 'npm',
+                'version' => '^1.2.3',
+            ],
+        ];
     }
 
     private function createImportMapManager(array $dirs, string $rootDir, string $publicPrefix = '/assets/', string $publicDirName = 'public'): ImportMapManager

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@ public function update(): array`
`111`	`111`	`*/`
`112`	`112`	`public static function parsePackageName(string $packageName): ?array`
`113`	`113`	`{`
`114`		`- // https://regex101.com/r/58bl9L/1`
`115`		`- $regex = '/(?:(?P<registry>[^:\n]+):)?(?P<package>[^@\n]+)(?:@(?P<version>[^\s\n]+))?/';`
	`114`	`+ // https://regex101.com/r/d99BEc/1`
	`115`	`+ $regex = '/(?:(?P<registry>[^:\n]+):)?((?P<package>@?[^@\n]+))(?:@(?P<version>[^\s\n]+))?/';`
`116`	`116`
`117`	`117`	`return preg_match($regex, $packageName, $matches) ? $matches : null;`
`118`	`118`	`}`