strapi-plugin-publish-media-validation 1.0.2 → 1.1.1

package/dist/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAO,MAAM,gBAAgB,CAAC;;2BAgClB;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE;uBAqC3B;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE;qBACzB;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE;;AAE/C,wBAAgD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAO,MAAM,gBAAgB,CAAC;;2BAiHlB;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE;uBAiC3B;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE;qBACzB;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE;;AAE/C,wBAAgD"}

package/dist/server/index.js

@@ -1,34 +1,98 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
+function resolveValidationError() {
+    try {
+        // @strapi/utils is always present in the host Strapi project; require()
+        // loads the CJS build, which is the same instance Strapi's error
+        // middleware uses for instanceof checks → errors become 400, not 500.
+        return require('@strapi/utils').errors.ValidationError;
+    }
+    catch {
+        return class extends Error {
+            constructor(message) {
+                super(message);
+                this.name = 'ValidationError';
+                this.status = 400;
+            }
+        };
+    }
+}
 /**
- * Resolve @strapi/utils from the already-running Strapi process instead of
- * requiring consumers to add it as a direct dependency. Strapi always loads
- * @strapi/utils early, so it is in require.cache by the time register() runs.
- * This keeps the instanceof check in Strapi's Koa error middleware working.
+ * Recursively build a Strapi populate object that covers every media field
+ * (at any depth) inside the given model, including inside components and
+ * dynamic zones. The visited set prevents infinite loops from circular
+ * component references.
  */
-function resolveValidationError() {
-    var _a, _b, _c;
-    const sep = path_1.default.sep;
-    for (const [filename, mod] of Object.entries((_a = require.cache) !== null && _a !== void 0 ? _a : {})) {
-        if (filename.includes(`@strapi${sep}utils`) &&
-            filename.endsWith('index.js') &&
-            ((_c = (_b = mod === null || mod === void 0 ? void 0 : mod.exports) === null || _b === void 0 ? void 0 : _b.errors) === null || _c === void 0 ? void 0 : _c.ValidationError)) {
-            return mod.exports.errors.ValidationError;
+function buildPopulate(modelUID, strapi, visited = new Set()) {
+    var _a;
+    if (visited.has(modelUID))
+        return {};
+    const seen = new Set(visited);
+    seen.add(modelUID);
+    const model = strapi.getModel(modelUID);
+    if (!(model === null || model === void 0 ? void 0 : model.attributes))
+        return {};
+    const populate = {};
+    for (const [key, attr] of Object.entries(model.attributes)) {
+        const a = attr;
+        if (a.type === 'media') {
+            populate[key] = true;
+        }
+        else if (a.type === 'component') {
+            const nested = buildPopulate(a.component, strapi, seen);
+            // Always include the component so we can inspect its fields; fall back
+            // to populate:'*' when there are no explicitly known nested keys.
+            populate[key] = { populate: Object.keys(nested).length ? nested : '*' };
+        }
+        else if (a.type === 'dynamiczone') {
+            // Merge field names from every possible component type so that
+            // Strapi populates whichever fields exist on each concrete item.
+            const merged = {};
+            for (const compUID of ((_a = a.components) !== null && _a !== void 0 ? _a : [])) {
+                const nested = buildPopulate(compUID, strapi, seen);
+                Object.assign(merged, nested);
+            }
+            populate[key] = { populate: Object.keys(merged).length ? merged : '*' };
         }
     }
-    // Fallback: plain Error with status 400 so Strapi's formatInternalError
-    // still returns a 400 with the message visible in the admin panel.
-    return class extends Error {
-        constructor(message) {
-            super(message);
-            this.name = 'ValidationError';
-            this.status = 400;
+    return populate;
+}
+/**
+ * Walk the fetched document data and collect human-readable paths for every
+ * required media field that is empty. Handles nested components and dynamic
+ * zones recursively.
+ */
+function collectMissingMedia(data, modelUID, strapi) {
+    if (!data)
+        return [];
+    const model = strapi.getModel(modelUID);
+    if (!(model === null || model === void 0 ? void 0 : model.attributes))
+        return [];
+    const missing = [];
+    for (const [key, attr] of Object.entries(model.attributes)) {
+        const a = attr;
+        if (a.type === 'media' && a.required === true) {
+            if (!data[key]) {
+                missing.push(key);
+            }
+        }
+        else if (a.type === 'component' && data[key] != null) {
+            const items = Array.isArray(data[key]) ? data[key] : [data[key]];
+            items.forEach((item, i) => {
+                const prefix = Array.isArray(data[key]) ? `${key}[${i + 1}]` : key;
+                collectMissingMedia(item, a.component, strapi).forEach((f) => missing.push(`${prefix} > ${f}`));
+            });
         }
-    };
+        else if (a.type === 'dynamiczone' && Array.isArray(data[key])) {
+            data[key].forEach((item, i) => {
+                const compUID = item === null || item === void 0 ? void 0 : item.__component;
+                if (compUID) {
+                    collectMissingMedia(item, compUID, strapi).forEach((f) => missing.push(`${key}[${i + 1}] > ${f}`));
+                }
+            });
+        }
+    }
+    return missing;
 }
 const register = ({ strapi }) => {
     const ValidationError = resolveValidationError();
@@ -39,23 +103,20 @@ const register = ({ strapi }) => {
         const model = strapi.getModel(ctx.uid);
         if (!(model === null || model === void 0 ? void 0 : model.attributes))
             return next();
-        const requiredMediaFields = Object.entries(model.attributes)
-            .filter(([, attr]) => attr.type === 'media' && attr.required === true)
-            .map(([key]) => key);
-        if (requiredMediaFields.length === 0)
-            return next();
         const documentId = (_a = ctx.params) === null || _a === void 0 ? void 0 : _a.documentId;
         if (!documentId)
             return next();
-        const populate = Object.fromEntries(requiredMediaFields.map((f) => [f, true]));
+        const populate = buildPopulate(ctx.uid, strapi);
+        if (Object.keys(populate).length === 0)
+            return next();
         const doc = await strapi.documents(ctx.uid).findOne({
             documentId,
             populate,
         });
-        const missing = requiredMediaFields.filter((f) => !(doc === null || doc === void 0 ? void 0 : doc[f]));
+        const missing = collectMissingMedia(doc, ctx.uid, strapi);
         if (missing.length > 0) {
             const labels = missing
-                .map((f) => f.charAt(0).toUpperCase() + f.slice(1).replace(/([A-Z])/g, ' $1'))
+                .map((f) => f.charAt(0).toUpperCase() + f.slice(1).replace(/([A-Z])/g, ' $1').replace(/_/g, ' '))
                 .join(', ');
             throw new ValidationError(`The following required media fields are empty: ${labels}`);
         }

package/dist/server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-publish-media-validation",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "Strapi v5 plugin that enforces required media fields at publish time — works around the known limitation where required: true on media fields is not validated on publish.",
   "license": "MIT",
   "keywords": [

package/src/server/__tests__/index.test.ts

@@ -1,7 +1,22 @@
 import { errors } from '@strapi/utils';
 import plugin from '../index';
 
-// Capture the middleware function registered via strapi.documents.use()
+const baseCtx = {
+  action: 'publish',
+  uid: 'api::article.article',
+  params: { documentId: 'abc123' },
+};
+
+const ARTICLE_UID = 'api::article.article';
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Simple helper: getModel always returns the same model regardless of UID.
+ * Use for flat content-type tests with no components or dynamic zones.
+ */
 function buildStrapi(
   modelAttributes: Record<string, unknown> | null,
   docFields: Record<string, unknown> | null = {}
@@ -10,7 +25,7 @@ function buildStrapi(
 
   const strapi = {
     documents: Object.assign(
-      (uid: string) => ({
+      (_uid: string) => ({
         findOne: jest.fn().mockResolvedValue(docFields),
       }),
       {
@@ -28,7 +43,7 @@ function buildStrapi(
 
   return {
     strapi,
-    runMiddleware: (ctx: Record<string, unknown>) => {
+    runMiddleware: (ctx: Record<string, unknown> = baseCtx) => {
       if (!capturedMiddleware) throw new Error('middleware not registered');
       const next = jest.fn().mockResolvedValue(undefined);
       return { result: capturedMiddleware(ctx, next), next };
@@ -36,11 +51,48 @@ function buildStrapi(
   };
 }
 
-const baseCtx = {
-  action: 'publish',
-  uid: 'api::article.article',
-  params: { documentId: 'abc123' },
-};
+/**
+ * Multi-model helper: getModel returns different attributes per UID.
+ * Required for tests involving components or dynamic zones.
+ */
+function buildStrapiFromModels(
+  modelsByUid: Record<string, Record<string, unknown>>,
+  docFields: Record<string, unknown> | null = {}
+) {
+  let capturedMiddleware: Function | null = null;
+
+  const strapi = {
+    documents: Object.assign(
+      (_uid: string) => ({
+        findOne: jest.fn().mockResolvedValue(docFields),
+      }),
+      {
+        use: jest.fn((fn: Function) => {
+          capturedMiddleware = fn;
+        }),
+      }
+    ),
+    getModel: jest.fn((uid: string) => {
+      const attrs = modelsByUid[uid];
+      return attrs !== undefined ? { attributes: attrs } : null;
+    }),
+  };
+
+  plugin.register({ strapi: strapi as any });
+
+  return {
+    strapi,
+    runMiddleware: (ctx: Record<string, unknown> = baseCtx) => {
+      if (!capturedMiddleware) throw new Error('middleware not registered');
+      const next = jest.fn().mockResolvedValue(undefined);
+      return { result: capturedMiddleware(ctx, next), next };
+    },
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Registration
+// ---------------------------------------------------------------------------
 
 describe('register', () => {
   it('calls strapi.documents.use once', () => {
@@ -49,7 +101,11 @@ describe('register', () => {
   });
 });
 
-describe('middleware', () => {
+// ---------------------------------------------------------------------------
+// Flat (top-level) media fields
+// ---------------------------------------------------------------------------
+
+describe('middleware — flat media fields', () => {
   it('passes through when action is not publish', async () => {
     const { runMiddleware } = buildStrapi({});
     const { next } = runMiddleware({ ...baseCtx, action: 'create' });
@@ -64,6 +120,15 @@ describe('middleware', () => {
     expect(next).toHaveBeenCalled();
   });
 
+  it('passes through when model has no media fields at all', async () => {
+    const { runMiddleware } = buildStrapi({
+      title: { type: 'string', required: true },
+    });
+    const { next } = runMiddleware(baseCtx);
+    await next;
+    expect(next).toHaveBeenCalled();
+  });
+
   it('passes through when model has no required media fields', async () => {
     const { runMiddleware } = buildStrapi({
       title: { type: 'string', required: true },
@@ -129,7 +194,7 @@ describe('middleware', () => {
     expect(next).toHaveBeenCalled();
   });
 
-  it('populates only required media fields when fetching the document', async () => {
+  it('builds populate that includes all media fields when fetching the document', async () => {
     const findOne = jest.fn().mockResolvedValue({ cover: { id: 1 } });
     const strapi = {
       documents: Object.assign(() => ({ findOne }), {
@@ -151,3 +216,204 @@ describe('middleware', () => {
     });
   });
 });
+
+// ---------------------------------------------------------------------------
+// Component fields
+// ---------------------------------------------------------------------------
+
+describe('middleware — component fields', () => {
+  const HERO_UID = 'sections.hero';
+
+  it('passes through when component required media is populated', async () => {
+    const { runMiddleware } = buildStrapiFromModels(
+      {
+        [ARTICLE_UID]: { hero: { type: 'component', component: HERO_UID } },
+        [HERO_UID]: { photo: { type: 'media', required: true } },
+      },
+      { hero: { photo: { id: 1 } } }
+    );
+    const { result, next } = runMiddleware();
+    await result;
+    expect(next).toHaveBeenCalled();
+  });
+
+  it('throws when component required media is empty', async () => {
+    const { runMiddleware } = buildStrapiFromModels(
+      {
+        [ARTICLE_UID]: { hero: { type: 'component', component: HERO_UID } },
+        [HERO_UID]: { photo: { type: 'media', required: true } },
+      },
+      { hero: { photo: null } }
+    );
+    const { result } = runMiddleware();
+    await expect(result).rejects.toThrow(errors.ValidationError);
+    await expect(result).rejects.toThrow('Hero > photo');
+  });
+
+  it('passes through when all repeatable component items have required media', async () => {
+    const { runMiddleware } = buildStrapiFromModels(
+      {
+        [ARTICLE_UID]: { cards: { type: 'component', component: HERO_UID, repeatable: true } },
+        [HERO_UID]: { photo: { type: 'media', required: true } },
+      },
+      { cards: [{ photo: { id: 1 } }, { photo: { id: 2 } }] }
+    );
+    const { result, next } = runMiddleware();
+    await result;
+    expect(next).toHaveBeenCalled();
+  });
+
+  it('reports the correct index for a missing repeatable component item', async () => {
+    const { runMiddleware } = buildStrapiFromModels(
+      {
+        [ARTICLE_UID]: { cards: { type: 'component', component: HERO_UID, repeatable: true } },
+        [HERO_UID]: { photo: { type: 'media', required: true } },
+      },
+      { cards: [{ photo: { id: 1 } }, { photo: null }] }
+    );
+    const { result } = runMiddleware();
+    await expect(result).rejects.toThrow('Cards[2] > photo');
+  });
+
+  it('builds populate that includes the component media field', async () => {
+    const findOne = jest.fn().mockResolvedValue({ hero: { photo: { id: 1 } } });
+    let capturedMiddleware: Function | null = null;
+    const strapi = {
+      documents: Object.assign(() => ({ findOne }), {
+        use: jest.fn((fn: Function) => {
+          capturedMiddleware = fn;
+        }),
+      }),
+      getModel: jest.fn((uid: string) => {
+        if (uid === ARTICLE_UID) return { attributes: { hero: { type: 'component', component: HERO_UID } } };
+        if (uid === HERO_UID)    return { attributes: { photo: { type: 'media', required: true } } };
+        return null;
+      }),
+    };
+
+    plugin.register({ strapi: strapi as any });
+    await capturedMiddleware!(baseCtx, jest.fn().mockResolvedValue(undefined));
+
+    expect(findOne).toHaveBeenCalledWith({
+      documentId: 'abc123',
+      populate: { hero: { populate: { photo: true } } },
+    });
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Dynamic zone fields
+// ---------------------------------------------------------------------------
+
+describe('middleware — dynamiczone fields', () => {
+  const COPY_PHOTO_UID = 'sections.copy-photo';
+  const TEXT_UID = 'sections.text';
+
+  it('passes through when all blocks have required media populated', async () => {
+    const { runMiddleware } = buildStrapiFromModels(
+      {
+        [ARTICLE_UID]: { blocks: { type: 'dynamiczone', components: [COPY_PHOTO_UID] } },
+        [COPY_PHOTO_UID]: { photo: { type: 'media', required: true } },
+      },
+      { blocks: [{ __component: COPY_PHOTO_UID, photo: { id: 1 } }] }
+    );
+    const { result, next } = runMiddleware();
+    await result;
+    expect(next).toHaveBeenCalled();
+  });
+
+  it('throws when a block is missing required media', async () => {
+    const { runMiddleware } = buildStrapiFromModels(
+      {
+        [ARTICLE_UID]: { blocks: { type: 'dynamiczone', components: [COPY_PHOTO_UID] } },
+        [COPY_PHOTO_UID]: { photo: { type: 'media', required: true } },
+      },
+      { blocks: [{ __component: COPY_PHOTO_UID, photo: null }] }
+    );
+    const { result } = runMiddleware();
+    await expect(result).rejects.toThrow(errors.ValidationError);
+    await expect(result).rejects.toThrow('Blocks[1] > photo');
+  });
+
+  it('reports the correct block index in a multi-block dynamic zone', async () => {
+    const { runMiddleware } = buildStrapiFromModels(
+      {
+        [ARTICLE_UID]: { blocks: { type: 'dynamiczone', components: [COPY_PHOTO_UID] } },
+        [COPY_PHOTO_UID]: { photo: { type: 'media', required: true } },
+      },
+      {
+        blocks: [
+          { __component: COPY_PHOTO_UID, photo: { id: 1 } },
+          { __component: COPY_PHOTO_UID, photo: null },
+        ],
+      }
+    );
+    const { result } = runMiddleware();
+    await expect(result).rejects.toThrow('Blocks[2] > photo');
+  });
+
+  it('skips blocks whose component type has no required media', async () => {
+    const { runMiddleware } = buildStrapiFromModels(
+      {
+        [ARTICLE_UID]: { blocks: { type: 'dynamiczone', components: [COPY_PHOTO_UID, TEXT_UID] } },
+        [COPY_PHOTO_UID]: { photo: { type: 'media', required: true } },
+        [TEXT_UID]: { content: { type: 'richtext' } },
+      },
+      {
+        blocks: [
+          { __component: TEXT_UID, content: 'hello' },
+          { __component: COPY_PHOTO_UID, photo: { id: 1 } },
+        ],
+      }
+    );
+    const { result, next } = runMiddleware();
+    await result;
+    expect(next).toHaveBeenCalled();
+  });
+
+  it('throws only for the failing block in a mixed dynamic zone', async () => {
+    const { runMiddleware } = buildStrapiFromModels(
+      {
+        [ARTICLE_UID]: { blocks: { type: 'dynamiczone', components: [COPY_PHOTO_UID, TEXT_UID] } },
+        [COPY_PHOTO_UID]: { photo: { type: 'media', required: true } },
+        [TEXT_UID]: { content: { type: 'richtext' } },
+      },
+      {
+        blocks: [
+          { __component: TEXT_UID, content: 'hello' },
+          { __component: COPY_PHOTO_UID, photo: null },
+        ],
+      }
+    );
+    const { result } = runMiddleware();
+    await expect(result).rejects.toThrow('Blocks[2] > photo');
+  });
+
+  it('builds populate that merges media fields from all component types', async () => {
+    const findOne = jest.fn().mockResolvedValue({
+      blocks: [{ __component: COPY_PHOTO_UID, photo: { id: 1 } }],
+    });
+    let capturedMiddleware: Function | null = null;
+    const strapi = {
+      documents: Object.assign(() => ({ findOne }), {
+        use: jest.fn((fn: Function) => {
+          capturedMiddleware = fn;
+        }),
+      }),
+      getModel: jest.fn((uid: string) => {
+        if (uid === ARTICLE_UID)    return { attributes: { blocks: { type: 'dynamiczone', components: [COPY_PHOTO_UID, TEXT_UID] } } };
+        if (uid === COPY_PHOTO_UID) return { attributes: { photo: { type: 'media', required: true } } };
+        if (uid === TEXT_UID)       return { attributes: { content: { type: 'richtext' } } };
+        return null;
+      }),
+    };
+
+    plugin.register({ strapi: strapi as any });
+    await capturedMiddleware!(baseCtx, jest.fn().mockResolvedValue(undefined));
+
+    expect(findOne).toHaveBeenCalledWith({
+      documentId: 'abc123',
+      populate: { blocks: { populate: { photo: true } } },
+    });
+  });
+});

package/src/server/index.ts

@@ -1,34 +1,114 @@
-import path from 'path';
 import type { Core, UID } from '@strapi/strapi';
 
 type ValidationErrorCtor = new (message: string) => Error;
 
+function resolveValidationError(): ValidationErrorCtor {
+  try {
+    // @strapi/utils is always present in the host Strapi project; require()
+    // loads the CJS build, which is the same instance Strapi's error
+    // middleware uses for instanceof checks → errors become 400, not 500.
+    return (require('@strapi/utils') as any).errors.ValidationError;
+  } catch {
+    return class extends Error {
+      constructor(message: string) {
+        super(message);
+        this.name = 'ValidationError';
+        (this as any).status = 400;
+      }
+    };
+  }
+}
+
 /**
- * Resolve @strapi/utils from the already-running Strapi process instead of
- * requiring consumers to add it as a direct dependency. Strapi always loads
- * @strapi/utils early, so it is in require.cache by the time register() runs.
- * This keeps the instanceof check in Strapi's Koa error middleware working.
+ * Recursively build a Strapi populate object that covers every media field
+ * (at any depth) inside the given model, including inside components and
+ * dynamic zones. The visited set prevents infinite loops from circular
+ * component references.
  */
-function resolveValidationError(): ValidationErrorCtor {
-  const sep = path.sep;
-  for (const [filename, mod] of Object.entries(require.cache ?? {})) {
-    if (
-      filename.includes(`@strapi${sep}utils`) &&
-      filename.endsWith('index.js') &&
-      (mod as any)?.exports?.errors?.ValidationError
-    ) {
-      return (mod as any).exports.errors.ValidationError;
+function buildPopulate(
+  modelUID: string,
+  strapi: Core.Strapi,
+  visited = new Set<string>()
+): Record<string, any> {
+  if (visited.has(modelUID)) return {};
+  const seen = new Set(visited);
+  seen.add(modelUID);
+
+  const model = strapi.getModel(modelUID as UID.Schema);
+  if (!model?.attributes) return {};
+
+  const populate: Record<string, any> = {};
+
+  for (const [key, attr] of Object.entries(model.attributes)) {
+    const a = attr as any;
+
+    if (a.type === 'media') {
+      populate[key] = true;
+    } else if (a.type === 'component') {
+      const nested = buildPopulate(a.component, strapi, seen);
+      // Always include the component so we can inspect its fields; fall back
+      // to populate:'*' when there are no explicitly known nested keys.
+      populate[key] = { populate: Object.keys(nested).length ? nested : '*' };
+    } else if (a.type === 'dynamiczone') {
+      // Merge field names from every possible component type so that
+      // Strapi populates whichever fields exist on each concrete item.
+      const merged: Record<string, any> = {};
+      for (const compUID of (a.components ?? [])) {
+        const nested = buildPopulate(compUID, strapi, seen);
+        Object.assign(merged, nested);
+      }
+      populate[key] = { populate: Object.keys(merged).length ? merged : '*' };
     }
   }
-  // Fallback: plain Error with status 400 so Strapi's formatInternalError
-  // still returns a 400 with the message visible in the admin panel.
-  return class extends Error {
-    constructor(message: string) {
-      super(message);
-      this.name = 'ValidationError';
-      (this as any).status = 400;
+
+  return populate;
+}
+
+/**
+ * Walk the fetched document data and collect human-readable paths for every
+ * required media field that is empty. Handles nested components and dynamic
+ * zones recursively.
+ */
+function collectMissingMedia(
+  data: any,
+  modelUID: string,
+  strapi: Core.Strapi
+): string[] {
+  if (!data) return [];
+
+  const model = strapi.getModel(modelUID as UID.Schema);
+  if (!model?.attributes) return [];
+
+  const missing: string[] = [];
+
+  for (const [key, attr] of Object.entries(model.attributes)) {
+    const a = attr as any;
+
+    if (a.type === 'media' && a.required === true) {
+      if (!data[key]) {
+        missing.push(key);
+      }
+    } else if (a.type === 'component' && data[key] != null) {
+      const items: any[] = Array.isArray(data[key]) ? data[key] : [data[key]];
+      items.forEach((item, i) => {
+        const prefix = Array.isArray(data[key]) ? `${key}[${i + 1}]` : key;
+        collectMissingMedia(item, a.component, strapi).forEach((f) =>
+          missing.push(`${prefix} > ${f}`)
+        );
+      });
+    } else if (a.type === 'dynamiczone' && Array.isArray(data[key])) {
+      data[key].forEach((item: any, i: number) => {
+        const compUID: string | undefined = item?.__component;
+        if (compUID) {
+          collectMissingMedia(item, compUID, strapi).forEach((f) =>
+            missing.push(`${key}[${i + 1}] > ${f}`)
+          );
+        }
+      });
     }
-  };
+  }
+
+  return missing;
 }
 
 const register = ({ strapi }: { strapi: Core.Strapi }) => {
@@ -40,26 +120,22 @@ const register = ({ strapi }: { strapi: Core.Strapi }) => {
     const model = strapi.getModel(ctx.uid as UID.ContentType);
     if (!model?.attributes) return next();
 
-    const requiredMediaFields = Object.entries(model.attributes)
-      .filter(([, attr]) => (attr as any).type === 'media' && (attr as any).required === true)
-      .map(([key]) => key);
-
-    if (requiredMediaFields.length === 0) return next();
-
     const documentId = (ctx.params as { documentId?: string })?.documentId;
     if (!documentId) return next();
 
-    const populate = Object.fromEntries(requiredMediaFields.map((f) => [f, true]));
+    const populate = buildPopulate(ctx.uid as string, strapi);
+    if (Object.keys(populate).length === 0) return next();
+
     const doc = await strapi.documents(ctx.uid as UID.ContentType).findOne({
       documentId,
       populate,
     });
 
-    const missing = requiredMediaFields.filter((f) => !(doc as any)?.[f]);
+    const missing = collectMissingMedia(doc, ctx.uid as string, strapi);
 
     if (missing.length > 0) {
       const labels = missing
-        .map((f) => f.charAt(0).toUpperCase() + f.slice(1).replace(/([A-Z])/g, ' $1'))
+        .map((f) => f.charAt(0).toUpperCase() + f.slice(1).replace(/([A-Z])/g, ' $1').replace(/_/g, ' '))
         .join(', ');
       throw new ValidationError(`The following required media fields are empty: ${labels}`);
     }