create-prisma-php-app 1.27.3 → 1.28.0

package/dist/src/Lib/Validator.php

@@ -81,6 +81,12 @@ final class Validator
      */
     public static function cuid($value): ?string
     {
+        // Ensure the value is a string
+        if (!is_string($value)) {
+            return null;
+        }
+
+        // Perform the CUID validation
         return preg_match('/^c[0-9a-z]{24}$/', $value) ? $value : null;
     }
 
@@ -92,6 +98,12 @@ final class Validator
      */
     public static function cuid2($value): ?string
     {
+        // Ensure the value is a string
+        if (!is_string($value)) {
+            return null;
+        }
+
+        // Perform the CUID2 validation
         return preg_match('/^[0-9a-zA-Z_-]{21,}$/', $value) ? $value : null;
     }
 
@@ -179,15 +191,21 @@ final class Validator
     }
 
     /**
-     * Validate a datetime in a given format.
+     * Validate and format a datetime value in a given format or ISO 8601 by default.
      *
      * @param mixed $value The value to validate.
-     * @param string $format The datetime format.
-     * @return string|null The valid datetime string or null if invalid.
+     * @param string $format The desired datetime format (default is database-friendly 'Y-m-d H:i:s.u').
+     * @return string|null The valid datetime string for the database or null if invalid.
      */
-    public static function dateTime($value, string $format = 'Y-m-d H:i:s'): ?string
+    public static function dateTime($value, string $format = 'Y-m-d H:i:s.u'): ?string
     {
-        return self::date($value, $format);
+        try {
+            $date = new \DateTime($value);
+        } catch (\Exception) {
+            return null;
+        }
+
+        return $date->format($format);
     }
 
     // Boolean Validation

package/package.json

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

package/dist/src/Lib/Prisma/Classes/Utility.php

@@ -1,406 +0,0 @@
-<?php
-
-namespace Lib\Prisma\Classes;
-
-use Lib\Validator;
-
-enum ArrayType: string
-{
-    case Associative = 'associative';
-    case Indexed = 'indexed';
-    case Value = 'value';
-}
-
-final class Utility
-{
-    public static function checkFieldsExistWithReferences(
-        array $select,
-        array &$relatedEntityFields,
-        array &$primaryEntityFields,
-        array $relationName,
-        array $fields,
-        string $modelName,
-        string $timestamp
-    ) {
-        if (isset($select) && is_array($select)) {
-            foreach ($select as $key => $value) {
-                if ($key === $timestamp) continue;
-
-                if (is_numeric($key) && is_string($value)) {
-                    if (array_key_exists($value, $fields))
-                        throw new \Exception("The '$value' is indexed, waiting example: ['$value' => true]");
-                }
-
-                if (isset($value) && empty($value) || !is_bool($value)) {
-                    if (is_string($key) && !array_key_exists($key, $fields)) {
-                        throw new \Exception("The field '$key' does not exist in the $modelName model.");
-                    }
-
-                    if (is_string($key) && array_key_exists($key, $fields)) {
-                        if (!is_bool($value) && !is_array($value)) {
-                            throw new \Exception("The '$key' is indexed, waiting example: ['$key' => true]");
-                        }
-                    }
-
-                    if (!is_array($value))
-                        continue;
-                }
-
-                if (is_string($key) && is_array($value)) {
-                    if (isset($value['select'])) {
-                        $relatedEntityFields[$key] = $value['select'];
-                    } else {
-                        if (is_array($value) && empty($value)) {
-                            $relatedEntityFields[$key] = [$key];
-                        } else {
-                            if (!is_bool($value) || empty($value)) {
-                                throw new \Exception("The '$key' is indexed, waiting example: ['$key' => true] or ['$key' => ['select' => ['field1' => true, 'field2' => true]]]");
-                            }
-                        }
-                    }
-                } else {
-                    foreach (explode(',', $key) as $fieldName) {
-                        if ($key === $timestamp || $fieldName === $timestamp) continue;
-                        $fieldName = trim($fieldName);
-
-                        if (!array_key_exists($fieldName, $fields)) {
-                            $availableFields = implode(', ', array_keys($fields));
-                            throw new \Exception("The field '$fieldName' does not exist in the $modelName model. Available fields are: $availableFields");
-                        }
-
-                        if (
-                            in_array($fieldName, $relationName) ||
-                            (isset($fields[$fieldName]) && in_array($fields[$fieldName]['type'], $relationName))
-                        ) {
-                            $relatedEntityFields[$fieldName] = [$fieldName];
-                            continue;
-                        }
-
-                        $isRelationalOrInverse = false;
-                        if (isset($fields[$fieldName]['decorators'])) {
-                            foreach ($fields[$fieldName]['decorators'] as $decoratorKey => $decoratorValue) {
-                                if ($decoratorKey === 'relation' || $decoratorKey === 'inverseRelation') {
-                                    $isRelationalOrInverse = true;
-                                    break;
-                                }
-                            }
-                        }
-
-                        if (!$isRelationalOrInverse) {
-                            if (in_array($fieldName, $primaryEntityFields)) continue;
-                            $primaryEntityFields[] = $fieldName;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public static function checkFieldsExist(array $select, array $fields, string $modelName)
-    {
-        foreach ($select as $key => $value) {
-            if (is_numeric($key) && is_string($value)) {
-                if (array_key_exists($value, $fields))
-                    throw new \Exception("The '$value' is indexed, waiting example: ['$value' => true]");
-            }
-
-            if (isset($value) && empty($value) || !is_bool($value)) {
-                if (is_string($key) && !array_key_exists($key, $fields)) {
-                    throw new \Exception("The field '$key' does not exist in the $modelName model.");
-                }
-
-                if (is_array($value) && !empty($value)) {
-
-                    $isRelatedModel = false;
-
-                    foreach ($fields as $field) {
-                        $relation = $field['decorators']['relation'] ?? null;
-                        $inverseRelation = $field['decorators']['inverseRelation'] ?? null;
-                        $implicitRelation = $field['decorators']['implicitRelation'] ?? null;
-
-                        if (isset($relation['name']) && $relation['name'] == $key || isset($inverseRelation['fromField']) && $inverseRelation['fromField'] == $key || isset($implicitRelation['fromField']) && $implicitRelation['fromField'] == $key) $isRelatedModel = true;
-                    }
-
-                    if ($isRelatedModel) continue;
-
-                    $keys = array_keys($value);
-                    foreach ($keys as $fieldName) {
-                        $fieldName = trim($fieldName);
-                        if (!array_key_exists($fieldName, $fields)) {
-                            throw new \Exception("The field '$fieldName' does not exist in the $modelName model.");
-                        }
-                    }
-                }
-
-                continue;
-            }
-
-            foreach (explode(',', $key) as $fieldName) {
-                $fieldName = trim($fieldName);
-                if (!array_key_exists($fieldName, $fields)) {
-                    throw new \Exception("The field '$fieldName' does not exist in the $modelName model.");
-                }
-            }
-        }
-    }
-
-    public static function checkArrayContents(array $array): ArrayType
-    {
-        foreach ($array as $key => $value) {
-            if (is_array($value)) {
-                if (array_keys($value) !== range(0, count($value) - 1)) {
-                    return ArrayType::Associative;
-                } else {
-                    return ArrayType::Indexed;
-                }
-            } else {
-                return ArrayType::Value;
-            }
-        }
-    }
-
-    public static function checkIncludes(array $include, array &$relatedEntityFields, array &$includes, array $fields, string $modelName)
-    {
-        if (isset($include) && is_array($include)) {
-            foreach ($include as $key => $value) {
-                self::processIncludeValue($key, $value, $relatedEntityFields, $fields, $modelName, $key);
-
-                if (is_numeric($key) && is_string($value)) {
-                    throw new \Exception("The '$value' is indexed, waiting example: ['$value' => true]");
-                }
-
-                if (isset($value) && empty($value) || !is_bool($value)) {
-                    continue;
-                }
-
-                if (!array_key_exists($key, $fields)) {
-                    throw new \Exception("The field '$key' does not exist in the $modelName model.");
-                }
-
-                $includes[$key] = $value;
-            }
-        }
-    }
-
-    private static function processIncludeValue($key, $value, &$relatedEntityFields, $fields, $modelName, $parentKey)
-    {
-        if (isset($value['select'])) {
-            $relatedEntityFields[$parentKey] = $value;
-        } elseif (is_array($value)) {
-            if (empty($value)) {
-                $relatedEntityFields[$parentKey] = [$parentKey];
-            } else {
-                foreach ($value as $k => $v) {
-                    if (is_string($k) && (is_bool($v) || empty($v))) {
-                        $relatedEntityFields[$parentKey]['include'] = [$k => $v];
-                    } else {
-                        self::processIncludeValue($k, $v, $relatedEntityFields, $fields, $modelName, $parentKey);
-                    }
-                }
-            }
-        } else {
-            if (!is_bool($value) || empty($value)) {
-                throw new \Exception("The '$value' is indexed, waiting example: ['$value' => true] or ['$value' => ['select' => ['field1' => true, 'field2' => true]]]");
-            }
-        }
-    }
-
-    public static function processConditions(array $conditions, &$sqlConditions, &$bindings, $dbType, $prefix = '', $level = 0)
-    {
-        foreach ($conditions as $key => $value) {
-            if (in_array($key, ['AND', 'OR', 'NOT'])) {
-                $groupedConditions = [];
-                if ($key === 'NOT') {
-                    self::processNotCondition($value, $groupedConditions, $bindings, $dbType, $prefix . $key . '_', $level);
-                    if (!empty($groupedConditions)) {
-                        $conditionGroup = '(' . implode(" $key ", $groupedConditions) . ')';
-                        $conditionGroup = 'NOT ' . $conditionGroup;
-                        $sqlConditions[] = $conditionGroup;
-                    }
-                } else {
-                    foreach ($value as $conditionKey => $subCondition) {
-                        if (is_numeric($conditionKey)) {
-                            self::processConditions($subCondition, $groupedConditions, $bindings, $dbType, $prefix . $key . $conditionKey . '_', $level + 1);
-                        } else {
-                            self::processSingleCondition($conditionKey, $subCondition, $groupedConditions, $bindings, $dbType, $prefix . $key . $conditionKey . '_', $level + 1);
-                        }
-                    }
-                    if (!empty($groupedConditions)) {
-                        $conditionGroup = '(' . implode(" $key ", $groupedConditions) . ')';
-                        $sqlConditions[] = $conditionGroup;
-                    }
-                }
-            } else {
-                self::processSingleCondition($key, $value, $sqlConditions, $bindings, $dbType, $prefix, $level);
-            }
-        }
-    }
-
-    private static function processSingleCondition($key, $value, &$sqlConditions, &$bindings, $dbType, $prefix, $level)
-    {
-        $fieldQuoted = ($dbType == 'pgsql' || $dbType == 'sqlite') ? "\"$key\"" : "`$key`";
-        if (is_array($value)) {
-            foreach ($value as $condition => $val) {
-                $bindingKey = ":" . $prefix . $key . "_" . $condition . $level;
-                switch ($condition) {
-                    case 'contains':
-                    case 'startsWith':
-                    case 'endsWith':
-                    case 'equals':
-                    case 'not':
-                        if ($val === null) {
-                            $sqlConditions[] = "$fieldQuoted IS NOT NULL";
-                        } elseif ($val === '') {
-                            $sqlConditions[] = "$fieldQuoted != ''";
-                        } else {
-                            $validatedValue = Validator::string($val);
-                            $likeOperator = $condition === 'contains' ? ($dbType == 'pgsql' ? 'ILIKE' : 'LIKE') : '=';
-                            if ($condition === 'startsWith') $validatedValue .= '%';
-                            if ($condition === 'endsWith') $validatedValue = '%' . $validatedValue;
-                            if ($condition === 'contains') $validatedValue = '%' . $validatedValue . '%';
-                            $sqlConditions[] = $condition === 'not' ? "$fieldQuoted != $bindingKey" : "$fieldQuoted $likeOperator $bindingKey";
-                            $bindings[$bindingKey] = $validatedValue;
-                        }
-                        break;
-                    case 'gt':
-                    case 'gte':
-                    case 'lt':
-                    case 'lte':
-                        if (is_float($val)) {
-                            $validatedValue = Validator::float($val);
-                        } elseif (is_int($val)) {
-                            $validatedValue = Validator::int($val);
-                        } elseif (strtotime($val) !== false) {
-                            $validatedValue = date('Y-m-d H:i:s', strtotime($val));
-                        } else {
-                            $validatedValue = Validator::string($val);
-                        }
-                        $operator = $condition === 'gt' ? '>' : ($condition === 'gte' ? '>=' : ($condition === 'lt' ? '<' : '<='));
-                        $sqlConditions[] = "$fieldQuoted $operator $bindingKey";
-                        $bindings[$bindingKey] = $validatedValue;
-                        break;
-                    case 'in':
-                    case 'notIn':
-                        $inPlaceholders = [];
-                        foreach ($val as $i => $inVal) {
-                            $inKey = $bindingKey . "_" . $i;
-                            $validatedValue = Validator::string($inVal);
-                            $inPlaceholders[] = $inKey;
-                            $bindings[$inKey] = $validatedValue;
-                        }
-                        $inClause = implode(', ', $inPlaceholders);
-                        $sqlConditions[] = "$fieldQuoted " . ($condition === 'notIn' ? 'NOT IN' : 'IN') . " ($inClause)";
-                        break;
-                    default:
-                        // Handle other conditions or log an error/warning for unsupported conditions
-                        throw new \Exception("Unsupported condition: $condition");
-                        break;
-                }
-            }
-        } else {
-            if ($value === null) {
-                $sqlConditions[] = "$fieldQuoted IS NULL";
-            } elseif ($value === '') {
-                $sqlConditions[] = "$fieldQuoted = ''";
-            } else {
-                $bindingKey = ":" . $prefix . $key . $level;
-                $validatedValue = Validator::string($value);
-                $sqlConditions[] = "$fieldQuoted = $bindingKey";
-                $bindings[$bindingKey] = $validatedValue;
-            }
-        }
-    }
-
-    private static function processNotCondition($conditions, &$sqlConditions, &$bindings, $dbType, $prefix, $level = 0)
-    {
-        foreach ($conditions as $key => $value) {
-            self::processSingleCondition($key, $value, $sqlConditions, $bindings, $dbType, $prefix . 'NOT_', $level);
-        }
-    }
-
-    public static function checkForInvalidKeys(array $data, array $fields, string $modelName)
-    {
-        foreach ($data as $key => $value) {
-            if (!empty($key) && !in_array($key, $fields)) {
-                throw new \Exception("The field '$key' does not exist in the $modelName model. Accepted fields: " . implode(', ', $fields));
-            }
-        }
-    }
-
-    public static function queryOptions(array $criteria, string &$sql)
-    {
-        // Handle _max, _min, _count, _avg, and _sum
-        $selectParts = [];
-        if (isset($criteria['_max'])) {
-            foreach ($criteria['_max'] as $column => $enabled) {
-                if ($enabled) {
-                    $selectParts[] = "MAX($column) AS max_$column";
-                }
-            }
-        }
-        if (isset($criteria['_min'])) {
-            foreach ($criteria['_min'] as $column => $enabled) {
-                if ($enabled) {
-                    $selectParts[] = "MIN($column) AS min_$column";
-                }
-            }
-        }
-        if (isset($criteria['_count'])) {
-            foreach ($criteria['_count'] as $column => $enabled) {
-                if ($enabled) {
-                    $selectParts[] = "COUNT($column) AS count_$column";
-                }
-            }
-        }
-        if (isset($criteria['_avg'])) {
-            foreach ($criteria['_avg'] as $column => $enabled) {
-                if ($enabled) {
-                    $selectParts[] = "AVG($column) AS avg_$column";
-                }
-            }
-        }
-        if (isset($criteria['_sum'])) {
-            foreach ($criteria['_sum'] as $column => $enabled) {
-                if ($enabled) {
-                    $selectParts[] = "SUM($column) AS sum_$column";
-                }
-            }
-        }
-
-        // Prepend to SELECT if _max, _min, _count, _avg, or _sum is specified
-        if (!empty($selectParts)) {
-            $sql = str_replace('SELECT', 'SELECT ' . implode(', ', $selectParts) . ',', $sql);
-        }
-
-        // Handle ORDER BY
-        if (isset($criteria['orderBy'])) {
-            $orderByParts = [];
-
-            // Check if orderBy is an associative array with directions or a list of columns
-            if (array_values($criteria['orderBy']) === $criteria['orderBy']) {
-                // If it's a list of columns, default to 'asc'
-                foreach ($criteria['orderBy'] as $column) {
-                    $orderByParts[] = "$column asc";
-                }
-            } else {
-                // If it's an associative array with directions
-                foreach ($criteria['orderBy'] as $column => $direction) {
-                    $direction = strtolower($direction) === 'desc' ? 'desc' : 'asc';
-                    $orderByParts[] = "$column $direction";
-                }
-            }
-
-            $sql .= " ORDER BY " . implode(', ', $orderByParts);
-        }
-
-        // Handle LIMIT (take)
-        if (isset($criteria['take'])) {
-            $sql .= " LIMIT " . intval($criteria['take']);
-        }
-
-        // Handle OFFSET (skip)
-        if (isset($criteria['skip'])) {
-            $sql .= " OFFSET " . intval($criteria['skip']);
-        }
-    }
-}