Statamic 6: Search indexing improvements (#48)

Author: duncanmcclean

.github/workflows/run-tests.yml

@@ -24,7 +24,7 @@ jobs:
             matrix:
                 os: [ubuntu-latest]
                 php: [8.3, 8.4]
-                laravel: [11.*, 12.*]
+                laravel: [12.*]
                 stability: [prefer-lowest, prefer-stable]
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

composer.json

@@ -27,12 +27,13 @@
         "meilisearch/meilisearch-php": "^1.0",
         "guzzlehttp/guzzle": "^7.3",
         "http-interop/http-factory-guzzle": "^1.0",
-        "illuminate/support": "^10.0 || ^11.0 || ^12.0",
-        "statamic/cms": "^6.0"
+        "illuminate/support": "^12.0",
+        "statamic/cms": "^6.0.0-beta.4",
+        "spatie/laravel-ray": "^1.0@dev"
     },
     "require-dev": {
         "laravel/pint": "^1.21",
-        "orchestra/testbench": "^9.0 || ^10.0",
+        "orchestra/testbench": "^10.0",
         "phpunit/phpunit": "^11.5.10"
     },
     "autoload": {
@@ -68,5 +69,6 @@
             "developer": "Statamic Rad Pack"
         }
     },
-    "minimum-stability": "dev"
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

config/statamic-meilisearch.php

@@ -31,23 +31,12 @@ public function insert($document)
         return $this->insertMultiple(collect([$document]));
     }
 
-    public function insertMultiple($documents)
-    {
-        $documents
-            ->chunk(config('statamic-meilisearch.insert_chunk_size', 100))
-            ->each(function ($documents, $index) {
-                $documents = $documents
-                    ->map(fn ($document) => array_merge(
-                        $this->searchables()->fields($document),
-                        $this->getDefaultFields($document),
-                    ))
-                    ->values()
-                    ->toArray();
-
-                $this->insertDocuments(new Documents($documents));
-            });
-
-        return $this;
+    public function fields(Searchable $searchable)
+    {
+        return array_merge(
+            $this->searchables()->fields($searchable),
+            $this->getDefaultFields($searchable)
+        );
     }
 
     public function delete($document)
@@ -66,9 +55,9 @@ public function exists()
         }
     }
 
-    protected function insertDocuments(Documents $documents)
+    public function insertDocuments(Documents $documents)
     {
-        $this->getIndex()->updateDocuments($documents->all());
+        $this->getIndex()->updateDocuments($documents->values()->all());
     }
 
     protected function deleteIndex()

src/Meilisearch/Index.php

@@ -11,16 +11,6 @@ class ServiceProvider extends AddonServiceProvider
 {
     public function bootAddon()
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/statamic-meilisearch.php', 'statamic-meilisearch');
-
-        if ($this->app->runningInConsole()) {
-
-            $this->publishes([
-                __DIR__.'/../config/statamic-meilisearch.php' => config_path('statamic-meilisearch.php'),
-            ], 'statamic-meilisearch-config');
-
-        }
-
         Search::extend('meilisearch', function (Application $app, array $config, $name, $locale = null) {
             $client = $app->makeWith(Client::class, [
                 'url' => $config['credentials']['url'],

src/ServiceProvider.php

@@ -15,15 +15,17 @@ protected function resolveApplicationConfiguration($app)
     {
         parent::resolveApplicationConfiguration($app);
 
-        // add driver
         $app['config']->set('statamic.search.drivers.meilisearch', [
             'credentials' => [
                 'url' => 'http://localhost:7700',
                 'secret' => 'masterKey',
             ],
         ]);
 
-        // add index
+        $app['config']->set('statamic.search.indexes.cp', [
+            'driver' => 'null',
+        ]);
+
         $app['config']->set('statamic.search.indexes.meilisearch_index', [
             'driver' => 'meilisearch',
             'searchables' => ['collection:pages'],