bug #54014 [AssetMapper] Fix enquoted string pattern (smnandre)

fabpot · fabpot · commit 2735cf44beff · 2024-02-21T12:52:22.000+01:00
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- [AssetMapper] Fix enquoted string pattern | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54012 | License | MIT Alternative to #54012 (fixes the bug and avoid a revert that will reintroduce other previous bugs / missmatches) + add a test to check things work as expected with the standard `app.js` file cc `@weaverryan` `@nicolas`-grekas Commits ------- df618bd [AssetMapper] Fix enquoted string pattern
diff --git a/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
@@ -35,9 +35,9 @@ final class JavaScriptImportPathCompiler implements AssetCompilerInterface
             (?:\/\/.*)                     # Lines that start with comments
         |
             (?:
-                \'(?:[^\'\\\\]|\\\\.)*\'   # Strings enclosed in single quotes
+                \'(?:[^\'\\\\\n]|\\\\.)*\'   # Strings enclosed in single quotes
             |
-                "(?:[^"\\\\]|\\\\.)*"      # Strings enclosed in double quotes
+                "(?:[^"\\\\\n]|\\\\.)*"      # Strings enclosed in double quotes
             )
         |
             (?:                            # Import statements (script captured)
@@ -49,7 +49,7 @@ final class JavaScriptImportPathCompiler implements AssetCompilerInterface
             |
                 \bimport\(
             )
-            \s*[\'"`](\.\/[^\'"`]+|(\.\.\/)*[^\'"`]+)[\'"`]\s*[;\)]
+            \s*[\'"`](\.\/[^\'"`\n]+|(\.\.\/)*[^\'"`\n]+)[\'"`]\s*[;\)]
         ?
     /mx';
 
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
@@ -68,8 +68,11 @@ public function testCompileFindsCorrectImports(string $input, array $expectedJav
             ->willReturnCallback(function ($path) {
                 return match ($path) {
                     '/project/assets/foo.js' => new MappedAsset('foo.js', '/can/be/anything.js', publicPathWithoutDigest: '/assets/foo.js'),
+                    '/project/assets/bootstrap.js' => new MappedAsset('bootstrap.js', '/can/be/anything.js', publicPathWithoutDigest: '/assets/bootstrap.js'),
                     '/project/assets/other.js' => new MappedAsset('other.js', '/can/be/anything.js', publicPathWithoutDigest: '/assets/other.js'),
                     '/project/assets/subdir/foo.js' => new MappedAsset('subdir/foo.js', '/can/be/anything.js', publicPathWithoutDigest: '/assets/subdir/foo.js'),
+                    '/project/assets/styles/app.css' => new MappedAsset('styles/app.css', '/can/be/anything.js', publicPathWithoutDigest: '/assets/styles/app.css'),
+                    '/project/assets/styles/app.scss' => new MappedAsset('styles/app.scss', '/can/be/anything.js', publicPathWithoutDigest: '/assets/styles/app.scss'),
                     '/project/assets/styles.css' => new MappedAsset('styles.css', '/can/be/anything.js', publicPathWithoutDigest: '/assets/styles.css'),
                     '/project/assets/vendor/module_in_importmap_remote.js' => new MappedAsset('module_in_importmap_remote.js', '/can/be/anything.js', publicPathWithoutDigest: '/assets/module_in_importmap_remote.js'),
                     '/project/assets/vendor/@popperjs/core.js' => new MappedAsset('assets/vendor/@popperjs/core.js', '/can/be/anything.js', publicPathWithoutDigest: '/assets/@popperjs/core.js'),
@@ -90,6 +93,26 @@ public function testCompileFindsCorrectImports(string $input, array $expectedJav
 
     public static function provideCompileTests(): iterable
     {
+        yield 'standard_symfony_app_js' => [
+            'input' => <<<EOF
+            import './bootstrap.js';
+
+            /*
+             * Welcome to your app's main JavaScript file!
+             *
+             * This file will be included onto the page via the importmap() Twig function,
+             * which should already be in your base.html.twig.
+             */
+            import './styles/app.css';
+
+            console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉');
+            EOF,
+            'expectedJavaScriptImports' => [
+                '/assets/bootstrap.js' => ['lazy' => false, 'asset' => 'bootstrap.js', 'add' => true],
+                '/assets/styles/app.css' => ['lazy' => false, 'asset' => 'styles/app.css', 'add' => true],
+            ],
+        ];
+
         yield 'dynamic_simple_double_quotes' => [
             'input' => 'import("./other.js");',
             'expectedJavaScriptImports' => ['/assets/other.js' => ['lazy' => true, 'asset' => 'other.js', 'add' => true]],

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ final class JavaScriptImportPathCompiler implements AssetCompilerInterface`
`35`	`35`	`(?:\/\/.*) # Lines that start with comments`
`36`	`36`	`\|`
`37`	`37`	`(?:`
`38`		`- \'(?:[^\'\\\\]\|\\\\.)*\' # Strings enclosed in single quotes`
	`38`	`+ \'(?:[^\'\\\\\n]\|\\\\.)*\' # Strings enclosed in single quotes`
`39`	`39`	`\|`
`40`		`- "(?:[^"\\\\]\|\\\\.)*" # Strings enclosed in double quotes`
	`40`	`+ "(?:[^"\\\\\n]\|\\\\.)*" # Strings enclosed in double quotes`
`41`	`41`	`)`
`42`	`42`	`\|`
`43`	`43`	`(?: # Import statements (script captured)`
`@@ -49,7 +49,7 @@ final class JavaScriptImportPathCompiler implements AssetCompilerInterface`
`49`	`49`	`\|`
`50`	`50`	`\bimport\(`
`51`	`51`	`)`
`52`		- \s[\'"`](\.\/[^\'"`]+\|(\.\.\/)[^\'"`]+)[\'"`]\s*[;\)]
	`52`	+ \s[\'"`](\.\/[^\'"`\n]+\|(\.\.\/)[^\'"`\n]+)[\'"`]\s*[;\)]
`53`	`53`	`?`
`54`	`54`	`/mx';`
`55`	`55`