From c6fc505be8626ea70864a1537b8fc1b31e3768bb Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Wed, 23 Jul 2025 01:19:19 -0400
Subject: [PATCH 1/8] Initial setup of per asset validation

---
 .../js/components/fieldtypes/assets/Asset.js  |   1 +
 .../components/fieldtypes/assets/AssetRow.vue |   7 +-
 .../fieldtypes/assets/AssetTile.vue           |  11 +-
 .../fieldtypes/assets/AssetsFieldtype.vue     |  27 ++-
 resources/lang/en/validation.php              |  14 +-
 src/Fields/Field.php                          |  14 +-
 src/Fieldtypes/Assets/DimensionsRule.php      | 176 +++++++++---------
 src/Fieldtypes/Assets/ImageRule.php           |  54 ++----
 src/Fieldtypes/Assets/MaxRule.php             |  39 ++--
 src/Fieldtypes/Assets/MimesRule.php           |  49 ++---
 src/Fieldtypes/Assets/MimetypesRule.php       |  51 ++---
 src/Fieldtypes/Assets/MinRule.php             |  39 ++--
 src/Fieldtypes/Assets/SizeBasedRule.php       |  75 --------
 tests/Assets/AssetTest.php                    |   6 +-
 tests/Fieldtypes/AssetsTest.php               |   4 +-
 15 files changed, 251 insertions(+), 316 deletions(-)
 delete mode 100644 src/Fieldtypes/Assets/SizeBasedRule.php

diff --git a/resources/js/components/fieldtypes/assets/Asset.js b/resources/js/components/fieldtypes/assets/Asset.js
index 9089894f625..38cc62e8b46 100644
--- a/resources/js/components/fieldtypes/assets/Asset.js
+++ b/resources/js/components/fieldtypes/assets/Asset.js
@@ -8,6 +8,7 @@ export default {
     props: {
         asset: Object,
         readOnly: Boolean,
+        errors: Array,
         showFilename: {
             type: Boolean,
             default: true,
diff --git a/resources/js/components/fieldtypes/assets/AssetRow.vue b/resources/js/components/fieldtypes/assets/AssetRow.vue
index 091770f9494..ac877f01747 100644
--- a/resources/js/components/fieldtypes/assets/AssetRow.vue
+++ b/resources/js/components/fieldtypes/assets/AssetRow.vue
@@ -23,11 +23,14 @@
             <button
                 v-if="showFilename"
                 @click="editOrOpen"
-                class="flex w-full flex-1 items-center truncate text-sm text-gray-600 dark:text-gray-400 text-start"
+                class="flex flex-col w-full flex-1 justify-center gap-1 truncate text-sm text-gray-600 dark:text-gray-400 text-start"
                 :title="__('Edit')"
                 :aria-label="__('Edit Asset')"
             >
-                {{ asset.basename }}
+                <div>{{ asset.basename }}</div>
+                <template v-if="errors.length">
+                    <small class="text-xs text-red-500" v-for="(error, i) in errors" :key="i" v-text="error" />
+                </template>
             </button>
             <ui-badge
                 v-if="showSetAlt && needsAlt"
diff --git a/resources/js/components/fieldtypes/assets/AssetTile.vue b/resources/js/components/fieldtypes/assets/AssetTile.vue
index e3f19398b0e..a7665a2eb7f 100644
--- a/resources/js/components/fieldtypes/assets/AssetTile.vue
+++ b/resources/js/components/fieldtypes/assets/AssetTile.vue
@@ -20,6 +20,15 @@
 
         <div class="asset-thumb-container">
             <div class="asset-thumb" :class="{ 'bg-checkerboard': canBeTransparent }">
+                <template v-if="errors.length">
+                    <div class="absolute z-10 inset-0 bg-white/75 dark:bg-dark-800/90 flex flex-col gap-2 items-center justify-center px-1 py-2">
+                        <small
+                            class="text-xs text-red-500 text-center"
+                            v-text="errors[0]"
+                        />
+                    </div>
+                </template>
+
                 <!-- Solo Bard -->
                 <template v-if="isImage && isInBardField && !isInAssetBrowser">
                     <img :src="asset.url" />
@@ -34,7 +43,7 @@
                     </template>
                 </template>
 
-                <div class="asset-controls">
+                <div class="asset-controls z-10">
                     <div class="flex items-center justify-center space-x-1 rtl:space-x-reverse">
                         <template v-if="!readOnly">
                             <button @click="edit" class="btn btn-icon" :title="__('Edit')">
diff --git a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
index e714ebc7a64..1666ea58269 100644
--- a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
+++ b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
@@ -105,9 +105,10 @@
                             ref="assets"
                         >
                             <asset-tile
-                                v-for="asset in assets"
+                                v-for="(asset, index) in assets"
                                 :key="asset.id"
                                 :asset="asset"
+                                :errors="errors[index] ?? []"
                                 :read-only="isReadOnly"
                                 :show-filename="config.show_filename"
                                 :show-set-alt="showSetAlt"
@@ -134,9 +135,10 @@
                                     <component
                                         is="assetRow"
                                         class="asset-row"
-                                        v-for="asset in assets"
+                                        v-for="(asset, index) in assets"
                                         :key="asset.id"
                                         :asset="asset"
+                                        :errors="errors[index] ?? []" 
                                         :read-only="isReadOnly"
                                         :show-filename="config.show_filename"
                                         :show-set-alt="showSetAlt"
@@ -425,6 +427,27 @@ export default {
                 },
             ];
         },
+        
+        errors() {
+            const state = this.publishContainer;
+            console.log('state', state);
+
+            if (!state) {
+                return {};
+            }
+
+            let errors = {};
+
+            // Filter errors to only include those for this field, and remove the field path prefix
+            // if there is one, then append it to the errors object.
+            Object.entries(state.errors)
+                .filter(([key, value]) => key.startsWith(this.fieldPathPrefix || this.handle))
+                .forEach(([key, value]) => {
+                    errors[key.split('.').pop()] = value;
+                });
+
+            return errors;
+        },
     },
 
     events: {
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index a00a20df0db..1240e6ab899 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -44,7 +44,17 @@
     'different' => 'This field and :other must be different.',
     'digits' => 'Must be :digits digits.',
     'digits_between' => 'Must be between :min and :max digits.',
-    'dimensions' => 'Invalid image dimensions.',
+    'dimensions' => [
+        'unknown' => 'Image dimensions are unknown.',
+        'ratio' => 'Must have a ratio of :ratio.',
+        'same' => 'Must be :comparison :width×:height pixels.',
+        'different' => 'Must be :comparison_width :width pixels wide and :comparison_height :height pixels tall.',
+        'width' => 'Must be :comparison_width :width pixels wide.',
+        'height' => 'Must be :comparison_height :height pixels tall.',
+        'min' => 'at least',
+        'max' => 'at most',
+        'exact' => 'exactly',
+    ],
     'distinct' => 'This field has a duplicate value.',
     'doesnt_end_with' => 'Must not end with one of the following: :values.',
     'doesnt_start_with' => 'Must not start with one of the following: :values.',
@@ -66,7 +76,7 @@
         'numeric' => 'Must be greater than or equal :value.',
         'string' => 'Must be greater than or equal :value characters.',
     ],
-    'image' => 'Must be an image.',
+    'image' => 'Must be an image of type: :extensions.',
     'in' => 'This is invalid.',
     'in_array' => 'This field does not exist in :other.',
     'integer' => 'Must be an integer.',
diff --git a/src/Fields/Field.php b/src/Fields/Field.php
index 07fceecd24d..a6ab37cc4f8 100644
--- a/src/Fields/Field.php
+++ b/src/Fields/Field.php
@@ -137,11 +137,21 @@ public function alwaysSave()
 
     public function rules()
     {
-        $rules = [$this->handle => $this->addNullableRule(array_merge(
+        $temp_rules = collect($this->addNullableRule(array_merge(
             $this->get('required') ? ['required'] : [],
             Validator::explodeRules($this->fieldtype()->fieldRules()),
             Validator::explodeRules($this->fieldtype()->rules())
-        ))];
+        )));
+
+        $rules = [];
+        if ($this->type() === 'assets') {
+            $rules = [
+                $this->handle.'.*' => $temp_rules->reject(fn ($rule) => in_array($rule, ['array', 'required']))->all(),
+                $this->handle => $temp_rules->filter(fn ($rule) => in_array($rule, ['array', 'required']))->all(),
+            ];
+        } else {
+            $rules = [$this->handle => $temp_rules->all()];
+        }
 
         $extra = collect($this->fieldtype()->extraRules())->map(function ($rules) {
             return $this->addNullableRule(Validator::explodeRules($rules));
diff --git a/src/Fieldtypes/Assets/DimensionsRule.php b/src/Fieldtypes/Assets/DimensionsRule.php
index 6232ee23abb..e33e21f3e14 100644
--- a/src/Fieldtypes/Assets/DimensionsRule.php
+++ b/src/Fieldtypes/Assets/DimensionsRule.php
@@ -2,132 +2,124 @@
 
 namespace Statamic\Fieldtypes\Assets;
 
-use Illuminate\Contracts\Validation\Rule;
-use Statamic\Contracts\GraphQL\CastableToValidationString;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Statamic\Facades\Asset;
 use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class DimensionsRule implements CastableToValidationString, Rule
+class DimensionsRule implements ValidationRule
 {
-    protected $parameters;
-
-    public function __construct($parameters = null)
+    public function __construct(protected $parameters)
     {
-        $this->parameters = $parameters;
+        $this->parameters = array_reduce($parameters, function ($result, $item) {
+            [$key, $value] = array_pad(explode('=', $item, 2), 2, null);
+
+            $result[$key] = $value;
+
+            return $result;
+        });
     }
 
-    /**
-     * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function passes($attribute, $value)
+    public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        return collect($value)->every(function ($id) {
-            if ($id instanceof UploadedFile) {
-                if (in_array($id->getMimeType(), ['image/svg+xml', 'image/svg'])) {
-                    return true;
-                }
-
-                $size = getimagesize($id->getPathname());
-            } else {
-                if (! $asset = Asset::find($id)) {
-                    return false;
-                }
-
-                if ($asset->isSvg()) {
-                    return true;
-                }
-
-                $size = $asset->dimensions();
+        $size = [0, 0];
+
+        if ($value instanceof UploadedFile) {
+            if (in_array($value->getMimeType(), ['image/svg+xml', 'image/svg'])) {
+                return;
             }
 
-            [$width, $height] = $size;
+            $size = getimagesize($value->getPathname());
+        } elseif ($asset = Asset::find($value)) {
+            if ($asset->isSvg()) {
+                return;
+            }
 
-            $parameters = $this->parseNamedParameters($this->parameters);
+            $size = $asset->dimensions();
+        }
 
-            if ($this->failsBasicDimensionChecks($parameters, $width, $height) ||
-                $this->failsRatioCheck($parameters, $width, $height)) {
-                return false;
-            }
+        [$width, $height] = $size;
+        if (! is_int($width) || ! is_int($height)) {
+            $fail(__('statamic::validation.dimensions.unknown'));
 
-            return true;
-        });
-    }
+            return;
+        }
 
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
-    {
-        return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.dimensions');
+        if ($message = $this->message($width, $height)) {
+            $fail($message);
+        }
     }
 
-    /**
-     * Parse named parameters to $key => $value items.
-     *
-     * @param  array  $parameters
-     * @return array
-     */
-    protected function parseNamedParameters($parameters)
+    public function message(int $width, int $height): ?string
     {
-        return array_reduce($parameters, function ($result, $item) {
-            [$key, $value] = array_pad(explode('=', $item, 2), 2, null);
+        $invalid_ratio = $this->validateRatio($width, $height);
+        $invalid_width = $this->validateWidth($width);
+        $invalid_height = $this->validateHeight($height);
+        $key = match (true) {
+            $invalid_ratio => 'ratio',
+            $invalid_width && $invalid_height && $invalid_width === $invalid_height => 'same',
+            $invalid_width && $invalid_height && $invalid_width !== $invalid_height => 'different',
+            (bool) $invalid_width => 'width',
+            (bool) $invalid_height => 'height',
+            default => null,
+        };
+
+        if (! $key) {
+            return null;
+        }
 
-            $result[$key] = $value;
+        $prefix = Statamic::isCpRoute() ? 'statamic::' : '';
+
+        $comparisons = [
+            'min' => __("{$prefix}validation.dimensions.min"),
+            'max' => __("{$prefix}validation.dimensions.max"),
+            'exact' => __("{$prefix}validation.dimensions.exact"),
+        ];
+
+        return __("{$prefix}validation.dimensions.{$key}", [
+            'width' => $this->parameters['width'] ?? $this->parameters['min_width'] ?? $this->parameters['max_width'] ?? null,
+            'height' => $this->parameters['height'] ?? $this->parameters['min_height'] ?? $this->parameters['max_height'] ?? null,
+            'ratio' => $this->parameters['ratio'] ?? null,
+            'comparison' => $comparisons[$invalid_width] ?? '',
+            'comparison_width' => $comparisons[$invalid_width] ?? '',
+            'comparison_height' => $comparisons[$invalid_height] ?? '',
+        ]);
+    }
 
-            return $result;
-        });
+    public function validateWidth(int $width): ?string
+    {
+        return match (true) {
+            isset($this->parameters['width']) && $this->parameters['width'] != $width => 'exact',
+            isset($this->parameters['min_width']) && $this->parameters['min_width'] > $width => 'min',
+            isset($this->parameters['max_width']) && $this->parameters['max_width'] < $width => 'max',
+            default => null,
+        };
     }
 
-    /**
-     * Test if the given width and height fail any conditions.
-     *
-     * @param  array  $parameters
-     * @param  int  $width
-     * @param  int  $height
-     * @return bool
-     */
-    protected function failsBasicDimensionChecks($parameters, $width, $height)
+    public function validateHeight(int $height): ?string
     {
-        return (isset($parameters['width']) && $parameters['width'] != $width) ||
-               (isset($parameters['min_width']) && $parameters['min_width'] > $width) ||
-               (isset($parameters['max_width']) && $parameters['max_width'] < $width) ||
-               (isset($parameters['height']) && $parameters['height'] != $height) ||
-               (isset($parameters['min_height']) && $parameters['min_height'] > $height) ||
-               (isset($parameters['max_height']) && $parameters['max_height'] < $height);
+        return match (true) {
+            isset($this->parameters['height']) && $this->parameters['height'] != $height => 'exact',
+            isset($this->parameters['min_height']) && $this->parameters['min_height'] > $height => 'min',
+            isset($this->parameters['max_height']) && $this->parameters['max_height'] < $height => 'max',
+            default => null,
+        };
     }
 
-    /**
-     * Determine if the given parameters fail a dimension ratio check.
-     *
-     * @param  array  $parameters
-     * @param  int  $width
-     * @param  int  $height
-     * @return bool
-     */
-    protected function failsRatioCheck($parameters, $width, $height)
+    public function validateRatio(int $width, int $height): bool
     {
-        if (! isset($parameters['ratio'])) {
+        if (! isset($this->parameters['ratio'])) {
             return false;
         }
 
         [$numerator, $denominator] = array_replace(
-            [1, 1], array_filter(sscanf($parameters['ratio'], '%f/%d'))
+            [1, 1],
+            array_filter(sscanf($this->parameters['ratio'], '%f/%d'))
         );
 
         $precision = 1 / (max($width, $height) + 1);
 
         return abs($numerator / $denominator - $width / $height) > $precision;
     }
-
-    public function toGqlValidationString(): string
-    {
-        return 'dimensions:'.implode(',', $this->parameters);
-    }
 }
diff --git a/src/Fieldtypes/Assets/ImageRule.php b/src/Fieldtypes/Assets/ImageRule.php
index 8044190761b..c86f3510087 100644
--- a/src/Fieldtypes/Assets/ImageRule.php
+++ b/src/Fieldtypes/Assets/ImageRule.php
@@ -2,57 +2,37 @@
 
 namespace Statamic\Fieldtypes\Assets;
 
-use Illuminate\Contracts\Validation\Rule;
-use Statamic\Contracts\GraphQL\CastableToValidationString;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Statamic\Facades\Asset;
 use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class ImageRule implements CastableToValidationString, Rule
+class ImageRule implements ValidationRule
 {
-    protected $parameters;
+    public $extensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp', 'avif'];
 
-    public function __construct($parameters = null)
+    public function __construct(protected $parameters)
     {
-        $this->parameters = $parameters;
     }
 
-    /**
-     * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function passes($attribute, $value)
+    public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        $extensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp', 'avif'];
+        $extension = '';
 
-        return collect($value)->every(function ($id) use ($extensions) {
-            if ($id instanceof UploadedFile) {
-                return in_array($id->guessExtension(), $extensions);
-            }
+        if ($value instanceof UploadedFile) {
+            $extension = $value->guessExtension();
+        } elseif ($asset = Asset::find($value)) {
+            $extension = $asset->extension();
+        }
 
-            if (! $asset = Asset::find($id)) {
-                return false;
-            }
-
-            return $asset->guessedExtensionIsOneOf($extensions);
-        });
-    }
-
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
-    {
-        return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.image');
+        if (! in_array($extension, $this->extensions)) {
+            $fail($this->message());
+        }
     }
 
-    public function toGqlValidationString(): string
+    public function message(): string
     {
-        return 'image:'.implode(',', $this->parameters);
+        return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.image', ['extensions' => implode(', ', $this->extensions)]);
     }
 }
diff --git a/src/Fieldtypes/Assets/MaxRule.php b/src/Fieldtypes/Assets/MaxRule.php
index 8a5f04e86f2..3d41b7fa2cc 100644
--- a/src/Fieldtypes/Assets/MaxRule.php
+++ b/src/Fieldtypes/Assets/MaxRule.php
@@ -2,28 +2,35 @@
 
 namespace Statamic\Fieldtypes\Assets;
 
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Statamic\Facades\Asset;
 use Statamic\Statamic;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class MaxRule extends SizeBasedRule
+class MaxRule implements ValidationRule
 {
-    /**
-     * Determine if the the rule passes for the given size.
-     *
-     * @param  int  $size
-     * @return bool
-     */
-    public function sizePasses($size)
+    public function __construct(protected $parameters)
     {
-        return $size <= $this->parameters[0];
     }
 
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
+    public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        return str_replace(':max', $this->parameters[0], __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.max.file'));
+        $size = 0;
+
+        if ($value instanceof UploadedFile) {
+            $size = $value->getSize() / 1024;
+        } elseif ($asset = Asset::find($value)) {
+            $size = $asset->size() / 1024;
+        }
+
+        if ($size > $this->parameters[0]) {
+            $fail($this->message());
+        }
+    }
+
+    public function message(): string
+    {
+        return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.max.file', ['max' => $this->parameters[0]]);
     }
 }
diff --git a/src/Fieldtypes/Assets/MimesRule.php b/src/Fieldtypes/Assets/MimesRule.php
index c184a34d578..660554345b5 100644
--- a/src/Fieldtypes/Assets/MimesRule.php
+++ b/src/Fieldtypes/Assets/MimesRule.php
@@ -2,13 +2,13 @@
 
 namespace Statamic\Fieldtypes\Assets;
 
-use Illuminate\Contracts\Validation\Rule;
-use Statamic\Contracts\GraphQL\CastableToValidationString;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Statamic\Facades\Asset;
 use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class MimesRule implements CastableToValidationString, Rule
+class MimesRule implements ValidationRule
 {
     protected $parameters;
 
@@ -18,43 +18,26 @@ public function __construct($parameters)
             $parameters = array_unique(array_merge($parameters, ['jpg', 'jpeg']));
         }
 
-        $this->parameters = $parameters;
+        $this->parameters = array_map(strtolower(...), $parameters);
     }
 
-    /**
-     * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function passes($attribute, $value)
+    public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        return collect($value)->every(function ($id) {
-            if ($id instanceof UploadedFile) {
-                return in_array($id->guessExtension(), $this->parameters);
-            }
+        $mime = '';
 
-            if (! $asset = Asset::find($id)) {
-                return false;
-            }
-
-            return $asset->guessedExtensionIsOneOf($this->parameters);
-        });
-    }
+        if ($value instanceof UploadedFile) {
+            $mime = $value->guessExtension();
+        } elseif ($asset = Asset::find($value)) {
+            $mime = $asset->extension();
+        }
 
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
-    {
-        return str_replace(':values', implode(', ', $this->parameters), __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimes'));
+        if (! in_array($mime, $this->parameters)) {
+            $fail($this->message());
+        }
     }
 
-    public function toGqlValidationString(): string
+    public function message(): string
     {
-        return 'mimes:'.implode(',', $this->parameters);
+        return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimes', ['values' => implode(', ', $this->parameters)]);
     }
 }
diff --git a/src/Fieldtypes/Assets/MimetypesRule.php b/src/Fieldtypes/Assets/MimetypesRule.php
index 65e3e0400bd..f4dc92afc32 100644
--- a/src/Fieldtypes/Assets/MimetypesRule.php
+++ b/src/Fieldtypes/Assets/MimetypesRule.php
@@ -2,54 +2,35 @@
 
 namespace Statamic\Fieldtypes\Assets;
 
-use Illuminate\Contracts\Validation\Rule;
-use Statamic\Contracts\GraphQL\CastableToValidationString;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Statamic\Facades\Asset;
 use Statamic\Statamic;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class MimetypesRule implements CastableToValidationString, Rule
+class MimetypesRule implements ValidationRule
 {
-    protected $parameters;
-
-    public function __construct($parameters)
+    public function __construct(protected $parameters)
     {
-        $this->parameters = $parameters;
     }
 
-    /**
-     * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function passes($attribute, $value)
+    public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        return collect($value)->every(function ($id) {
-            if ($id instanceof UploadedFile) {
-                $mimeType = $id->getMimeType();
-            } elseif (! ($mimeType = optional(Asset::find($id))->mimeType())) {
-                return false;
-            }
+        $mime_type = '';
 
-            return in_array($mimeType, $this->parameters) ||
-                in_array(explode('/', $mimeType)[0].'/*', $this->parameters);
-        });
-    }
+        if ($value instanceof UploadedFile) {
+            $mime_type = $value->getMimeType();
+        } elseif ($asset = Asset::find($value)) {
+            $mime_type = $asset->mimeType();
+        }
 
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
-    {
-        return str_replace(':values', implode(', ', $this->parameters), __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimetypes'));
+        if (! in_array($mime_type, $this->parameters) && ! in_array(explode('/', $mime_type)[0].'/*', $this->parameters)) {
+            $fail($this->message());
+        }
     }
 
-    public function toGqlValidationString(): string
+    public function message()
     {
-        return 'mimetypes:'.implode(',', $this->parameters);
+        return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimetypes', ['values' => implode(', ', $this->parameters)]);
     }
 }
diff --git a/src/Fieldtypes/Assets/MinRule.php b/src/Fieldtypes/Assets/MinRule.php
index b37bfaa5874..64fb897768a 100644
--- a/src/Fieldtypes/Assets/MinRule.php
+++ b/src/Fieldtypes/Assets/MinRule.php
@@ -2,28 +2,35 @@
 
 namespace Statamic\Fieldtypes\Assets;
 
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Statamic\Facades\Asset;
 use Statamic\Statamic;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class MinRule extends SizeBasedRule
+class MinRule implements ValidationRule
 {
-    /**
-     * Determine if the the rule passes for the given size.
-     *
-     * @param  int  $size
-     * @return bool
-     */
-    public function sizePasses($size)
+    public function __construct(protected $parameters)
     {
-        return $size >= $this->parameters[0];
     }
 
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
+    public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        return str_replace(':min', $this->parameters[0], __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.min.file'));
+        $size = 0;
+
+        if ($value instanceof UploadedFile) {
+            $size = $value->getSize() / 1024;
+        } elseif ($asset = Asset::find($value)) {
+            $size = $asset->size() / 1024;
+        }
+
+        if ($size < $this->parameters[0]) {
+            $fail($this->message());
+        }
+    }
+
+    public function message(): string
+    {
+        return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.min.file', ['min' => $this->parameters[0]]);
     }
 }
diff --git a/src/Fieldtypes/Assets/SizeBasedRule.php b/src/Fieldtypes/Assets/SizeBasedRule.php
deleted file mode 100644
index 875c3c612d0..00000000000
--- a/src/Fieldtypes/Assets/SizeBasedRule.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Statamic\Fieldtypes\Assets;
-
-use Illuminate\Contracts\Validation\Rule;
-use Statamic\Contracts\GraphQL\CastableToValidationString;
-use Statamic\Facades\Asset;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-
-abstract class SizeBasedRule implements CastableToValidationString, Rule
-{
-    protected $parameters;
-
-    public function __construct($parameters = null)
-    {
-        $this->parameters = $parameters;
-    }
-
-    /**
-     * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function passes($attribute, $value)
-    {
-        return collect($value)->every(function ($id) {
-            if (($size = $this->getFileSize($id)) === false) {
-                return false;
-            }
-
-            return $this->sizePasses($size);
-        });
-    }
-
-    /**
-     * Determine if the the rule passes for the given size.
-     *
-     * @param  int  $size
-     * @return bool
-     */
-    abstract public function sizePasses($size);
-
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    abstract public function message();
-
-    /**
-     * Get the file size.
-     *
-     * @param  string|UploadedFile  $id
-     * @return int|false
-     */
-    protected function getFileSize($id)
-    {
-        if ($id instanceof UploadedFile) {
-            return $id->getSize() / 1024;
-        }
-
-        if ($asset = Asset::find($id)) {
-            return $asset->size() / 1024;
-        }
-
-        return false;
-    }
-
-    public function toGqlValidationString(): string
-    {
-        return 'size:'.implode(',', $this->parameters);
-    }
-}
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index af941d32c57..2a9c3d93719 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -11,6 +11,7 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Validator;
 use League\Flysystem\PathTraversalDetected;
 use Mockery;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -1552,7 +1553,10 @@ public function it_gets_dimensions()
     public function it_passes_the_dimensions_validation()
     {
         $file = UploadedFile::fake()->image('image.jpg', 30, 60);
-        $validDimensions = (new DimensionsRule(['max_width=10']))->passes('Image', [$file]);
+        $validDimensions = Validator::make(
+            ['Image' => $file],
+            ['Image' => [new DimensionsRule(['max_width=10'])]],
+        )->passes();
 
         $this->assertFalse($validDimensions);
     }
diff --git a/tests/Fieldtypes/AssetsTest.php b/tests/Fieldtypes/AssetsTest.php
index 19ae89d96d0..88084c54d0d 100644
--- a/tests/Fieldtypes/AssetsTest.php
+++ b/tests/Fieldtypes/AssetsTest.php
@@ -138,7 +138,7 @@ public function it_replaces_dimensions_rule()
         $this->assertIsArray($replaced);
         $this->assertCount(1, $replaced);
         $this->assertInstanceOf(DimensionsRule::class, $replaced[0]);
-        $this->assertEquals(__('statamic::validation.dimensions'), $replaced[0]->message());
+        $this->assertEquals(__('statamic::validation.dimensions.same', ['width' => '180', 'height' => '180', 'comparison' => 'exactly']), $replaced[0]->message(100, 100));
     }
 
     #[Test]
@@ -151,7 +151,7 @@ public function it_replaces_image_rule()
         $this->assertIsArray($replaced);
         $this->assertCount(1, $replaced);
         $this->assertInstanceOf(ImageRule::class, $replaced[0]);
-        $this->assertEquals(__('statamic::validation.image'), $replaced[0]->message());
+        $this->assertEquals(__('statamic::validation.image', ['extensions' => implode(', ', $replaced[0]->extensions)]), $replaced[0]->message());
     }
 
     #[Test]

From dd4ebdfc0b2e9cc4ff040289169358f5363ae42a Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Wed, 23 Jul 2025 11:54:03 -0400
Subject: [PATCH 2/8] Fixing tests

---
 src/Fields/Field.php                     |  4 ++--
 src/Fieldtypes/Assets/DimensionsRule.php | 17 ++++++++++++++++-
 src/Fieldtypes/Assets/ImageRule.php      | 17 ++++++++++++++++-
 src/Fieldtypes/Assets/MimesRule.php      | 18 ++++++++++++++----
 src/Fieldtypes/Assets/MimetypesRule.php  | 14 +++++++++++++-
 tests/Feature/GraphQL/FormTest.php       | 16 +++++++++-------
 6 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/src/Fields/Field.php b/src/Fields/Field.php
index a6ab37cc4f8..bc2790bab65 100644
--- a/src/Fields/Field.php
+++ b/src/Fields/Field.php
@@ -146,8 +146,8 @@ public function rules()
         $rules = [];
         if ($this->type() === 'assets') {
             $rules = [
-                $this->handle.'.*' => $temp_rules->reject(fn ($rule) => in_array($rule, ['array', 'required']))->all(),
-                $this->handle => $temp_rules->filter(fn ($rule) => in_array($rule, ['array', 'required']))->all(),
+                $this->handle.'.*' => $temp_rules->reject(fn ($rule) => in_array($rule, ['array', 'required', 'nullable']))->values()->all(),
+                $this->handle => $temp_rules->filter(fn ($rule) => in_array($rule, ['array', 'required', 'nullable']))->values()->all(),
             ];
         } else {
             $rules = [$this->handle => $temp_rules->all()];
diff --git a/src/Fieldtypes/Assets/DimensionsRule.php b/src/Fieldtypes/Assets/DimensionsRule.php
index e33e21f3e14..9282bb5e7bc 100644
--- a/src/Fieldtypes/Assets/DimensionsRule.php
+++ b/src/Fieldtypes/Assets/DimensionsRule.php
@@ -4,14 +4,19 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Statamic\Contracts\GraphQL\CastableToValidationString;
 use Statamic\Facades\Asset;
 use Statamic\Statamic;
+use Stringable;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class DimensionsRule implements ValidationRule
+class DimensionsRule implements CastableToValidationString, Stringable, ValidationRule
 {
+    protected $string_parameters;
+
     public function __construct(protected $parameters)
     {
+        $this->string_parameters = $parameters;
         $this->parameters = array_reduce($parameters, function ($result, $item) {
             [$key, $value] = array_pad(explode('=', $item, 2), 2, null);
 
@@ -122,4 +127,14 @@ public function validateRatio(int $width, int $height): bool
 
         return abs($numerator / $denominator - $width / $height) > $precision;
     }
+
+    public function __toString()
+    {
+        return 'dimensions:'.implode(',', $this->string_parameters);
+    }
+
+    public function toGqlValidationString(): string
+    {
+        return $this->__toString();
+    }
 }
diff --git a/src/Fieldtypes/Assets/ImageRule.php b/src/Fieldtypes/Assets/ImageRule.php
index c86f3510087..4521506104c 100644
--- a/src/Fieldtypes/Assets/ImageRule.php
+++ b/src/Fieldtypes/Assets/ImageRule.php
@@ -4,16 +4,21 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Statamic\Contracts\GraphQL\CastableToValidationString;
 use Statamic\Facades\Asset;
 use Statamic\Statamic;
+use Stringable;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class ImageRule implements ValidationRule
+class ImageRule implements CastableToValidationString, Stringable, ValidationRule
 {
     public $extensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp', 'avif'];
 
     public function __construct(protected $parameters)
     {
+        if (! empty($this->parameters)) {
+            $this->extensions = array_map(strtolower(...), $this->parameters);
+        }
     }
 
     public function validate(string $attribute, mixed $value, Closure $fail): void
@@ -35,4 +40,14 @@ public function message(): string
     {
         return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.image', ['extensions' => implode(', ', $this->extensions)]);
     }
+
+    public function __toString()
+    {
+        return 'image:'.implode(',', $this->extensions);
+    }
+
+    public function toGqlValidationString(): string
+    {
+        return $this->__toString();
+    }
 }
diff --git a/src/Fieldtypes/Assets/MimesRule.php b/src/Fieldtypes/Assets/MimesRule.php
index 660554345b5..81d60f36b6a 100644
--- a/src/Fieldtypes/Assets/MimesRule.php
+++ b/src/Fieldtypes/Assets/MimesRule.php
@@ -4,15 +4,15 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Statamic\Contracts\GraphQL\CastableToValidationString;
 use Statamic\Facades\Asset;
 use Statamic\Statamic;
+use Stringable;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class MimesRule implements ValidationRule
+class MimesRule implements CastableToValidationString, Stringable, ValidationRule
 {
-    protected $parameters;
-
-    public function __construct($parameters)
+    public function __construct(protected $parameters)
     {
         if (in_array('jpg', $parameters) || in_array('jpeg', $parameters)) {
             $parameters = array_unique(array_merge($parameters, ['jpg', 'jpeg']));
@@ -40,4 +40,14 @@ public function message(): string
     {
         return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimes', ['values' => implode(', ', $this->parameters)]);
     }
+
+    public function __toString()
+    {
+        return 'mimes:'.implode(',', $this->parameters);
+    }
+
+    public function toGqlValidationString(): string
+    {
+        return $this->__toString();
+    }
 }
diff --git a/src/Fieldtypes/Assets/MimetypesRule.php b/src/Fieldtypes/Assets/MimetypesRule.php
index f4dc92afc32..6c91fe32f8b 100644
--- a/src/Fieldtypes/Assets/MimetypesRule.php
+++ b/src/Fieldtypes/Assets/MimetypesRule.php
@@ -4,11 +4,13 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Statamic\Contracts\GraphQL\CastableToValidationString;
 use Statamic\Facades\Asset;
 use Statamic\Statamic;
+use Stringable;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class MimetypesRule implements ValidationRule
+class MimetypesRule implements CastableToValidationString, Stringable, ValidationRule
 {
     public function __construct(protected $parameters)
     {
@@ -33,4 +35,14 @@ public function message()
     {
         return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.mimetypes', ['values' => implode(', ', $this->parameters)]);
     }
+
+    public function __toString()
+    {
+        return 'mimetypes:'.implode(',', $this->parameters);
+    }
+
+    public function toGqlValidationString(): string
+    {
+        return $this->__toString();
+    }
 }
diff --git a/tests/Feature/GraphQL/FormTest.php b/tests/Feature/GraphQL/FormTest.php
index d3ce69622d4..06dc9016307 100644
--- a/tests/Feature/GraphQL/FormTest.php
+++ b/tests/Feature/GraphQL/FormTest.php
@@ -357,13 +357,15 @@ public function it_returns_string_based_validation_rules_for_mimes_mimetypes_dim
                 'form' => [
                     'rules' => [
                         'name' => [
-                            'mimes:image/jpeg,image/png',
-                            'mimetypes:image/jpeg,image/png',
-                            'dimensions:1024',
-                            'size:1000',
-                            'image:jpeg',
-                            'thevalidationrule:foo,bar',
-                            'Tests\\Feature\\GraphQL\\TestValidationRuleWithoutToString::class',
+                            '*' => [
+                                'mimes:image/jpeg,image/png',
+                                'mimetypes:image/jpeg,image/png',
+                                'dimensions:1024',
+                                'size:1000',
+                                'image:jpeg',
+                                'thevalidationrule:foo,bar',
+                                'Tests\\Feature\\GraphQL\\TestValidationRuleWithoutToString::class',
+                            ],
                             'array',
                             'nullable',
                         ],

From 08b2568395ad44fee87831f98073267e3bbb4ac3 Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Wed, 23 Jul 2025 15:16:37 -0400
Subject: [PATCH 3/8] Assign asset errors by asset id not index

---
 .../fieldtypes/assets/AssetsFieldtype.vue     | 45 +++++++++----------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
index 9484f04f48d..80b897d87c1 100644
--- a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
+++ b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
@@ -106,10 +106,10 @@
                             ref="assets"
                         >
                             <asset-tile
-                                v-for="(asset, index) in assets"
+                                v-for="asset in assets"
                                 :key="asset.id"
                                 :asset="asset"
-                                :errors="errors[index] ?? []"
+                                :errors="errorForAsset(asset)"
                                 :read-only="isReadOnly"
                                 :show-filename="config.show_filename"
                                 :show-set-alt="showSetAlt"
@@ -137,10 +137,10 @@
                                     <component
                                         is="assetRow"
                                         class="asset-row"
-                                        v-for="(asset, index) in assets"
+                                        v-for="asset in assets"
                                         :key="asset.id"
                                         :asset="asset"
-                                        :errors="errors[index] ?? []" 
+                                        :errors="errorForAsset(asset)"
                                         :read-only="isReadOnly"
                                         :show-filename="config.show_filename"
                                         :show-set-alt="showSetAlt"
@@ -229,6 +229,7 @@ export default {
             innerDragging: false,
             displayMode: 'grid',
             lockedDynamicFolder: this.meta.dynamicFolder,
+            errors: {},
         };
     },
 
@@ -429,27 +430,6 @@ export default {
                 },
             ];
         },
-        
-        errors() {
-            const state = this.publishContainer;
-            console.log('state', state);
-
-            if (!state) {
-                return {};
-            }
-
-            let errors = {};
-
-            // Filter errors to only include those for this field, and remove the field path prefix
-            // if there is one, then append it to the errors object.
-            Object.entries(state.errors)
-                .filter(([key, value]) => key.startsWith(this.fieldPathPrefix || this.handle))
-                .forEach(([key, value]) => {
-                    errors[key.split('.').pop()] = value;
-                });
-
-            return errors;
-        },
     },
 
     events: {
@@ -639,6 +619,12 @@ export default {
                 this.loadAssets([...this.value, id]);
             }
         },
+
+        errorForAsset(asset) {
+            if (Object.keys(this.errors).length === 0) return [];
+
+            return this.errors[asset.id] ?? [];
+        },
     },
 
     watch: {
@@ -658,6 +644,15 @@ export default {
             }
         },
 
+        'publishContainer.errors': {
+            immediate: true,
+            handler(errors) {
+                this.errors = Object.entries(errors)
+                    .filter(([key, value]) => key.startsWith(this.fieldPathPrefix || this.handle))
+                    .reduce((errors, [key, value]) => ({ [this.assetIds.at(key.split('.').pop())]: value, ...errors }), {});
+            },
+        },
+
         loading(loading) {
             this.$progress.loading(`assets-fieldtype-${this.$.uid}`, loading);
         },

From 781765983a0e3d5e0d8726d0485f14edcd3451b6 Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Wed, 23 Jul 2025 17:07:00 -0400
Subject: [PATCH 4/8] Misc fixes

---
 .../fieldtypes/assets/AssetsFieldtype.vue     | 34 ++++++++++++++-----
 src/Fieldtypes/Assets/ImageRule.php           |  2 +-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
index 80b897d87c1..d58855863e9 100644
--- a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
+++ b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
@@ -109,7 +109,7 @@
                                 v-for="asset in assets"
                                 :key="asset.id"
                                 :asset="asset"
-                                :errors="errorForAsset(asset)"
+                                :errors="errorsForAsset(asset.id)"
                                 :read-only="isReadOnly"
                                 :show-filename="config.show_filename"
                                 :show-set-alt="showSetAlt"
@@ -140,7 +140,7 @@
                                         v-for="asset in assets"
                                         :key="asset.id"
                                         :asset="asset"
-                                        :errors="errorForAsset(asset)"
+                                        :errors="errorsForAsset(asset.id)"
                                         :read-only="isReadOnly"
                                         :show-filename="config.show_filename"
                                         :show-set-alt="showSetAlt"
@@ -229,7 +229,7 @@ export default {
             innerDragging: false,
             displayMode: 'grid',
             lockedDynamicFolder: this.meta.dynamicFolder,
-            errors: {},
+            errorsById: {},
         };
     },
 
@@ -620,10 +620,12 @@ export default {
             }
         },
 
-        errorForAsset(asset) {
-            if (Object.keys(this.errors).length === 0) return [];
+        errorsForAsset(id) {
+            if (Object.keys(this.errorsById).length === 0 || !this.errorsById.hasOwnProperty(id)) {
+                return [];
+            }
 
-            return this.errors[asset.id] ?? [];
+            return this.errorsById[id];
         },
     },
 
@@ -647,9 +649,23 @@ export default {
         'publishContainer.errors': {
             immediate: true,
             handler(errors) {
-                this.errors = Object.entries(errors)
-                    .filter(([key, value]) => key.startsWith(this.fieldPathPrefix || this.handle))
-                    .reduce((errors, [key, value]) => ({ [this.assetIds.at(key.split('.').pop())]: value, ...errors }), {});
+                this.errorsById = Object.entries(errors).reduce((acc, [key, value]) => {
+                    const prefix = this.fieldPathKeys || this.handle;
+
+                    if (!key.startsWith(prefix)) {
+                        return acc;
+                    }
+
+                    const subKey = key.replace(`${prefix}.`, '');
+                    const assetIndex = subKey.split('.').shift();
+                    const assetId = this.assetIds[assetIndex];
+
+                    if (assetId) {
+                        acc[assetId] = value;
+                    }
+
+                    return acc;
+                }, {});
             },
         },
 
diff --git a/src/Fieldtypes/Assets/ImageRule.php b/src/Fieldtypes/Assets/ImageRule.php
index 4521506104c..f97860db8a5 100644
--- a/src/Fieldtypes/Assets/ImageRule.php
+++ b/src/Fieldtypes/Assets/ImageRule.php
@@ -16,7 +16,7 @@ class ImageRule implements CastableToValidationString, Stringable, ValidationRul
 
     public function __construct(protected $parameters)
     {
-        if (! empty($this->parameters)) {
+        if ($this->parameters !== ['image']) {
             $this->extensions = array_map(strtolower(...), $this->parameters);
         }
     }

From fb9e8a759062c97c76a2cb114aa4b450db2d9e8b Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Thu, 24 Jul 2025 11:29:39 -0400
Subject: [PATCH 5/8] Reverting customized validation messages

---
 resources/lang/en/validation.php         |  14 +--
 src/Fieldtypes/Assets/DimensionsRule.php | 108 ++++++++---------------
 tests/Fieldtypes/AssetsTest.php          |   4 +-
 3 files changed, 42 insertions(+), 84 deletions(-)

diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index 1240e6ab899..a00a20df0db 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -44,17 +44,7 @@
     'different' => 'This field and :other must be different.',
     'digits' => 'Must be :digits digits.',
     'digits_between' => 'Must be between :min and :max digits.',
-    'dimensions' => [
-        'unknown' => 'Image dimensions are unknown.',
-        'ratio' => 'Must have a ratio of :ratio.',
-        'same' => 'Must be :comparison :width×:height pixels.',
-        'different' => 'Must be :comparison_width :width pixels wide and :comparison_height :height pixels tall.',
-        'width' => 'Must be :comparison_width :width pixels wide.',
-        'height' => 'Must be :comparison_height :height pixels tall.',
-        'min' => 'at least',
-        'max' => 'at most',
-        'exact' => 'exactly',
-    ],
+    'dimensions' => 'Invalid image dimensions.',
     'distinct' => 'This field has a duplicate value.',
     'doesnt_end_with' => 'Must not end with one of the following: :values.',
     'doesnt_start_with' => 'Must not start with one of the following: :values.',
@@ -76,7 +66,7 @@
         'numeric' => 'Must be greater than or equal :value.',
         'string' => 'Must be greater than or equal :value characters.',
     ],
-    'image' => 'Must be an image of type: :extensions.',
+    'image' => 'Must be an image.',
     'in' => 'This is invalid.',
     'in_array' => 'This field does not exist in :other.',
     'integer' => 'Must be an integer.',
diff --git a/src/Fieldtypes/Assets/DimensionsRule.php b/src/Fieldtypes/Assets/DimensionsRule.php
index 9282bb5e7bc..f34fcc719a0 100644
--- a/src/Fieldtypes/Assets/DimensionsRule.php
+++ b/src/Fieldtypes/Assets/DimensionsRule.php
@@ -12,18 +12,14 @@
 
 class DimensionsRule implements CastableToValidationString, Stringable, ValidationRule
 {
-    protected $string_parameters;
-
     public function __construct(protected $parameters)
     {
-        $this->string_parameters = $parameters;
-        $this->parameters = array_reduce($parameters, function ($result, $item) {
+        $this->parameters = array_reduce($parameters, function ($acc, $item) {
             [$key, $value] = array_pad(explode('=', $item, 2), 2, null);
+            $acc[$key] = $value;
 
-            $result[$key] = $value;
-
-            return $result;
-        });
+            return $acc;
+        }, []);
     }
 
     public function validate(string $attribute, mixed $value, Closure $fail): void
@@ -45,82 +41,52 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
         }
 
         [$width, $height] = $size;
-        if (! is_int($width) || ! is_int($height)) {
-            $fail(__('statamic::validation.dimensions.unknown'));
 
-            return;
+        if ($this->failsBasicDimensionChecks($this->parameters, $width, $height) ||
+            $this->failsRatioCheck($this->parameters, $width, $height)) {
+            $fail($this->message());
         }
-
-        if ($message = $this->message($width, $height)) {
-            $fail($message);
-        }
-    }
-
-    public function message(int $width, int $height): ?string
-    {
-        $invalid_ratio = $this->validateRatio($width, $height);
-        $invalid_width = $this->validateWidth($width);
-        $invalid_height = $this->validateHeight($height);
-        $key = match (true) {
-            $invalid_ratio => 'ratio',
-            $invalid_width && $invalid_height && $invalid_width === $invalid_height => 'same',
-            $invalid_width && $invalid_height && $invalid_width !== $invalid_height => 'different',
-            (bool) $invalid_width => 'width',
-            (bool) $invalid_height => 'height',
-            default => null,
-        };
-
-        if (! $key) {
-            return null;
-        }
-
-        $prefix = Statamic::isCpRoute() ? 'statamic::' : '';
-
-        $comparisons = [
-            'min' => __("{$prefix}validation.dimensions.min"),
-            'max' => __("{$prefix}validation.dimensions.max"),
-            'exact' => __("{$prefix}validation.dimensions.exact"),
-        ];
-
-        return __("{$prefix}validation.dimensions.{$key}", [
-            'width' => $this->parameters['width'] ?? $this->parameters['min_width'] ?? $this->parameters['max_width'] ?? null,
-            'height' => $this->parameters['height'] ?? $this->parameters['min_height'] ?? $this->parameters['max_height'] ?? null,
-            'ratio' => $this->parameters['ratio'] ?? null,
-            'comparison' => $comparisons[$invalid_width] ?? '',
-            'comparison_width' => $comparisons[$invalid_width] ?? '',
-            'comparison_height' => $comparisons[$invalid_height] ?? '',
-        ]);
     }
 
-    public function validateWidth(int $width): ?string
+    public function message(): string
     {
-        return match (true) {
-            isset($this->parameters['width']) && $this->parameters['width'] != $width => 'exact',
-            isset($this->parameters['min_width']) && $this->parameters['min_width'] > $width => 'min',
-            isset($this->parameters['max_width']) && $this->parameters['max_width'] < $width => 'max',
-            default => null,
-        };
+        return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.dimensions');
     }
 
-    public function validateHeight(int $height): ?string
+    /**
+     * Test if the given width and height fail any conditions.
+     *
+     * @param  array  $parameters
+     * @param  int  $width
+     * @param  int  $height
+     * @return bool
+     */
+    protected function failsBasicDimensionChecks($parameters, $width, $height)
     {
-        return match (true) {
-            isset($this->parameters['height']) && $this->parameters['height'] != $height => 'exact',
-            isset($this->parameters['min_height']) && $this->parameters['min_height'] > $height => 'min',
-            isset($this->parameters['max_height']) && $this->parameters['max_height'] < $height => 'max',
-            default => null,
-        };
+        return (isset($parameters['width']) && $parameters['width'] != $width) ||
+               (isset($parameters['min_width']) && $parameters['min_width'] > $width) ||
+               (isset($parameters['max_width']) && $parameters['max_width'] < $width) ||
+               (isset($parameters['height']) && $parameters['height'] != $height) ||
+               (isset($parameters['min_height']) && $parameters['min_height'] > $height) ||
+               (isset($parameters['max_height']) && $parameters['max_height'] < $height);
     }
 
-    public function validateRatio(int $width, int $height): bool
+    /**
+     * Determine if the given parameters fail a dimension ratio check.
+     *
+     * @param  array  $parameters
+     * @param  int  $width
+     * @param  int  $height
+     * @return bool
+     */
+    protected function failsRatioCheck($parameters, $width, $height)
     {
-        if (! isset($this->parameters['ratio'])) {
+        if (! isset($parameters['ratio'])) {
             return false;
         }
 
         [$numerator, $denominator] = array_replace(
-            [1, 1],
-            array_filter(sscanf($this->parameters['ratio'], '%f/%d'))
+            [1, 1], array_filter(sscanf($parameters['ratio'], '%f/%d'))
         );
 
         $precision = 1 / (max($width, $height) + 1);
@@ -130,7 +96,9 @@ public function validateRatio(int $width, int $height): bool
 
     public function __toString()
     {
-        return 'dimensions:'.implode(',', $this->string_parameters);
+        return 'dimensions:' . collect($this->parameters)
+            ->map(fn ($value, $key) => "{$key}={$value}")
+            ->implode(',');
     }
 
     public function toGqlValidationString(): string
diff --git a/tests/Fieldtypes/AssetsTest.php b/tests/Fieldtypes/AssetsTest.php
index 88084c54d0d..19ae89d96d0 100644
--- a/tests/Fieldtypes/AssetsTest.php
+++ b/tests/Fieldtypes/AssetsTest.php
@@ -138,7 +138,7 @@ public function it_replaces_dimensions_rule()
         $this->assertIsArray($replaced);
         $this->assertCount(1, $replaced);
         $this->assertInstanceOf(DimensionsRule::class, $replaced[0]);
-        $this->assertEquals(__('statamic::validation.dimensions.same', ['width' => '180', 'height' => '180', 'comparison' => 'exactly']), $replaced[0]->message(100, 100));
+        $this->assertEquals(__('statamic::validation.dimensions'), $replaced[0]->message());
     }
 
     #[Test]
@@ -151,7 +151,7 @@ public function it_replaces_image_rule()
         $this->assertIsArray($replaced);
         $this->assertCount(1, $replaced);
         $this->assertInstanceOf(ImageRule::class, $replaced[0]);
-        $this->assertEquals(__('statamic::validation.image', ['extensions' => implode(', ', $replaced[0]->extensions)]), $replaced[0]->message());
+        $this->assertEquals(__('statamic::validation.image'), $replaced[0]->message());
     }
 
     #[Test]

From 5fd48d769bf2efaf4d02a2da651f9b012ab994c7 Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Thu, 24 Jul 2025 11:32:18 -0400
Subject: [PATCH 6/8] Code style

---
 src/Fieldtypes/Assets/DimensionsRule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Fieldtypes/Assets/DimensionsRule.php b/src/Fieldtypes/Assets/DimensionsRule.php
index f34fcc719a0..778b326fdc1 100644
--- a/src/Fieldtypes/Assets/DimensionsRule.php
+++ b/src/Fieldtypes/Assets/DimensionsRule.php
@@ -96,7 +96,7 @@ protected function failsRatioCheck($parameters, $width, $height)
 
     public function __toString()
     {
-        return 'dimensions:' . collect($this->parameters)
+        return 'dimensions:'.collect($this->parameters)
             ->map(fn ($value, $key) => "{$key}={$value}")
             ->implode(',');
     }

From 8bf37b838b0004d39ae4c52af62850f13834ff4d Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Thu, 24 Jul 2025 11:57:43 -0400
Subject: [PATCH 7/8] Fixing to string parameters

---
 src/Fieldtypes/Assets/DimensionsRule.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Fieldtypes/Assets/DimensionsRule.php b/src/Fieldtypes/Assets/DimensionsRule.php
index 778b326fdc1..4a95347eae3 100644
--- a/src/Fieldtypes/Assets/DimensionsRule.php
+++ b/src/Fieldtypes/Assets/DimensionsRule.php
@@ -12,8 +12,11 @@
 
 class DimensionsRule implements CastableToValidationString, Stringable, ValidationRule
 {
+    protected array $raw_parameters;
+
     public function __construct(protected $parameters)
     {
+        $this->raw_parameters = $parameters;
         $this->parameters = array_reduce($parameters, function ($acc, $item) {
             [$key, $value] = array_pad(explode('=', $item, 2), 2, null);
             $acc[$key] = $value;
@@ -96,9 +99,7 @@ protected function failsRatioCheck($parameters, $width, $height)
 
     public function __toString()
     {
-        return 'dimensions:'.collect($this->parameters)
-            ->map(fn ($value, $key) => "{$key}={$value}")
-            ->implode(',');
+        return 'dimensions:'.implode(',', $this->raw_parameters);
     }
 
     public function toGqlValidationString(): string

From 27bd17e37bf6c7626b10a1cef0651fc3ed328e38 Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Mon, 22 Sep 2025 13:04:40 -0400
Subject: [PATCH 8/8] Fixing bug with max/min on assets field

---
 src/Fields/Field.php              | 16 ++++++++++++----
 src/Fieldtypes/Assets/MaxRule.php | 14 +++++++++++++-
 src/Fieldtypes/Assets/MinRule.php | 14 +++++++++++++-
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/Fields/Field.php b/src/Fields/Field.php
index 488a50051f3..c17bdd569c9 100644
--- a/src/Fields/Field.php
+++ b/src/Fields/Field.php
@@ -145,10 +145,18 @@ public function rules()
 
         $rules = [];
         if ($this->type() === 'assets') {
-            $rules = [
-                $this->handle.'.*' => $temp_rules->reject(fn ($rule) => in_array($rule, ['array', 'required', 'nullable']))->values()->all(),
-                $this->handle => $temp_rules->filter(fn ($rule) => in_array($rule, ['array', 'required', 'nullable']))->values()->all(),
-            ];
+            $rules = $temp_rules->reduce(function ($result, $rule) {
+                // These rules need to be applied to the field as a whole vs each asset in the field
+                if (Str::of($rule)->before(':')->is(['array', 'required', 'nullable', 'max', 'min'])) {
+                    $result[$this->handle] ??= [];
+                    $result[$this->handle][] = $rule;
+                } else {
+                    $result["{$this->handle}.*"] ??= [];
+                    $result["{$this->handle}.*"][] = $rule;
+                }
+
+                return $result;
+            }, []);
         } else {
             $rules = [$this->handle => $temp_rules->all()];
         }
diff --git a/src/Fieldtypes/Assets/MaxRule.php b/src/Fieldtypes/Assets/MaxRule.php
index 3d41b7fa2cc..c18341c201a 100644
--- a/src/Fieldtypes/Assets/MaxRule.php
+++ b/src/Fieldtypes/Assets/MaxRule.php
@@ -4,11 +4,13 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Statamic\Contracts\GraphQL\CastableToValidationString;
 use Statamic\Facades\Asset;
 use Statamic\Statamic;
+use Stringable;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class MaxRule implements ValidationRule
+class MaxRule implements CastableToValidationString, Stringable, ValidationRule
 {
     public function __construct(protected $parameters)
     {
@@ -33,4 +35,14 @@ public function message(): string
     {
         return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.max.file', ['max' => $this->parameters[0]]);
     }
+
+    public function __toString(): string
+    {
+        return 'max_filesize:'.$this->parameters[0];
+    }
+
+    public function toGqlValidationString(): string
+    {
+        return $this->__toString();
+    }
 }
diff --git a/src/Fieldtypes/Assets/MinRule.php b/src/Fieldtypes/Assets/MinRule.php
index 64fb897768a..8d9edb30446 100644
--- a/src/Fieldtypes/Assets/MinRule.php
+++ b/src/Fieldtypes/Assets/MinRule.php
@@ -4,11 +4,13 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Statamic\Contracts\GraphQL\CastableToValidationString;
 use Statamic\Facades\Asset;
 use Statamic\Statamic;
+use Stringable;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
-class MinRule implements ValidationRule
+class MinRule implements CastableToValidationString, Stringable, ValidationRule
 {
     public function __construct(protected $parameters)
     {
@@ -33,4 +35,14 @@ public function message(): string
     {
         return __((Statamic::isCpRoute() ? 'statamic::' : '').'validation.min.file', ['min' => $this->parameters[0]]);
     }
+
+    public function __toString(): string
+    {
+        return 'min_filesize:'.$this->parameters[0];
+    }
+
+    public function toGqlValidationString(): string
+    {
+        return $this->__toString();
+    }
 }