Merge pull request #49 from tonysm/tm/update-cmd

New `importmap:update` command and store CDN URL with package name and version in vendor comment
tonysm · Feb 4, 2024 · 0cfdcb1 · 0cfdcb1
2 parents e0988fe + b700aae
commit 0cfdcb1
Show file tree

Hide file tree

Showing 15 changed files with 72 additions and 7 deletions.
diff --git a/src/Commands/AuditCommand.php b/src/Commands/AuditCommand.php
@@ -4,9 +4,11 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Tonysm\ImportmapLaravel\Npm;
 use Tonysm\ImportmapLaravel\VulnerablePackage;
 
+#[AsCommand('importmap:audit')]
 class AuditCommand extends Command
 {
     public $signature = 'importmap:audit';

diff --git a/src/Commands/ClearCacheCommand.php b/src/Commands/ClearCacheCommand.php
@@ -4,9 +4,11 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Tonysm\ImportmapLaravel\Importmap;
 use Tonysm\ImportmapLaravel\Manifest;
 
+#[AsCommand('importmap:clear')]
 class ClearCacheCommand extends Command
 {
     public $signature = 'importmap:clear';

diff --git a/src/Commands/InstallCommand.php b/src/Commands/InstallCommand.php
@@ -7,10 +7,12 @@
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Terminal;
 use Tonysm\ImportmapLaravel\Actions\FixJsImportPaths;
 use Tonysm\ImportmapLaravel\Events\FailedToFixImportStatement;
 
+#[AsCommand('importmap:install')]
 class InstallCommand extends Command
 {
     public $signature = 'importmap:install';

diff --git a/src/Commands/JsonCommand.php b/src/Commands/JsonCommand.php
@@ -3,9 +3,11 @@
 namespace Tonysm\ImportmapLaravel\Commands;
 
 use Illuminate\Console\Command;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Tonysm\ImportmapLaravel\AssetResolver;
 use Tonysm\ImportmapLaravel\Importmap;
 
+#[AsCommand('importmap:json')]
 class JsonCommand extends Command
 {
     public $signature = 'importmap:json';

diff --git a/src/Commands/OptimizeCommand.php b/src/Commands/OptimizeCommand.php
@@ -5,10 +5,12 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Tonysm\ImportmapLaravel\FileDigest;
 use Tonysm\ImportmapLaravel\Importmap;
 use Tonysm\ImportmapLaravel\Manifest;
 
+#[AsCommand('importmap:optimize')]
 class OptimizeCommand extends Command
 {
     public $signature = 'importmap:optimize';

diff --git a/src/Commands/OutdatedCommand.php b/src/Commands/OutdatedCommand.php
@@ -4,9 +4,11 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Tonysm\ImportmapLaravel\Npm;
 use Tonysm\ImportmapLaravel\OutdatedPackage;
 
+#[AsCommand('importmap:outdated')]
 class OutdatedCommand extends Command
 {
     public $signature = 'importmap:outdated';

diff --git a/src/Commands/PackagesCommand.php b/src/Commands/PackagesCommand.php
@@ -3,9 +3,11 @@
 namespace Tonysm\ImportmapLaravel\Commands;
 
 use Illuminate\Console\Command;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Tonysm\ImportmapLaravel\Npm;
 use Tonysm\ImportmapLaravel\PackageVersion;
 
+#[AsCommand('importmap:packages')]
 class PackagesCommand extends Command
 {
     public $signature = 'importmap:packages';

diff --git a/src/Commands/PinCommand.php b/src/Commands/PinCommand.php
@@ -6,8 +6,10 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\File;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Tonysm\ImportmapLaravel\Packager;
 
+#[AsCommand('importmap:pin')]
 class PinCommand extends Command
 {
     /**
@@ -82,7 +84,7 @@ private function importPackages(Packager $packager, Collection $imports): void
     private function pattern(string $package): string
     {
         return sprintf(
-            '#^Importmap::pin\("%s".*$#',
+            '#Importmap::pin\([\'\"]%s[\'\"].*$#',
             preg_quote($package),
         );
     }

diff --git a/src/Commands/UnpinCommand.php b/src/Commands/UnpinCommand.php
@@ -4,8 +4,10 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Arr;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Tonysm\ImportmapLaravel\Packager;
 
+#[AsCommand('importmap:unpin')]
 class UnpinCommand extends Command
 {
     /**

diff --git a/src/Commands/UpdateCommand.php b/src/Commands/UpdateCommand.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Tonysm\ImportmapLaravel\Commands;
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Tonysm\ImportmapLaravel\Npm;
+
+#[AsCommand('importmap:update')]
+class UpdateCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'importmap:update';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update outdated pinned packages.';
+
+    public function handle(Npm $npm)
+    {
+        if (count($outdatedPackages = $npm->outdatedPackages()) > 0) {
+            $this->call('importmap:pin', [
+                'packages' => $outdatedPackages->pluck('name')->all(),
+            ]);
+        } else {
+            $this->components->info('No oudated packages found.');
+        }
+    }
+}
diff --git a/src/ImportmapLaravelServiceProvider.php b/src/ImportmapLaravelServiceProvider.php
@@ -27,7 +27,8 @@ public function configurePackage(Package $package): void
             ->hasCommand(Commands\UnpinCommand::class)
             ->hasCommand(Commands\OutdatedCommand::class)
             ->hasCommand(Commands\AuditCommand::class)
-            ->hasCommand(Commands\PackagesCommand::class);
+            ->hasCommand(Commands\PackagesCommand::class)
+            ->hasCommand(Commands\UpdateCommand::class);
     }
 
     public function packageRegistered()

diff --git a/src/Npm.php b/src/Npm.php
@@ -95,7 +95,7 @@ private function findPackagesFromCdnMatches(string $content)
 
     private function findPackagesFromLocalMatches(string $content)
     {
-        preg_match_all('/^Importmap::pin\(["\']([^"\']*)["\'].*\)\; \/\/.*@(\d+\.\d+\.\d+(?:[^\s]*)).*\r?$/m', $content, $matches);
+        preg_match_all('/^Importmap::pin\(.+\)\;\s*\/\/\s*(.+?)@(.+?)\s+.*\r?$/m', $content, $matches);
 
         if (count($matches) !== 3) {
             return collect();

diff --git a/src/Packager.php b/src/Packager.php
@@ -28,7 +28,7 @@ public function import(array $packages, string $env, string $from)
             'install' => $packages,
             'flattenScope' => true,
             'env' => ['browser', 'module', $env],
-            'provider' => $from,
+            'provider' => $this->normalizeProvider($from),
         ]);
 
         return match ($response->status()) {
@@ -55,10 +55,12 @@ public function vendoredPinFor(string $package, string $url): string
         $version = $this->extractPackageVersionFrom($url);
 
         return sprintf(
-            'Importmap::pin("%s", to: "%s"); // %s',
+            'Importmap::pin("%s", to: "%s"); // %s%s downloaded from %s',
             $package,
             Str::after($this->vendoredPackageName($package), 'resources'),
+            $package,
             $version,
+            $url,
         );
     }
 
@@ -138,4 +140,12 @@ private function handleFailureResponse(Response $response)
 
         throw Exceptions\ImportmapException::withUnexpectedResponseCode($response->status());
     }
+
+    private function normalizeProvider(string $provider): string
+    {
+        return match ($provider) {
+            'jspm' => 'jspm.io',
+            default => $provider,
+        };
+    }
 }
diff --git a/tests/fixtures/npm/audit-importmap.php b/tests/fixtures/npm/audit-importmap.php
@@ -3,4 +3,4 @@
 use Tonysm\ImportmapLaravel\Facades\Importmap;
 
 Importmap::pin('is-svg', to: 'https://cdn.skypack.dev/[email protected]', preload: true);
-Importmap::pin('lodash', to: '/js/vendor/lodash.js'); // @4.17.12
+Importmap::pin('lodash', to: '/js/vendor/lodash.js'); // lodash@4.17.12
diff --git a/tests/fixtures/npm/outdated-importmap.php b/tests/fixtures/npm/outdated-importmap.php
@@ -3,4 +3,4 @@
 use Tonysm\ImportmapLaravel\Facades\Importmap;
 
 Importmap::pin('is-svg', to: 'https://cdn.skypack.dev/[email protected]', preload: true);
-Importmap::pin('lodash', to: '/js/vendor/lodash.js'); // @4.0.0
+Importmap::pin('lodash', to: '/js/vendor/lodash.js'); // lodash@4.0.0