fix: query-string-parser exception

packages/Agent/src/Builder/AgentFactory.php

@@ -31,7 +31,9 @@ class AgentFactory
 
     public static ?array $fileCacheOptions;
 
-    protected ?DatasourceContract $datasource = null;
+    protected bool $isBuild = false;
+
+    protected ?DatasourceContract $computedDatasource = null;
 
     public function __construct(protected array $config)
     {
@@ -46,14 +48,11 @@ public function createAgent(array $config): self
         $this->config = array_merge($this->config, $config);
         $this->buildLogger();
         if ($this->hasEnvSecret) {
-            $serializableConfig = $this->config;
-
             if (isset($this->config['customizeErrorMessage']) && is_callable($this->config['customizeErrorMessage']) && ! is_string($this->config['customizeErrorMessage'])) {
                 Cache::put('customizeErrorMessage', new SerializableClosure($this->config['customizeErrorMessage']));
             }
 
-            unset($serializableConfig['logger'], $serializableConfig['customizeErrorMessage']);
-            Cache::put('config', $serializableConfig, self::TTL_CONFIG);
+            Cache::put('config', $this->serializeConfig(), self::TTL_CONFIG);
         }
 
         Cache::put('forestAgent', new SerializableClosure(fn () => $this), self::TTL);
@@ -84,11 +83,11 @@ public function use(string $plugin, array $options = []): self
 
     public function build(): void
     {
-        if ($this->datasource === null) {
-            $this->datasource = $this->customizer->getDatasource();
+        if (! $this->isBuild) {
+            $this->computedDatasource = $this->customizer->getDatasource();
             Cache::put('forestAgent', new SerializableClosure(fn () => $this), self::TTL);
-
             self::sendSchema();
+            $this->isBuild = true;
         }
     }
 
@@ -133,9 +132,8 @@ public static function getDatasource()
     {
         /** @var self $instance */
         $forestAgentClosure = Cache::get('forestAgent');
-        $instance = $forestAgentClosure();
 
-        return $instance->getDatasourceInstance();
+        return $forestAgentClosure()->getDatasourceInstance();
     }
 
     /**
@@ -162,6 +160,14 @@ public static function sendSchema(bool $force = false): void
         }
     }
 
+    private function serializeConfig(): array
+    {
+        $serializableConfig = $this->config;
+        unset($serializableConfig['logger'], $serializableConfig['customizeErrorMessage']);
+
+        return $serializableConfig;
+    }
+
     private function buildCache(): void
     {
         if ($this->hasEnvSecret) {
@@ -172,7 +178,7 @@ private function buildCache(): void
                 self::$fileCacheOptions = compact('filesystem', 'directory', 'disabledApcuCache');
             }
 
-            Cache::add('config', $this->config, self::TTL_CONFIG);
+            Cache::add('config', $this->serializeConfig(), self::TTL_CONFIG);
         }
     }
 
@@ -188,6 +194,30 @@ private function buildLogger(): void
 
     public function getDatasourceInstance(): ?DatasourceContract
     {
-        return $this->datasource;
+        return $this->computedDatasource;
+    }
+
+    /**
+     * @codeCoverageIgnore
+    */
+    public function __serialize(): array
+    {
+        return [
+            'hasEnvSecret'       => $this->hasEnvSecret,
+            'isBuild'            => $this->isBuild,
+            'computedDatasource' => $this->computedDatasource,
+        ];
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __unserialize(array $data): void
+    {
+        $this->hasEnvSecret = $data['hasEnvSecret'];
+        $this->isBuild = $data['isBuild'];
+        $this->computedDatasource = $data['computedDatasource'];
+
+        $this->customizer = new DatasourceCustomizer();
     }
 }

packages/Agent/src/Http/Traits/ErrorHandling.php

@@ -3,6 +3,7 @@
 namespace ForestAdmin\AgentPHP\Agent\Http\Traits;
 
 use ForestAdmin\AgentPHP\Agent\Builder\AgentFactory;
+use ForestAdmin\AgentPHP\DatasourceToolkit\Exceptions\ForestException;
 use ReflectionClass;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -21,17 +22,19 @@ public function getErrorStatus(Throwable $error): int
 
     public function getErrorMessage(Throwable $error): string
     {
-        if ($error instanceof HttpException || is_subclass_of($error, HttpException::class)) {
-            return $error->getMessage();
-        }
-
         if ($customizer = AgentFactory::get('customizeErrorMessage')) {
             $message = $customizer($error);
             if ($message) {
                 return $message;
             }
         }
 
+        if ($error instanceof HttpException ||
+            is_subclass_of($error, HttpException::class) ||
+            $error instanceof ForestException) {
+            return $error->getMessage();
+        }
+
         return 'Unexpected error';
     }
 

packages/Agent/src/Serializer/Transformers/BaseTransformer.php

@@ -80,7 +80,7 @@ public function processIncludedResources(Scope $scope, $data)
             $includedData[$include] = [
                 'data' => [
                     'type'          => $item->getResourceKey(),
-                    'id'            => Id::packId(AgentFactory::get('datasource')->getCollection($this->name), $data),
+                    'id'            => Id::packId(AgentFactory::get('datasource')->getCollection($item->getResourceKey()), $item->getData()),
                     'attributes'    => $item->getData(),
                 ],
             ];

packages/Agent/src/Utils/Id.php

@@ -18,6 +18,10 @@ public static function packId(CollectionContract $collection, array $record): st
             throw new ForestException('This collection has no primary key');
         }
 
+        if (empty($record)) {
+            throw new ForestException('This record does not exist');
+        }
+
         return collect($primaryKeyNames)->map(fn ($pk) => $record[$pk])->join('|');
     }
 

packages/Agent/src/Utils/QueryStringParser.php

@@ -57,33 +57,29 @@ public static function parseConditionTree(CollectionContract $collection, Reques
      */
     public static function parseProjection(CollectionContract $collection, Request $request): Projection
     {
-        try {
-            $fields = $request->input('fields.' . $collection->getName());
+        $fields = $request->input('fields.' . $collection->getName());
 
-            if ($fields === null || $fields === '') {
-                return ProjectionFactory::all($collection);
-            }
-            $rootFields = collect(explode(',', $fields));
-            $explicitRequest = $rootFields->map(
-                static function ($field) use ($collection, $request) {
-                    $field = trim($field);
-                    $column = $collection->getFields()->get($field);
-
-                    if (null !== $column && $column->getType() === 'PolymorphicManyToOne') {
-                        return $field . ':*';
-                    }
-
-                    return null !== $column && $column->getType() === 'Column' ?
-                        $field : $field . ':' . $request->input("fields.$field");
+        if ($fields === null || $fields === '') {
+            return ProjectionFactory::all($collection);
+        }
+        $rootFields = collect(explode(',', $fields));
+        $explicitRequest = $rootFields->map(
+            static function ($field) use ($collection, $request) {
+                $field = trim($field);
+                $column = $collection->getFields()->get($field);
+
+                if (null !== $column && $column->getType() === 'PolymorphicManyToOne') {
+                    return $field . ':*';
                 }
-            );
 
-            ProjectionValidator::validate($collection, new Projection($explicitRequest->toArray()));
+                return null !== $column && $column->getType() === 'Column' ?
+                    $field : $field . ':' . $request->input("fields.$field");
+            }
+        );
+
+        ProjectionValidator::validate($collection, new Projection($explicitRequest->toArray()));
 
-            return new Projection($explicitRequest->all());
-        } catch (\Exception $e) {
-            throw new ForestException('Invalid projection');
-        }
+        return new Projection($explicitRequest->all());
     }
 
     public static function parseProjectionWithPks(CollectionContract $collection, Request $request): Projection

packages/BaseDatasource/src/BaseDatasource.php

@@ -51,7 +51,6 @@ private function makeOrm(array $databaseConfig): void
     {
         $this->orm = new Manager();
         $this->orm->addConnection($databaseConfig);
-        $this->orm->bootEloquent();
     }
 
     private function makeDoctrineConnection(array $databaseConfig): void
@@ -84,16 +83,24 @@ private function makeDoctrineConnection(array $databaseConfig): void
     /**
      * @codeCoverageIgnore
      */
-    public function __sleep(): array
+    public function __serialize(): array
     {
-        return ['collections', 'charts', 'databaseConfig'];
+        return [
+            'collections'    => $this->collections,
+            'charts'         => $this->charts,
+            'databaseConfig' => $this->databaseConfig,
+        ];
     }
 
     /**
      * @codeCoverageIgnore
      */
-    public function __wakeup(): void
+    public function __unserialize(array $data): void
     {
+        $this->collections = $data['collections'];
+        $this->charts = $data['charts'];
+        $this->databaseConfig = $data['databaseConfig'];
+
         $this->makeOrm($this->databaseConfig);
         $this->makeDoctrineConnection($this->databaseConfig);
     }

packages/DatasourceEloquent/src/EloquentCollection.php

@@ -338,4 +338,33 @@ private function nullablePolymorphicMorphManyRelationFields($record, $relationNa
             // Do nothing
         }
     }
+
+    public function __serialize(): array
+    {
+        return [
+            'fields'     => $this->fields,
+            'actions'    => $this->actions,
+            'segments'   => $this->segments,
+            'charts'     => $this->charts,
+            'schema'     => $this->schema,
+            'dataSource' => $this->dataSource,
+            'name'       => $this->name,
+            'tableName'  => $this->tableName,
+            'model'      => $this->model::class,
+        ];
+    }
+
+    public function __unserialize(array $data): void
+    {
+        $this->fields = $data['fields'];
+        $this->actions = $data['actions'];
+        $this->segments = $data['segments'];
+        $this->charts = $data['charts'];
+        $this->schema = $data['schema'];
+        $this->dataSource = $data['dataSource'];
+        $this->name = $data['name'];
+        $this->tableName = $data['tableName'];
+        $this->model = new $data['model']();
+        $this->nativeDriver = null;
+    }
 }

packages/DatasourceEloquent/src/EloquentDatasource.php

@@ -69,4 +69,26 @@ public function getModels(): array
     {
         return $this->models;
     }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __serialize(): array
+    {
+        return array_merge(
+            parent::__serialize(),
+            ['supportPolymorphicRelations' => $this->supportPolymorphicRelations]
+        );
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function __unserialize(array $data): void
+    {
+        parent::__unserialize($data);
+
+        $finder = new ClassFinder(config('projectDir'));
+        $this->models = $finder->getModelsInNamespace('App');
+    }
 }

packages/DatasourceToolkit/src/CollectionMethods.php

@@ -60,10 +60,6 @@ public function setSegments(array $segments): Collection
      */
     public function addField(string $name, ColumnSchema|RelationSchema $field): void
     {
-        if ($this->fields->has($name)) {
-            throw new ForestException('Field ' . $name . ' already defined in collection');
-        }
-
         $this->fields->put($name, $field);
     }
 

tests/Agent/Http/ForestControllerTest.php

@@ -6,7 +6,6 @@
 use ForestAdmin\AgentPHP\Agent\Http\ForestController;
 use ForestAdmin\AgentPHP\Agent\Http\Request;
 use ForestAdmin\AgentPHP\DatasourceToolkit\Datasource;
-use ForestAdmin\AgentPHP\DatasourceToolkit\Exceptions\ForestException;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -59,7 +58,7 @@
             ->getMock();
         $forestControllerMock->expects($this->once())
             ->method('getClosure')
-            ->willReturn(fn () => throw new ForestException());
+            ->willReturn(fn () => throw new \Exception());
 
         $result = $forestControllerMock->__invoke($request);
 
@@ -72,7 +71,7 @@
                 [
                     'errors' => [
                         [
-                            'name'   => 'ForestException',
+                            'name'   => 'Exception',
                             'detail' => 'Unexpected error',
                             'status' => 500,
                         ],

tests/Agent/Http/Traits/ErrorHandlingTest.php

@@ -45,9 +45,6 @@
 
 test('getErrorMessage() should return the original message when error is subclass of HttpException', function () {
     $this->buildAgent(new Datasource());
-    $this->agent->createAgent([
-        'customizeErrorMessage' => fn ($error) => 'my custom message error',
-    ]);
     $trait = $this->getObjectForTrait(ErrorHandling::class);
 
     expect($trait->getErrorMessage(new ForbiddenError('test')))->toEqual('test');
@@ -67,5 +64,5 @@
     $this->buildAgent(new Datasource());
     $trait = $this->getObjectForTrait(ErrorHandling::class);
 
-    expect($trait->getErrorMessage(new ForestException('test')))->toEqual('Unexpected error');
+    expect($trait->getErrorMessage(new \Exception('test')))->toEqual('Unexpected error');
 });

tests/Agent/Routes/Capabilities/CollectionsTest.php

@@ -117,6 +117,7 @@
                                     'operators' => [
                                         'In',
                                         'Equal',
+                                        'Blank',
                                     ],
                                 ],
                                 [
@@ -125,6 +126,7 @@
                                     'operators' => [
                                         'In',
                                         'Equal',
+                                        'Blank',
                                     ],
                                 ],
                                 [
@@ -133,6 +135,7 @@
                                     'operators' => [
                                         'In',
                                         'Equal',
+                                        'Blank',
                                     ],
                                 ],
                             ],

tests/Agent/Routes/Charts/ApiChartCollectionTest.php

@@ -29,7 +29,6 @@
             ->addChart('myChart', fn ($context, ResultBuilder $resultBuilder) => $resultBuilder->value(34))
             ->addChart('mySmartChart', fn ($context) => [])
     );
-    $this->invokeProperty($this->agent, 'datasource', 'null');
     $this->agent->build();
     $_GET['record_id'] = 1;
     $request = Request::createFromGlobals();