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

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

@@ -96,12 +96,12 @@ class TwMerge
         "text-decoration" => ["text-decoration"],
         // **Opacity conflict group**
         "opacity" => ["opacity"],
-        // **Flexbox alignment conflict group**
+        // **Flexbox alignment conflict groups**
         "justify" => ["justify"],
         // **Flexbox alignment conflict group**
         "items" => ["items"],
         // **Width conflict group**
-        "w" => ["w", "max-w"],
+        "w" => ["w"], // Only conflicts with other width classes.
         // **Max-width conflict group**
         "max-w" => ["max-w"],
         // **Add other conflict groups as needed**
@@ -118,16 +118,16 @@ class TwMerge
         $classArray = [];
 
         foreach ($classes as $class) {
-            // Handle arrays by flattening them into strings
+            // Handle arrays by flattening them into strings.
             $classList = is_array($class) ? $class : [$class];
             foreach ($classList as $item) {
                 if (!empty(trim($item))) {
-                    // Split the classes by any whitespace characters
+                    // Split the classes by any whitespace characters.
                     $splitClasses = preg_split("/\s+/", $item);
                     foreach ($splitClasses as $individualClass) {
                         $classKey = self::getClassGroup($individualClass);
 
-                        // If the class is non-responsive (no colon), remove any responsive variants for the same base
+                        // If the class is non-responsive (no colon), remove any responsive variants for the same base.
                         if (strpos($classKey, ':') === false) {
                             $baseGroup = $classKey;
                             foreach ($classArray as $existingKey => $existingClass) {
@@ -137,58 +137,47 @@ class TwMerge
                             }
                         }
 
-                        // 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 conflicting classes based on the conflict groups
+                        // Remove conflicting classes based on the conflict groups.
                         $conflictingKeys = self::getConflictingKeys($classKey);
                         foreach ($conflictingKeys as $key) {
                             unset($classArray[$key]);
                         }
 
-                        // Update the array, prioritizing the last occurrence
+                        // Update the array, prioritizing the last occurrence.
                         $classArray[$classKey] = $individualClass;
                     }
                 }
             }
         }
 
-        // Combine the final classes into a single string
+        // Combine the final classes into a single string.
         return implode(" ", array_values($classArray));
     }
 
     private static function getClassGroup($class)
     {
-        // Match optional prefixes (responsive and variants)
+        // Match optional prefixes (responsive and variants).
         $pattern = '/^((?:[a-z-]+:)*)(.+)$/';
         if (preg_match($pattern, $class, $matches)) {
             $prefixes = $matches[1];
             $utilityClass = $matches[2];
 
+            // Match the 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;
     }
 
     private static function getConflictingKeys($classKey)
     {
-        // Remove any responsive or variant prefixes
+        // Remove any responsive or variant prefixes.
         $baseClassKey = preg_replace("/^(?:[a-z-]+:)+/", "", $classKey);
         if (isset(self::$conflictGroups[$baseClassKey])) {
             $prefix = preg_replace("/" . preg_quote($baseClassKey, "/") . '$/', "", $classKey);

package/package.json

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