prettier

Author: k0d3r1s

.coverage/cobertura.xml

@@ -1,5 +1,4 @@
-Please do not submit any Pull Requests here. They will be closed.
----
+## Please do not submit any Pull Requests here. They will be closed.
 
 Please submit your PR here instead:
 https://github.com/valksor/php-dev

.github/PULL_REQUEST_TEMPLATE.md

@@ -60,6 +60,7 @@ final class BinaryAssetManager
      *     source: 'github'|'npm'|'github-zip',
      *     repo?: string,
      *     npm_package?: string,
+     *     npm_dist_tag?: string,
      *     assets: array<int,array{pattern:string,target:string,executable:bool,extract_path?:string}>,
      *     target_dir: string,
      *     version_in_path?: bool,
@@ -289,8 +290,19 @@ private function downloadNpmAsset(
     ): void {
         $assetConfig = $this->toolConfig['assets'][0];
         $platform = self::detectPlatform();
-        $npmPackage = sprintf('@esbuild/%s', $platform);
-        $url = sprintf('https://registry.npmjs.org/%s/-/%s-%s.tgz', $npmPackage, $platform, $version);
+
+        // Use the actual npm package from configuration instead of hardcoded @esbuild
+        $npmPackage = $this->toolConfig['npm_package'];
+
+        // For scoped packages (@scope/package), use the correct URL format
+        if (str_starts_with($npmPackage, '@')) {
+            $scope = substr($npmPackage, 0, strpos($npmPackage, '/'));
+            $packageName = substr($npmPackage, strpos($npmPackage, '/') + 1);
+            $url = sprintf('https://registry.npmjs.org/%s/-/%s-%s.tgz', $npmPackage, $packageName, $version);
+        } else {
+            // For regular packages, download the full package
+            $url = sprintf('https://registry.npmjs.org/%s/-/%s-%s.tgz', $npmPackage, $npmPackage, $version);
+        }
 
         $context = stream_context_create([
             'http' => [
@@ -321,22 +333,34 @@ private function downloadNpmAsset(
             $extractDir = $tmpDir . '/extracted';
             $this->ensureDirectory($extractDir);
 
-            exec(sprintf('tar -xzf %s -C %s %s 2>&1', escapeshellarg($tgzPath), escapeshellarg($extractDir), escapeshellarg($extractPath)), $output, $returnCode);
+            // Extract the entire tarball
+            exec(sprintf('tar -xzf %s -C %s 2>&1', escapeshellarg($tgzPath), escapeshellarg($extractDir)), $output, $returnCode);
 
             if (0 !== $returnCode) {
                 throw new RuntimeException(sprintf('Failed to extract %s tarball: %s', $this->toolConfig['name'], implode("\n", $output)));
             }
 
-            $extractedBinary = $extractDir . '/' . $extractPath;
-
-            if (!is_file($extractedBinary)) {
-                throw new RuntimeException(sprintf('Extracted binary not found at %s', $extractedBinary));
-            }
-
+            // Handle both file and directory extraction
+            $sourcePath = $extractDir . '/' . $extractPath;
             $targetPath = $targetDir . '/' . $assetConfig['target'];
 
-            if (!rename($extractedBinary, $targetPath)) {
-                throw new RuntimeException(sprintf('Failed to move %s binary to %s', $this->toolConfig['name'], $targetPath));
+            // If target is '.', copy the entire extracted directory
+            if ('.' === $assetConfig['target']) {
+                // Copy entire extracted directory contents to target
+                exec(sprintf('cp -r %s/* %s/ 2>&1', escapeshellarg($sourcePath), escapeshellarg($targetDir)), $output, $returnCode);
+
+                if (0 !== $returnCode) {
+                    throw new RuntimeException(sprintf('Failed to copy %s package: %s', $this->toolConfig['name'], implode("\n", $output)));
+                }
+            } else {
+                // Original behavior: move specific file
+                if (!is_file($sourcePath)) {
+                    throw new RuntimeException(sprintf('Extracted binary not found at %s', $sourcePath));
+                }
+
+                if (!rename($sourcePath, $targetPath)) {
+                    throw new RuntimeException(sprintf('Failed to move %s binary to %s', $this->toolConfig['name'], $targetPath));
+                }
             }
 
             if ($assetConfig['executable']) {
@@ -410,7 +434,8 @@ private function fetchLatestCommit(): array
      */
     private function fetchLatestNpmVersion(): array
     {
-        $packageUrl = sprintf('https://registry.npmjs.org/%s/latest', $this->toolConfig['npm_package']);
+        $distTag = $this->toolConfig['npm_dist_tag'] ?? 'latest';
+        $packageUrl = sprintf('https://registry.npmjs.org/%s/%s', $this->toolConfig['npm_package'], $distTag);
 
         $context = stream_context_create([
             'http' => [

Binary/BinaryAssetManager.php

@@ -26,12 +26,14 @@ interface BinaryInterface
     /**
      * Create a configured BinaryAssetManager for this tool.
      *
-     * @param string $varDir The base var directory (e.g., /path/to/project/var)
+     * @param string $varDir        The base var directory (e.g., /path/to/project/var)
+     * @param string $requestedName The actual binary name requested (e.g., '@valksor/valksor@next')
      *
      * @return BinaryAssetManager Configured manager ready to download/ensure the binary
      */
     public function createManager(
         string $varDir,
+        ?string $requestedName = null,
     ): BinaryAssetManager;
 
     /**

Binary/BinaryInterface.php

@@ -46,7 +46,7 @@ public function __construct(
     /**
      * Get a provider by binary name.
      *
-     * @param string $name The binary name (e.g., 'tailwindcss')
+     * @param string $name The binary name (e.g., 'tailwindcss', '@valksor/valksor@next')
      *
      * @return BinaryInterface The registered provider
      *
@@ -59,7 +59,17 @@ public function get(
             throw new RuntimeException(sprintf('No binary provider registered for: %s', $name));
         }
 
-        return $this->providers[$name];
+        // Direct match first
+        if (isset($this->providers[$name])) {
+            return $this->providers[$name];
+        }
+
+        // For @valksor/valksor packages, return the base provider
+        if (str_starts_with($name, '@valksor/valksor')) {
+            return $this->providers['@valksor/valksor'];
+        }
+
+        throw new RuntimeException(sprintf('No binary provider registered for: %s', $name));
     }
 
     /**
@@ -75,14 +85,24 @@ public function getAvailableNames(): array
     /**
      * Check if a provider is registered for the given binary name.
      *
-     * @param string $name The binary name (e.g., 'tailwindcss')
+     * @param string $name The binary name (e.g., 'tailwindcss', '@valksor/valksor@next')
      *
      * @return bool True if provider exists
      */
     public function has(
         string $name,
     ): bool {
-        return isset($this->providers[$name]);
+        // Direct match first
+        if (isset($this->providers[$name])) {
+            return true;
+        }
+
+        // For @valksor/valksor packages, check for base provider
+        if (str_starts_with($name, '@valksor/valksor')) {
+            return isset($this->providers['@valksor/valksor']);
+        }
+
+        return false;
     }
 
     /**

Binary/BinaryRegistry.php

@@ -19,6 +19,7 @@ final class DaisyUiBinary implements BinaryInterface
 {
     public function createManager(
         string $varDir,
+        ?string $requestedName = null,
     ): BinaryAssetManager {
         return self::createForDaisyUi($varDir . '/daisyui');
     }

Binary/DaisyUiBinary.php

@@ -19,6 +19,7 @@ final class EsbuildBinary implements BinaryInterface
 {
     public function createManager(
         string $varDir,
+        ?string $requestedName = null,
     ): BinaryAssetManager {
         return self::createForEsbuild($varDir . '/esbuild');
     }

Binary/EsbuildBinary.php

@@ -19,6 +19,7 @@ final class LucideBinary implements BinaryInterface
 {
     public function createManager(
         string $varDir,
+        ?string $requestedName = null,
     ): BinaryAssetManager {
         return self::createForLucide($varDir . '/lucide');
     }

Binary/LucideBinary.php

@@ -21,6 +21,7 @@ final class TailwindBinary implements BinaryInterface
 {
     public function createManager(
         string $varDir,
+        ?string $requestedName = null,
     ): BinaryAssetManager {
         return self::createForTailwindCss($varDir . '/tailwindcss');
     }

Binary/TailwindBinary.php

@@ -16,24 +16,24 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
+- Focusing on what is best not just for us as individuals, but for the overall
   community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or advances
+- The use of sexualized language or imagery, and sexual attention or advances
   of any kind
-* Trolling, insulting or derogatory comments, and personal or political
+- Trolling, insulting or derogatory comments, and personal or political
   attacks
-* Public or private harassment
-* Publishing others’ private information, such as a physical or email address,
+- Public or private harassment
+- Publishing others’ private information, such as a physical or email address,
   without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
+- Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Enforcement Responsibilities
@@ -71,13 +71,15 @@ determining the consequences for any action they deem in violation of this
 Code of Conduct:
 
 ### 1. Correction
+
 **Community Impact**: Use of inappropriate language or other behavior deemed
 unprofessional or unwelcome in the community.
 **Consequence**: A private, written warning from community leaders,
 providing clarity around the nature of the violation and an explanation of why
 the behavior was inappropriate. A public apology may be requested.
 
 ### 2. Warning
+
 **Community Impact**: A violation through a single incident or series of
 actions.
 **Consequence**: A warning with consequences for continued behavior. No
@@ -88,6 +90,7 @@ like social media. Violating these terms may lead to a temporary or permanent
 ban.
 
 ### 3. Temporary Ban
+
 **Community Impact**: A serious violation of community standards, including
 sustained inappropriate behavior.
 **Consequence**: A temporary ban from any sort of interaction or public
@@ -97,6 +100,7 @@ with those enforcing the Code of Conduct, is allowed during this period.
 Violating these terms may lead to a permanent ban.
 
 ### 4. Permanent Ban
+
 **Community Impact**: Demonstrating a pattern of violation of community
 standards, including sustained inappropriate behavior, harassment of an
 individual, or aggression toward or disparagement of classes of individuals.