[6.x] Respect field defaults when querying

src/Assets/Asset.php

@@ -1151,7 +1151,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Auth/User.php

@@ -488,7 +488,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Entries/Entry.php

@@ -1235,7 +1235,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Fields/Field.php

@@ -315,6 +315,15 @@ public function defaultValue()
         return $this->config['default'] ?? $this->fieldtype()->defaultValue();
     }
 
+    public function toQueryableValue($value)
+    {
+        if ($value === null && ! $this->hasComputedDefault()) {
+            $value = $this->defaultValue();
+        }
+
+        return $this->fieldtype()->toQueryableValue($value);
+    }
+
     public function hasComputedDefault(): bool
     {
         if (! isset($this->config['default'])) {

src/Fieldtypes/Date.php

@@ -367,6 +367,10 @@ public function toGqlType()
 
     public function toQueryableValue($value)
     {
+        if ($value === 'now') {
+            return null;
+        }
+
         return $this->augment($value);
     }
 

src/Forms/Form.php

@@ -467,7 +467,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Forms/Submission.php

@@ -278,7 +278,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Globals/Variables.php

@@ -304,7 +304,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

src/Taxonomies/LocalizedTerm.php

@@ -500,7 +500,7 @@ public function getQueryableValue(string $field)
             return $value;
         }
 
-        return $field->fieldtype()->toQueryableValue($value);
+        return $field->toQueryableValue($value);
     }
 
     private function queryableMethods(): array

tests/Assets/AssetTest.php

@@ -3075,4 +3075,19 @@ public function it_clones_internal_collections()
         $this->assertEquals('A', $asset->getSupplement('bar'));
         $this->assertEquals('B', $clone->getSupplement('bar'));
     }
+
+    #[Test]
+    public function it_uses_a_fields_default_as_the_queryable_value()
+    {
+        $blueprint = Facades\Blueprint::makeFromFields(['foo' => ['type' => 'toggle', 'default' => true]]);
+        BlueprintRepository::shouldReceive('find')->with('assets/test_container')->andReturn($blueprint);
+
+        $asset = (new Asset)->path('test.txt')->container($this->container);
+
+        $this->assertTrue($asset->getQueryableValue('foo'));
+
+        $asset->set('foo', false);
+
+        $this->assertFalse($asset->getQueryableValue('foo'));
+    }
 }

tests/Auth/UserContractTests.php

@@ -821,4 +821,19 @@ public function __construct($handle)
 
         return $class;
     }
+
+    #[Test]
+    public function it_uses_a_fields_default_as_the_queryable_value()
+    {
+        $blueprint = Blueprint::makeFromFields(['my_toggle' => ['type' => 'toggle', 'default' => true]]);
+        BlueprintRepository::shouldReceive('find')->with('user')->andReturn($blueprint);
+
+        $user = $this->user();
+
+        $this->assertTrue($user->getQueryableValue('my_toggle'));
+
+        $user->set('my_toggle', false);
+
+        $this->assertFalse($user->getQueryableValue('my_toggle'));
+    }
 }

tests/Data/Globals/VariablesTest.php

@@ -421,4 +421,19 @@ public function it_can_be_found_via_the_data_repository_using_its_reference()
         $this->assertEquals($variables->id(), $found->id());
         $this->assertEquals('bar', $found->get('foo'));
     }
+
+    #[Test]
+    public function it_uses_a_fields_default_as_the_queryable_value()
+    {
+        $blueprint = Blueprint::makeFromFields(['foo' => ['type' => 'toggle', 'default' => true]]);
+        BlueprintRepository::shouldReceive('find')->with('globals.settings')->andReturn($blueprint);
+
+        $variables = GlobalSet::make('settings')->in('en');
+
+        $this->assertTrue($variables->getQueryableValue('foo'));
+
+        $variables->set('foo', false);
+
+        $this->assertFalse($variables->getQueryableValue('foo'));
+    }
 }

tests/Data/Taxonomies/LocalizedTermTest.php

@@ -305,4 +305,20 @@ 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'));
     }
+
+    #[Test]
+    public function it_uses_a_fields_default_as_the_queryable_value()
+    {
+        $blueprint = Blueprint::makeFromFields(['foo' => ['type' => 'toggle', 'default' => true]]);
+        BlueprintRepository::shouldReceive('in')->with('taxonomies/tags')->andReturn(collect(['tags' => $blueprint]));
+        Taxonomy::make('tags')->save();
+
+        $localized = (new Term)->taxonomy('tags')->in('en');
+
+        $this->assertTrue($localized->getQueryableValue('foo'));
+
+        $localized->set('foo', false);
+
+        $this->assertFalse($localized->getQueryableValue('foo'));
+    }
 }

tests/Fields/FieldTest.php

@@ -748,4 +748,32 @@ public function it_gets_and_sets_the_form()
         $this->assertEquals($field, $return);
         $this->assertEquals($form, $field->form());
     }
+
+    #[Test]
+    public function it_uses_the_default_when_converting_a_null_value_to_a_queryable_value()
+    {
+        $field = new Field('test', ['type' => 'toggle', 'default' => true]);
+
+        $this->assertTrue($field->toQueryableValue(null));
+        $this->assertTrue($field->toQueryableValue(true));
+        $this->assertFalse($field->toQueryableValue(false));
+    }
+
+    #[Test]
+    public function it_converts_a_null_value_to_a_queryable_value_when_there_is_no_default()
+    {
+        $this->assertFalse((new Field('test', ['type' => 'toggle']))->toQueryableValue(null));
+        $this->assertNull((new Field('test', ['type' => 'text']))->toQueryableValue(null));
+        $this->assertEquals('foo', (new Field('test', ['type' => 'text', 'default' => 'bar']))->toQueryableValue('foo'));
+    }
+
+    #[Test]
+    public function it_does_not_use_a_computed_default_when_converting_to_a_queryable_value()
+    {
+        Fields::computedDefault('computed-value', fn () => 'computed defined default');
+
+        $field = new Field('test', ['type' => 'text', 'default' => 'computed:computed-value']);
+
+        $this->assertNull($field->toQueryableValue(null));
+    }
 }

tests/Fieldtypes/DateTest.php

@@ -836,6 +836,15 @@ public function it_includes_timezone_in_config_field_items()
         $this->assertEquals('timezones', $dateTimeSection['fields']['timezone']['dictionary']);
     }
 
+    #[Test]
+    public function it_does_not_use_a_default_of_now_as_the_queryable_value()
+    {
+        $field = new Field('test', ['type' => 'date', 'default' => 'now']);
+
+        $this->assertNull($field->toQueryableValue(null));
+        $this->assertEquals('2012-01-04', $field->toQueryableValue('2012-01-04')->format('Y-m-d'));
+    }
+
     public function fieldtype($config = [])
     {
         $field = new Field('test', array_replace([

tests/Forms/FormTest.php

@@ -11,6 +11,7 @@
 use Statamic\Events\FormDeleting;
 use Statamic\Events\FormSaved;
 use Statamic\Events\FormSaving;
+use Statamic\Facades;
 use Statamic\Facades\File;
 use Statamic\Facades\Form;
 use Statamic\Fields\Blueprint;
@@ -291,4 +292,19 @@ public function it_clones_internal_collections()
         $this->assertEquals('A', $form->getSupplement('bar'));
         $this->assertEquals('B', $clone->getSupplement('bar'));
     }
+
+    #[Test]
+    public function it_uses_a_fields_default_as_the_queryable_value()
+    {
+        $blueprint = Facades\Blueprint::makeFromFields(['foo' => ['type' => 'toggle', 'default' => true]]);
+        Facades\Blueprint::shouldReceive('find')->with('forms.test')->andReturn($blueprint);
+
+        $form = Form::make('test');
+
+        $this->assertTrue($form->getQueryableValue('foo'));
+
+        $form->set('foo', false);
+
+        $this->assertFalse($form->getQueryableValue('foo'));
+    }
 }

tests/Forms/SubmissionTest.php

@@ -252,4 +252,19 @@ public function it_clones_internal_collections()
         $this->assertEquals('A', $submission->getSupplement('bar'));
         $this->assertEquals('B', $clone->getSupplement('bar'));
     }
+
+    #[Test]
+    public function it_uses_a_fields_default_as_the_queryable_value()
+    {
+        $blueprint = Blueprint::makeFromFields(['foo' => ['type' => 'toggle', 'default' => true]]);
+        Blueprint::shouldReceive('find')->with('forms.test')->andReturn($blueprint);
+
+        $submission = Form::make('test')->makeSubmission();
+
+        $this->assertTrue($submission->getQueryableValue('foo'));
+
+        $submission->set('foo', false);
+
+        $this->assertFalse($submission->getQueryableValue('foo'));
+    }
 }

tests/Tags/Collection/EntriesTest.php

@@ -253,6 +253,20 @@ public function it_limits_entries_with_offset_using_value_objects()
         );
     }
 
+    #[Test]
+    public function it_filters_by_a_fields_default_value()
+    {
+        $blueprint = Blueprint::makeFromFields(['my_toggle' => ['type' => 'toggle', 'default' => true]])->setHandle('test');
+        Blueprint::shouldReceive('in')->with('collections/test')->andReturn(collect([$blueprint]));
+
+        $this->makeEntry('unsaved')->save();
+        $this->makeEntry('explicit-true')->set('my_toggle', true)->save();
+        $this->makeEntry('explicit-false')->set('my_toggle', false)->save();
+
+        $this->assertEqualsCanonicalizing(['unsaved', 'explicit-true'], $this->getEntryIds(['my_toggle:is' => 'true']));
+        $this->assertEquals(['explicit-false'], $this->getEntryIds(['my_toggle:is' => 'false']));
+    }
+
     #[Test]
     public function it_filters_by_future_and_past()
     {