[5.x] Augmentation Adjustments

src/Auth/AugmentedUser.php

@@ -39,7 +39,7 @@ private function commonKeys()
  ];
  }
 
- public function get($handle): Value
+ public function get($handle, $fieldtype = null): Value
  {
  if ($handle === 'is_user') {
  return new Value(true, 'is_user', null, $this->data);
@@ -57,7 +57,7 @@ public function get($handle): Value
  return new Value(in_array(Str::after($handle, 'in_'), $this->groups()), $handle, null, $this->data);
  }
 
- return parent::get($handle);
+ return parent::get($handle, $fieldtype);
  }
 
  protected function roles()

src/Data/AbstractAugmented.php

@@ -13,6 +13,7 @@ abstract class AbstractAugmented implements Augmented
  protected $data;
  protected $blueprintFields;
  protected $relations = [];
+ protected $isSelecting = false;
 
  public function __construct($data)
  {
@@ -34,33 +35,52 @@ public function select($keys = null)
  $arr = [];
 
  $keys = $this->filterKeys(Arr::wrap($keys ?: $this->keys()));
+ $fields = $this->blueprintFields();
+
+ $this->isSelecting = true;
 
  foreach ($keys as $key) {
- $arr[$key] = $this->get($key);
+ $arr[$key] = $this->get($key, optional($fields->get($key))->fieldtype());
  }
 
+ $this->isSelecting = false;
+
  return (new AugmentedCollection($arr))->withRelations($this->relations);
  }
 
  abstract public function keys();
 
- public function get($handle): Value
+ public function getAugmentedMethodValue($method)
+ {
+ if ($this->methodExistsOnThisClass($method)) {
+ return $this->$method();
+ }
+
+ return $this->data->$method();
+ }
+
+ protected function adjustFieldtype($handle, $fieldtype)
+ {
+ if ($this->isSelecting || $fieldtype !== null) {
+ return $fieldtype;
+ }
+
+ return $this->getFieldtype($handle);
+ }
+
+ public function get($handle, $fieldtype = null): Value
  {
  $method = Str::camel($handle);
 
  if ($this->methodExistsOnThisClass($method)) {
- $value = $this->$method();
-
- return $value instanceof Value
- ? $value
- : new Value($value, $method, null, $this->data);
+ return $this->wrapInvokable($method, true, $this, $handle, $fieldtype);
  }
 
  if (method_exists($this->data, $method) && collect($this->keys())->contains(Str::snake($handle))) {
- return $this->wrapValue($this->data->$method(), $handle);
+ return $this->wrapInvokable($method, false, $this->data, $handle, $fieldtype);
  }
 
- return $this->wrapValue($this->getFromData($handle), $handle);
+ return $this->wrapValue($this->getFromData($handle), $handle, $fieldtype);
  }
 
  protected function filterKeys($keys)
@@ -93,18 +113,35 @@ protected function getFromData($handle)
  return $value;
  }
 
- protected function wrapValue($value, $handle)
+ protected function wrapInvokable(string $method, bool $proxy, $methodTarget, string $handle, $fieldtype = null)
  {
- $fields = $this->blueprintFields();
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
+
+ return (new InvokableValue(
+ null,
+ $handle,
+ $fieldtype,
+ $this->data
+ ))->setInvokableDetails($method, $proxy, $methodTarget);
+ }
+
+ protected function wrapValue($value, $handle, $fieldtype = null)
+ {
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
 
  return new Value(
  $value,
  $handle,
-optional($fields->get($handle))->fieldtype(),
+$fieldtype,
  $this->data
  );
  }
 
+ protected function getFieldtype($handle)
+ {
+ return optional($this->blueprintFields()->get($handle))->fieldtype();
+ }
+
  protected function blueprintFields()
  {
  if (! isset($this->blueprintFields)) {

src/Data/AugmentedCollection.php

@@ -47,6 +47,22 @@ public function withoutEvaluation()
  return $this;
  }
 
+ public function all()
+ {
+ return collect($this->items)->map(function ($item) {
+ if ($item instanceof InvokableValue) {
+ return $item->materialize();
+ }
+
+ return $item;
+ })->all();
+ }
+
+ public function deferredAll()
+ {
+ return parent::all();
+ }
+
  public function toArray()
  {
  return $this->map(function ($value) {

src/Data/HasAugmentedInstance.php

@@ -26,6 +26,11 @@ public function toAugmentedArray($keys = null)
  return $this->toAugmentedCollection($keys)->all();
  }
 
+ public function toDeferredAugmentedArray($keys = null)
+ {
+ return $this->toAugmentedCollection($keys)->deferredAll();
+ }
+
  public function toShallowAugmentedCollection()
  {
  return $this->augmented()->select($this->shallowAugmentedArrayKeys())->withShallowNesting();

src/Data/InvokableValue.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Statamic\Data;
+
+use Statamic\Fields\Value;
+use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
+
+class InvokableValue extends Value
+{
+ protected $methodTarget = null;
+ protected bool $hasResolved = false;
+ protected string $methodName;
+ protected bool $proxyThroughAugmented = false;
+ protected $resolvedValueInstance = null;
+
+ public function setInvokableDetails(string $method, bool $proxyCall, $target): self
+ {
+ $this->proxyThroughAugmented = $proxyCall;
+ $this->methodName = $method;
+ $this->methodTarget = $target;
+
+ return $this;
+ }
+
+ protected function resolve()
+ {
+ if ($this->hasResolved) {
+ return;
+ }
+
+ if ($this->methodTarget == null) {
+ $this->hasResolved = true;
+
+ return;
+ }
+
+ $curIsolationState = GlobalRuntimeState::$requiresRuntimeIsolation;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = true;
+ if ($this->proxyThroughAugmented && method_exists($this->methodTarget, 'getAugmentedMethodValue')) {
+ $this->raw = $this->methodTarget->getAugmentedMethodValue($this->methodName);
+
+ if (! $this->raw instanceof Value) {
+ // Replicate previous behavior of not having
+ // a field set if the method call did not
+ // return a Value instance.
+ $this->fieldtype = null;
+ } else {
+ // Store the original Value instance, if we have it.
+ $this->resolvedValueInstance = $this->raw;
+
+ // Shift some values around.
+ $this->fieldtype = $this->raw->fieldtype();
+ $this->raw = $this->raw->raw();
+ }
+ } elseif (! $this->proxyThroughAugmented) {
+ $this->raw = $this->methodTarget->{$this->methodName}();
+ }
+
+ $this->methodTarget = null;
+
+ $this->hasResolved = true;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = $curIsolationState;
+ }
+
+ public function materialize()
+ {
+ $this->resolve();
+
+ if ($this->resolvedValueInstance != null) {
+ return $this->resolvedValueInstance;
+ }
+
+ return $this->toValue();
+ }
+
+ protected function toValue()
+ {
+ return new Value($this->raw, $this->handle, $this->fieldtype, $this->augmentable, $this->shallow);
+ }
+
+ public function raw()
+ {
+ $this->resolve();
+
+ return parent::raw();
+ }
+
+ public function value()
+ {
+ $this->resolve();
+
+ return parent::value();
+ }
+
+ public function shallow()
+ {
+ $this->resolve();
+
+ return parent::shallow();
+ }
+}

src/Fields/Value.php

@@ -37,6 +37,11 @@ public function raw()
  return $this->raw;
  }
 
+ public function materialize()
+ {
+ return $this;
+ }
+
  public function value()
  {
  if (! $this->fieldtype) {

src/Modifiers/CoreModifiers.php

@@ -767,7 +767,7 @@ public function get($value, $params)
 
  // Convert the item to an array, since we'll want access to all the
  // available data. Then grab the requested variable from there.
- $array = $item instanceof Augmentable ? $item->toAugmentedArray() : $item->toArray();
+ $array = $item instanceof Augmentable ? $item->toDeferredAugmentedArray() : $item->toArray();
 
  if ($arrayValue = Arr::get($array, $var)) {
  return $arrayValue;
@@ -838,7 +838,7 @@ private function getGroupByValueFromObject($item, $groupBy)
  {
  // Make the array just from the params, so it only augments the values that might be needed.
  $keys = explode(':', $groupBy);
- $context = $item->toAugmentedArray($keys);
+ $context = $item->toDeferredAugmentedArray($keys);
 
  return Antlers::parser()->getVariable($groupBy, $context);
  }
@@ -2057,7 +2057,7 @@ public function scope($value, $params)
  }
 
  if ($value instanceof Collection) {
- $value = $value->toAugmentedArray();
+ $value = $value->toDeferredAugmentedArray();
  }
 
  return Arr::addScope($value, $scope);

src/Providers/CollectionsServiceProvider.php

@@ -163,6 +163,16 @@ protected function toAugmentedArray()
  }, $this->items);
  });
 
+ Collection::macro('toDeferredAugmentedArray', function ($keys = null) {
+ return array_map(function ($value) use ($keys) {
+ if ($value instanceof Augmentable) {
+ return $value->toDeferredAugmentedArray($keys);
+ }
+
+ return $value instanceof Arrayable ? $value->toArray() : $value;
+ }, $this->items);
+ });
+
  Collection::macro('toAugmentedCollection', function ($keys = null) {
  return array_map(function ($value) use ($keys) {
  if ($value instanceof Augmentable) {

src/Tags/Structure.php

@@ -123,7 +123,7 @@ public function toArray($tree, $parent = null, $depth = 1)
  $pages = collect($tree)->map(function ($item, $index) use ($parent, $depth, $tree) {
  $page = $item['page'];
  $keys = $this->getQuerySelectKeys($page);
- $data = $page->toAugmentedArray($keys);
+ $data = $page->toDeferredAugmentedArray($keys);
  $children = empty($item['children']) ? [] : $this->toArray($item['children'], $data, $depth + 1);
 
  $url = $page->urlWithoutRedirect();

src/View/Antlers/Engine.php

@@ -161,11 +161,11 @@ public static function renderTag(Parser $parser, $name, $parameters = [], $conte
  }
 
  if ($output instanceof Collection) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  if ($output instanceof Augmentable) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  // Allow tags to return an array. We'll parse it for them.

src/View/Antlers/Language/Runtime/Sandbox/RuntimeValues.php

@@ -12,7 +12,7 @@ public static function resolveWithRuntimeIsolation($augmentable)
  {
  GlobalRuntimeState::$requiresRuntimeIsolation = true;
  try {
- $value = $augmentable->toAugmentedArray();
+ $value = $augmentable->toDeferredAugmentedArray();
  } catch (Exception $e) {
  throw $e;
  } finally {

src/View/Cascade.php

@@ -148,7 +148,7 @@ protected function hydrateGlobals()
  }
 
  if ($mainGlobal = $this->get('global')) {
- foreach ($mainGlobal->toAugmentedCollection() as $key => $value) {
+ foreach ($mainGlobal->toDeferredAugmentedArray() as $key => $value) {
  $this->set($key, $value);
  }
  }
@@ -163,7 +163,7 @@ protected function hydrateContent()
  }
 
  $variables = $this->content instanceof Augmentable
- ? $this->content->toAugmentedArray()
+ ? $this->content->toDeferredAugmentedArray()
  : $this->content->toArray();
 
  foreach ($variables as $key => $value) {

tests/Antlers/Runtime/CoreModifiersTest.php

@@ -581,6 +581,11 @@ public function toAugmentedArray()
  ];
  }
 
+ public function toDeferredAugmentedArray()
+ {
+ return $this->toAugmentedArray();
+ }
+
  public function toArray()
  {
  return $this->toAugmentedArray();

tests/Data/AugmentedTest.php

@@ -141,7 +141,7 @@ public function foo()
  }
  };
 
- $this->assertSame($valueInstance, $augmented->get('foo'));
+ $this->assertSame($valueInstance, $augmented->get('foo')->materialize());
  }
 
  /** @test */

src/Auth/AugmentedUser.php

@@ -39,7 +39,7 @@ private function commonKeys()
  ];
  }
 
- public function get($handle): Value
+ public function get($handle, $fieldtype = null): Value
  {
  if ($handle === 'is_user') {
  return new Value(true, 'is_user', null, $this->data);
@@ -57,7 +57,7 @@ public function get($handle): Value
  return new Value(in_array(Str::after($handle, 'in_'), $this->groups()), $handle, null, $this->data);
  }
 
- return parent::get($handle);
+ return parent::get($handle, $fieldtype);
  }
 
  protected function roles()

src/Data/AbstractAugmented.php

@@ -13,6 +13,7 @@ abstract class AbstractAugmented implements Augmented
  protected $data;
  protected $blueprintFields;
  protected $relations = [];
+ protected $isSelecting = false;
 
  public function __construct($data)
  {
@@ -34,33 +35,52 @@ public function select($keys = null)
  $arr = [];
 
  $keys = $this->filterKeys(Arr::wrap($keys ?: $this->keys()));
+ $fields = $this->blueprintFields();
+
+ $this->isSelecting = true;
 
  foreach ($keys as $key) {
- $arr[$key] = $this->get($key);
+ $arr[$key] = $this->get($key, optional($fields->get($key))->fieldtype());
  }
 
+ $this->isSelecting = false;
+
  return (new AugmentedCollection($arr))->withRelations($this->relations);
  }
 
  abstract public function keys();
 
- public function get($handle): Value
+ public function getAugmentedMethodValue($method)
+ {
+ if ($this->methodExistsOnThisClass($method)) {
+ return $this->$method();
+ }
+
+ return $this->data->$method();
+ }
+
+ protected function adjustFieldtype($handle, $fieldtype)
+ {
+ if ($this->isSelecting || $fieldtype !== null) {
+ return $fieldtype;
+ }
+
+ return $this->getFieldtype($handle);
+ }
+
+ public function get($handle, $fieldtype = null): Value
  {
  $method = Str::camel($handle);
 
  if ($this->methodExistsOnThisClass($method)) {
- $value = $this->$method();
-
- return $value instanceof Value
- ? $value
- : new Value($value, $method, null, $this->data);
+ return $this->wrapInvokable($method, true, $this, $handle, $fieldtype);
  }
 
  if (method_exists($this->data, $method) && collect($this->keys())->contains(Str::snake($handle))) {
- return $this->wrapValue($this->data->$method(), $handle);
+ return $this->wrapInvokable($method, false, $this->data, $handle, $fieldtype);
  }
 
- return $this->wrapValue($this->getFromData($handle), $handle);
+ return $this->wrapValue($this->getFromData($handle), $handle, $fieldtype);
  }
 
  protected function filterKeys($keys)
@@ -93,18 +113,35 @@ protected function getFromData($handle)
  return $value;
  }
 
- protected function wrapValue($value, $handle)
+ protected function wrapInvokable(string $method, bool $proxy, $methodTarget, string $handle, $fieldtype = null)
  {
- $fields = $this->blueprintFields();
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
+
+ return (new InvokableValue(
+ null,
+ $handle,
+ $fieldtype,
+ $this->data
+ ))->setInvokableDetails($method, $proxy, $methodTarget);
+ }
+
+ protected function wrapValue($value, $handle, $fieldtype = null)
+ {
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
 
  return new Value(
  $value,
  $handle,
-optional($fields->get($handle))->fieldtype(),
+$fieldtype,
  $this->data
  );
  }
 
+ protected function getFieldtype($handle)
+ {
+ return optional($this->blueprintFields()->get($handle))->fieldtype();
+ }
+
  protected function blueprintFields()
  {
  if (! isset($this->blueprintFields)) {

src/Data/AugmentedCollection.php

@@ -47,6 +47,22 @@ public function withoutEvaluation()
  return $this;
  }
 
+ public function all()
+ {
+ return collect($this->items)->map(function ($item) {
+ if ($item instanceof InvokableValue) {
+ return $item->materialize();
+ }
+
+ return $item;
+ })->all();
+ }
+
+ public function deferredAll()
+ {
+ return parent::all();
+ }
+
  public function toArray()
  {
  return $this->map(function ($value) {

src/Data/HasAugmentedInstance.php

@@ -26,6 +26,11 @@ public function toAugmentedArray($keys = null)
  return $this->toAugmentedCollection($keys)->all();
  }
 
+ public function toDeferredAugmentedArray($keys = null)
+ {
+ return $this->toAugmentedCollection($keys)->deferredAll();
+ }
+
  public function toShallowAugmentedCollection()
  {
  return $this->augmented()->select($this->shallowAugmentedArrayKeys())->withShallowNesting();

src/Data/InvokableValue.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Statamic\Data;
+
+use Statamic\Fields\Value;
+use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
+
+class InvokableValue extends Value
+{
+ protected $methodTarget = null;
+ protected bool $hasResolved = false;
+ protected string $methodName;
+ protected bool $proxyThroughAugmented = false;
+ protected $resolvedValueInstance = null;
+
+ public function setInvokableDetails(string $method, bool $proxyCall, $target): self
+ {
+ $this->proxyThroughAugmented = $proxyCall;
+ $this->methodName = $method;
+ $this->methodTarget = $target;
+
+ return $this;
+ }
+
+ protected function resolve()
+ {
+ if ($this->hasResolved) {
+ return;
+ }
+
+ if ($this->methodTarget == null) {
+ $this->hasResolved = true;
+
+ return;
+ }
+
+ $curIsolationState = GlobalRuntimeState::$requiresRuntimeIsolation;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = true;
+ if ($this->proxyThroughAugmented && method_exists($this->methodTarget, 'getAugmentedMethodValue')) {
+ $this->raw = $this->methodTarget->getAugmentedMethodValue($this->methodName);
+
+ if (! $this->raw instanceof Value) {
+ // Replicate previous behavior of not having
+ // a field set if the method call did not
+ // return a Value instance.
+ $this->fieldtype = null;
+ } else {
+ // Store the original Value instance, if we have it.
+ $this->resolvedValueInstance = $this->raw;
+
+ // Shift some values around.
+ $this->fieldtype = $this->raw->fieldtype();
+ $this->raw = $this->raw->raw();
+ }
+ } elseif (! $this->proxyThroughAugmented) {
+ $this->raw = $this->methodTarget->{$this->methodName}();
+ }
+
+ $this->methodTarget = null;
+
+ $this->hasResolved = true;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = $curIsolationState;
+ }
+
+ public function materialize()
+ {
+ $this->resolve();
+
+ if ($this->resolvedValueInstance != null) {
+ return $this->resolvedValueInstance;
+ }
+
+ return $this->toValue();
+ }
+
+ protected function toValue()
+ {
+ return new Value($this->raw, $this->handle, $this->fieldtype, $this->augmentable, $this->shallow);
+ }
+
+ public function raw()
+ {
+ $this->resolve();
+
+ return parent::raw();
+ }
+
+ public function value()
+ {
+ $this->resolve();
+
+ return parent::value();
+ }
+
+ public function shallow()
+ {
+ $this->resolve();
+
+ return parent::shallow();
+ }
+}

src/Fields/Value.php

@@ -37,6 +37,11 @@ public function raw()
  return $this->raw;
  }
 
+ public function materialize()
+ {
+ return $this;
+ }
+
  public function value()
  {
  if (! $this->fieldtype) {

src/Modifiers/CoreModifiers.php

@@ -767,7 +767,7 @@ public function get($value, $params)
 
  // Convert the item to an array, since we'll want access to all the
  // available data. Then grab the requested variable from there.
- $array = $item instanceof Augmentable ? $item->toAugmentedArray() : $item->toArray();
+ $array = $item instanceof Augmentable ? $item->toDeferredAugmentedArray() : $item->toArray();
 
  if ($arrayValue = Arr::get($array, $var)) {
  return $arrayValue;
@@ -838,7 +838,7 @@ private function getGroupByValueFromObject($item, $groupBy)
  {
  // Make the array just from the params, so it only augments the values that might be needed.
  $keys = explode(':', $groupBy);
- $context = $item->toAugmentedArray($keys);
+ $context = $item->toDeferredAugmentedArray($keys);
 
  return Antlers::parser()->getVariable($groupBy, $context);
  }
@@ -2057,7 +2057,7 @@ public function scope($value, $params)
  }
 
  if ($value instanceof Collection) {
- $value = $value->toAugmentedArray();
+ $value = $value->toDeferredAugmentedArray();
  }
 
  return Arr::addScope($value, $scope);

src/Providers/CollectionsServiceProvider.php

@@ -163,6 +163,16 @@ protected function toAugmentedArray()
  }, $this->items);
  });
 
+ Collection::macro('toDeferredAugmentedArray', function ($keys = null) {
+ return array_map(function ($value) use ($keys) {
+ if ($value instanceof Augmentable) {
+ return $value->toDeferredAugmentedArray($keys);
+ }
+
+ return $value instanceof Arrayable ? $value->toArray() : $value;
+ }, $this->items);
+ });
+
  Collection::macro('toAugmentedCollection', function ($keys = null) {
  return array_map(function ($value) use ($keys) {
  if ($value instanceof Augmentable) {

src/Tags/Structure.php

@@ -123,7 +123,7 @@ public function toArray($tree, $parent = null, $depth = 1)
  $pages = collect($tree)->map(function ($item, $index) use ($parent, $depth, $tree) {
  $page = $item['page'];
  $keys = $this->getQuerySelectKeys($page);
- $data = $page->toAugmentedArray($keys);
+ $data = $page->toDeferredAugmentedArray($keys);
  $children = empty($item['children']) ? [] : $this->toArray($item['children'], $data, $depth + 1);
 
  $url = $page->urlWithoutRedirect();

src/View/Antlers/Engine.php

@@ -161,11 +161,11 @@ public static function renderTag(Parser $parser, $name, $parameters = [], $conte
  }
 
  if ($output instanceof Collection) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  if ($output instanceof Augmentable) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  // Allow tags to return an array. We'll parse it for them.

src/View/Antlers/Language/Runtime/Sandbox/RuntimeValues.php

@@ -12,7 +12,7 @@ public static function resolveWithRuntimeIsolation($augmentable)
  {
  GlobalRuntimeState::$requiresRuntimeIsolation = true;
  try {
- $value = $augmentable->toAugmentedArray();
+ $value = $augmentable->toDeferredAugmentedArray();
  } catch (Exception $e) {
  throw $e;
  } finally {

src/View/Cascade.php

@@ -148,7 +148,7 @@ protected function hydrateGlobals()
  }
 
  if ($mainGlobal = $this->get('global')) {
- foreach ($mainGlobal->toAugmentedCollection() as $key => $value) {
+ foreach ($mainGlobal->toDeferredAugmentedArray() as $key => $value) {
  $this->set($key, $value);
  }
  }
@@ -163,7 +163,7 @@ protected function hydrateContent()
  }
 
  $variables = $this->content instanceof Augmentable
- ? $this->content->toAugmentedArray()
+ ? $this->content->toDeferredAugmentedArray()
  : $this->content->toArray();
 
  foreach ($variables as $key => $value) {

tests/Antlers/Runtime/CoreModifiersTest.php

@@ -581,6 +581,11 @@ public function toAugmentedArray()
  ];
  }
 
+ public function toDeferredAugmentedArray()
+ {
+ return $this->toAugmentedArray();
+ }
+
  public function toArray()
  {
  return $this->toAugmentedArray();

tests/Data/AugmentedTest.php

@@ -141,7 +141,7 @@ public function foo()
  }
  };
 
- $this->assertSame($valueInstance, $augmented->get('foo'));
+ $this->assertSame($valueInstance, $augmented->get('foo')->materialize());
  }
 
  /** @test */

src/Auth/AugmentedUser.php

@@ -39,7 +39,7 @@ private function commonKeys()
  ];
  }
 
- public function get($handle): Value
+ public function get($handle, $fieldtype = null): Value
  {
  if ($handle === 'is_user') {
  return new Value(true, 'is_user', null, $this->data);
@@ -57,7 +57,7 @@ public function get($handle): Value
  return new Value(in_array(Str::after($handle, 'in_'), $this->groups()), $handle, null, $this->data);
  }
 
- return parent::get($handle);
+ return parent::get($handle, $fieldtype);
  }
 
  protected function roles()

src/Data/AbstractAugmented.php

@@ -13,6 +13,7 @@ abstract class AbstractAugmented implements Augmented
  protected $data;
  protected $blueprintFields;
  protected $relations = [];
+ protected $isSelecting = false;
 
  public function __construct($data)
  {
@@ -34,33 +35,52 @@ public function select($keys = null)
  $arr = [];
 
  $keys = $this->filterKeys(Arr::wrap($keys ?: $this->keys()));
+ $fields = $this->blueprintFields();
+
+ $this->isSelecting = true;
 
  foreach ($keys as $key) {
- $arr[$key] = $this->get($key);
+ $arr[$key] = $this->get($key, optional($fields->get($key))->fieldtype());
  }
 
+ $this->isSelecting = false;
+
  return (new AugmentedCollection($arr))->withRelations($this->relations);
  }
 
  abstract public function keys();
 
- public function get($handle): Value
+ public function getAugmentedMethodValue($method)
+ {
+ if ($this->methodExistsOnThisClass($method)) {
+ return $this->$method();
+ }
+
+ return $this->data->$method();
+ }
+
+ protected function adjustFieldtype($handle, $fieldtype)
+ {
+ if ($this->isSelecting || $fieldtype !== null) {
+ return $fieldtype;
+ }
+
+ return $this->getFieldtype($handle);
+ }
+
+ public function get($handle, $fieldtype = null): Value
  {
  $method = Str::camel($handle);
 
  if ($this->methodExistsOnThisClass($method)) {
- $value = $this->$method();
-
- return $value instanceof Value
- ? $value
- : new Value($value, $method, null, $this->data);
+ return $this->wrapInvokable($method, true, $this, $handle, $fieldtype);
  }
 
  if (method_exists($this->data, $method) && collect($this->keys())->contains(Str::snake($handle))) {
- return $this->wrapValue($this->data->$method(), $handle);
+ return $this->wrapInvokable($method, false, $this->data, $handle, $fieldtype);
  }
 
- return $this->wrapValue($this->getFromData($handle), $handle);
+ return $this->wrapValue($this->getFromData($handle), $handle, $fieldtype);
  }
 
  protected function filterKeys($keys)
@@ -93,18 +113,35 @@ protected function getFromData($handle)
  return $value;
  }
 
- protected function wrapValue($value, $handle)
+ protected function wrapInvokable(string $method, bool $proxy, $methodTarget, string $handle, $fieldtype = null)
  {
- $fields = $this->blueprintFields();
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
+
+ return (new InvokableValue(
+ null,
+ $handle,
+ $fieldtype,
+ $this->data
+ ))->setInvokableDetails($method, $proxy, $methodTarget);
+ }
+
+ protected function wrapValue($value, $handle, $fieldtype = null)
+ {
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
 
  return new Value(
  $value,
  $handle,
-optional($fields->get($handle))->fieldtype(),
+$fieldtype,
  $this->data
  );
  }
 
+ protected function getFieldtype($handle)
+ {
+ return optional($this->blueprintFields()->get($handle))->fieldtype();
+ }
+
  protected function blueprintFields()
  {
  if (! isset($this->blueprintFields)) {

src/Data/AugmentedCollection.php

@@ -47,6 +47,22 @@ public function withoutEvaluation()
  return $this;
  }
 
+ public function all()
+ {
+ return collect($this->items)->map(function ($item) {
+ if ($item instanceof InvokableValue) {
+ return $item->materialize();
+ }
+
+ return $item;
+ })->all();
+ }
+
+ public function deferredAll()
+ {
+ return parent::all();
+ }
+
  public function toArray()
  {
  return $this->map(function ($value) {

src/Data/HasAugmentedInstance.php

@@ -26,6 +26,11 @@ public function toAugmentedArray($keys = null)
  return $this->toAugmentedCollection($keys)->all();
  }
 
+ public function toDeferredAugmentedArray($keys = null)
+ {
+ return $this->toAugmentedCollection($keys)->deferredAll();
+ }
+
  public function toShallowAugmentedCollection()
  {
  return $this->augmented()->select($this->shallowAugmentedArrayKeys())->withShallowNesting();

src/Data/InvokableValue.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Statamic\Data;
+
+use Statamic\Fields\Value;
+use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
+
+class InvokableValue extends Value
+{
+ protected $methodTarget = null;
+ protected bool $hasResolved = false;
+ protected string $methodName;
+ protected bool $proxyThroughAugmented = false;
+ protected $resolvedValueInstance = null;
+
+ public function setInvokableDetails(string $method, bool $proxyCall, $target): self
+ {
+ $this->proxyThroughAugmented = $proxyCall;
+ $this->methodName = $method;
+ $this->methodTarget = $target;
+
+ return $this;
+ }
+
+ protected function resolve()
+ {
+ if ($this->hasResolved) {
+ return;
+ }
+
+ if ($this->methodTarget == null) {
+ $this->hasResolved = true;
+
+ return;
+ }
+
+ $curIsolationState = GlobalRuntimeState::$requiresRuntimeIsolation;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = true;
+ if ($this->proxyThroughAugmented && method_exists($this->methodTarget, 'getAugmentedMethodValue')) {
+ $this->raw = $this->methodTarget->getAugmentedMethodValue($this->methodName);
+
+ if (! $this->raw instanceof Value) {
+ // Replicate previous behavior of not having
+ // a field set if the method call did not
+ // return a Value instance.
+ $this->fieldtype = null;
+ } else {
+ // Store the original Value instance, if we have it.
+ $this->resolvedValueInstance = $this->raw;
+
+ // Shift some values around.
+ $this->fieldtype = $this->raw->fieldtype();
+ $this->raw = $this->raw->raw();
+ }
+ } elseif (! $this->proxyThroughAugmented) {
+ $this->raw = $this->methodTarget->{$this->methodName}();
+ }
+
+ $this->methodTarget = null;
+
+ $this->hasResolved = true;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = $curIsolationState;
+ }
+
+ public function materialize()
+ {
+ $this->resolve();
+
+ if ($this->resolvedValueInstance != null) {
+ return $this->resolvedValueInstance;
+ }
+
+ return $this->toValue();
+ }
+
+ protected function toValue()
+ {
+ return new Value($this->raw, $this->handle, $this->fieldtype, $this->augmentable, $this->shallow);
+ }
+
+ public function raw()
+ {
+ $this->resolve();
+
+ return parent::raw();
+ }
+
+ public function value()
+ {
+ $this->resolve();
+
+ return parent::value();
+ }
+
+ public function shallow()
+ {
+ $this->resolve();
+
+ return parent::shallow();
+ }
+}

src/Fields/Value.php

@@ -37,6 +37,11 @@ public function raw()
  return $this->raw;
  }
 
+ public function materialize()
+ {
+ return $this;
+ }
+
  public function value()
  {
  if (! $this->fieldtype) {

src/Modifiers/CoreModifiers.php

@@ -767,7 +767,7 @@ public function get($value, $params)
 
  // Convert the item to an array, since we'll want access to all the
  // available data. Then grab the requested variable from there.
- $array = $item instanceof Augmentable ? $item->toAugmentedArray() : $item->toArray();
+ $array = $item instanceof Augmentable ? $item->toDeferredAugmentedArray() : $item->toArray();
 
  if ($arrayValue = Arr::get($array, $var)) {
  return $arrayValue;
@@ -838,7 +838,7 @@ private function getGroupByValueFromObject($item, $groupBy)
  {
  // Make the array just from the params, so it only augments the values that might be needed.
  $keys = explode(':', $groupBy);
- $context = $item->toAugmentedArray($keys);
+ $context = $item->toDeferredAugmentedArray($keys);
 
  return Antlers::parser()->getVariable($groupBy, $context);
  }
@@ -2057,7 +2057,7 @@ public function scope($value, $params)
  }
 
  if ($value instanceof Collection) {
- $value = $value->toAugmentedArray();
+ $value = $value->toDeferredAugmentedArray();
  }
 
  return Arr::addScope($value, $scope);

src/Providers/CollectionsServiceProvider.php

@@ -163,6 +163,16 @@ protected function toAugmentedArray()
  }, $this->items);
  });
 
+ Collection::macro('toDeferredAugmentedArray', function ($keys = null) {
+ return array_map(function ($value) use ($keys) {
+ if ($value instanceof Augmentable) {
+ return $value->toDeferredAugmentedArray($keys);
+ }
+
+ return $value instanceof Arrayable ? $value->toArray() : $value;
+ }, $this->items);
+ });
+
  Collection::macro('toAugmentedCollection', function ($keys = null) {
  return array_map(function ($value) use ($keys) {
  if ($value instanceof Augmentable) {

src/Tags/Structure.php

@@ -123,7 +123,7 @@ public function toArray($tree, $parent = null, $depth = 1)
  $pages = collect($tree)->map(function ($item, $index) use ($parent, $depth, $tree) {
  $page = $item['page'];
  $keys = $this->getQuerySelectKeys($page);
- $data = $page->toAugmentedArray($keys);
+ $data = $page->toDeferredAugmentedArray($keys);
  $children = empty($item['children']) ? [] : $this->toArray($item['children'], $data, $depth + 1);
 
  $url = $page->urlWithoutRedirect();

src/View/Antlers/Engine.php

@@ -161,11 +161,11 @@ public static function renderTag(Parser $parser, $name, $parameters = [], $conte
  }
 
  if ($output instanceof Collection) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  if ($output instanceof Augmentable) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  // Allow tags to return an array. We'll parse it for them.

src/View/Antlers/Language/Runtime/Sandbox/RuntimeValues.php

@@ -12,7 +12,7 @@ public static function resolveWithRuntimeIsolation($augmentable)
  {
  GlobalRuntimeState::$requiresRuntimeIsolation = true;
  try {
- $value = $augmentable->toAugmentedArray();
+ $value = $augmentable->toDeferredAugmentedArray();
  } catch (Exception $e) {
  throw $e;
  } finally {

src/View/Cascade.php

@@ -148,7 +148,7 @@ protected function hydrateGlobals()
  }
 
  if ($mainGlobal = $this->get('global')) {
- foreach ($mainGlobal->toAugmentedCollection() as $key => $value) {
+ foreach ($mainGlobal->toDeferredAugmentedArray() as $key => $value) {
  $this->set($key, $value);
  }
  }
@@ -163,7 +163,7 @@ protected function hydrateContent()
  }
 
  $variables = $this->content instanceof Augmentable
- ? $this->content->toAugmentedArray()
+ ? $this->content->toDeferredAugmentedArray()
  : $this->content->toArray();
 
  foreach ($variables as $key => $value) {

tests/Antlers/Runtime/CoreModifiersTest.php

@@ -581,6 +581,11 @@ public function toAugmentedArray()
  ];
  }
 
+ public function toDeferredAugmentedArray()
+ {
+ return $this->toAugmentedArray();
+ }
+
  public function toArray()
  {
  return $this->toAugmentedArray();

tests/Data/AugmentedTest.php

@@ -141,7 +141,7 @@ public function foo()
  }
  };
 
- $this->assertSame($valueInstance, $augmented->get('foo'));
+ $this->assertSame($valueInstance, $augmented->get('foo')->materialize());
  }
 
  /** @test */

src/Auth/AugmentedUser.php

@@ -39,7 +39,7 @@ private function commonKeys()
  ];
  }
 
- public function get($handle): Value
+ public function get($handle, $fieldtype = null): Value
  {
  if ($handle === 'is_user') {
  return new Value(true, 'is_user', null, $this->data);
@@ -57,7 +57,7 @@ public function get($handle): Value
  return new Value(in_array(Str::after($handle, 'in_'), $this->groups()), $handle, null, $this->data);
  }
 
- return parent::get($handle);
+ return parent::get($handle, $fieldtype);
  }
 
  protected function roles()

src/Data/AbstractAugmented.php

@@ -13,6 +13,7 @@ abstract class AbstractAugmented implements Augmented
  protected $data;
  protected $blueprintFields;
  protected $relations = [];
+ protected $isSelecting = false;
 
  public function __construct($data)
  {
@@ -34,33 +35,52 @@ public function select($keys = null)
  $arr = [];
 
  $keys = $this->filterKeys(Arr::wrap($keys ?: $this->keys()));
+ $fields = $this->blueprintFields();
+
+ $this->isSelecting = true;
 
  foreach ($keys as $key) {
- $arr[$key] = $this->get($key);
+ $arr[$key] = $this->get($key, optional($fields->get($key))->fieldtype());
  }
 
+ $this->isSelecting = false;
+
  return (new AugmentedCollection($arr))->withRelations($this->relations);
  }
 
  abstract public function keys();
 
- public function get($handle): Value
+ public function getAugmentedMethodValue($method)
+ {
+ if ($this->methodExistsOnThisClass($method)) {
+ return $this->$method();
+ }
+
+ return $this->data->$method();
+ }
+
+ protected function adjustFieldtype($handle, $fieldtype)
+ {
+ if ($this->isSelecting || $fieldtype !== null) {
+ return $fieldtype;
+ }
+
+ return $this->getFieldtype($handle);
+ }
+
+ public function get($handle, $fieldtype = null): Value
  {
  $method = Str::camel($handle);
 
  if ($this->methodExistsOnThisClass($method)) {
- $value = $this->$method();
-
- return $value instanceof Value
- ? $value
- : new Value($value, $method, null, $this->data);
+ return $this->wrapInvokable($method, true, $this, $handle, $fieldtype);
  }
 
  if (method_exists($this->data, $method) && collect($this->keys())->contains(Str::snake($handle))) {
- return $this->wrapValue($this->data->$method(), $handle);
+ return $this->wrapInvokable($method, false, $this->data, $handle, $fieldtype);
  }
 
- return $this->wrapValue($this->getFromData($handle), $handle);
+ return $this->wrapValue($this->getFromData($handle), $handle, $fieldtype);
  }
 
  protected function filterKeys($keys)
@@ -93,18 +113,35 @@ protected function getFromData($handle)
  return $value;
  }
 
- protected function wrapValue($value, $handle)
+ protected function wrapInvokable(string $method, bool $proxy, $methodTarget, string $handle, $fieldtype = null)
  {
- $fields = $this->blueprintFields();
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
+
+ return (new InvokableValue(
+ null,
+ $handle,
+ $fieldtype,
+ $this->data
+ ))->setInvokableDetails($method, $proxy, $methodTarget);
+ }
+
+ protected function wrapValue($value, $handle, $fieldtype = null)
+ {
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
 
  return new Value(
  $value,
  $handle,
-optional($fields->get($handle))->fieldtype(),
+$fieldtype,
  $this->data
  );
  }
 
+ protected function getFieldtype($handle)
+ {
+ return optional($this->blueprintFields()->get($handle))->fieldtype();
+ }
+
  protected function blueprintFields()
  {
  if (! isset($this->blueprintFields)) {

src/Data/AugmentedCollection.php

@@ -47,6 +47,22 @@ public function withoutEvaluation()
  return $this;
  }
 
+ public function all()
+ {
+ return collect($this->items)->map(function ($item) {
+ if ($item instanceof InvokableValue) {
+ return $item->materialize();
+ }
+
+ return $item;
+ })->all();
+ }
+
+ public function deferredAll()
+ {
+ return parent::all();
+ }
+
  public function toArray()
  {
  return $this->map(function ($value) {

src/Data/HasAugmentedInstance.php

@@ -26,6 +26,11 @@ public function toAugmentedArray($keys = null)
  return $this->toAugmentedCollection($keys)->all();
  }
 
+ public function toDeferredAugmentedArray($keys = null)
+ {
+ return $this->toAugmentedCollection($keys)->deferredAll();
+ }
+
  public function toShallowAugmentedCollection()
  {
  return $this->augmented()->select($this->shallowAugmentedArrayKeys())->withShallowNesting();

src/Data/InvokableValue.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Statamic\Data;
+
+use Statamic\Fields\Value;
+use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
+
+class InvokableValue extends Value
+{
+ protected $methodTarget = null;
+ protected bool $hasResolved = false;
+ protected string $methodName;
+ protected bool $proxyThroughAugmented = false;
+ protected $resolvedValueInstance = null;
+
+ public function setInvokableDetails(string $method, bool $proxyCall, $target): self
+ {
+ $this->proxyThroughAugmented = $proxyCall;
+ $this->methodName = $method;
+ $this->methodTarget = $target;
+
+ return $this;
+ }
+
+ protected function resolve()
+ {
+ if ($this->hasResolved) {
+ return;
+ }
+
+ if ($this->methodTarget == null) {
+ $this->hasResolved = true;
+
+ return;
+ }
+
+ $curIsolationState = GlobalRuntimeState::$requiresRuntimeIsolation;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = true;
+ if ($this->proxyThroughAugmented && method_exists($this->methodTarget, 'getAugmentedMethodValue')) {
+ $this->raw = $this->methodTarget->getAugmentedMethodValue($this->methodName);
+
+ if (! $this->raw instanceof Value) {
+ // Replicate previous behavior of not having
+ // a field set if the method call did not
+ // return a Value instance.
+ $this->fieldtype = null;
+ } else {
+ // Store the original Value instance, if we have it.
+ $this->resolvedValueInstance = $this->raw;
+
+ // Shift some values around.
+ $this->fieldtype = $this->raw->fieldtype();
+ $this->raw = $this->raw->raw();
+ }
+ } elseif (! $this->proxyThroughAugmented) {
+ $this->raw = $this->methodTarget->{$this->methodName}();
+ }
+
+ $this->methodTarget = null;
+
+ $this->hasResolved = true;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = $curIsolationState;
+ }
+
+ public function materialize()
+ {
+ $this->resolve();
+
+ if ($this->resolvedValueInstance != null) {
+ return $this->resolvedValueInstance;
+ }
+
+ return $this->toValue();
+ }
+
+ protected function toValue()
+ {
+ return new Value($this->raw, $this->handle, $this->fieldtype, $this->augmentable, $this->shallow);
+ }
+
+ public function raw()
+ {
+ $this->resolve();
+
+ return parent::raw();
+ }
+
+ public function value()
+ {
+ $this->resolve();
+
+ return parent::value();
+ }
+
+ public function shallow()
+ {
+ $this->resolve();
+
+ return parent::shallow();
+ }
+}

src/Fields/Value.php

@@ -37,6 +37,11 @@ public function raw()
  return $this->raw;
  }
 
+ public function materialize()
+ {
+ return $this;
+ }
+
  public function value()
  {
  if (! $this->fieldtype) {

src/Modifiers/CoreModifiers.php

@@ -767,7 +767,7 @@ public function get($value, $params)
 
  // Convert the item to an array, since we'll want access to all the
  // available data. Then grab the requested variable from there.
- $array = $item instanceof Augmentable ? $item->toAugmentedArray() : $item->toArray();
+ $array = $item instanceof Augmentable ? $item->toDeferredAugmentedArray() : $item->toArray();
 
  if ($arrayValue = Arr::get($array, $var)) {
  return $arrayValue;
@@ -838,7 +838,7 @@ private function getGroupByValueFromObject($item, $groupBy)
  {
  // Make the array just from the params, so it only augments the values that might be needed.
  $keys = explode(':', $groupBy);
- $context = $item->toAugmentedArray($keys);
+ $context = $item->toDeferredAugmentedArray($keys);
 
  return Antlers::parser()->getVariable($groupBy, $context);
  }
@@ -2057,7 +2057,7 @@ public function scope($value, $params)
  }
 
  if ($value instanceof Collection) {
- $value = $value->toAugmentedArray();
+ $value = $value->toDeferredAugmentedArray();
  }
 
  return Arr::addScope($value, $scope);

src/Providers/CollectionsServiceProvider.php

@@ -163,6 +163,16 @@ protected function toAugmentedArray()
  }, $this->items);
  });
 
+ Collection::macro('toDeferredAugmentedArray', function ($keys = null) {
+ return array_map(function ($value) use ($keys) {
+ if ($value instanceof Augmentable) {
+ return $value->toDeferredAugmentedArray($keys);
+ }
+
+ return $value instanceof Arrayable ? $value->toArray() : $value;
+ }, $this->items);
+ });
+
  Collection::macro('toAugmentedCollection', function ($keys = null) {
  return array_map(function ($value) use ($keys) {
  if ($value instanceof Augmentable) {

src/Tags/Structure.php

@@ -123,7 +123,7 @@ public function toArray($tree, $parent = null, $depth = 1)
  $pages = collect($tree)->map(function ($item, $index) use ($parent, $depth, $tree) {
  $page = $item['page'];
  $keys = $this->getQuerySelectKeys($page);
- $data = $page->toAugmentedArray($keys);
+ $data = $page->toDeferredAugmentedArray($keys);
  $children = empty($item['children']) ? [] : $this->toArray($item['children'], $data, $depth + 1);
 
  $url = $page->urlWithoutRedirect();

src/View/Antlers/Engine.php

@@ -161,11 +161,11 @@ public static function renderTag(Parser $parser, $name, $parameters = [], $conte
  }
 
  if ($output instanceof Collection) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  if ($output instanceof Augmentable) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  // Allow tags to return an array. We'll parse it for them.

src/View/Antlers/Language/Runtime/Sandbox/RuntimeValues.php

@@ -12,7 +12,7 @@ public static function resolveWithRuntimeIsolation($augmentable)
  {
  GlobalRuntimeState::$requiresRuntimeIsolation = true;
  try {
- $value = $augmentable->toAugmentedArray();
+ $value = $augmentable->toDeferredAugmentedArray();
  } catch (Exception $e) {
  throw $e;
  } finally {

src/View/Cascade.php

@@ -148,7 +148,7 @@ protected function hydrateGlobals()
  }
 
  if ($mainGlobal = $this->get('global')) {
- foreach ($mainGlobal->toAugmentedCollection() as $key => $value) {
+ foreach ($mainGlobal->toDeferredAugmentedArray() as $key => $value) {
  $this->set($key, $value);
  }
  }
@@ -163,7 +163,7 @@ protected function hydrateContent()
  }
 
  $variables = $this->content instanceof Augmentable
- ? $this->content->toAugmentedArray()
+ ? $this->content->toDeferredAugmentedArray()
  : $this->content->toArray();
 
  foreach ($variables as $key => $value) {

tests/Antlers/Runtime/CoreModifiersTest.php

@@ -581,6 +581,11 @@ public function toAugmentedArray()
  ];
  }
 
+ public function toDeferredAugmentedArray()
+ {
+ return $this->toAugmentedArray();
+ }
+
  public function toArray()
  {
  return $this->toAugmentedArray();

tests/Data/AugmentedTest.php

@@ -141,7 +141,7 @@ public function foo()
  }
  };
 
- $this->assertSame($valueInstance, $augmented->get('foo'));
+ $this->assertSame($valueInstance, $augmented->get('foo')->materialize());
  }
 
  /** @test */

src/Auth/AugmentedUser.php

@@ -39,7 +39,7 @@ private function commonKeys()
  ];
  }
 
- public function get($handle): Value
+ public function get($handle, $fieldtype = null): Value
  {
  if ($handle === 'is_user') {
  return new Value(true, 'is_user', null, $this->data);
@@ -57,7 +57,7 @@ public function get($handle): Value
  return new Value(in_array(Str::after($handle, 'in_'), $this->groups()), $handle, null, $this->data);
  }
 
- return parent::get($handle);
+ return parent::get($handle, $fieldtype);
  }
 
  protected function roles()

src/Data/AbstractAugmented.php

@@ -13,6 +13,7 @@ abstract class AbstractAugmented implements Augmented
  protected $data;
  protected $blueprintFields;
  protected $relations = [];
+ protected $isSelecting = false;
 
  public function __construct($data)
  {
@@ -34,33 +35,52 @@ public function select($keys = null)
  $arr = [];
 
  $keys = $this->filterKeys(Arr::wrap($keys ?: $this->keys()));
+ $fields = $this->blueprintFields();
+
+ $this->isSelecting = true;
 
  foreach ($keys as $key) {
- $arr[$key] = $this->get($key);
+ $arr[$key] = $this->get($key, optional($fields->get($key))->fieldtype());
  }
 
+ $this->isSelecting = false;
+
  return (new AugmentedCollection($arr))->withRelations($this->relations);
  }
 
  abstract public function keys();
 
- public function get($handle): Value
+ public function getAugmentedMethodValue($method)
+ {
+ if ($this->methodExistsOnThisClass($method)) {
+ return $this->$method();
+ }
+
+ return $this->data->$method();
+ }
+
+ protected function adjustFieldtype($handle, $fieldtype)
+ {
+ if ($this->isSelecting || $fieldtype !== null) {
+ return $fieldtype;
+ }
+
+ return $this->getFieldtype($handle);
+ }
+
+ public function get($handle, $fieldtype = null): Value
  {
  $method = Str::camel($handle);
 
  if ($this->methodExistsOnThisClass($method)) {
- $value = $this->$method();
-
- return $value instanceof Value
- ? $value
- : new Value($value, $method, null, $this->data);
+ return $this->wrapInvokable($method, true, $this, $handle, $fieldtype);
  }
 
  if (method_exists($this->data, $method) && collect($this->keys())->contains(Str::snake($handle))) {
- return $this->wrapValue($this->data->$method(), $handle);
+ return $this->wrapInvokable($method, false, $this->data, $handle, $fieldtype);
  }
 
- return $this->wrapValue($this->getFromData($handle), $handle);
+ return $this->wrapValue($this->getFromData($handle), $handle, $fieldtype);
  }
 
  protected function filterKeys($keys)
@@ -93,18 +113,35 @@ protected function getFromData($handle)
  return $value;
  }
 
- protected function wrapValue($value, $handle)
+ protected function wrapInvokable(string $method, bool $proxy, $methodTarget, string $handle, $fieldtype = null)
  {
- $fields = $this->blueprintFields();
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
+
+ return (new InvokableValue(
+ null,
+ $handle,
+ $fieldtype,
+ $this->data
+ ))->setInvokableDetails($method, $proxy, $methodTarget);
+ }
+
+ protected function wrapValue($value, $handle, $fieldtype = null)
+ {
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
 
  return new Value(
  $value,
  $handle,
-optional($fields->get($handle))->fieldtype(),
+$fieldtype,
  $this->data
  );
  }
 
+ protected function getFieldtype($handle)
+ {
+ return optional($this->blueprintFields()->get($handle))->fieldtype();
+ }
+
  protected function blueprintFields()
  {
  if (! isset($this->blueprintFields)) {

src/Data/AugmentedCollection.php

@@ -47,6 +47,22 @@ public function withoutEvaluation()
  return $this;
  }
 
+ public function all()
+ {
+ return collect($this->items)->map(function ($item) {
+ if ($item instanceof InvokableValue) {
+ return $item->materialize();
+ }
+
+ return $item;
+ })->all();
+ }
+
+ public function deferredAll()
+ {
+ return parent::all();
+ }
+
  public function toArray()
  {
  return $this->map(function ($value) {

src/Data/HasAugmentedInstance.php

@@ -26,6 +26,11 @@ public function toAugmentedArray($keys = null)
  return $this->toAugmentedCollection($keys)->all();
  }
 
+ public function toDeferredAugmentedArray($keys = null)
+ {
+ return $this->toAugmentedCollection($keys)->deferredAll();
+ }
+
  public function toShallowAugmentedCollection()
  {
  return $this->augmented()->select($this->shallowAugmentedArrayKeys())->withShallowNesting();

src/Data/InvokableValue.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Statamic\Data;
+
+use Statamic\Fields\Value;
+use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
+
+class InvokableValue extends Value
+{
+ protected $methodTarget = null;
+ protected bool $hasResolved = false;
+ protected string $methodName;
+ protected bool $proxyThroughAugmented = false;
+ protected $resolvedValueInstance = null;
+
+ public function setInvokableDetails(string $method, bool $proxyCall, $target): self
+ {
+ $this->proxyThroughAugmented = $proxyCall;
+ $this->methodName = $method;
+ $this->methodTarget = $target;
+
+ return $this;
+ }
+
+ protected function resolve()
+ {
+ if ($this->hasResolved) {
+ return;
+ }
+
+ if ($this->methodTarget == null) {
+ $this->hasResolved = true;
+
+ return;
+ }
+
+ $curIsolationState = GlobalRuntimeState::$requiresRuntimeIsolation;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = true;
+ if ($this->proxyThroughAugmented && method_exists($this->methodTarget, 'getAugmentedMethodValue')) {
+ $this->raw = $this->methodTarget->getAugmentedMethodValue($this->methodName);
+
+ if (! $this->raw instanceof Value) {
+ // Replicate previous behavior of not having
+ // a field set if the method call did not
+ // return a Value instance.
+ $this->fieldtype = null;
+ } else {
+ // Store the original Value instance, if we have it.
+ $this->resolvedValueInstance = $this->raw;
+
+ // Shift some values around.
+ $this->fieldtype = $this->raw->fieldtype();
+ $this->raw = $this->raw->raw();
+ }
+ } elseif (! $this->proxyThroughAugmented) {
+ $this->raw = $this->methodTarget->{$this->methodName}();
+ }
+
+ $this->methodTarget = null;
+
+ $this->hasResolved = true;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = $curIsolationState;
+ }
+
+ public function materialize()
+ {
+ $this->resolve();
+
+ if ($this->resolvedValueInstance != null) {
+ return $this->resolvedValueInstance;
+ }
+
+ return $this->toValue();
+ }
+
+ protected function toValue()
+ {
+ return new Value($this->raw, $this->handle, $this->fieldtype, $this->augmentable, $this->shallow);
+ }
+
+ public function raw()
+ {
+ $this->resolve();
+
+ return parent::raw();
+ }
+
+ public function value()
+ {
+ $this->resolve();
+
+ return parent::value();
+ }
+
+ public function shallow()
+ {
+ $this->resolve();
+
+ return parent::shallow();
+ }
+}

src/Fields/Value.php

@@ -37,6 +37,11 @@ public function raw()
  return $this->raw;
  }
 
+ public function materialize()
+ {
+ return $this;
+ }
+
  public function value()
  {
  if (! $this->fieldtype) {

src/Modifiers/CoreModifiers.php

@@ -767,7 +767,7 @@ public function get($value, $params)
 
  // Convert the item to an array, since we'll want access to all the
  // available data. Then grab the requested variable from there.
- $array = $item instanceof Augmentable ? $item->toAugmentedArray() : $item->toArray();
+ $array = $item instanceof Augmentable ? $item->toDeferredAugmentedArray() : $item->toArray();
 
  if ($arrayValue = Arr::get($array, $var)) {
  return $arrayValue;
@@ -838,7 +838,7 @@ private function getGroupByValueFromObject($item, $groupBy)
  {
  // Make the array just from the params, so it only augments the values that might be needed.
  $keys = explode(':', $groupBy);
- $context = $item->toAugmentedArray($keys);
+ $context = $item->toDeferredAugmentedArray($keys);
 
  return Antlers::parser()->getVariable($groupBy, $context);
  }
@@ -2057,7 +2057,7 @@ public function scope($value, $params)
  }
 
  if ($value instanceof Collection) {
- $value = $value->toAugmentedArray();
+ $value = $value->toDeferredAugmentedArray();
  }
 
  return Arr::addScope($value, $scope);

src/Providers/CollectionsServiceProvider.php

@@ -163,6 +163,16 @@ protected function toAugmentedArray()
  }, $this->items);
  });
 
+ Collection::macro('toDeferredAugmentedArray', function ($keys = null) {
+ return array_map(function ($value) use ($keys) {
+ if ($value instanceof Augmentable) {
+ return $value->toDeferredAugmentedArray($keys);
+ }
+
+ return $value instanceof Arrayable ? $value->toArray() : $value;
+ }, $this->items);
+ });
+
  Collection::macro('toAugmentedCollection', function ($keys = null) {
  return array_map(function ($value) use ($keys) {
  if ($value instanceof Augmentable) {

src/Tags/Structure.php

@@ -123,7 +123,7 @@ public function toArray($tree, $parent = null, $depth = 1)
  $pages = collect($tree)->map(function ($item, $index) use ($parent, $depth, $tree) {
  $page = $item['page'];
  $keys = $this->getQuerySelectKeys($page);
- $data = $page->toAugmentedArray($keys);
+ $data = $page->toDeferredAugmentedArray($keys);
  $children = empty($item['children']) ? [] : $this->toArray($item['children'], $data, $depth + 1);
 
  $url = $page->urlWithoutRedirect();

src/View/Antlers/Engine.php

@@ -161,11 +161,11 @@ public static function renderTag(Parser $parser, $name, $parameters = [], $conte
  }
 
  if ($output instanceof Collection) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  if ($output instanceof Augmentable) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  // Allow tags to return an array. We'll parse it for them.

src/View/Antlers/Language/Runtime/Sandbox/RuntimeValues.php

@@ -12,7 +12,7 @@ public static function resolveWithRuntimeIsolation($augmentable)
  {
  GlobalRuntimeState::$requiresRuntimeIsolation = true;
  try {
- $value = $augmentable->toAugmentedArray();
+ $value = $augmentable->toDeferredAugmentedArray();
  } catch (Exception $e) {
  throw $e;
  } finally {

src/View/Cascade.php

@@ -148,7 +148,7 @@ protected function hydrateGlobals()
  }
 
  if ($mainGlobal = $this->get('global')) {
- foreach ($mainGlobal->toAugmentedCollection() as $key => $value) {
+ foreach ($mainGlobal->toDeferredAugmentedArray() as $key => $value) {
  $this->set($key, $value);
  }
  }
@@ -163,7 +163,7 @@ protected function hydrateContent()
  }
 
  $variables = $this->content instanceof Augmentable
- ? $this->content->toAugmentedArray()
+ ? $this->content->toDeferredAugmentedArray()
  : $this->content->toArray();
 
  foreach ($variables as $key => $value) {

tests/Antlers/Runtime/CoreModifiersTest.php

@@ -581,6 +581,11 @@ public function toAugmentedArray()
  ];
  }
 
+ public function toDeferredAugmentedArray()
+ {
+ return $this->toAugmentedArray();
+ }
+
  public function toArray()
  {
  return $this->toAugmentedArray();

tests/Data/AugmentedTest.php

@@ -141,7 +141,7 @@ public function foo()
  }
  };
 
- $this->assertSame($valueInstance, $augmented->get('foo'));
+ $this->assertSame($valueInstance, $augmented->get('foo')->materialize());
  }
 
  /** @test */

src/Auth/AugmentedUser.php

@@ -39,7 +39,7 @@ private function commonKeys()
  ];
  }
 
- public function get($handle): Value
+ public function get($handle, $fieldtype = null): Value
  {
  if ($handle === 'is_user') {
  return new Value(true, 'is_user', null, $this->data);
@@ -57,7 +57,7 @@ public function get($handle): Value
  return new Value(in_array(Str::after($handle, 'in_'), $this->groups()), $handle, null, $this->data);
  }
 
- return parent::get($handle);
+ return parent::get($handle, $fieldtype);
  }
 
  protected function roles()

src/Data/AbstractAugmented.php

@@ -13,6 +13,7 @@ abstract class AbstractAugmented implements Augmented
  protected $data;
  protected $blueprintFields;
  protected $relations = [];
+ protected $isSelecting = false;
 
  public function __construct($data)
  {
@@ -34,33 +35,52 @@ public function select($keys = null)
  $arr = [];
 
  $keys = $this->filterKeys(Arr::wrap($keys ?: $this->keys()));
+ $fields = $this->blueprintFields();
+
+ $this->isSelecting = true;
 
  foreach ($keys as $key) {
- $arr[$key] = $this->get($key);
+ $arr[$key] = $this->get($key, optional($fields->get($key))->fieldtype());
  }
 
+ $this->isSelecting = false;
+
  return (new AugmentedCollection($arr))->withRelations($this->relations);
  }
 
  abstract public function keys();
 
- public function get($handle): Value
+ public function getAugmentedMethodValue($method)
+ {
+ if ($this->methodExistsOnThisClass($method)) {
+ return $this->$method();
+ }
+
+ return $this->data->$method();
+ }
+
+ protected function adjustFieldtype($handle, $fieldtype)
+ {
+ if ($this->isSelecting || $fieldtype !== null) {
+ return $fieldtype;
+ }
+
+ return $this->getFieldtype($handle);
+ }
+
+ public function get($handle, $fieldtype = null): Value
  {
  $method = Str::camel($handle);
 
  if ($this->methodExistsOnThisClass($method)) {
- $value = $this->$method();
-
- return $value instanceof Value
- ? $value
- : new Value($value, $method, null, $this->data);
+ return $this->wrapInvokable($method, true, $this, $handle, $fieldtype);
  }
 
  if (method_exists($this->data, $method) && collect($this->keys())->contains(Str::snake($handle))) {
- return $this->wrapValue($this->data->$method(), $handle);
+ return $this->wrapInvokable($method, false, $this->data, $handle, $fieldtype);
  }
 
- return $this->wrapValue($this->getFromData($handle), $handle);
+ return $this->wrapValue($this->getFromData($handle), $handle, $fieldtype);
  }
 
  protected function filterKeys($keys)
@@ -93,18 +113,35 @@ protected function getFromData($handle)
  return $value;
  }
 
- protected function wrapValue($value, $handle)
+ protected function wrapInvokable(string $method, bool $proxy, $methodTarget, string $handle, $fieldtype = null)
  {
- $fields = $this->blueprintFields();
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
+
+ return (new InvokableValue(
+ null,
+ $handle,
+ $fieldtype,
+ $this->data
+ ))->setInvokableDetails($method, $proxy, $methodTarget);
+ }
+
+ protected function wrapValue($value, $handle, $fieldtype = null)
+ {
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
 
  return new Value(
  $value,
  $handle,
-optional($fields->get($handle))->fieldtype(),
+$fieldtype,
  $this->data
  );
  }
 
+ protected function getFieldtype($handle)
+ {
+ return optional($this->blueprintFields()->get($handle))->fieldtype();
+ }
+
  protected function blueprintFields()
  {
  if (! isset($this->blueprintFields)) {

src/Data/AugmentedCollection.php

@@ -47,6 +47,22 @@ public function withoutEvaluation()
  return $this;
  }
 
+ public function all()
+ {
+ return collect($this->items)->map(function ($item) {
+ if ($item instanceof InvokableValue) {
+ return $item->materialize();
+ }
+
+ return $item;
+ })->all();
+ }
+
+ public function deferredAll()
+ {
+ return parent::all();
+ }
+
  public function toArray()
  {
  return $this->map(function ($value) {

src/Data/HasAugmentedInstance.php

@@ -26,6 +26,11 @@ public function toAugmentedArray($keys = null)
  return $this->toAugmentedCollection($keys)->all();
  }
 
+ public function toDeferredAugmentedArray($keys = null)
+ {
+ return $this->toAugmentedCollection($keys)->deferredAll();
+ }
+
  public function toShallowAugmentedCollection()
  {
  return $this->augmented()->select($this->shallowAugmentedArrayKeys())->withShallowNesting();

src/Data/InvokableValue.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Statamic\Data;
+
+use Statamic\Fields\Value;
+use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
+
+class InvokableValue extends Value
+{
+ protected $methodTarget = null;
+ protected bool $hasResolved = false;
+ protected string $methodName;
+ protected bool $proxyThroughAugmented = false;
+ protected $resolvedValueInstance = null;
+
+ public function setInvokableDetails(string $method, bool $proxyCall, $target): self
+ {
+ $this->proxyThroughAugmented = $proxyCall;
+ $this->methodName = $method;
+ $this->methodTarget = $target;
+
+ return $this;
+ }
+
+ protected function resolve()
+ {
+ if ($this->hasResolved) {
+ return;
+ }
+
+ if ($this->methodTarget == null) {
+ $this->hasResolved = true;
+
+ return;
+ }
+
+ $curIsolationState = GlobalRuntimeState::$requiresRuntimeIsolation;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = true;
+ if ($this->proxyThroughAugmented && method_exists($this->methodTarget, 'getAugmentedMethodValue')) {
+ $this->raw = $this->methodTarget->getAugmentedMethodValue($this->methodName);
+
+ if (! $this->raw instanceof Value) {
+ // Replicate previous behavior of not having
+ // a field set if the method call did not
+ // return a Value instance.
+ $this->fieldtype = null;
+ } else {
+ // Store the original Value instance, if we have it.
+ $this->resolvedValueInstance = $this->raw;
+
+ // Shift some values around.
+ $this->fieldtype = $this->raw->fieldtype();
+ $this->raw = $this->raw->raw();
+ }
+ } elseif (! $this->proxyThroughAugmented) {
+ $this->raw = $this->methodTarget->{$this->methodName}();
+ }
+
+ $this->methodTarget = null;
+
+ $this->hasResolved = true;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = $curIsolationState;
+ }
+
+ public function materialize()
+ {
+ $this->resolve();
+
+ if ($this->resolvedValueInstance != null) {
+ return $this->resolvedValueInstance;
+ }
+
+ return $this->toValue();
+ }
+
+ protected function toValue()
+ {
+ return new Value($this->raw, $this->handle, $this->fieldtype, $this->augmentable, $this->shallow);
+ }
+
+ public function raw()
+ {
+ $this->resolve();
+
+ return parent::raw();
+ }
+
+ public function value()
+ {
+ $this->resolve();
+
+ return parent::value();
+ }
+
+ public function shallow()
+ {
+ $this->resolve();
+
+ return parent::shallow();
+ }
+}

src/Fields/Value.php

@@ -37,6 +37,11 @@ public function raw()
  return $this->raw;
  }
 
+ public function materialize()
+ {
+ return $this;
+ }
+
  public function value()
  {
  if (! $this->fieldtype) {

src/Modifiers/CoreModifiers.php

@@ -767,7 +767,7 @@ public function get($value, $params)
 
  // Convert the item to an array, since we'll want access to all the
  // available data. Then grab the requested variable from there.
- $array = $item instanceof Augmentable ? $item->toAugmentedArray() : $item->toArray();
+ $array = $item instanceof Augmentable ? $item->toDeferredAugmentedArray() : $item->toArray();
 
  if ($arrayValue = Arr::get($array, $var)) {
  return $arrayValue;
@@ -838,7 +838,7 @@ private function getGroupByValueFromObject($item, $groupBy)
  {
  // Make the array just from the params, so it only augments the values that might be needed.
  $keys = explode(':', $groupBy);
- $context = $item->toAugmentedArray($keys);
+ $context = $item->toDeferredAugmentedArray($keys);
 
  return Antlers::parser()->getVariable($groupBy, $context);
  }
@@ -2057,7 +2057,7 @@ public function scope($value, $params)
  }
 
  if ($value instanceof Collection) {
- $value = $value->toAugmentedArray();
+ $value = $value->toDeferredAugmentedArray();
  }
 
  return Arr::addScope($value, $scope);

src/Providers/CollectionsServiceProvider.php

@@ -163,6 +163,16 @@ protected function toAugmentedArray()
  }, $this->items);
  });
 
+ Collection::macro('toDeferredAugmentedArray', function ($keys = null) {
+ return array_map(function ($value) use ($keys) {
+ if ($value instanceof Augmentable) {
+ return $value->toDeferredAugmentedArray($keys);
+ }
+
+ return $value instanceof Arrayable ? $value->toArray() : $value;
+ }, $this->items);
+ });
+
  Collection::macro('toAugmentedCollection', function ($keys = null) {
  return array_map(function ($value) use ($keys) {
  if ($value instanceof Augmentable) {

src/Tags/Structure.php

@@ -123,7 +123,7 @@ public function toArray($tree, $parent = null, $depth = 1)
  $pages = collect($tree)->map(function ($item, $index) use ($parent, $depth, $tree) {
  $page = $item['page'];
  $keys = $this->getQuerySelectKeys($page);
- $data = $page->toAugmentedArray($keys);
+ $data = $page->toDeferredAugmentedArray($keys);
  $children = empty($item['children']) ? [] : $this->toArray($item['children'], $data, $depth + 1);
 
  $url = $page->urlWithoutRedirect();

src/View/Antlers/Engine.php

@@ -161,11 +161,11 @@ public static function renderTag(Parser $parser, $name, $parameters = [], $conte
  }
 
  if ($output instanceof Collection) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  if ($output instanceof Augmentable) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  // Allow tags to return an array. We'll parse it for them.

src/View/Antlers/Language/Runtime/Sandbox/RuntimeValues.php

@@ -12,7 +12,7 @@ public static function resolveWithRuntimeIsolation($augmentable)
  {
  GlobalRuntimeState::$requiresRuntimeIsolation = true;
  try {
- $value = $augmentable->toAugmentedArray();
+ $value = $augmentable->toDeferredAugmentedArray();
  } catch (Exception $e) {
  throw $e;
  } finally {

src/View/Cascade.php

@@ -148,7 +148,7 @@ protected function hydrateGlobals()
  }
 
  if ($mainGlobal = $this->get('global')) {
- foreach ($mainGlobal->toAugmentedCollection() as $key => $value) {
+ foreach ($mainGlobal->toDeferredAugmentedArray() as $key => $value) {
  $this->set($key, $value);
  }
  }
@@ -163,7 +163,7 @@ protected function hydrateContent()
  }
 
  $variables = $this->content instanceof Augmentable
- ? $this->content->toAugmentedArray()
+ ? $this->content->toDeferredAugmentedArray()
  : $this->content->toArray();
 
  foreach ($variables as $key => $value) {

tests/Antlers/Runtime/CoreModifiersTest.php

@@ -581,6 +581,11 @@ public function toAugmentedArray()
  ];
  }
 
+ public function toDeferredAugmentedArray()
+ {
+ return $this->toAugmentedArray();
+ }
+
  public function toArray()
  {
  return $this->toAugmentedArray();

tests/Data/AugmentedTest.php

@@ -141,7 +141,7 @@ public function foo()
  }
  };
 
- $this->assertSame($valueInstance, $augmented->get('foo'));
+ $this->assertSame($valueInstance, $augmented->get('foo')->materialize());
  }
 
  /** @test */

src/Auth/AugmentedUser.php

@@ -39,7 +39,7 @@ private function commonKeys()
  ];
  }
 
- public function get($handle): Value
+ public function get($handle, $fieldtype = null): Value
  {
  if ($handle === 'is_user') {
  return new Value(true, 'is_user', null, $this->data);
@@ -57,7 +57,7 @@ public function get($handle): Value
  return new Value(in_array(Str::after($handle, 'in_'), $this->groups()), $handle, null, $this->data);
  }
 
- return parent::get($handle);
+ return parent::get($handle, $fieldtype);
  }
 
  protected function roles()

src/Data/AbstractAugmented.php

@@ -13,6 +13,7 @@ abstract class AbstractAugmented implements Augmented
  protected $data;
  protected $blueprintFields;
  protected $relations = [];
+ protected $isSelecting = false;
 
  public function __construct($data)
  {
@@ -34,33 +35,52 @@ public function select($keys = null)
  $arr = [];
 
  $keys = $this->filterKeys(Arr::wrap($keys ?: $this->keys()));
+ $fields = $this->blueprintFields();
+
+ $this->isSelecting = true;
 
  foreach ($keys as $key) {
- $arr[$key] = $this->get($key);
+ $arr[$key] = $this->get($key, optional($fields->get($key))->fieldtype());
  }
 
+ $this->isSelecting = false;
+
  return (new AugmentedCollection($arr))->withRelations($this->relations);
  }
 
  abstract public function keys();
 
- public function get($handle): Value
+ public function getAugmentedMethodValue($method)
+ {
+ if ($this->methodExistsOnThisClass($method)) {
+ return $this->$method();
+ }
+
+ return $this->data->$method();
+ }
+
+ protected function adjustFieldtype($handle, $fieldtype)
+ {
+ if ($this->isSelecting || $fieldtype !== null) {
+ return $fieldtype;
+ }
+
+ return $this->getFieldtype($handle);
+ }
+
+ public function get($handle, $fieldtype = null): Value
  {
  $method = Str::camel($handle);
 
  if ($this->methodExistsOnThisClass($method)) {
- $value = $this->$method();
-
- return $value instanceof Value
- ? $value
- : new Value($value, $method, null, $this->data);
+ return $this->wrapInvokable($method, true, $this, $handle, $fieldtype);
  }
 
  if (method_exists($this->data, $method) && collect($this->keys())->contains(Str::snake($handle))) {
- return $this->wrapValue($this->data->$method(), $handle);
+ return $this->wrapInvokable($method, false, $this->data, $handle, $fieldtype);
  }
 
- return $this->wrapValue($this->getFromData($handle), $handle);
+ return $this->wrapValue($this->getFromData($handle), $handle, $fieldtype);
  }
 
  protected function filterKeys($keys)
@@ -93,18 +113,35 @@ protected function getFromData($handle)
  return $value;
  }
 
- protected function wrapValue($value, $handle)
+ protected function wrapInvokable(string $method, bool $proxy, $methodTarget, string $handle, $fieldtype = null)
  {
- $fields = $this->blueprintFields();
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
+
+ return (new InvokableValue(
+ null,
+ $handle,
+ $fieldtype,
+ $this->data
+ ))->setInvokableDetails($method, $proxy, $methodTarget);
+ }
+
+ protected function wrapValue($value, $handle, $fieldtype = null)
+ {
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
 
  return new Value(
  $value,
  $handle,
-optional($fields->get($handle))->fieldtype(),
+$fieldtype,
  $this->data
  );
  }
 
+ protected function getFieldtype($handle)
+ {
+ return optional($this->blueprintFields()->get($handle))->fieldtype();
+ }
+
  protected function blueprintFields()
  {
  if (! isset($this->blueprintFields)) {

src/Data/AugmentedCollection.php

@@ -47,6 +47,22 @@ public function withoutEvaluation()
  return $this;
  }
 
+ public function all()
+ {
+ return collect($this->items)->map(function ($item) {
+ if ($item instanceof InvokableValue) {
+ return $item->materialize();
+ }
+
+ return $item;
+ })->all();
+ }
+
+ public function deferredAll()
+ {
+ return parent::all();
+ }
+
  public function toArray()
  {
  return $this->map(function ($value) {

src/Data/HasAugmentedInstance.php

@@ -26,6 +26,11 @@ public function toAugmentedArray($keys = null)
  return $this->toAugmentedCollection($keys)->all();
  }
 
+ public function toDeferredAugmentedArray($keys = null)
+ {
+ return $this->toAugmentedCollection($keys)->deferredAll();
+ }
+
  public function toShallowAugmentedCollection()
  {
  return $this->augmented()->select($this->shallowAugmentedArrayKeys())->withShallowNesting();

src/Data/InvokableValue.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Statamic\Data;
+
+use Statamic\Fields\Value;
+use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
+
+class InvokableValue extends Value
+{
+ protected $methodTarget = null;
+ protected bool $hasResolved = false;
+ protected string $methodName;
+ protected bool $proxyThroughAugmented = false;
+ protected $resolvedValueInstance = null;
+
+ public function setInvokableDetails(string $method, bool $proxyCall, $target): self
+ {
+ $this->proxyThroughAugmented = $proxyCall;
+ $this->methodName = $method;
+ $this->methodTarget = $target;
+
+ return $this;
+ }
+
+ protected function resolve()
+ {
+ if ($this->hasResolved) {
+ return;
+ }
+
+ if ($this->methodTarget == null) {
+ $this->hasResolved = true;
+
+ return;
+ }
+
+ $curIsolationState = GlobalRuntimeState::$requiresRuntimeIsolation;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = true;
+ if ($this->proxyThroughAugmented && method_exists($this->methodTarget, 'getAugmentedMethodValue')) {
+ $this->raw = $this->methodTarget->getAugmentedMethodValue($this->methodName);
+
+ if (! $this->raw instanceof Value) {
+ // Replicate previous behavior of not having
+ // a field set if the method call did not
+ // return a Value instance.
+ $this->fieldtype = null;
+ } else {
+ // Store the original Value instance, if we have it.
+ $this->resolvedValueInstance = $this->raw;
+
+ // Shift some values around.
+ $this->fieldtype = $this->raw->fieldtype();
+ $this->raw = $this->raw->raw();
+ }
+ } elseif (! $this->proxyThroughAugmented) {
+ $this->raw = $this->methodTarget->{$this->methodName}();
+ }
+
+ $this->methodTarget = null;
+
+ $this->hasResolved = true;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = $curIsolationState;
+ }
+
+ public function materialize()
+ {
+ $this->resolve();
+
+ if ($this->resolvedValueInstance != null) {
+ return $this->resolvedValueInstance;
+ }
+
+ return $this->toValue();
+ }
+
+ protected function toValue()
+ {
+ return new Value($this->raw, $this->handle, $this->fieldtype, $this->augmentable, $this->shallow);
+ }
+
+ public function raw()
+ {
+ $this->resolve();
+
+ return parent::raw();
+ }
+
+ public function value()
+ {
+ $this->resolve();
+
+ return parent::value();
+ }
+
+ public function shallow()
+ {
+ $this->resolve();
+
+ return parent::shallow();
+ }
+}

src/Fields/Value.php

@@ -37,6 +37,11 @@ public function raw()
  return $this->raw;
  }
 
+ public function materialize()
+ {
+ return $this;
+ }
+
  public function value()
  {
  if (! $this->fieldtype) {

src/Modifiers/CoreModifiers.php

@@ -767,7 +767,7 @@ public function get($value, $params)
 
  // Convert the item to an array, since we'll want access to all the
  // available data. Then grab the requested variable from there.
- $array = $item instanceof Augmentable ? $item->toAugmentedArray() : $item->toArray();
+ $array = $item instanceof Augmentable ? $item->toDeferredAugmentedArray() : $item->toArray();
 
  if ($arrayValue = Arr::get($array, $var)) {
  return $arrayValue;
@@ -838,7 +838,7 @@ private function getGroupByValueFromObject($item, $groupBy)
  {
  // Make the array just from the params, so it only augments the values that might be needed.
  $keys = explode(':', $groupBy);
- $context = $item->toAugmentedArray($keys);
+ $context = $item->toDeferredAugmentedArray($keys);
 
  return Antlers::parser()->getVariable($groupBy, $context);
  }
@@ -2057,7 +2057,7 @@ public function scope($value, $params)
  }
 
  if ($value instanceof Collection) {
- $value = $value->toAugmentedArray();
+ $value = $value->toDeferredAugmentedArray();
  }
 
  return Arr::addScope($value, $scope);

src/Providers/CollectionsServiceProvider.php

@@ -163,6 +163,16 @@ protected function toAugmentedArray()
  }, $this->items);
  });
 
+ Collection::macro('toDeferredAugmentedArray', function ($keys = null) {
+ return array_map(function ($value) use ($keys) {
+ if ($value instanceof Augmentable) {
+ return $value->toDeferredAugmentedArray($keys);
+ }
+
+ return $value instanceof Arrayable ? $value->toArray() : $value;
+ }, $this->items);
+ });
+
  Collection::macro('toAugmentedCollection', function ($keys = null) {
  return array_map(function ($value) use ($keys) {
  if ($value instanceof Augmentable) {

src/Tags/Structure.php

@@ -123,7 +123,7 @@ public function toArray($tree, $parent = null, $depth = 1)
  $pages = collect($tree)->map(function ($item, $index) use ($parent, $depth, $tree) {
  $page = $item['page'];
  $keys = $this->getQuerySelectKeys($page);
- $data = $page->toAugmentedArray($keys);
+ $data = $page->toDeferredAugmentedArray($keys);
  $children = empty($item['children']) ? [] : $this->toArray($item['children'], $data, $depth + 1);
 
  $url = $page->urlWithoutRedirect();

src/View/Antlers/Engine.php

@@ -161,11 +161,11 @@ public static function renderTag(Parser $parser, $name, $parameters = [], $conte
  }
 
  if ($output instanceof Collection) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  if ($output instanceof Augmentable) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  // Allow tags to return an array. We'll parse it for them.

src/View/Antlers/Language/Runtime/Sandbox/RuntimeValues.php

@@ -12,7 +12,7 @@ public static function resolveWithRuntimeIsolation($augmentable)
  {
  GlobalRuntimeState::$requiresRuntimeIsolation = true;
  try {
- $value = $augmentable->toAugmentedArray();
+ $value = $augmentable->toDeferredAugmentedArray();
  } catch (Exception $e) {
  throw $e;
  } finally {

src/View/Cascade.php

@@ -148,7 +148,7 @@ protected function hydrateGlobals()
  }
 
  if ($mainGlobal = $this->get('global')) {
- foreach ($mainGlobal->toAugmentedCollection() as $key => $value) {
+ foreach ($mainGlobal->toDeferredAugmentedArray() as $key => $value) {
  $this->set($key, $value);
  }
  }
@@ -163,7 +163,7 @@ protected function hydrateContent()
  }
 
  $variables = $this->content instanceof Augmentable
- ? $this->content->toAugmentedArray()
+ ? $this->content->toDeferredAugmentedArray()
  : $this->content->toArray();
 
  foreach ($variables as $key => $value) {

tests/Antlers/Runtime/CoreModifiersTest.php

@@ -581,6 +581,11 @@ public function toAugmentedArray()
  ];
  }
 
+ public function toDeferredAugmentedArray()
+ {
+ return $this->toAugmentedArray();
+ }
+
  public function toArray()
  {
  return $this->toAugmentedArray();

tests/Data/AugmentedTest.php

@@ -141,7 +141,7 @@ public function foo()
  }
  };
 
- $this->assertSame($valueInstance, $augmented->get('foo'));
+ $this->assertSame($valueInstance, $augmented->get('foo')->materialize());
  }
 
  /** @test */

src/Auth/AugmentedUser.php

@@ -39,7 +39,7 @@ private function commonKeys()
  ];
  }
 
- public function get($handle): Value
+ public function get($handle, $fieldtype = null): Value
  {
  if ($handle === 'is_user') {
  return new Value(true, 'is_user', null, $this->data);
@@ -57,7 +57,7 @@ public function get($handle): Value
  return new Value(in_array(Str::after($handle, 'in_'), $this->groups()), $handle, null, $this->data);
  }
 
- return parent::get($handle);
+ return parent::get($handle, $fieldtype);
  }
 
  protected function roles()

src/Data/AbstractAugmented.php

@@ -13,6 +13,7 @@ abstract class AbstractAugmented implements Augmented
  protected $data;
  protected $blueprintFields;
  protected $relations = [];
+ protected $isSelecting = false;
 
  public function __construct($data)
  {
@@ -34,33 +35,52 @@ public function select($keys = null)
  $arr = [];
 
  $keys = $this->filterKeys(Arr::wrap($keys ?: $this->keys()));
+ $fields = $this->blueprintFields();
+
+ $this->isSelecting = true;
 
  foreach ($keys as $key) {
- $arr[$key] = $this->get($key);
+ $arr[$key] = $this->get($key, optional($fields->get($key))->fieldtype());
  }
 
+ $this->isSelecting = false;
+
  return (new AugmentedCollection($arr))->withRelations($this->relations);
  }
 
  abstract public function keys();
 
- public function get($handle): Value
+ public function getAugmentedMethodValue($method)
+ {
+ if ($this->methodExistsOnThisClass($method)) {
+ return $this->$method();
+ }
+
+ return $this->data->$method();
+ }
+
+ protected function adjustFieldtype($handle, $fieldtype)
+ {
+ if ($this->isSelecting || $fieldtype !== null) {
+ return $fieldtype;
+ }
+
+ return $this->getFieldtype($handle);
+ }
+
+ public function get($handle, $fieldtype = null): Value
  {
  $method = Str::camel($handle);
 
  if ($this->methodExistsOnThisClass($method)) {
- $value = $this->$method();
-
- return $value instanceof Value
- ? $value
- : new Value($value, $method, null, $this->data);
+ return $this->wrapInvokable($method, true, $this, $handle, $fieldtype);
  }
 
  if (method_exists($this->data, $method) && collect($this->keys())->contains(Str::snake($handle))) {
- return $this->wrapValue($this->data->$method(), $handle);
+ return $this->wrapInvokable($method, false, $this->data, $handle, $fieldtype);
  }
 
- return $this->wrapValue($this->getFromData($handle), $handle);
+ return $this->wrapValue($this->getFromData($handle), $handle, $fieldtype);
  }
 
  protected function filterKeys($keys)
@@ -93,18 +113,35 @@ protected function getFromData($handle)
  return $value;
  }
 
- protected function wrapValue($value, $handle)
+ protected function wrapInvokable(string $method, bool $proxy, $methodTarget, string $handle, $fieldtype = null)
  {
- $fields = $this->blueprintFields();
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
+
+ return (new InvokableValue(
+ null,
+ $handle,
+ $fieldtype,
+ $this->data
+ ))->setInvokableDetails($method, $proxy, $methodTarget);
+ }
+
+ protected function wrapValue($value, $handle, $fieldtype = null)
+ {
+ $fieldtype = $this->adjustFieldtype($handle, $fieldtype);
 
  return new Value(
  $value,
  $handle,
-optional($fields->get($handle))->fieldtype(),
+$fieldtype,
  $this->data
  );
  }
 
+ protected function getFieldtype($handle)
+ {
+ return optional($this->blueprintFields()->get($handle))->fieldtype();
+ }
+
  protected function blueprintFields()
  {
  if (! isset($this->blueprintFields)) {

src/Data/AugmentedCollection.php

@@ -47,6 +47,22 @@ public function withoutEvaluation()
  return $this;
  }
 
+ public function all()
+ {
+ return collect($this->items)->map(function ($item) {
+ if ($item instanceof InvokableValue) {
+ return $item->materialize();
+ }
+
+ return $item;
+ })->all();
+ }
+
+ public function deferredAll()
+ {
+ return parent::all();
+ }
+
  public function toArray()
  {
  return $this->map(function ($value) {

src/Data/HasAugmentedInstance.php

@@ -26,6 +26,11 @@ public function toAugmentedArray($keys = null)
  return $this->toAugmentedCollection($keys)->all();
  }
 
+ public function toDeferredAugmentedArray($keys = null)
+ {
+ return $this->toAugmentedCollection($keys)->deferredAll();
+ }
+
  public function toShallowAugmentedCollection()
  {
  return $this->augmented()->select($this->shallowAugmentedArrayKeys())->withShallowNesting();

src/Data/InvokableValue.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Statamic\Data;
+
+use Statamic\Fields\Value;
+use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
+
+class InvokableValue extends Value
+{
+ protected $methodTarget = null;
+ protected bool $hasResolved = false;
+ protected string $methodName;
+ protected bool $proxyThroughAugmented = false;
+ protected $resolvedValueInstance = null;
+
+ public function setInvokableDetails(string $method, bool $proxyCall, $target): self
+ {
+ $this->proxyThroughAugmented = $proxyCall;
+ $this->methodName = $method;
+ $this->methodTarget = $target;
+
+ return $this;
+ }
+
+ protected function resolve()
+ {
+ if ($this->hasResolved) {
+ return;
+ }
+
+ if ($this->methodTarget == null) {
+ $this->hasResolved = true;
+
+ return;
+ }
+
+ $curIsolationState = GlobalRuntimeState::$requiresRuntimeIsolation;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = true;
+ if ($this->proxyThroughAugmented && method_exists($this->methodTarget, 'getAugmentedMethodValue')) {
+ $this->raw = $this->methodTarget->getAugmentedMethodValue($this->methodName);
+
+ if (! $this->raw instanceof Value) {
+ // Replicate previous behavior of not having
+ // a field set if the method call did not
+ // return a Value instance.
+ $this->fieldtype = null;
+ } else {
+ // Store the original Value instance, if we have it.
+ $this->resolvedValueInstance = $this->raw;
+
+ // Shift some values around.
+ $this->fieldtype = $this->raw->fieldtype();
+ $this->raw = $this->raw->raw();
+ }
+ } elseif (! $this->proxyThroughAugmented) {
+ $this->raw = $this->methodTarget->{$this->methodName}();
+ }
+
+ $this->methodTarget = null;
+
+ $this->hasResolved = true;
+
+ GlobalRuntimeState::$requiresRuntimeIsolation = $curIsolationState;
+ }
+
+ public function materialize()
+ {
+ $this->resolve();
+
+ if ($this->resolvedValueInstance != null) {
+ return $this->resolvedValueInstance;
+ }
+
+ return $this->toValue();
+ }
+
+ protected function toValue()
+ {
+ return new Value($this->raw, $this->handle, $this->fieldtype, $this->augmentable, $this->shallow);
+ }
+
+ public function raw()
+ {
+ $this->resolve();
+
+ return parent::raw();
+ }
+
+ public function value()
+ {
+ $this->resolve();
+
+ return parent::value();
+ }
+
+ public function shallow()
+ {
+ $this->resolve();
+
+ return parent::shallow();
+ }
+}

src/Fields/Value.php

@@ -37,6 +37,11 @@ public function raw()
  return $this->raw;
  }
 
+ public function materialize()
+ {
+ return $this;
+ }
+
  public function value()
  {
  if (! $this->fieldtype) {

src/Modifiers/CoreModifiers.php

@@ -767,7 +767,7 @@ public function get($value, $params)
 
  // Convert the item to an array, since we'll want access to all the
  // available data. Then grab the requested variable from there.
- $array = $item instanceof Augmentable ? $item->toAugmentedArray() : $item->toArray();
+ $array = $item instanceof Augmentable ? $item->toDeferredAugmentedArray() : $item->toArray();
 
  if ($arrayValue = Arr::get($array, $var)) {
  return $arrayValue;
@@ -838,7 +838,7 @@ private function getGroupByValueFromObject($item, $groupBy)
  {
  // Make the array just from the params, so it only augments the values that might be needed.
  $keys = explode(':', $groupBy);
- $context = $item->toAugmentedArray($keys);
+ $context = $item->toDeferredAugmentedArray($keys);
 
  return Antlers::parser()->getVariable($groupBy, $context);
  }
@@ -2057,7 +2057,7 @@ public function scope($value, $params)
  }
 
  if ($value instanceof Collection) {
- $value = $value->toAugmentedArray();
+ $value = $value->toDeferredAugmentedArray();
  }
 
  return Arr::addScope($value, $scope);

src/Providers/CollectionsServiceProvider.php

@@ -163,6 +163,16 @@ protected function toAugmentedArray()
  }, $this->items);
  });
 
+ Collection::macro('toDeferredAugmentedArray', function ($keys = null) {
+ return array_map(function ($value) use ($keys) {
+ if ($value instanceof Augmentable) {
+ return $value->toDeferredAugmentedArray($keys);
+ }
+
+ return $value instanceof Arrayable ? $value->toArray() : $value;
+ }, $this->items);
+ });
+
  Collection::macro('toAugmentedCollection', function ($keys = null) {
  return array_map(function ($value) use ($keys) {
  if ($value instanceof Augmentable) {

src/Tags/Structure.php

@@ -123,7 +123,7 @@ public function toArray($tree, $parent = null, $depth = 1)
  $pages = collect($tree)->map(function ($item, $index) use ($parent, $depth, $tree) {
  $page = $item['page'];
  $keys = $this->getQuerySelectKeys($page);
- $data = $page->toAugmentedArray($keys);
+ $data = $page->toDeferredAugmentedArray($keys);
  $children = empty($item['children']) ? [] : $this->toArray($item['children'], $data, $depth + 1);
 
  $url = $page->urlWithoutRedirect();

src/View/Antlers/Engine.php

@@ -161,11 +161,11 @@ public static function renderTag(Parser $parser, $name, $parameters = [], $conte
  }
 
  if ($output instanceof Collection) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  if ($output instanceof Augmentable) {
- $output = $output->toAugmentedArray();
+ $output = $output->toDeferredAugmentedArray();
  }
 
  // Allow tags to return an array. We'll parse it for them.

src/View/Antlers/Language/Runtime/Sandbox/RuntimeValues.php

@@ -12,7 +12,7 @@ public static function resolveWithRuntimeIsolation($augmentable)
  {
  GlobalRuntimeState::$requiresRuntimeIsolation = true;
  try {
- $value = $augmentable->toAugmentedArray();
+ $value = $augmentable->toDeferredAugmentedArray();
  } catch (Exception $e) {
  throw $e;
  } finally {

src/View/Cascade.php

@@ -148,7 +148,7 @@ protected function hydrateGlobals()
  }
 
  if ($mainGlobal = $this->get('global')) {
- foreach ($mainGlobal->toAugmentedCollection() as $key => $value) {
+ foreach ($mainGlobal->toDeferredAugmentedArray() as $key => $value) {
  $this->set($key, $value);
  }
  }
@@ -163,7 +163,7 @@ protected function hydrateContent()
  }
 
  $variables = $this->content instanceof Augmentable
- ? $this->content->toAugmentedArray()
+ ? $this->content->toDeferredAugmentedArray()
  : $this->content->toArray();
 
  foreach ($variables as $key => $value) {

tests/Antlers/Runtime/CoreModifiersTest.php

@@ -581,6 +581,11 @@ public function toAugmentedArray()
  ];
  }
 
+ public function toDeferredAugmentedArray()
+ {
+ return $this->toAugmentedArray();
+ }
+
  public function toArray()
  {
  return $this->toAugmentedArray();

tests/Data/AugmentedTest.php

@@ -141,7 +141,7 @@ public function foo()
  }
  };
 
- $this->assertSame($valueInstance, $augmented->get('foo'));
+ $this->assertSame($valueInstance, $augmented->get('foo')->materialize());
  }
 
  /** @test */