Fix creation context issue

Add failing test about nested collection lazy

CHANGELOG.md

@@ -158,7 +158,7 @@ Laravel-data 4.0.0 was released 5 hours ago, time for an update!
 
 - Make ValidationPath Stringable
 - Fix PHPStan
-- Improve performance when optional peoperty exists (#612)
+- Improve performance when optional property exists (#612)
 
 ## 3.10.0 - 2023-12-01
 

src/DataPipes/CastPropertiesDataPipe.php

@@ -87,9 +87,13 @@ protected function cast(
  ) {
  $context = $creationContext->next($property->type->dataClass, $property->name);
 
- return $property->type->kind->isDataObject()
+ $data = $property->type->kind->isDataObject()
  ? $context->from($value)
  : $context->collect($value, $property->type->iterableClass);
+
+ $creationContext->previous();
+
+ return $data;
  }
 
  if (

tests/CreationTest.php

@@ -11,6 +11,10 @@
 use Illuminate\Support\Facades\Route;
 use Illuminate\Validation\ValidationException;
 
+use Spatie\LaravelData\DataPipeline;
+use Spatie\LaravelData\DataPipes\DataPipe;
+use Spatie\LaravelData\Support\Creation\CreationContext;
+use Spatie\LaravelData\Support\DataClass;
 use function Pest\Laravel\postJson;
 
 use Spatie\LaravelData\Attributes\Computed;
@@ -1067,3 +1071,60 @@ public function __invoke(SimpleData $data)
  ->toBeArray()
  ->toEqual(['a', 'collection']);
 })->skip(fn () => config('data.features.cast_and_transform_iterables') === false);
+
+it('keeps the creation context path up to date', function () {
+ global $testCreationContexts;
+ $testCreationContexts = [];
+ class TestDataPipe implements DataPipe
+ {
+ public function handle(mixed $payload, DataClass $class, array $properties, CreationContext $creationContext): array
+ {
+ global $testCreationContexts;
+ $testCreationContexts[] = clone $creationContext;
+
+ return $properties;
+ }
+ }
+ class TestNestedDataPipe implements DataPipe
+ {
+ public function handle(mixed $payload, DataClass $class, array $properties, CreationContext $creationContext): array
+ {
+ global $testCreationContexts;
+ $testCreationContexts[] = clone $creationContext;
+
+ return $properties;
+ }
+ }
+
+ class SimpleDataWithTestPipe extends SimpleData
+ {
+ public static function pipeline(): DataPipeline
+ {
+ return parent::pipeline()
+ ->through(TestNestedDataPipe::class);
+ }
+ }
+
+ $dataClass = new class () extends Data {
+ #[DataCollectionOf(SimpleDataWithTestPipe::class)]
+ public Collection $collection;
+
+ public static function pipeline(): DataPipeline
+ {
+ return parent::pipeline()
+ ->through(TestDataPipe::class);
+ }
+ };
+
+ $dataClass::from([
+ 'collection' => [['string' => 'no'], 'models', ['string' => 'here']],
+ ]);
+
+ expect($testCreationContexts)->toHaveCount(3);
+ expect($testCreationContexts[0])->toBeInstanceOf(CreationContext::class);
+
+ expect($testCreationContexts[0]->currentPath)->toBe([0 => 'collection', 1 => 0]);
+ expect($testCreationContexts[1]->currentPath)->toBe([0 => 'collection', 1 => 2]);
+ expect($testCreationContexts[2]->currentPath)->toHaveCount(0);
+
+});

tests/PartialsTest.php

@@ -225,6 +225,32 @@
  ]);
 });
 
+it('can conditionally include nested collection', function () {
+ $dataClass = new class () extends Data {
+ #[DataCollectionOf(MultiLazyData::class)]
+ public Collection $nested;
+ };
+
+ $data = $dataClass::collect([
+ [
+ 'nested' => [DummyDto::rick()],
+ ], [
+ 'nested' => [DummyDto::bon()],
+ ]
+ ], DataCollection::class);
+
+ expect($data->toArray())->toMatchArray([
+ ['nested' => [[]]],
+ ['nested' => [[]]]
+ ]);
+
+ expect($data->include('nested.{artist,year}')->toArray())
+ ->toMatchArray([
+ ['nested' => [['artist' => DummyDto::rick()->artist, 'year' => DummyDto::rick()->year]]],
+ ['nested' => [['artist' => DummyDto::bon()->artist, 'year' => DummyDto::bon()->year]]]
+ ]);
+});
+
 it('can conditionally include using class defaults', function () {
  PartialClassConditionalData::setDefinitions(includeDefinitions: [
  'string' => fn (PartialClassConditionalData $data) => $data->enabled,