2.1.0 - add new raw query method

Author: chr15k

src/MeilisearchQuery.php

@@ -97,6 +97,32 @@ public function search(string $term = ''): \Laravel\Scout\Builder
         return $this->model::search($term, $this->callback());
     }
 
+    /**
+     * Add a raw "AND" Meilisearch query to the builder.
+     */
+    public function whereRaw(string $query): self
+    {
+        return $this->raw($query);
+    }
+
+    /**
+     * Add a raw "OR" Meilisearch query to the builder.
+     */
+    public function orWhereRaw(string $query): self
+    {
+        return $this->raw($query, 'OR');
+    }
+
+    /**
+     * Add raw expression to the builder.
+     */
+    protected function raw(string $query, string $boolean = 'AND'): self
+    {
+        $this->segments[] = new RawExpression($query, $boolean, empty($this->segments));
+
+        return $this;
+    }
+
     /**
      * Ensure that the for() method has been called before proceeding.
      *

src/RawExpression.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Chr15k\MeilisearchAdvancedQuery;
+
+use Chr15k\MeilisearchAdvancedQuery\Contracts\QuerySegment;
+
+class RawExpression implements QuerySegment
+{
+    public function __construct(
+        public string $rawQuery,
+        public string $boolean = 'AND',
+        public bool $init = false
+    ) {}
+
+    public function compile(): string
+    {
+        return trim(sprintf('%s %s', $this->init ? '' : $this->boolean, $this->rawQuery));
+    }
+}

tests/MeilisearchQueryTest.php

@@ -223,4 +223,54 @@ public function testMultipleSort()
 
         $this->assertSame(['name:desc', 'email:asc'], $instance['sort']);
     }
+
+    public function testBasicRawQuery()
+    {
+        $compiled = MeilisearchQuery::for(User::class)->whereRaw("name = 'Chris'")->compile();
+
+        $this->assertSame("name = 'Chris'", $compiled);
+    }
+
+    public function testBasicMultipleRawOrQuery()
+    {
+        $compiled = MeilisearchQuery::for(User::class)
+            ->whereRaw("name = 'Chris'")
+            ->orWhereRaw("name = 'Bob'")
+            ->compile();
+
+        $this->assertSame("name = 'Chris' OR name = 'Bob'", $compiled);
+    }
+
+    public function testBasicRawAndQuery()
+    {
+        $compiled = MeilisearchQuery::for(User::class)
+            ->whereRaw("name = 'Chris'")
+            ->whereRaw("name = 'Bob'")
+            ->compile();
+
+        $this->assertSame("name = 'Chris' AND name = 'Bob'", $compiled);
+    }
+
+    public function testSingleBasicRawQuery()
+    {
+        $compiled = MeilisearchQuery::for(User::class)
+            ->whereRaw("name = 'Chris' OR name = 'Bob'")
+            ->compile();
+
+        $this->assertSame("name = 'Chris' OR name = 'Bob'", $compiled);
+    }
+
+    public function testMixedRawNestedQuery()
+    {
+        $compiled = MeilisearchQuery::for(User::class)
+            ->where('email', '[email protected]')
+            ->where(fn ($query) => $query
+                ->whereRaw("name = 'Chris'")
+                ->orWhereRaw("name = 'Bob'")
+            )
+            ->where('verified', true)
+            ->compile();
+
+        $this->assertSame("email = '[email protected]' AND (name = 'Chris' OR name = 'Bob') AND verified = 'true'", $compiled);
+    }
 }