Make lazyMap actually lazy

Author: Michaël

src/Engine.php

@@ -221,8 +221,8 @@ protected function performSearch(Builder $builder, array $options = [])
                 ->cloneWithoutBindings(['order']);
         $results = ['nbHits' => $countQuery->count($countQuery->getConnection()->raw('distinct record_id'))];
 
-        // Performing the search itself:
-        $results['hits'] = $query->with('record')->get();
+        // Preparing the actual query:
+        $results['query'] = $query->with('record');
 
         return $results;
     }
@@ -235,7 +235,19 @@ protected function performSearch(Builder $builder, array $options = [])
      */
     public function mapIds($results)
     {
-        return $results['hits']->pluck('record_id')->values();
+        return $results['query']->pluck('record_id')->values();
+    }
+
+    /**
+     * Extract the Model from the search hit.
+     *
+     * @param SearchIndex $hit
+     * @return \Illuminate\Database\Eloquent\Model
+     */
+    protected function getRecord($hit)
+    {
+        $hit->record->_score = $hit->_score;
+        return $hit->record;
     }
 
     /**
@@ -248,9 +260,8 @@ public function mapIds($results)
      */
     public function map(Builder $builder, $results, $model)
     {
-        $models = $results['hits']->map(function ($hit) {
-            $hit->record->_score = $hit->_score;
-            return $hit->record;
+        $models = $results['query']->get()->map(function ($hit) {
+            return $this->getRecord($hit);
         })->all();
         return $model->newCollection($models);
     }
@@ -265,11 +276,9 @@ public function map(Builder $builder, $results, $model)
      */
     public function lazyMap(Builder $builder, $results, $model)
     {
-        $models = $results['hits']->map(function ($hit) {
-            $hit->record->_score = $hit->_score;
-            return $hit->record;
-        })->all();
-        return new LazyCollection($models);
+        return $results['query']->lazy()->map(function ($hit) {
+            return $this->getRecord($hit);
+        });
     }
 
     /**

tests/SearchTest.php

@@ -238,4 +238,18 @@ public function test_morph_map()
         Post::all()->searchable();
         $this->assertEquals(5, Post::search('morphs')->count());
     }
+
+    public function test_lazy()
+    {
+        Post::skip(1)->take(3)->get()->each(function ($post) {
+            $post->title = 'kikikuku';
+            $post->save();
+        });
+
+        $search = Post::search('kikikuku');
+        $results = $search->get()->all();
+        $lazyResults = $search->cursor()->all();
+        $this->assertCount(3, $lazyResults);
+        $this->assertEquals($results, $lazyResults);
+    }
 }