create-prisma-php-app 3.4.3 → 3.4.5

package/dist/src/Lib/MainLayout.php

@@ -20,6 +20,8 @@ class MainLayout
     private static ?Set $footerScripts = null;
     private static array $customMetadata = [];
 
+    private static array $processedScripts = [];
+
     public static function init(): void
     {
         if (self::$headScripts === null) {
@@ -28,6 +30,7 @@ class MainLayout
         if (self::$footerScripts === null) {
             self::$footerScripts = new Set();
         }
+        self::$processedScripts = [];
     }
 
     /**
@@ -55,11 +58,19 @@ class MainLayout
         $callerClass = $trace[1]['class'] ?? 'Unknown';
 
         foreach ($scripts as $script) {
+            $scriptKey = md5(trim($script));
+
             if (strpos($script, '<script') !== false) {
                 $taggedScript = "<!-- class:" . $callerClass . " -->\n" . $script;
-                self::$footerScripts->add($taggedScript);
+                if (!isset(self::$processedScripts[$scriptKey])) {
+                    self::$footerScripts->add($taggedScript);
+                    self::$processedScripts[$scriptKey] = true;
+                }
             } else {
-                self::$footerScripts->add($script);
+                if (!isset(self::$processedScripts[$scriptKey])) {
+                    self::$footerScripts->add($script);
+                    self::$processedScripts[$scriptKey] = true;
+                }
             }
         }
     }
@@ -97,6 +108,7 @@ class MainLayout
     public static function outputFooterScripts(): string
     {
         $processed = [];
+        $componentCounter = 0;
 
         foreach (self::$footerScripts->values() as $script) {
             if (preg_match('/<!-- class:([^\s]+) -->/', $script, $matches)) {
@@ -106,9 +118,11 @@ class MainLayout
                 if (str_starts_with(trim($script), '<script')) {
                     $script = preg_replace_callback(
                         '/<script\b([^>]*)>/i',
-                        function ($m) use ($rawClassName) {
+                        function ($m) use ($rawClassName, &$componentCounter) {
                             $attrs = $m[1];
-                            $encodedClass = 's' . base_convert(sprintf('%u', crc32($rawClassName)), 10, 36);
+                            $scriptHash = substr(md5($m[0]), 0, 8);
+                            $encodedClass = 's' . base_convert(sprintf('%u', crc32($rawClassName . $componentCounter . $scriptHash)), 10, 36);
+                            $componentCounter++;
 
                             if (!str_contains($attrs, 'pp-component=')) {
                                 $attrs .= " pp-component=\"{$encodedClass}\"";
@@ -150,6 +164,7 @@ class MainLayout
     public static function clearFooterScripts(): void
     {
         self::$footerScripts->clear();
+        self::$processedScripts = [];
     }
 
     /**

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

@@ -118,9 +118,7 @@ class PHPX implements IPHPX
             array_flip(array_merge($reserved, $exclude))
         );
 
-        foreach ($params as $k => $v) {
-            $props[$k] = $v;
-        }
+        $props = array_merge($params, $props);
 
         $pairs = array_map(
             static fn($k, $v) => sprintf(

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

@@ -245,10 +245,10 @@ class TypeCoercer
 
     private static function isArrayLike(string $value): bool
     {
-        return Validator::json($value) ||
-            str_contains($value, ',') ||
-            str_contains($value, '[') ||
-            str_contains($value, '{');
+        return Validator::json($value) === true
+            || str_contains($value, ',')
+            || str_contains($value, '[')
+            || str_contains($value, '{');
     }
 
     private static function getNormalizedType(mixed $value): string
@@ -328,7 +328,7 @@ class TypeCoercer
             return $value;
         }
         if (is_string($value)) {
-            if (Validator::json($value)) {
+            if (Validator::json($value) === true) {
                 $decoded = json_decode($value, true);
                 if (is_array($decoded)) {
                     return $decoded;

package/dist/src/Lib/Validator.php

@@ -284,17 +284,21 @@ final class Validator
     // Other Validation
 
     /**
-     * Validate a JSON string.
+     * Validate a JSON string or convert an array to a JSON string.
      *
-     * @param mixed $value The value to validate.
-     * @return string The JSON string if valid, or throws an exception if invalid.
+     * This function checks if the input is a valid JSON string. If it is, it returns the string.
+     * If the input is an array, it converts it to a JSON string with specific options.
+     * If the input is invalid, it returns an error message.
+     *
+     * @param mixed $value The value to validate or convert.
+     * @return string The valid JSON string or an error message if invalid.
      */
     public static function json(mixed $value): string
     {
         if (is_string($value)) {
             json_decode($value);
             if (json_last_error() !== JSON_ERROR_NONE) {
-                throw new InvalidArgumentException('Invalid JSON string');
+                return json_last_error_msg();
             }
             return $value;
         }

package/package.json

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