[AssetMapper] Fixing jsdelivr regex to catch 2x export syntax in a row

symfony · nicolas-grekas · Sep 27, 2023 · Sep 23, 2023 · Sep 27, 2023 · 2e6618b2640ddf3dbcd176f1323e5753adc454f5
commit 2e6618b2640ddf3dbcd176f1323e5753adc454f5
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php
@@ -25,7 +25,7 @@ final class JsDelivrEsmResolver implements PackageResolverInterface
    public const URL_PATTERN_VERSION = 'https://data.jsdelivr.com/v1/packages/npm/%s/resolved?specifier=%s';
    public const URL_PATTERN_DIST = 'https://cdn.jsdelivr.net/npm/%s@%s%s/+esm';

-    public const IMPORT_REGEX = '{from"/npm/([^@]*@?[\S]+)@([^/]+)/\+esm"}';
+    public const IMPORT_REGEX = '{from"/npm/([^@]*@?\S+?)@([^/]+)/\+esm"}';

    private HttpClientInterface $httpClient;


diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php
@@ -235,21 +235,49 @@ public static function provideResolvePackagesTests(): iterable
        ];
    }

-    public function testImportRegex()
+    /**
+     * @dataProvider provideImportRegex
+     */
+    public function testImportRegex(string $subject, array $expectedPackages)
    {
-        $subject = 'import{Color as t}from"/npm/@kurkle/color@0.3.2/+esm";import t from"/npm/jquery@3.7.0/+esm";import e from"/npm/popper.js@1.16.1/+esm";console.log("yo");';
        preg_match_all(JsDelivrEsmResolver::IMPORT_REGEX, $subject, $matches);

-        $this->assertCount(3, $matches[0]);
-        $this->assertSame([
-            '@kurkle/color',
-            'jquery',
-            'popper.js',
-        ], $matches[1]);
-        $this->assertSame([
-            '0.3.2',
-            '3.7.0',
-            '1.16.1',
-        ], $matches[2]);
+        $this->assertCount(\count($expectedPackages), $matches[0]);
+        $expectedNames = [];
+        $expectedVersions = [];
+        foreach ($expectedPackages as $packageData) {
+            $expectedNames[] = $packageData[0];
+            $expectedVersions[] = $packageData[1];
+        }
+        $this->assertSame($expectedNames, $matches[1]);
+        $this->assertSame($expectedVersions, $matches[2]);
+    }
+
+    public static function provideImportRegex(): iterable
+    {
+        yield 'standard import format' => [
+            'import{Color as t}from"/npm/@kurkle/color@0.3.2/+esm";import t from"/npm/jquery@3.7.0/+esm";import e from"/npm/popper.js@1.16.1/+esm";console.log("yo");',
+            [
+                ['@kurkle/color', '0.3.2'],
+                ['jquery', '3.7.0'],
+                ['popper.js', '1.16.1'],
+            ],
+        ];
+
+        yield 'export and import format' => [
+            'export*from"/npm/@vue/runtime-dom@3.3.4/+esm";const e=()=>{};export{e as compile};export default null;',
+            [
+                ['@vue/runtime-dom', '3.3.4'],
+            ],
+        ];
+
+        yield 'multiple export format & import' => [
+            'import{defineComponent as e,nextTick as t,createVNode as n,getCurrentInstance as r,watchPostEffect as s,onMounted as o,onUnmounted as i,h as a,BaseTransition as l,BaseTransitionPropsValidators as c,Fragment as u,Static as p,useTransitionState as f,onUpdated as d,toRaw as m,getTransitionRawChildren as h,setTransitionHooks as v,resolveTransitionHooks as g,createRenderer as _,createHydrationRenderer as b,camelize as y,callWithAsyncErrorHandling as C}from"/npm/@vue/runtime-core@3.3.4/+esm";export*from"/npm/@vue/runtime-core@3.3.4/+esm";import{isArray as S,camelize as E,toNumber as A,hyphenate as w,extend as T,EMPTY_OBJ as x,isObject as P,looseToNumber as k,looseIndexOf as L,isSet as N,looseEqual as $,isFunction as R,isString as M,invokeArrayFns as V,isOn as B,isModelListener as D,capitalize as I,isSpecialBooleanAttr as O,includeBooleanAttr as F}from"/npm/@vue/shared@3.3.4/+esm";const U="undefined"!=typeof document?',
+            [
+                ['@vue/runtime-core', '3.3.4'],
+                ['@vue/runtime-core', '3.3.4'],
+                ['@vue/shared', '3.3.4'],
+            ],
+        ];
    }
 }