[6.x] Stache index cleanup

src/Entries/Entry.php

@@ -1186,6 +1186,11 @@ public function getQueryableValue(string $field)
             return $this->value('authors');
         }
 
+        // Avoid resolving the Site object.
+        if ($field === 'site') {
+            return $this->locale();
+        }
+
         // Reset the cached uri so it gets recalculated.
         if ($field === 'uri') {
             Blink::store('entry-uris')->forget($this->id());

src/Sites/Site.php

@@ -3,6 +3,7 @@
 namespace Statamic\Sites;
 
 use Statamic\Contracts\Data\Augmentable;
+use Statamic\Contracts\Query\QueryableValue;
 use Statamic\Data\HasAugmentedData;
 use Statamic\Facades\Parse;
 use Statamic\Facades\URL;
@@ -14,7 +15,7 @@
 use Statamic\View\Antlers\Language\Utilities\StringUtilities;
 use Statamic\View\Cascade;
 
-class Site implements Augmentable
+class Site implements Augmentable, QueryableValue
 {
     use HasAugmentedData;
 
@@ -163,6 +164,11 @@ public function rawConfig()
         return $this->rawConfig;
     }
 
+    public function toQueryableValue()
+    {
+        return $this->handle();
+    }
+
     public function __toString()
     {
         return $this->handle();

src/Stache/Indexes/Site.php

@@ -2,6 +2,9 @@
 
 namespace Statamic\Stache\Indexes;
 
+/**
+ * @deprecated Entries resolve their site handle in getQueryableValue(), so the regular value index is used.
+ */
 class Site extends Value
 {
     public function getItemValue($item)

src/Stache/Indexes/Terms/Site.php

@@ -2,6 +2,9 @@
 
 namespace Statamic\Stache\Indexes\Terms;
 
+/**
+ * @deprecated Terms resolve their site handle in getQueryableValue(), so the regular value index is used.
+ */
 class Site extends Value
 {
     public function getItemValue($item)

src/Stache/Stores/CollectionEntriesStore.php

@@ -163,7 +163,7 @@ protected function storeIndexes()
             'collectionHandle',
             'published',
             'title',
-            'site' => Indexes\Site::class,
+            'site',
             'origin' => Indexes\Origin::class,
             'parent' => Indexes\Parents::class,
             'uri',

src/Stache/Stores/FormSubmissionsStore.php

@@ -16,7 +16,6 @@ class FormSubmissionsStore extends ChildStore
 {
     protected $valueIndex = Value::class;
     protected $storeIndexes = [
-        'form',
         'date',
     ];
 

src/Stache/Stores/TaxonomyTermsStore.php

@@ -20,9 +20,8 @@ class TaxonomyTermsStore extends ChildStore
     protected $valueIndex = Value::class;
     protected $storeIndexes = [
         'slug',
-        'taxonomy',
         'associations' => Indexes\Terms\Associations::class,
-        'site' => Indexes\Terms\Site::class,
+        'site',
     ];
 
     public function getItemFilter(SplFileInfo $file)

src/Taxonomies/LocalizedTerm.php

@@ -485,6 +485,11 @@ public function repository()
 
     public function getQueryableValue(string $field)
     {
+        // Avoid resolving the Site object.
+        if ($field === 'site') {
+            return $this->locale();
+        }
+
         if (in_array($method = Str::camel($field), $this->queryableMethods())) {
             return $this->{$method}();
         }

tests/Data/Entries/EntryTest.php

@@ -2996,6 +2996,13 @@ public function entries_can_be_serialized_after_resolving_values()
 
         $this->assertSame('entry-slug', $unserialized->slug);
     }
+
+    #[Test]
+    public function it_gets_the_site_handle_as_the_queryable_site_value()
+    {
+        $this->assertSame('en', (new Entry)->locale('en')->getQueryableValue('site'));
+        $this->assertSame('removed', (new Entry)->locale('removed')->getQueryableValue('site'));
+    }
 }
 
 class CustomEntry extends Entry

tests/Data/Taxonomies/LocalizedTermTest.php

@@ -298,4 +298,11 @@ public function it_dispatches_localized_term_deleted_event()
 
         Event::assertDispatched(LocalizedTermDeleted::class, fn ($event) => $event->term === $localized);
     }
+
+    #[Test]
+    public function it_gets_the_site_handle_as_the_queryable_site_value()
+    {
+        $this->assertSame('en', (new LocalizedTerm(new Term, 'en'))->getQueryableValue('site'));
+        $this->assertSame('removed', (new LocalizedTerm(new Term, 'removed'))->getQueryableValue('site'));
+    }
 }

tests/Sites/SiteTest.php

@@ -3,8 +3,10 @@
 namespace Tests\Sites;
 
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Contracts\Query\QueryableValue;
 use Statamic\Data\AugmentedCollection;
 use Statamic\Facades\Antlers;
+use Statamic\Query\ResolveValue;
 use Statamic\Sites\Site;
 use Tests\TestCase;
 
@@ -366,4 +368,14 @@ public function it_gets_attributes()
         $this->assertNull($site->attribute('unknown'));
         $this->assertNull($site->attribute('charlie.unknown'));
     }
+
+    #[Test]
+    public function it_resolves_to_its_handle_when_queried()
+    {
+        $site = new Site('en', []);
+
+        $this->assertInstanceOf(QueryableValue::class, $site);
+        $this->assertSame('en', $site->toQueryableValue());
+        $this->assertSame('en', (new ResolveValue)(['site' => $site], 'site'));
+    }
 }