create-prisma-php-app 2.0.0-beta.13 → 2.0.0-beta.15

package/dist/bootstrap.php

@@ -64,7 +64,7 @@ final class Bootstrap
 
         Request::$pathname = $contentInfo['pathname'] ? '/' . $contentInfo['pathname'] : '/';
         Request::$uri = $contentInfo['uri'] ? $contentInfo['uri'] : '/';
-        Request::$decodedUri = urldecode(Request::$uri);
+        Request::$decodedUri = Request::getDecodedUrl(Request::$uri);
 
         if (is_file(self::$contentToInclude)) {
             Request::$fileToInclude = basename(self::$contentToInclude);
@@ -675,7 +675,7 @@ final class Bootstrap
             }
         }
 
-        $currentUrl = urldecode(Request::$uri);
+        $currentUrl = Request::getDecodedUrl(Request::$uri);
 
         if (isset($currentData[$currentUrl])) {
             $currentData[$currentUrl]['includedFiles'] = array_values(array_unique(
@@ -687,7 +687,7 @@ final class Bootstrap
             }
         } else {
             $currentData[$currentUrl] = [
-                'url'         => $currentUrl,
+                'url'         => Request::$uri,
                 'fileName'    => self::convertUrlToFileName($currentUrl),
                 'isCacheable' => CacheHandler::$isCacheable,
                 'cacheTtl' => CacheHandler::$ttl,
@@ -707,7 +707,7 @@ final class Bootstrap
     {
         $url = trim($url, '/');
         $fileName = preg_replace('/[^a-zA-Z0-9-_]/', '_', $url);
-        return $fileName ?: 'index';
+        return $fileName ? mb_strtolower($fileName, 'UTF-8') : 'index';
     }
 
     private static function authenticateUserToken(): void

package/dist/src/Lib/PHPX/TwMerge.php

@@ -9,7 +9,6 @@ class TwMerge
     private static $classGroupPatterns = [
         // **General Padding classes**
         "p" => "/^p-/",
-
         // **Specific Padding classes**
         "pt" => "/^pt-/",
         "pr" => "/^pr-/",
@@ -17,7 +16,6 @@ class TwMerge
         "pl" => "/^pl-/",
         "px" => "/^px-/",
         "py" => "/^py-/",
-
         // **Margin classes**
         "m" => "/^m-/",
         "mt" => "/^mt-/",
@@ -26,60 +24,42 @@ class TwMerge
         "ml" => "/^ml-/",
         "mx" => "/^mx-/",
         "my" => "/^my-/",
-
         // **Background color classes**
         "bg" => "/^bg-/",
-
-        // **Text size classes
+        // **Text size classes**
         "text-size" => '/^text-(xs|sm|base|lg|xl|[2-9]xl)$/',
-
         // **Text alignment classes**
         "text-alignment" => '/^text-(left|center|right|justify)$/',
-
-        // **Text color classes
+        // **Text color classes**
         "text-color" => '/^text-(?!xs$|sm$|base$|lg$|xl$|[2-9]xl$).+$/',
-
         // **Text transform classes**
-        "text-transform" =>
-        '/^text-(uppercase|lowercase|capitalize|normal-case)$/',
-
+        "text-transform" => '/^text-(uppercase|lowercase|capitalize|normal-case)$/',
         // **Text decoration classes**
         "text-decoration" => '/^text-(underline|line-through|no-underline)$/',
-
         // **Border width classes**
         "border-width" => '/^border(-[0-9]+)?$/',
-
         // **Border color classes**
         "border-color" => "/^border-(?![0-9])/",
-
         // **Border radius classes**
         "rounded" => '/^rounded(-.*)?$/',
-
         // **Font weight classes**
-        "font" =>
-        '/^font-(thin|extralight|light|normal|medium|semibold|bold|extrabold|black)$/',
-
+        "font" => '/^font-(thin|extralight|light|normal|medium|semibold|bold|extrabold|black)$/',
         // **Hover background color classes**
         "hover:bg" => "/^hover:bg-/",
-
         // **Hover text color classes**
         "hover:text" => "/^hover:text-/",
-
         // **Transition classes**
         "transition" => '/^transition(-[a-z]+)?$/',
-
-        // **Opacity classes
+        // **Opacity classes**
         "opacity" => '/^opacity(-[0-9]+)?$/',
-
         // **Flexbox alignment classes**
         "justify" => "/^justify-(start|end|center|between|around|evenly)$/",
-
         // **Flexbox alignment classes**
         "items" => "/^items-(start|end|center|baseline|stretch)$/",
-
         // **Width classes**
         "w" => "/^w-(full|[0-9]+|\\[.+\\])$/",
-
+        // **Max-width classes**
+        "max-w" => '/^max-w-(full|[0-9]+|\\[.+\\]|[a-zA-Z]+)$/',
         // **Other utility classes can be added here**
     ];
 
@@ -92,7 +72,6 @@ class TwMerge
         "pr" => ["pr"],
         "pb" => ["pb"],
         "pl" => ["pl"],
-
         // **Margin conflict groups**
         "m" => ["m", "mx", "my", "mt", "mr", "mb", "ml"],
         "mx" => ["mx", "ml", "mr"],
@@ -101,57 +80,37 @@ class TwMerge
         "mr" => ["mr"],
         "mb" => ["mb"],
         "ml" => ["ml"],
-
         // **Border width conflict group**
         "border-width" => ["border-width"],
-
         // **Border color conflict group**
         "border-color" => ["border-color"],
-
         // **Text size conflict group**
         "text-size" => ["text-size"],
-
         // **Text color conflict group**
         "text-color" => ["text-color"],
-
         // **Text alignment conflict group**
         "text-alignment" => ["text-alignment"],
-
         // **Text transform conflict group**
         "text-transform" => ["text-transform"],
-
         // **Text decoration conflict group**
         "text-decoration" => ["text-decoration"],
-
-        // **Opacity conflict group
+        // **Opacity conflict group**
         "opacity" => ["opacity"],
-
         // **Flexbox alignment conflict group**
         "justify" => ["justify"],
-
         // **Flexbox alignment conflict group**
         "items" => ["items"],
-
         // **Width conflict group**
-        "w" => ["w"],
-
+        "w" => ["w", "max-w"],
+        // **Max-width conflict group**
+        "max-w" => ["max-w"],
         // **Add other conflict groups as needed**
     ];
 
     /**
      * Merges multiple CSS class strings or arrays of CSS class strings into a single, optimized CSS class string.
      *
-     * This method processes the provided classes, which can be either strings or arrays of strings, removes
-     * duplicate or conflicting classes, and prioritizes the last occurrence of a class. It splits class strings
-     * by whitespace, handles conflicting class groups, and ensures a clean and well-formatted output.
-     *
-     * ### Features:
-     * - Accepts individual class strings or arrays of class strings.
-     * - Automatically handles arrays by flattening them into individual strings.
-     * - Removes duplicate or conflicting classes based on class groups.
-     * - Combines all classes into a single string, properly formatted and optimized.
-     *
-     * @param string|array ...$classes The CSS classes to be merged. Each argument can be a string or an array of strings.
+     * @param string|array ...$classes The CSS classes to be merged.
      * @return string A single CSS class string with duplicates and conflicts resolved.
      */
     public static function mergeClasses(string|array ...$classes): string
@@ -170,9 +129,7 @@ class TwMerge
 
                         // If the class is non-responsive (no colon), remove any responsive variants for the same base
                         if (strpos($classKey, ':') === false) {
-                            // The base group is the class key itself (e.g. "justify")
                             $baseGroup = $classKey;
-                            // Remove any entries that end with the same base group but have a prefix (e.g. "sm:justify")
                             foreach ($classArray as $existingKey => $existingClass) {
                                 if ($existingKey !== $baseGroup && substr($existingKey, -strlen($baseGroup)) === $baseGroup) {
                                     unset($classArray[$existingKey]);
@@ -180,10 +137,22 @@ class TwMerge
                             }
                         }
 
-                        // Get the conflicting keys and remove them
-                        $conflictingKeys = self::getConflictingKeys($classKey);
+                        // If the class belongs to the max-w group and a corresponding w class exists for the same prefix, skip it.
+                        $baseClassKey = preg_replace("/^(?:[a-z-]+:)+/", "", $classKey);
+                        if ($baseClassKey === "max-w") {
+                            if (preg_match("/^((?:[a-z-]+:)*)max-w$/", $classKey, $prefixMatches)) {
+                                $prefix = $prefixMatches[1] ?? "";
+                            } else {
+                                $prefix = "";
+                            }
+                            $wKey = $prefix . "w";
+                            if (isset($classArray[$wKey])) {
+                                continue;
+                            }
+                        }
 
-                        // Remove any conflicting classes
+                        // Remove conflicting classes based on the conflict groups
+                        $conflictingKeys = self::getConflictingKeys($classKey);
                         foreach ($conflictingKeys as $key) {
                             unset($classArray[$key]);
                         }
@@ -203,23 +172,17 @@ class TwMerge
     {
         // Match optional prefixes (responsive and variants)
         $pattern = '/^((?:[a-z-]+:)*)(.+)$/';
-
         if (preg_match($pattern, $class, $matches)) {
-            $prefixes = $matches[1]; // Includes responsive and variant prefixes
-            $utilityClass = $matches[2]; // The utility class
+            $prefixes = $matches[1];
+            $utilityClass = $matches[2];
 
-            // Now match utilityClass against patterns
             foreach (self::$classGroupPatterns as $groupKey => $regex) {
                 if (preg_match($regex, $utilityClass)) {
                     return $prefixes . $groupKey;
                 }
             }
-
-            // If no match, use the full class
             return $prefixes . $utilityClass;
         }
-
-        // For classes without a recognizable prefix, return the class itself
         return $class;
     }
 
@@ -227,20 +190,12 @@ class TwMerge
     {
         // Remove any responsive or variant prefixes
         $baseClassKey = preg_replace("/^(?:[a-z-]+:)+/", "", $classKey);
-
-        // Check for conflicts
         if (isset(self::$conflictGroups[$baseClassKey])) {
-            // Add responsive and variant prefixes back to the conflicting keys
-            $prefix = preg_replace(
-                "/" . preg_quote($baseClassKey, "/") . '$/',
-                "",
-                $classKey
-            );
+            $prefix = preg_replace("/" . preg_quote($baseClassKey, "/") . '$/', "", $classKey);
             return array_map(function ($conflict) use ($prefix) {
                 return $prefix . $conflict;
             }, self::$conflictGroups[$baseClassKey]);
         }
-
         return [$classKey];
     }
 }

package/dist/src/Lib/Request.php

@@ -457,4 +457,16 @@ class Request
 
         exit;
     }
+
+    public static function getDecodedUrl(string $uri): string
+    {
+        $parsedUrl = parse_url($uri);
+
+        $queryString = isset($parsedUrl['query']) ? '?' . urldecode($parsedUrl['query']) : '';
+        $path = $parsedUrl['path'] ?? '';
+
+        $decodedUrl = urldecode($path . $queryString);
+
+        return $decodedUrl;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-prisma-php-app",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.15",
   "description": "Prisma-PHP: A Revolutionary Library Bridging PHP with Prisma ORM",
   "main": "dist/index.js",
   "type": "module",