create-prisma-php-app 1.1.3 → 1.1.5

package/dist/src/app/api/api.php

@@ -6,60 +6,67 @@ require_once __DIR__ . "/../../../bootstrap.php";
 
 use App\Classes\Prisma\Prisma;
 
-if (!empty($_SERVER["HTTP_X_REQUESTED_WITH"]) && $_SERVER["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest") {
+header('Content-Type: application/json');
 
-    $className = $_POST["className"] ?? "";
-    $methodName = $_POST["methodName"] ?? "";
-    $params = !empty($_POST["params"]) && is_string($_POST["params"]) ? json_decode($_POST["params"], true) : [];
+if (empty($_SERVER["HTTP_X_REQUESTED_WITH"]) || $_SERVER["HTTP_X_REQUESTED_WITH"] != "XMLHttpRequest") {
+    http_response_code(400); // Bad Request
+    echo json_encode(["error" => "This endpoint expects an XMLHttpRequest."]);
+    exit;
+}
 
-    if (json_last_error() != JSON_ERROR_NONE) {
-        echo "Error: Invalid JSON in params!";
-        exit;
-    }
+// Retrieve class name, method name, and params from POST data
+$className = $_POST["className"] ?? "";
+$methodName = $_POST["methodName"] ?? "";
+$paramsJson = $_POST["params"] ?? '';
 
-    // Append the namespace to the class name
-    $fullClassName = "App\\Classes\\Prisma\\" . $className;
+$params = null; // Initialize params as null
 
-    if (!class_exists($fullClassName)) {
-        echo "Error: Class $fullClassName not found!";
+// Attempt to decode JSON only if paramsJson is not empty
+if (!empty($paramsJson)) {
+    $params = json_decode($paramsJson, true);
+    if (json_last_error() !== JSON_ERROR_NONE) {
+        echo json_encode(['error' => 'Error: Invalid JSON in params!']);
         exit;
     }
+}
 
-    $prisma = new Prisma();
-    // Ensure that we correctly handle the case where $className might not directly map to a property.
-    if (!property_exists($prisma, $className)) {
-        echo "Error: Property $className not found in Prisma class!";
-        exit;
-    }
-    $instance = $prisma->$className;
+// Construct the full class name and check for class and property existence
+$fullClassName = "App\\Classes\\Prisma\\" . $className;
+if (!class_exists($fullClassName) || !property_exists(Prisma::class, $className)) {
+    echo json_encode(['error' => "Error: Class $fullClassName not found or property $className not found in Prisma class!"]);
+    exit;
+}
 
-    if (!method_exists($instance, $methodName)) {
-        echo "Error: Method $methodName not found in class $fullClassName!";
-        exit;
-    }
+// Create an instance of the class
+$instance = (new Prisma())->$className;
+
+// Check for method existence
+if (!method_exists($instance, $methodName)) {
+    echo json_encode(['error' => "Error: Method $methodName not found in class $fullClassName!"]);
+    exit;
+}
+
+try {
+    // Call the method with params if they are provided and decoded; otherwise, call without params
+    $result = $params !== null ? call_user_method_with_params($instance, $methodName, $params) : $instance->$methodName();
+    // Encode and return the result as JSON
+    echo json_encode(['result' => $result instanceof \stdClass ? (array)$result : $result]);
+} catch (\ArgumentCountError | \Exception $e) {
+    // Catch and return any errors during method execution
+    echo json_encode(['error' => "Error: " . $e->getMessage()]);
+}
 
-    // Check if $params is correctly structured for the expected arguments.
-    // Adjust the logic here based on how $params should be passed to the method.
-    // This example assumes $methodName expects an array of arguments.
-    if (is_array($params)) {
-        // Attempt to call the method with unpacked arguments.
-        try {
-            if (isset($params['identifier'], $params['data'])) {
-                $result = $instance->$methodName($params['identifier'], $params['data']);
-            } else {
-                $result = $instance->$methodName($params);
-            }
-            if (is_object($result)) {
-                $result = (array) $result;
-            }
-            echo json_encode($result, JSON_INVALID_UTF8_IGNORE);
-        } catch (\ArgumentCountError $e) {
-            echo "Error: Incorrect number of arguments provided for $methodName method.";
-        } catch (\Exception $e) {
-            // Handle other potential errors here.
-            echo "Error: An error occurred while executing $methodName method. " . $e->getMessage();
-        }
+function call_user_method_with_params($instance, $methodName, $params)
+{
+    // Determine how to call the method based on the presence of specific keys in $params
+    if (isset($params['identifier'], $params['data'])) {
+        return $instance->$methodName($params['identifier'], $params['data']);
+    } elseif (isset($params['criteria'], $params['aggregates'])) {
+        return $instance->$methodName($params['criteria'], $params['aggregates']);
+    } elseif (isset($params['criteria'], $params['data'])) {
+        return $instance->$methodName($params['criteria'], $params['data']);
     } else {
-        echo "Error: Parameters for $methodName method are not correctly formatted or missing.";
+        // If none of the specific keys are present, pass the whole $params array
+        return $instance->$methodName($params);
     }
 }

package/package.json

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