Completed npm commands (npm:install, npm:update, npm:run)

modules/system/ServiceProvider.php

@@ -332,8 +332,9 @@ protected function registerConsole()
         $this->registerConsoleCommand('vite.list', Console\Asset\Vite\ViteList::class);
         $this->registerConsoleCommand('vite.watch', Console\Asset\Vite\ViteWatch::class);
 
-        $this->registerConsoleCommand('npm.run', Console\Asset\NpmRun::class);
-        $this->registerConsoleCommand('npm.update', Console\Asset\NpmUpdate::class);
+        $this->registerConsoleCommand('npm.run', Console\Asset\Npm\NpmRun::class);
+        $this->registerConsoleCommand('npm.install', Console\Asset\Npm\NpmInstall::class);
+        $this->registerConsoleCommand('npm.update', Console\Asset\Npm\NpmUpdate::class);
     }
 
     /*

modules/system/console/asset/AssetInstall.php

@@ -8,6 +8,7 @@
 use System\Classes\Asset\PackageJson;
 use System\Classes\Asset\PackageManager;
 use System\Classes\PluginManager;
+use System\Console\Asset\Exceptions\PackageNotFoundException;
 use Winter\Storm\Console\Command;
 use Winter\Storm\Support\Facades\Config;
 use Winter\Storm\Support\Facades\File;
@@ -194,14 +195,36 @@ protected function validateRequirePackagesPresent(PackageJson $packageJson): Pac
 
     protected function processPackages(array $registeredPackages, PackageJson $packageJson): PackageJson
     {
-        // Process each package
+        // Check if the user requested a specific package for install
+        $requestedPackage = strtolower($this->argument('assetPackage'));
+        $foundRequestedPackage = !$requestedPackage;
+
+        if (!$foundRequestedPackage) {
+            foreach ($registeredPackages as $name => $package) {
+                if ($requestedPackage === $name) {
+                    $foundRequestedPackage = true;
+                }
+            }
+
+            // We did not find the package, exit
+            if (!$foundRequestedPackage) {
+                throw new PackageNotFoundException(sprintf(
+                    'The requested package `%s` could not be found. Try %s:config or check if the package is ignored.',
+                    $this->argument('assetPackage'),
+                    $this->assetType
+                ));
+            }
+        }
+
+        // Process each found package
         foreach ($registeredPackages as $name => $package) {
             // Normalize package path across OS types
             $packagePath = Str::replace(DIRECTORY_SEPARATOR, '/', $package['path']);
             // Add the package path to the instance's package.json->workspaces->packages property if not present
             if (!$packageJson->hasWorkspace($packagePath) && !$packageJson->hasIgnoredPackage($packagePath)) {
                 if (
-                    $this->confirm(
+                    $requestedPackage === $name
+                    || $this->confirm(
                         sprintf(
                             "Detected %s (%s), should it be added to your package.json?",
                             $name,
@@ -242,7 +265,7 @@ protected function processPackages(array $registeredPackages, PackageJson $packa
      */
     protected function installPackageDeps(): int
     {
-        $command = $this->argument('npmArgs') ?? [];
+        $command = [];
         array_unshift($command, 'npm', $this->npmCommand);
 
         $process = new Process($command, base_path(), null, null, null);

modules/system/console/asset/NpmCommand.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace System\Console\Asset;
+
+use Symfony\Component\Process\Process;
+use System\Classes\Asset\PackageJson;
+use System\Classes\Asset\PackageManager;
+use System\Console\Asset\Exceptions\PackageNotRegisteredException;
+use Winter\Storm\Console\Command;
+
+abstract class NpmCommand extends Command
+{
+    protected function getPackage(): ?array
+    {
+        $compilableAssets = PackageManager::instance();
+        $compilableAssets->fireCallbacks();
+
+        $name = $this->argument('package');
+
+        if (!$name) {
+            return null;
+        }
+
+        if (!$compilableAssets->hasPackage($name, true)) {
+            throw new PackageNotRegisteredException(sprintf('Package "%s" is not a registered package.', $name));
+        }
+
+        $package = $compilableAssets->getPackage($name, true)[0] ?? [];
+
+        // Assume that packages with matching names have matching package.json files
+        $packageJson = new PackageJson($package['package'] ?? null);
+
+        return [$package, $packageJson];
+    }
+
+    protected function npmRun(array $command, string $path): int
+    {
+        $process = new Process(
+            $command,
+            base_path($path),
+            ['NODE_ENV' => $this->getNodeEnv()],
+            null,
+            null
+        );
+
+        try {
+            $process->setTty(true);
+        } catch (\Throwable $e) {
+            // This will fail on unsupported systems
+        }
+
+        return $process->run(function ($status, $stdout) {
+            if (!$this->option('silent')) {
+                $this->getOutput()->write($stdout);
+            }
+        });
+    }
+
+    protected function getNodeEnv(): string
+    {
+        if (!$this->hasOption('production')) {
+            return 'development';
+        }
+
+        return $this->option('production', false) ? 'production' : 'development';
+    }
+}

modules/system/console/asset/exceptions/PackageNotFoundException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace System\Console\Asset\Exceptions;
+
+class PackageNotFoundException extends \InvalidArgumentException
+{
+
+}

modules/system/console/asset/exceptions/PackageNotRegisteredException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace System\Console\Asset\Exceptions;
+
+class PackageNotRegisteredException extends \InvalidArgumentException
+{
+
+}

modules/system/console/asset/mix/MixInstall.php

@@ -13,7 +13,7 @@ class MixInstall extends AssetInstall
      * @var string The name and signature of this command.
      */
     protected $signature = 'mix:install
-        {npmArgs?* : Arguments to pass through to the "npm" binary}
+        {assetPackage? : The asset package name to install}
         {--npm= : Defines a custom path to the "npm" binary}
         {--p|package=* : Defines one or more packages to install}';
 

modules/system/console/asset/npm/NpmInstall.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace System\console\asset\npm;
+
+use System\Console\Asset\Exceptions\PackageNotRegisteredException;
+use System\Console\Asset\NpmCommand;
+
+class NpmInstall extends NpmCommand
+{
+    /**
+     * @var string|null The default command name for lazy loading.
+     */
+    protected static $defaultName = 'npm:install';
+
+    /**
+     * @inheritDoc
+     */
+    protected $description = 'Install Node.js dependencies for a package';
+
+    /**
+     * @inheritDoc
+     */
+    protected $signature = 'npm:install
+        {package? : The package name to add configuration for}
+        {npmArgs?* : Arguments to pass through to the "npm" binary}
+        {--npm= : Defines a custom path to the "npm" binary}
+        {--d|dev : Install packages in devDependencies}';
+
+    /**
+     * @inheritDoc
+     */
+    public $replaces = [
+        'mix:update'
+    ];
+
+    public function handle(): int
+    {
+        $command = ($this->argument('npmArgs')) ?? [];
+
+        try {
+            [$package, $packageJson] = $this->getPackage();
+        } catch (PackageNotRegisteredException $e) {
+            array_unshift($command, $this->argument('package'));
+        }
+
+        array_unshift($command, 'npm', 'install');
+
+        if ($this->option('dev')) {
+            $command[] = '--save-dev';
+        }
+
+        return $this->npmRun($command, $package['path'] ?? '');
+    }
+}

modules/system/console/asset/NpmRun.php → modules/system/console/asset/npm/NpmRun.php

@@ -1,13 +1,10 @@
 <?php
 
-namespace System\Console\Asset;
+namespace System\Console\Asset\Npm;
 
-use Symfony\Component\Process\Process;
-use System\Classes\Asset\PackageManager;
-use System\Classes\Asset\PackageJson;
-use Winter\Storm\Console\Command;
+use System\Console\Asset\NpmCommand;
 
-class NpmRun extends Command
+class NpmRun extends NpmCommand
 {
     /**
      * @var string|null The default command name for lazy loading.
@@ -41,32 +38,18 @@ class NpmRun extends Command
      */
     public function handle(): int
     {
-        $compilableAssets = PackageManager::instance();
-        $compilableAssets->fireCallbacks();
+        [$package, $packageJson] = $this->getPackage();
 
-        $name = $this->argument('package');
         $script = $this->argument('script');
 
-        if (!$compilableAssets->hasPackage($name, true)) {
-            $this->error(
-                sprintf('Package "%s" is not a registered package.', $name)
-            );
-            return 1;
-        }
-
-        $package = $compilableAssets->getPackage($name, true)[0] ?? [];
-
-        // Assume that packages with matching names have matching package.json files
-        $packageJson = new PackageJson($package['package'] ?? null);
-
         if (!$packageJson->hasScript($script)) {
             $this->error(
-                sprintf('Script "%s" is not defined in package "%s".', $script, $name)
+                sprintf('Script "%s" is not defined in package "%s".', $script, $this->argument('package'))
             );
             return 1;
         }
 
-        $this->info(sprintf('Running script "%s" in package "%s"', $script, $name));
+        $this->info(sprintf('Running script "%s" in package "%s"', $script, $this->argument('package')));
 
         $command = ($this->argument('additionalArgs')) ?? [];
         if (count($command)) {
@@ -75,25 +58,6 @@ public function handle(): int
             array_unshift($command, 'npm', 'run', $script);
         }
 
-
-        $process = new Process(
-            $command,
-            base_path($package['path']),
-            ['NODE_ENV' => $this->option('production', false) ? 'production' : 'development'],
-            null,
-            null
-        );
-
-        try {
-            $process->setTty(true);
-        } catch (\Throwable $e) {
-            // This will fail on unsupported systems
-        }
-
-        return $process->run(function ($status, $stdout) {
-            if (!$this->option('silent')) {
-                $this->getOutput()->write($stdout);
-            }
-        });
+        return $this->npmRun($command, $package['path']);
     }
 }

modules/system/console/asset/npm/NpmUpdate.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace System\Console\Asset\Npm;
+
+use System\Console\Asset\Exceptions\PackageNotRegisteredException;
+use System\Console\Asset\NpmCommand;
+
+class NpmUpdate extends NpmCommand
+{
+    /**
+     * @var string|null The default command name for lazy loading.
+     */
+    protected static $defaultName = 'npm:update';
+
+    /**
+     * @inheritDoc
+     */
+    protected $description = 'Update Node.js dependencies required for mixed assets';
+
+    /**
+     * @inheritDoc
+     */
+    protected $signature = 'npm:update
+        {package? : The package name to add configuration for}
+        {npmArgs?* : Arguments to pass through to the "npm" binary}
+        {--npm= : Defines a custom path to the "npm" binary}';
+
+    /**
+     * @inheritDoc
+     */
+    public $replaces = [
+        'mix:update'
+    ];
+
+    public function handle(): int
+    {
+        $command = ($this->argument('npmArgs')) ?? [];
+
+        try {
+            [$package, $packageJson] = $this->getPackage();
+        } catch (PackageNotRegisteredException $e) {
+            array_unshift($command, $this->argument('package'));
+        }
+
+        if (count($command)) {
+            array_unshift($command, 'npm', 'update', '--');
+        } else {
+            array_unshift($command, 'npm', 'update');
+        }
+
+        return $this->npmRun($command, $package['path'] ?? '');
+    }
+}