@strapi/core 5.46.1 → 5.47.1

package/dist/services/document-service/draft-and-publish.js

@@ -93,57 +93,6 @@ var strapiUtils = require('@strapi/utils');
     }
     return params;
 };
-/**
- * Parses and sanitizes the hasPublishedVersion parameter.
- * Returns normalized boolean value or undefined if not provided.
- * Throws ValidationError for invalid input (400 response).
- */ const parseHasPublishedVersion = (value)=>{
-    if (value === undefined || value === null) {
-        return undefined;
-    }
-    if (value === true || value === 'true') {
-        return true;
-    }
-    if (value === false || value === 'false') {
-        return false;
-    }
-    throw new strapiUtils.errors.ValidationError("Invalid value for 'hasPublishedVersion'. Expected boolean or 'true'/'false' string.");
-};
-/**
- * Synchronous helper that returns the "has published version" condition for a given model.
- * Returns the documentId subquery condition, or null if the model doesn't use draft & publish.
- *
- * This is used by the filters function in transform/query.ts so that the condition
- * is applied to both root and nested (populate) queries.
- */ const getHasPublishedVersionCondition = (uid, hasPublishedVersion)=>{
-    const model = strapi.getModel(uid);
-    // Ignore if target model has disabled DP or doesn't exist (e.g., components)
-    if (!model || !strapiUtils.contentTypes.hasDraftAndPublish(model)) {
-        return null;
-    }
-    // Get table and column names from metadata
-    const meta = strapi.db.metadata.get(uid);
-    const tableName = meta.tableName;
-    const documentIdAttr = meta.attributes.documentId;
-    const publishedAtAttr = meta.attributes.publishedAt;
-    const documentIdColumn = 'columnName' in documentIdAttr && documentIdAttr.columnName || 'document_id';
-    const publishedAtColumn = 'columnName' in publishedAtAttr && publishedAtAttr.columnName || 'published_at';
-    // Create a Knex subquery that selects document IDs with published entries
-    const knex = strapi.db.connection;
-    const subquery = knex(tableName).distinct(documentIdColumn).whereNotNull(publishedAtColumn);
-    if (hasPublishedVersion) {
-        return {
-            documentId: {
-                $in: subquery
-            }
-        };
-    }
-    return {
-        documentId: {
-            $notIn: subquery
-        }
-    };
-};
 const setStatusToDraftCurry = fp.curry(setStatusToDraft);
 const defaultToDraftCurry = fp.curry(defaultToDraft);
 const defaultStatusCurry = fp.curry(defaultStatus);
@@ -154,8 +103,6 @@ const statusToDataCurry = fp.curry(statusToData);
 exports.defaultStatus = defaultStatusCurry;
 exports.defaultToDraft = defaultToDraftCurry;
 exports.filterDataPublishedAt = filterDataPublishedAtCurry;
-exports.getHasPublishedVersionCondition = getHasPublishedVersionCondition;
-exports.parseHasPublishedVersion = parseHasPublishedVersion;
 exports.setStatusToDraft = setStatusToDraftCurry;
 exports.statusToData = statusToDataCurry;
 exports.statusToLookup = statusToLookupCurry;

package/dist/services/document-service/draft-and-publish.js.map

@@ -1 +1 @@
-{"version":3,"file":"draft-and-publish.js","sources":["../../../src/services/document-service/draft-and-publish.ts"],"sourcesContent":["import { assoc, curry } from 'lodash/fp';\n\nimport type { Modules, Struct, UID } from '@strapi/types';\nimport { contentTypes, errors } from '@strapi/utils';\n\ntype ParamsTransform = (params: Modules.Documents.Params.All) => Modules.Documents.Params.All;\n\ntype TransformWithContentType = (\n  contentType: Struct.SingleTypeSchema | Struct.CollectionTypeSchema,\n  params: Modules.Documents.Params.All\n) => Modules.Documents.Params.All;\n\n/**\n * DP enabled -> set status to draft\n * DP disabled -> Used mostly for parsing relations, so there is not a need for a default.\n */\nconst setStatusToDraft: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType) && params.status) {\n    return params;\n  }\n\n  return assoc('status', 'draft', params);\n};\n\n/**\n * Adds a default status of `draft` to the params\n */\nconst defaultToDraft: ParamsTransform = (params) => {\n  // Default to draft if no status is provided or it's invalid\n  if (!params.status || params.status !== 'published') {\n    return assoc('status', 'draft', params);\n  }\n\n  return params;\n};\n\n/**\n * DP disabled -> ignore status\n * DP enabled -> set status to draft if no status is provided or it's invalid\n */\nconst defaultStatus: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return params;\n  }\n\n  // Default to draft if no status is provided or it's invalid\n  if (!params.status || params.status !== 'published') {\n    return defaultToDraft(params);\n  }\n\n  return params;\n};\n\n/**\n * In mutating actions we don't want user to set the publishedAt attribute.\n */\nconst filterDataPublishedAt: ParamsTransform = (params) => {\n  if (params?.data?.publishedAt) {\n    return assoc(['data', 'publishedAt'], null, params);\n  }\n\n  return params;\n};\n\n/**\n * Add status lookup query to the params\n */\nconst statusToLookup: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return params;\n  }\n\n  const lookup = params.lookup || {};\n\n  switch (params?.status) {\n    case 'published':\n      return assoc(['lookup', 'publishedAt'], { $notNull: true }, params);\n    case 'draft':\n      return assoc(['lookup', 'publishedAt'], { $null: true }, params);\n    default:\n      break;\n  }\n\n  return assoc('lookup', lookup, params);\n};\n\n/**\n * Translate publication status parameter into the data that will be saved\n */\nconst statusToData: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return assoc(['data', 'publishedAt'], new Date(), params);\n  }\n\n  switch (params?.status) {\n    case 'published':\n      return assoc(['data', 'publishedAt'], new Date(), params);\n    case 'draft':\n      return assoc(['data', 'publishedAt'], null, params);\n    default:\n      break;\n  }\n\n  return params;\n};\n\n/**\n * Parses and sanitizes the hasPublishedVersion parameter.\n * Returns normalized boolean value or undefined if not provided.\n * Throws ValidationError for invalid input (400 response).\n */\nconst parseHasPublishedVersion = (value: unknown): boolean | undefined => {\n  if (value === undefined || value === null) {\n    return undefined;\n  }\n\n  if (value === true || value === 'true') {\n    return true;\n  }\n\n  if (value === false || value === 'false') {\n    return false;\n  }\n\n  throw new errors.ValidationError(\n    \"Invalid value for 'hasPublishedVersion'. Expected boolean or 'true'/'false' string.\"\n  );\n};\n\n/**\n * Synchronous helper that returns the \"has published version\" condition for a given model.\n * Returns the documentId subquery condition, or null if the model doesn't use draft & publish.\n *\n * This is used by the filters function in transform/query.ts so that the condition\n * is applied to both root and nested (populate) queries.\n */\nconst getHasPublishedVersionCondition = (\n  uid: UID.Schema,\n  hasPublishedVersion: boolean\n): Record<string, any> | null => {\n  const model = strapi.getModel(uid);\n\n  // Ignore if target model has disabled DP or doesn't exist (e.g., components)\n  if (!model || !contentTypes.hasDraftAndPublish(model)) {\n    return null;\n  }\n\n  // Get table and column names from metadata\n  const meta = strapi.db.metadata.get(uid);\n  const tableName = meta.tableName;\n  const documentIdAttr = meta.attributes.documentId;\n  const publishedAtAttr = meta.attributes.publishedAt;\n  const documentIdColumn =\n    ('columnName' in documentIdAttr && documentIdAttr.columnName) || 'document_id';\n  const publishedAtColumn =\n    ('columnName' in publishedAtAttr && publishedAtAttr.columnName) || 'published_at';\n\n  // Create a Knex subquery that selects document IDs with published entries\n  const knex = strapi.db.connection;\n  const subquery = knex(tableName).distinct(documentIdColumn).whereNotNull(publishedAtColumn);\n\n  if (hasPublishedVersion) {\n    return { documentId: { $in: subquery } };\n  }\n\n  return { documentId: { $notIn: subquery } };\n};\n\nconst setStatusToDraftCurry = curry(setStatusToDraft);\nconst defaultToDraftCurry = curry(defaultToDraft);\nconst defaultStatusCurry = curry(defaultStatus);\nconst filterDataPublishedAtCurry = curry(filterDataPublishedAt);\nconst statusToLookupCurry = curry(statusToLookup);\nconst statusToDataCurry = curry(statusToData);\n\nexport {\n  setStatusToDraftCurry as setStatusToDraft,\n  defaultToDraftCurry as defaultToDraft,\n  defaultStatusCurry as defaultStatus,\n  filterDataPublishedAtCurry as filterDataPublishedAt,\n  statusToLookupCurry as statusToLookup,\n  statusToDataCurry as statusToData,\n  parseHasPublishedVersion,\n  getHasPublishedVersionCondition,\n};\n"],"names":["setStatusToDraft","contentType","params","contentTypes","hasDraftAndPublish","status","assoc","defaultToDraft","defaultStatus","filterDataPublishedAt","data","publishedAt","statusToLookup","lookup","$notNull","$null","statusToData","Date","parseHasPublishedVersion","value","undefined","errors","ValidationError","getHasPublishedVersionCondition","uid","hasPublishedVersion","model","strapi","getModel","meta","db","metadata","get","tableName","documentIdAttr","attributes","documentId","publishedAtAttr","documentIdColumn","columnName","publishedAtColumn","knex","connection","subquery","distinct","whereNotNull","$in","$notIn","setStatusToDraftCurry","curry","defaultToDraftCurry","defaultStatusCurry","filterDataPublishedAtCurry","statusToLookupCurry","statusToDataCurry"],"mappings":"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"}
+{"version":3,"file":"draft-and-publish.js","sources":["../../../src/services/document-service/draft-and-publish.ts"],"sourcesContent":["import { assoc, curry } from 'lodash/fp';\n\nimport type { Modules, Struct } from '@strapi/types';\nimport { contentTypes } from '@strapi/utils';\n\ntype ParamsTransform = (params: Modules.Documents.Params.All) => Modules.Documents.Params.All;\n\ntype TransformWithContentType = (\n  contentType: Struct.SingleTypeSchema | Struct.CollectionTypeSchema,\n  params: Modules.Documents.Params.All\n) => Modules.Documents.Params.All;\n\n/**\n * DP enabled -> set status to draft\n * DP disabled -> Used mostly for parsing relations, so there is not a need for a default.\n */\nconst setStatusToDraft: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType) && params.status) {\n    return params;\n  }\n\n  return assoc('status', 'draft', params);\n};\n\n/**\n * Adds a default status of `draft` to the params\n */\nconst defaultToDraft: ParamsTransform = (params) => {\n  // Default to draft if no status is provided or it's invalid\n  if (!params.status || params.status !== 'published') {\n    return assoc('status', 'draft', params);\n  }\n\n  return params;\n};\n\n/**\n * DP disabled -> ignore status\n * DP enabled -> set status to draft if no status is provided or it's invalid\n */\nconst defaultStatus: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return params;\n  }\n\n  // Default to draft if no status is provided or it's invalid\n  if (!params.status || params.status !== 'published') {\n    return defaultToDraft(params);\n  }\n\n  return params;\n};\n\n/**\n * In mutating actions we don't want user to set the publishedAt attribute.\n */\nconst filterDataPublishedAt: ParamsTransform = (params) => {\n  if (params?.data?.publishedAt) {\n    return assoc(['data', 'publishedAt'], null, params);\n  }\n\n  return params;\n};\n\n/**\n * Add status lookup query to the params\n */\nconst statusToLookup: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return params;\n  }\n\n  const lookup = params.lookup || {};\n\n  switch (params?.status) {\n    case 'published':\n      return assoc(['lookup', 'publishedAt'], { $notNull: true }, params);\n    case 'draft':\n      return assoc(['lookup', 'publishedAt'], { $null: true }, params);\n    default:\n      break;\n  }\n\n  return assoc('lookup', lookup, params);\n};\n\n/**\n * Translate publication status parameter into the data that will be saved\n */\nconst statusToData: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return assoc(['data', 'publishedAt'], new Date(), params);\n  }\n\n  switch (params?.status) {\n    case 'published':\n      return assoc(['data', 'publishedAt'], new Date(), params);\n    case 'draft':\n      return assoc(['data', 'publishedAt'], null, params);\n    default:\n      break;\n  }\n\n  return params;\n};\n\nconst setStatusToDraftCurry = curry(setStatusToDraft);\nconst defaultToDraftCurry = curry(defaultToDraft);\nconst defaultStatusCurry = curry(defaultStatus);\nconst filterDataPublishedAtCurry = curry(filterDataPublishedAt);\nconst statusToLookupCurry = curry(statusToLookup);\nconst statusToDataCurry = curry(statusToData);\n\nexport {\n  setStatusToDraftCurry as setStatusToDraft,\n  defaultToDraftCurry as defaultToDraft,\n  defaultStatusCurry as defaultStatus,\n  filterDataPublishedAtCurry as filterDataPublishedAt,\n  statusToLookupCurry as statusToLookup,\n  statusToDataCurry as statusToData,\n};\n"],"names":["setStatusToDraft","contentType","params","contentTypes","hasDraftAndPublish","status","assoc","defaultToDraft","defaultStatus","filterDataPublishedAt","data","publishedAt","statusToLookup","lookup","$notNull","$null","statusToData","Date","setStatusToDraftCurry","curry","defaultToDraftCurry","defaultStatusCurry","filterDataPublishedAtCurry","statusToLookupCurry","statusToDataCurry"],"mappings":"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"}

package/dist/services/document-service/draft-and-publish.mjs

@@ -1,5 +1,5 @@
 import { curry, assoc } from 'lodash/fp';
-import { contentTypes, errors } from '@strapi/utils';
+import { contentTypes } from '@strapi/utils';
 
 /**
  * DP enabled -> set status to draft
@@ -91,57 +91,6 @@ import { contentTypes, errors } from '@strapi/utils';
     }
     return params;
 };
-/**
- * Parses and sanitizes the hasPublishedVersion parameter.
- * Returns normalized boolean value or undefined if not provided.
- * Throws ValidationError for invalid input (400 response).
- */ const parseHasPublishedVersion = (value)=>{
-    if (value === undefined || value === null) {
-        return undefined;
-    }
-    if (value === true || value === 'true') {
-        return true;
-    }
-    if (value === false || value === 'false') {
-        return false;
-    }
-    throw new errors.ValidationError("Invalid value for 'hasPublishedVersion'. Expected boolean or 'true'/'false' string.");
-};
-/**
- * Synchronous helper that returns the "has published version" condition for a given model.
- * Returns the documentId subquery condition, or null if the model doesn't use draft & publish.
- *
- * This is used by the filters function in transform/query.ts so that the condition
- * is applied to both root and nested (populate) queries.
- */ const getHasPublishedVersionCondition = (uid, hasPublishedVersion)=>{
-    const model = strapi.getModel(uid);
-    // Ignore if target model has disabled DP or doesn't exist (e.g., components)
-    if (!model || !contentTypes.hasDraftAndPublish(model)) {
-        return null;
-    }
-    // Get table and column names from metadata
-    const meta = strapi.db.metadata.get(uid);
-    const tableName = meta.tableName;
-    const documentIdAttr = meta.attributes.documentId;
-    const publishedAtAttr = meta.attributes.publishedAt;
-    const documentIdColumn = 'columnName' in documentIdAttr && documentIdAttr.columnName || 'document_id';
-    const publishedAtColumn = 'columnName' in publishedAtAttr && publishedAtAttr.columnName || 'published_at';
-    // Create a Knex subquery that selects document IDs with published entries
-    const knex = strapi.db.connection;
-    const subquery = knex(tableName).distinct(documentIdColumn).whereNotNull(publishedAtColumn);
-    if (hasPublishedVersion) {
-        return {
-            documentId: {
-                $in: subquery
-            }
-        };
-    }
-    return {
-        documentId: {
-            $notIn: subquery
-        }
-    };
-};
 const setStatusToDraftCurry = curry(setStatusToDraft);
 const defaultToDraftCurry = curry(defaultToDraft);
 const defaultStatusCurry = curry(defaultStatus);
@@ -149,5 +98,5 @@ const filterDataPublishedAtCurry = curry(filterDataPublishedAt);
 const statusToLookupCurry = curry(statusToLookup);
 const statusToDataCurry = curry(statusToData);
 
-export { defaultStatusCurry as defaultStatus, defaultToDraftCurry as defaultToDraft, filterDataPublishedAtCurry as filterDataPublishedAt, getHasPublishedVersionCondition, parseHasPublishedVersion, setStatusToDraftCurry as setStatusToDraft, statusToDataCurry as statusToData, statusToLookupCurry as statusToLookup };
+export { defaultStatusCurry as defaultStatus, defaultToDraftCurry as defaultToDraft, filterDataPublishedAtCurry as filterDataPublishedAt, setStatusToDraftCurry as setStatusToDraft, statusToDataCurry as statusToData, statusToLookupCurry as statusToLookup };
 //# sourceMappingURL=draft-and-publish.mjs.map

package/dist/services/document-service/draft-and-publish.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"draft-and-publish.mjs","sources":["../../../src/services/document-service/draft-and-publish.ts"],"sourcesContent":["import { assoc, curry } from 'lodash/fp';\n\nimport type { Modules, Struct, UID } from '@strapi/types';\nimport { contentTypes, errors } from '@strapi/utils';\n\ntype ParamsTransform = (params: Modules.Documents.Params.All) => Modules.Documents.Params.All;\n\ntype TransformWithContentType = (\n  contentType: Struct.SingleTypeSchema | Struct.CollectionTypeSchema,\n  params: Modules.Documents.Params.All\n) => Modules.Documents.Params.All;\n\n/**\n * DP enabled -> set status to draft\n * DP disabled -> Used mostly for parsing relations, so there is not a need for a default.\n */\nconst setStatusToDraft: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType) && params.status) {\n    return params;\n  }\n\n  return assoc('status', 'draft', params);\n};\n\n/**\n * Adds a default status of `draft` to the params\n */\nconst defaultToDraft: ParamsTransform = (params) => {\n  // Default to draft if no status is provided or it's invalid\n  if (!params.status || params.status !== 'published') {\n    return assoc('status', 'draft', params);\n  }\n\n  return params;\n};\n\n/**\n * DP disabled -> ignore status\n * DP enabled -> set status to draft if no status is provided or it's invalid\n */\nconst defaultStatus: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return params;\n  }\n\n  // Default to draft if no status is provided or it's invalid\n  if (!params.status || params.status !== 'published') {\n    return defaultToDraft(params);\n  }\n\n  return params;\n};\n\n/**\n * In mutating actions we don't want user to set the publishedAt attribute.\n */\nconst filterDataPublishedAt: ParamsTransform = (params) => {\n  if (params?.data?.publishedAt) {\n    return assoc(['data', 'publishedAt'], null, params);\n  }\n\n  return params;\n};\n\n/**\n * Add status lookup query to the params\n */\nconst statusToLookup: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return params;\n  }\n\n  const lookup = params.lookup || {};\n\n  switch (params?.status) {\n    case 'published':\n      return assoc(['lookup', 'publishedAt'], { $notNull: true }, params);\n    case 'draft':\n      return assoc(['lookup', 'publishedAt'], { $null: true }, params);\n    default:\n      break;\n  }\n\n  return assoc('lookup', lookup, params);\n};\n\n/**\n * Translate publication status parameter into the data that will be saved\n */\nconst statusToData: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return assoc(['data', 'publishedAt'], new Date(), params);\n  }\n\n  switch (params?.status) {\n    case 'published':\n      return assoc(['data', 'publishedAt'], new Date(), params);\n    case 'draft':\n      return assoc(['data', 'publishedAt'], null, params);\n    default:\n      break;\n  }\n\n  return params;\n};\n\n/**\n * Parses and sanitizes the hasPublishedVersion parameter.\n * Returns normalized boolean value or undefined if not provided.\n * Throws ValidationError for invalid input (400 response).\n */\nconst parseHasPublishedVersion = (value: unknown): boolean | undefined => {\n  if (value === undefined || value === null) {\n    return undefined;\n  }\n\n  if (value === true || value === 'true') {\n    return true;\n  }\n\n  if (value === false || value === 'false') {\n    return false;\n  }\n\n  throw new errors.ValidationError(\n    \"Invalid value for 'hasPublishedVersion'. Expected boolean or 'true'/'false' string.\"\n  );\n};\n\n/**\n * Synchronous helper that returns the \"has published version\" condition for a given model.\n * Returns the documentId subquery condition, or null if the model doesn't use draft & publish.\n *\n * This is used by the filters function in transform/query.ts so that the condition\n * is applied to both root and nested (populate) queries.\n */\nconst getHasPublishedVersionCondition = (\n  uid: UID.Schema,\n  hasPublishedVersion: boolean\n): Record<string, any> | null => {\n  const model = strapi.getModel(uid);\n\n  // Ignore if target model has disabled DP or doesn't exist (e.g., components)\n  if (!model || !contentTypes.hasDraftAndPublish(model)) {\n    return null;\n  }\n\n  // Get table and column names from metadata\n  const meta = strapi.db.metadata.get(uid);\n  const tableName = meta.tableName;\n  const documentIdAttr = meta.attributes.documentId;\n  const publishedAtAttr = meta.attributes.publishedAt;\n  const documentIdColumn =\n    ('columnName' in documentIdAttr && documentIdAttr.columnName) || 'document_id';\n  const publishedAtColumn =\n    ('columnName' in publishedAtAttr && publishedAtAttr.columnName) || 'published_at';\n\n  // Create a Knex subquery that selects document IDs with published entries\n  const knex = strapi.db.connection;\n  const subquery = knex(tableName).distinct(documentIdColumn).whereNotNull(publishedAtColumn);\n\n  if (hasPublishedVersion) {\n    return { documentId: { $in: subquery } };\n  }\n\n  return { documentId: { $notIn: subquery } };\n};\n\nconst setStatusToDraftCurry = curry(setStatusToDraft);\nconst defaultToDraftCurry = curry(defaultToDraft);\nconst defaultStatusCurry = curry(defaultStatus);\nconst filterDataPublishedAtCurry = curry(filterDataPublishedAt);\nconst statusToLookupCurry = curry(statusToLookup);\nconst statusToDataCurry = curry(statusToData);\n\nexport {\n  setStatusToDraftCurry as setStatusToDraft,\n  defaultToDraftCurry as defaultToDraft,\n  defaultStatusCurry as defaultStatus,\n  filterDataPublishedAtCurry as filterDataPublishedAt,\n  statusToLookupCurry as statusToLookup,\n  statusToDataCurry as statusToData,\n  parseHasPublishedVersion,\n  getHasPublishedVersionCondition,\n};\n"],"names":["setStatusToDraft","contentType","params","contentTypes","hasDraftAndPublish","status","assoc","defaultToDraft","defaultStatus","filterDataPublishedAt","data","publishedAt","statusToLookup","lookup","$notNull","$null","statusToData","Date","parseHasPublishedVersion","value","undefined","errors","ValidationError","getHasPublishedVersionCondition","uid","hasPublishedVersion","model","strapi","getModel","meta","db","metadata","get","tableName","documentIdAttr","attributes","documentId","publishedAtAttr","documentIdColumn","columnName","publishedAtColumn","knex","connection","subquery","distinct","whereNotNull","$in","$notIn","setStatusToDraftCurry","curry","defaultToDraftCurry","defaultStatusCurry","filterDataPublishedAtCurry","statusToLookupCurry","statusToDataCurry"],"mappings":"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"}
+{"version":3,"file":"draft-and-publish.mjs","sources":["../../../src/services/document-service/draft-and-publish.ts"],"sourcesContent":["import { assoc, curry } from 'lodash/fp';\n\nimport type { Modules, Struct } from '@strapi/types';\nimport { contentTypes } from '@strapi/utils';\n\ntype ParamsTransform = (params: Modules.Documents.Params.All) => Modules.Documents.Params.All;\n\ntype TransformWithContentType = (\n  contentType: Struct.SingleTypeSchema | Struct.CollectionTypeSchema,\n  params: Modules.Documents.Params.All\n) => Modules.Documents.Params.All;\n\n/**\n * DP enabled -> set status to draft\n * DP disabled -> Used mostly for parsing relations, so there is not a need for a default.\n */\nconst setStatusToDraft: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType) && params.status) {\n    return params;\n  }\n\n  return assoc('status', 'draft', params);\n};\n\n/**\n * Adds a default status of `draft` to the params\n */\nconst defaultToDraft: ParamsTransform = (params) => {\n  // Default to draft if no status is provided or it's invalid\n  if (!params.status || params.status !== 'published') {\n    return assoc('status', 'draft', params);\n  }\n\n  return params;\n};\n\n/**\n * DP disabled -> ignore status\n * DP enabled -> set status to draft if no status is provided or it's invalid\n */\nconst defaultStatus: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return params;\n  }\n\n  // Default to draft if no status is provided or it's invalid\n  if (!params.status || params.status !== 'published') {\n    return defaultToDraft(params);\n  }\n\n  return params;\n};\n\n/**\n * In mutating actions we don't want user to set the publishedAt attribute.\n */\nconst filterDataPublishedAt: ParamsTransform = (params) => {\n  if (params?.data?.publishedAt) {\n    return assoc(['data', 'publishedAt'], null, params);\n  }\n\n  return params;\n};\n\n/**\n * Add status lookup query to the params\n */\nconst statusToLookup: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return params;\n  }\n\n  const lookup = params.lookup || {};\n\n  switch (params?.status) {\n    case 'published':\n      return assoc(['lookup', 'publishedAt'], { $notNull: true }, params);\n    case 'draft':\n      return assoc(['lookup', 'publishedAt'], { $null: true }, params);\n    default:\n      break;\n  }\n\n  return assoc('lookup', lookup, params);\n};\n\n/**\n * Translate publication status parameter into the data that will be saved\n */\nconst statusToData: TransformWithContentType = (contentType, params) => {\n  if (!contentTypes.hasDraftAndPublish(contentType)) {\n    return assoc(['data', 'publishedAt'], new Date(), params);\n  }\n\n  switch (params?.status) {\n    case 'published':\n      return assoc(['data', 'publishedAt'], new Date(), params);\n    case 'draft':\n      return assoc(['data', 'publishedAt'], null, params);\n    default:\n      break;\n  }\n\n  return params;\n};\n\nconst setStatusToDraftCurry = curry(setStatusToDraft);\nconst defaultToDraftCurry = curry(defaultToDraft);\nconst defaultStatusCurry = curry(defaultStatus);\nconst filterDataPublishedAtCurry = curry(filterDataPublishedAt);\nconst statusToLookupCurry = curry(statusToLookup);\nconst statusToDataCurry = curry(statusToData);\n\nexport {\n  setStatusToDraftCurry as setStatusToDraft,\n  defaultToDraftCurry as defaultToDraft,\n  defaultStatusCurry as defaultStatus,\n  filterDataPublishedAtCurry as filterDataPublishedAt,\n  statusToLookupCurry as statusToLookup,\n  statusToDataCurry as statusToData,\n};\n"],"names":["setStatusToDraft","contentType","params","contentTypes","hasDraftAndPublish","status","assoc","defaultToDraft","defaultStatus","filterDataPublishedAt","data","publishedAt","statusToLookup","lookup","$notNull","$null","statusToData","Date","setStatusToDraftCurry","curry","defaultToDraftCurry","defaultStatusCurry","filterDataPublishedAtCurry","statusToLookupCurry","statusToDataCurry"],"mappings":"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"}

package/dist/services/document-service/params.d.ts

@@ -14,13 +14,13 @@ import type { UID, Modules } from '@strapi/types';
 /**
  * Keys passed to the query-params transformer. = SHARED_QUERY_PARAM_KEYS + withCount.
  */
-export declare const ALLOWED_DOCUMENT_PARAM_KEYS: readonly ["filters", "sort", "fields", "populate", "status", "locale", "page", "pageSize", "start", "limit", "_q", "hasPublishedVersion", "withCount"];
+export declare const ALLOWED_DOCUMENT_PARAM_KEYS: readonly ["filters", "sort", "fields", "populate", "status", "locale", "page", "pageSize", "start", "limit", "_q", "publicationFilter", "hasPublishedVersion", "withCount"];
 /**
  * Keys allowed at root when strictParams is true. = ALLOWED_DOCUMENT_PARAM_KEYS plus:
  * - data: create/update payload (never part of query params)
  * - pagination, count, ordering: REST-style keys core-api may pass; accepted then stripped (query builder uses flat page/pageSize/start/limit and does not use count/ordering at root)
  */
-export declare const ALLOWED_DOCUMENT_ROOT_PARAM_KEYS: readonly ["filters", "sort", "fields", "populate", "status", "locale", "page", "pageSize", "start", "limit", "_q", "hasPublishedVersion", "withCount", "data", "pagination", "count", "ordering"];
+export declare const ALLOWED_DOCUMENT_ROOT_PARAM_KEYS: readonly ["filters", "sort", "fields", "populate", "status", "locale", "page", "pageSize", "start", "limit", "_q", "publicationFilter", "hasPublishedVersion", "withCount", "data", "pagination", "count", "ordering"];
 /** Restrict to allowed query keys so only these reach the query-params transformer (security). */
 export declare const pickAllowedQueryParams: (params: Record<string, unknown>) => Record<(typeof ALLOWED_DOCUMENT_PARAM_KEYS)[number], unknown>;
 declare const pickSelectionParams: <TUID extends UID.ContentType>(data: unknown) => Modules.Documents.Params.Pick<TUID, 'fields' | 'populate' | 'status'>;

package/dist/services/document-service/params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../../src/services/document-service/params.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGlD;;;;;;;;;;;GAWG;AAEH;;GAEG;AACH,eAAO,MAAM,2BAA2B,wJAAqD,CAAC;AAE9F;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,mMAMnC,CAAC;AAEX,kGAAkG;AAClG,eAAO,MAAM,sBAAsB,WACzB,OAAO,MAAM,EAAE,OAAO,CAAC,KAC9B,OAAO,CAAC,kCAAkC,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,CAI5D,CAAC;AAEJ,QAAA,MAAM,mBAAmB,uCACjB,OAAO,KACZ,QAAQ,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAEtE,CAAC;AAEF,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
+{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../../src/services/document-service/params.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGlD;;;;;;;;;;;GAWG;AAEH;;GAEG;AACH,eAAO,MAAM,2BAA2B,6KAAqD,CAAC;AAE9F;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,wNAMnC,CAAC;AAEX,kGAAkG;AAClG,eAAO,MAAM,sBAAsB,WACzB,OAAO,MAAM,EAAE,OAAO,CAAC,KAC9B,OAAO,CAAC,kCAAkC,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,CAI5D,CAAC;AAEJ,QAAA,MAAM,mBAAmB,uCACjB,OAAO,KACZ,QAAQ,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAEtE,CAAC;AAEF,OAAO,EAAE,mBAAmB,EAAE,CAAC"}

package/dist/services/document-service/publication-filter.d.ts

@@ -0,0 +1,6 @@
+import type { UID } from '@strapi/types';
+import { parsePublicationFilter, type PublicationFilterMode } from '@strapi/utils';
+export { parsePublicationFilter };
+export type { PublicationFilterMode };
+export declare const getPublicationFilterCondition: (uid: UID.Schema, mode: PublicationFilterMode, status: 'draft' | 'published') => Record<string, unknown> | null;
+//# sourceMappingURL=publication-filter.d.ts.map

package/dist/services/document-service/publication-filter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"publication-filter.d.ts","sourceRoot":"","sources":["../../../src/services/document-service/publication-filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAGL,sBAAsB,EACtB,KAAK,qBAAqB,EAC3B,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAClC,YAAY,EAAE,qBAAqB,EAAE,CAAC;AAEtC,eAAO,MAAM,6BAA6B,QACnC,IAAI,MAAM,QACT,qBAAqB,UACnB,OAAO,GAAG,WAAW,KAC5B,OAAO,MAAM,EAAE,OAAO,CAAC,GAAG,IAW5B,CAAC"}

package/dist/services/document-service/publication-filter.js

@@ -0,0 +1,20 @@
+'use strict';
+
+var strapiUtils = require('@strapi/utils');
+
+const getPublicationFilterCondition = (uid, mode, status)=>{
+    const model = strapi.getModel(uid);
+    if (!model || !strapiUtils.contentTypes.hasDraftAndPublish(model)) {
+        return null;
+    }
+    const knex = strapi.db.connection;
+    const meta = strapi.db.metadata.get(uid);
+    return strapiUtils.buildPublicationFilterWhere(knex, meta, model, mode, status);
+};
+
+Object.defineProperty(exports, "parsePublicationFilter", {
+  enumerable: true,
+  get: function () { return strapiUtils.parsePublicationFilter; }
+});
+exports.getPublicationFilterCondition = getPublicationFilterCondition;
+//# sourceMappingURL=publication-filter.js.map

package/dist/services/document-service/publication-filter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"publication-filter.js","sources":["../../../src/services/document-service/publication-filter.ts"],"sourcesContent":["import type { UID } from '@strapi/types';\nimport {\n  contentTypes,\n  buildPublicationFilterWhere,\n  parsePublicationFilter,\n  type PublicationFilterMode,\n} from '@strapi/utils';\n\nexport { parsePublicationFilter };\nexport type { PublicationFilterMode };\n\nexport const getPublicationFilterCondition = (\n  uid: UID.Schema,\n  mode: PublicationFilterMode,\n  status: 'draft' | 'published'\n): Record<string, unknown> | null => {\n  const model = strapi.getModel(uid);\n\n  if (!model || !contentTypes.hasDraftAndPublish(model)) {\n    return null;\n  }\n\n  const knex = strapi.db.connection;\n  const meta = strapi.db.metadata.get(uid);\n\n  return buildPublicationFilterWhere(knex, meta, model, mode, status);\n};\n"],"names":["getPublicationFilterCondition","uid","mode","status","model","strapi","getModel","contentTypes","hasDraftAndPublish","knex","db","connection","meta","metadata","get","buildPublicationFilterWhere"],"mappings":";;;;AAWO,MAAMA,6BAAAA,GAAgC,CAC3CC,GAAAA,EACAC,IAAAA,EACAC,MAAAA,GAAAA;IAEA,MAAMC,KAAAA,GAAQC,MAAAA,CAAOC,QAAQ,CAACL,GAAAA,CAAAA;AAE9B,IAAA,IAAI,CAACG,KAAAA,IAAS,CAACG,wBAAAA,CAAaC,kBAAkB,CAACJ,KAAAA,CAAAA,EAAQ;QACrD,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,MAAMK,IAAAA,GAAOJ,MAAAA,CAAOK,EAAE,CAACC,UAAU;AACjC,IAAA,MAAMC,OAAOP,MAAAA,CAAOK,EAAE,CAACG,QAAQ,CAACC,GAAG,CAACb,GAAAA,CAAAA;AAEpC,IAAA,OAAOc,uCAAAA,CAA4BN,IAAAA,EAAMG,IAAAA,EAAMR,KAAAA,EAAOF,IAAAA,EAAMC,MAAAA,CAAAA;AAC9D;;;;;;;;"}

package/dist/services/document-service/publication-filter.mjs

@@ -0,0 +1,15 @@
+import { contentTypes, buildPublicationFilterWhere } from '@strapi/utils';
+export { parsePublicationFilter } from '@strapi/utils';
+
+const getPublicationFilterCondition = (uid, mode, status)=>{
+    const model = strapi.getModel(uid);
+    if (!model || !contentTypes.hasDraftAndPublish(model)) {
+        return null;
+    }
+    const knex = strapi.db.connection;
+    const meta = strapi.db.metadata.get(uid);
+    return buildPublicationFilterWhere(knex, meta, model, mode, status);
+};
+
+export { getPublicationFilterCondition };
+//# sourceMappingURL=publication-filter.mjs.map

package/dist/services/document-service/publication-filter.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"publication-filter.mjs","sources":["../../../src/services/document-service/publication-filter.ts"],"sourcesContent":["import type { UID } from '@strapi/types';\nimport {\n  contentTypes,\n  buildPublicationFilterWhere,\n  parsePublicationFilter,\n  type PublicationFilterMode,\n} from '@strapi/utils';\n\nexport { parsePublicationFilter };\nexport type { PublicationFilterMode };\n\nexport const getPublicationFilterCondition = (\n  uid: UID.Schema,\n  mode: PublicationFilterMode,\n  status: 'draft' | 'published'\n): Record<string, unknown> | null => {\n  const model = strapi.getModel(uid);\n\n  if (!model || !contentTypes.hasDraftAndPublish(model)) {\n    return null;\n  }\n\n  const knex = strapi.db.connection;\n  const meta = strapi.db.metadata.get(uid);\n\n  return buildPublicationFilterWhere(knex, meta, model, mode, status);\n};\n"],"names":["getPublicationFilterCondition","uid","mode","status","model","strapi","getModel","contentTypes","hasDraftAndPublish","knex","db","connection","meta","metadata","get","buildPublicationFilterWhere"],"mappings":";;;AAWO,MAAMA,6BAAAA,GAAgC,CAC3CC,GAAAA,EACAC,IAAAA,EACAC,MAAAA,GAAAA;IAEA,MAAMC,KAAAA,GAAQC,MAAAA,CAAOC,QAAQ,CAACL,GAAAA,CAAAA;AAE9B,IAAA,IAAI,CAACG,KAAAA,IAAS,CAACG,YAAAA,CAAaC,kBAAkB,CAACJ,KAAAA,CAAAA,EAAQ;QACrD,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,MAAMK,IAAAA,GAAOJ,MAAAA,CAAOK,EAAE,CAACC,UAAU;AACjC,IAAA,MAAMC,OAAOP,MAAAA,CAAOK,EAAE,CAACG,QAAQ,CAACC,GAAG,CAACb,GAAAA,CAAAA;AAEpC,IAAA,OAAOc,2BAAAA,CAA4BN,IAAAA,EAAMG,IAAAA,EAAMR,KAAAA,EAAOF,IAAAA,EAAMC,MAAAA,CAAAA;AAC9D;;;;"}

package/dist/services/document-service/transform/query.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="lodash" />
 import type { UID } from '@strapi/types';
-declare const transformParamsToQuery: import("lodash").CurriedFunction2<UID.Schema, any, any>;
+declare const transformParamsToQuery: import("lodash").CurriedFunction2<UID.Schema, any, Partial<any>>;
 export { transformParamsToQuery };
 //# sourceMappingURL=query.d.ts.map

package/dist/services/document-service/transform/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/query.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAOzC,QAAA,MAAM,sBAAsB,yDAsC1B,CAAC;AAEH,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/query.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAazC,QAAA,MAAM,sBAAsB,kEAmE1B,CAAC;AAEH,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/services/document-service/transform/query.js

@@ -1,21 +1,37 @@
 'use strict';
 
 var fp = require('lodash/fp');
-var draftAndPublish = require('../draft-and-publish.js');
+var strapiUtils = require('@strapi/utils');
+var publicationFilter = require('../publication-filter.js');
 var params = require('../params.js');
 
 const transformParamsToQuery = fp.curry((uid, params$1)=>{
-    const allowlisted = params.pickAllowedQueryParams(params$1 ?? {});
+    const rawParams = params$1 ?? {};
+    const allowlisted = params.pickAllowedQueryParams(rawParams);
     const query = strapi.get('query-params').transform(uid, allowlisted);
-    // Parse and validate hasPublishedVersion if provided (from allowlisted params only)
-    const hasPublishedVersion = draftAndPublish.parseHasPublishedVersion(allowlisted?.hasPublishedVersion);
-    // If hasPublishedVersion is set, wrap the existing filters function to also
-    // apply the hasPublishedVersion condition. This ensures the condition is
-    // applied to both root and nested (populate) queries.
-    if (hasPublishedVersion !== undefined) {
+    const explicitPublicationFilter = strapiUtils.parsePublicationFilter(allowlisted.publicationFilter);
+    const legacyHasPublishedVersion = strapiUtils.parseHasPublishedVersionQueryParam(rawParams.hasPublishedVersion);
+    let effectivePublicationFilter = explicitPublicationFilter;
+    if (effectivePublicationFilter === undefined && legacyHasPublishedVersion !== undefined) {
+        effectivePublicationFilter = strapiUtils.hasPublishedVersionBooleanToPublicationFilterMode(legacyHasPublishedVersion);
+    }
+    const status = allowlisted.status === 'published' ? 'published' : 'draft';
+    const baseWhere = {
+        ...params$1?.lookup,
+        ...query.where
+    };
+    // `transformQueryParams` leaves `publicationFilter` / `hasPublishedVersion` on the query object
+    // via `...rest`; the DB layer must not receive them as extra top-level keys.
+    const stripPublicationParamsFromQuery = fp.omit([
+        'publicationFilter',
+        'hasPublishedVersion'
+    ]);
+    // Publication filtering must go through `query.filters`, not only `where`, so the same
+    // cohort logic applies to nested populate queries (each sub-query uses `meta.uid`).
+    // Merging into `where` alone breaks populate cascade — see has-published-version API tests.
+    if (effectivePublicationFilter !== undefined) {
         const existingFilters = query.filters;
-        query.filters = ({ meta, ...rest })=>{
-            // Get the existing filters result (from status param)
+        const wrappedFilters = ({ meta, ...rest })=>{
             let existingResult = {};
             if (typeof existingFilters === 'function') {
                 existingResult = existingFilters({
@@ -25,13 +41,11 @@ const transformParamsToQuery = fp.curry((uid, params$1)=>{
             } else if (existingFilters) {
                 existingResult = existingFilters;
             }
-            // Get the hasPublishedVersion condition for this specific model
-            const hasPublishedCondition = draftAndPublish.getHasPublishedVersionCondition(meta.uid, hasPublishedVersion);
-            // Merge both conditions
-            if (hasPublishedCondition) {
+            const publicationCondition = publicationFilter.getPublicationFilterCondition(meta.uid, effectivePublicationFilter, status);
+            if (publicationCondition && Object.keys(publicationCondition).length > 0) {
                 const conditions = [
                     existingResult,
-                    hasPublishedCondition
+                    publicationCondition
                 ].filter((c)=>Object.keys(c).length);
                 return {
                     $and: conditions
@@ -39,11 +53,10 @@ const transformParamsToQuery = fp.curry((uid, params$1)=>{
             }
             return existingResult;
         };
+        const queryWithoutPublicationParams = stripPublicationParamsFromQuery(query);
+        return fp.assoc('where', baseWhere, fp.assoc('filters', wrappedFilters, queryWithoutPublicationParams));
     }
-    return fp.assoc('where', {
-        ...params$1?.lookup,
-        ...query.where
-    }, query);
+    return fp.assoc('where', baseWhere, stripPublicationParamsFromQuery(query));
 });
 
 exports.transformParamsToQuery = transformParamsToQuery;

package/dist/services/document-service/transform/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sources":["../../../../src/services/document-service/transform/query.ts"],"sourcesContent":["import type { UID } from '@strapi/types';\n\nimport { curry, assoc } from 'lodash/fp';\nimport { parseHasPublishedVersion, getHasPublishedVersionCondition } from '../draft-and-publish';\n\nimport { pickAllowedQueryParams } from '../params';\n\nconst transformParamsToQuery = curry((uid: UID.Schema, params: any) => {\n  const allowlisted = pickAllowedQueryParams(params ?? {});\n  const query = strapi.get('query-params').transform(uid, allowlisted);\n\n  // Parse and validate hasPublishedVersion if provided (from allowlisted params only)\n  const hasPublishedVersion = parseHasPublishedVersion(allowlisted?.hasPublishedVersion);\n\n  // If hasPublishedVersion is set, wrap the existing filters function to also\n  // apply the hasPublishedVersion condition. This ensures the condition is\n  // applied to both root and nested (populate) queries.\n  if (hasPublishedVersion !== undefined) {\n    const existingFilters = query.filters;\n\n    query.filters = ({ meta, ...rest }: { meta: { uid: UID.Schema } }) => {\n      // Get the existing filters result (from status param)\n      let existingResult = {};\n      if (typeof existingFilters === 'function') {\n        existingResult = existingFilters({ meta, ...rest }) || {};\n      } else if (existingFilters) {\n        existingResult = existingFilters;\n      }\n\n      // Get the hasPublishedVersion condition for this specific model\n      const hasPublishedCondition = getHasPublishedVersionCondition(meta.uid, hasPublishedVersion);\n\n      // Merge both conditions\n      if (hasPublishedCondition) {\n        const conditions = [existingResult, hasPublishedCondition].filter(\n          (c) => Object.keys(c).length\n        );\n        return { $and: conditions };\n      }\n\n      return existingResult;\n    };\n  }\n\n  return assoc('where', { ...params?.lookup, ...query.where }, query);\n});\n\nexport { transformParamsToQuery };\n"],"names":["transformParamsToQuery","curry","uid","params","allowlisted","pickAllowedQueryParams","query","strapi","get","transform","hasPublishedVersion","parseHasPublishedVersion","undefined","existingFilters","filters","meta","rest","existingResult","hasPublishedCondition","getHasPublishedVersionCondition","conditions","filter","c","Object","keys","length","$and","assoc","lookup","where"],"mappings":";;;;;;AAOA,MAAMA,sBAAAA,GAAyBC,QAAAA,CAAM,CAACC,GAAAA,EAAiBC,QAAAA,GAAAA;IACrD,MAAMC,WAAAA,GAAcC,6BAAAA,CAAuBF,QAAAA,IAAU,EAAC,CAAA;AACtD,IAAA,MAAMG,QAAQC,MAAAA,CAAOC,GAAG,CAAC,cAAA,CAAA,CAAgBC,SAAS,CAACP,GAAAA,EAAKE,WAAAA,CAAAA;;IAGxD,MAAMM,mBAAAA,GAAsBC,yCAAyBP,WAAAA,EAAaM,mBAAAA,CAAAA;;;;AAKlE,IAAA,IAAIA,wBAAwBE,SAAAA,EAAW;QACrC,MAAMC,eAAAA,GAAkBP,MAAMQ,OAAO;AAErCR,QAAAA,KAAAA,CAAMQ,OAAO,GAAG,CAAC,EAAEC,IAAI,EAAE,GAAGC,IAAAA,EAAqC,GAAA;;AAE/D,YAAA,IAAIC,iBAAiB,EAAC;YACtB,IAAI,OAAOJ,oBAAoB,UAAA,EAAY;AACzCI,gBAAAA,cAAAA,GAAiBJ,eAAAA,CAAgB;AAAEE,oBAAAA,IAAAA;AAAM,oBAAA,GAAGC;AAAK,iBAAA,CAAA,IAAM,EAAC;AAC1D,YAAA,CAAA,MAAO,IAAIH,eAAAA,EAAiB;gBAC1BI,cAAAA,GAAiBJ,eAAAA;AACnB,YAAA;;AAGA,YAAA,MAAMK,qBAAAA,GAAwBC,+CAAAA,CAAgCJ,IAAAA,CAAKb,GAAG,EAAEQ,mBAAAA,CAAAA;;AAGxE,YAAA,IAAIQ,qBAAAA,EAAuB;AACzB,gBAAA,MAAME,UAAAA,GAAa;AAACH,oBAAAA,cAAAA;AAAgBC,oBAAAA;iBAAsB,CAACG,MAAM,CAC/D,CAACC,CAAAA,GAAMC,OAAOC,IAAI,CAACF,GAAGG,MAAM,CAAA;gBAE9B,OAAO;oBAAEC,IAAAA,EAAMN;AAAW,iBAAA;AAC5B,YAAA;YAEA,OAAOH,cAAAA;AACT,QAAA,CAAA;AACF,IAAA;AAEA,IAAA,OAAOU,SAAM,OAAA,EAAS;AAAE,QAAA,GAAGxB,UAAQyB,MAAM;AAAE,QAAA,GAAGtB,MAAMuB;KAAM,EAAGvB,KAAAA,CAAAA;AAC/D,CAAA;;;;"}
+{"version":3,"file":"query.js","sources":["../../../../src/services/document-service/transform/query.ts"],"sourcesContent":["import type { UID } from '@strapi/types';\n\nimport { curry, assoc, omit } from 'lodash/fp';\nimport {\n  parseHasPublishedVersionQueryParam,\n  hasPublishedVersionBooleanToPublicationFilterMode,\n  type PublicationFilterMode,\n} from '@strapi/utils';\n\nimport { parsePublicationFilter, getPublicationFilterCondition } from '../publication-filter';\n\nimport { pickAllowedQueryParams } from '../params';\n\nconst transformParamsToQuery = curry((uid: UID.Schema, params: any) => {\n  const rawParams = (params ?? {}) as Record<string, unknown>;\n  const allowlisted = pickAllowedQueryParams(rawParams);\n  const query = strapi.get('query-params').transform(uid, allowlisted);\n\n  const explicitPublicationFilter = parsePublicationFilter(allowlisted.publicationFilter);\n  const legacyHasPublishedVersion = parseHasPublishedVersionQueryParam(\n    rawParams.hasPublishedVersion\n  );\n\n  let effectivePublicationFilter: PublicationFilterMode | undefined = explicitPublicationFilter;\n  if (effectivePublicationFilter === undefined && legacyHasPublishedVersion !== undefined) {\n    effectivePublicationFilter =\n      hasPublishedVersionBooleanToPublicationFilterMode(legacyHasPublishedVersion);\n  }\n\n  const status: 'draft' | 'published' = allowlisted.status === 'published' ? 'published' : 'draft';\n\n  const baseWhere = { ...params?.lookup, ...query.where };\n\n  // `transformQueryParams` leaves `publicationFilter` / `hasPublishedVersion` on the query object\n  // via `...rest`; the DB layer must not receive them as extra top-level keys.\n  const stripPublicationParamsFromQuery = omit([\n    'publicationFilter',\n    'hasPublishedVersion',\n  ] as const);\n\n  // Publication filtering must go through `query.filters`, not only `where`, so the same\n  // cohort logic applies to nested populate queries (each sub-query uses `meta.uid`).\n  // Merging into `where` alone breaks populate cascade — see has-published-version API tests.\n  if (effectivePublicationFilter !== undefined) {\n    const existingFilters = query.filters;\n\n    const wrappedFilters = ({ meta, ...rest }: { meta: { uid: UID.Schema } }) => {\n      let existingResult = {};\n      if (typeof existingFilters === 'function') {\n        existingResult = existingFilters({ meta, ...rest }) || {};\n      } else if (existingFilters) {\n        existingResult = existingFilters;\n      }\n\n      const publicationCondition = getPublicationFilterCondition(\n        meta.uid,\n        effectivePublicationFilter,\n        status\n      );\n\n      if (publicationCondition && Object.keys(publicationCondition).length > 0) {\n        const conditions = [existingResult, publicationCondition].filter(\n          (c) => Object.keys(c).length\n        );\n        return { $and: conditions };\n      }\n\n      return existingResult;\n    };\n\n    const queryWithoutPublicationParams = stripPublicationParamsFromQuery(query);\n\n    return assoc(\n      'where',\n      baseWhere,\n      assoc('filters', wrappedFilters, queryWithoutPublicationParams)\n    );\n  }\n\n  return assoc('where', baseWhere, stripPublicationParamsFromQuery(query));\n});\n\nexport { transformParamsToQuery };\n"],"names":["transformParamsToQuery","curry","uid","params","rawParams","allowlisted","pickAllowedQueryParams","query","strapi","get","transform","explicitPublicationFilter","parsePublicationFilter","publicationFilter","legacyHasPublishedVersion","parseHasPublishedVersionQueryParam","hasPublishedVersion","effectivePublicationFilter","undefined","hasPublishedVersionBooleanToPublicationFilterMode","status","baseWhere","lookup","where","stripPublicationParamsFromQuery","omit","existingFilters","filters","wrappedFilters","meta","rest","existingResult","publicationCondition","getPublicationFilterCondition","Object","keys","length","conditions","filter","c","$and","queryWithoutPublicationParams","assoc"],"mappings":";;;;;;;AAaA,MAAMA,sBAAAA,GAAyBC,QAAAA,CAAM,CAACC,GAAAA,EAAiBC,QAAAA,GAAAA;IACrD,MAAMC,SAAAA,GAAaD,YAAU,EAAC;AAC9B,IAAA,MAAME,cAAcC,6BAAAA,CAAuBF,SAAAA,CAAAA;AAC3C,IAAA,MAAMG,QAAQC,MAAAA,CAAOC,GAAG,CAAC,cAAA,CAAA,CAAgBC,SAAS,CAACR,GAAAA,EAAKG,WAAAA,CAAAA;IAExD,MAAMM,yBAAAA,GAA4BC,kCAAAA,CAAuBP,WAAAA,CAAYQ,iBAAiB,CAAA;IACtF,MAAMC,yBAAAA,GAA4BC,8CAAAA,CAChCX,SAAAA,CAAUY,mBAAmB,CAAA;AAG/B,IAAA,IAAIC,0BAAAA,GAAgEN,yBAAAA;IACpE,IAAIM,0BAAAA,KAA+BC,SAAAA,IAAaJ,yBAAAA,KAA8BI,SAAAA,EAAW;AACvFD,QAAAA,0BAAAA,GACEE,6DAAAA,CAAkDL,yBAAAA,CAAAA;AACtD,IAAA;AAEA,IAAA,MAAMM,MAAAA,GAAgCf,WAAAA,CAAYe,MAAM,KAAK,cAAc,WAAA,GAAc,OAAA;AAEzF,IAAA,MAAMC,SAAAA,GAAY;AAAE,QAAA,GAAGlB,UAAQmB,MAAM;AAAE,QAAA,GAAGf,MAAMgB;AAAM,KAAA;;;AAItD,IAAA,MAAMC,kCAAkCC,OAAAA,CAAK;AAC3C,QAAA,mBAAA;AACA,QAAA;AACD,KAAA,CAAA;;;;AAKD,IAAA,IAAIR,+BAA+BC,SAAAA,EAAW;QAC5C,MAAMQ,eAAAA,GAAkBnB,MAAMoB,OAAO;AAErC,QAAA,MAAMC,iBAAiB,CAAC,EAAEC,IAAI,EAAE,GAAGC,IAAAA,EAAqC,GAAA;AACtE,YAAA,IAAIC,iBAAiB,EAAC;YACtB,IAAI,OAAOL,oBAAoB,UAAA,EAAY;AACzCK,gBAAAA,cAAAA,GAAiBL,eAAAA,CAAgB;AAAEG,oBAAAA,IAAAA;AAAM,oBAAA,GAAGC;AAAK,iBAAA,CAAA,IAAM,EAAC;AAC1D,YAAA,CAAA,MAAO,IAAIJ,eAAAA,EAAiB;gBAC1BK,cAAAA,GAAiBL,eAAAA;AACnB,YAAA;AAEA,YAAA,MAAMM,oBAAAA,GAAuBC,+CAAAA,CAC3BJ,IAAAA,CAAK3B,GAAG,EACRe,0BAAAA,EACAG,MAAAA,CAAAA;AAGF,YAAA,IAAIY,wBAAwBE,MAAAA,CAAOC,IAAI,CAACH,oBAAAA,CAAAA,CAAsBI,MAAM,GAAG,CAAA,EAAG;AACxE,gBAAA,MAAMC,UAAAA,GAAa;AAACN,oBAAAA,cAAAA;AAAgBC,oBAAAA;iBAAqB,CAACM,MAAM,CAC9D,CAACC,CAAAA,GAAML,OAAOC,IAAI,CAACI,GAAGH,MAAM,CAAA;gBAE9B,OAAO;oBAAEI,IAAAA,EAAMH;AAAW,iBAAA;AAC5B,YAAA;YAEA,OAAON,cAAAA;AACT,QAAA,CAAA;AAEA,QAAA,MAAMU,gCAAgCjB,+BAAAA,CAAgCjB,KAAAA,CAAAA;AAEtE,QAAA,OAAOmC,QAAAA,CACL,OAAA,EACArB,SAAAA,EACAqB,QAAAA,CAAM,WAAWd,cAAAA,EAAgBa,6BAAAA,CAAAA,CAAAA;AAErC,IAAA;IAEA,OAAOC,QAAAA,CAAM,OAAA,EAASrB,SAAAA,EAAWG,+BAAAA,CAAgCjB,KAAAA,CAAAA,CAAAA;AACnE,CAAA;;;;"}

package/dist/services/document-service/transform/query.mjs

@@ -1,19 +1,35 @@
-import { curry, assoc } from 'lodash/fp';
-import { parseHasPublishedVersion, getHasPublishedVersionCondition } from '../draft-and-publish.mjs';
+import { curry, omit, assoc } from 'lodash/fp';
+import { parsePublicationFilter, parseHasPublishedVersionQueryParam, hasPublishedVersionBooleanToPublicationFilterMode } from '@strapi/utils';
+import { getPublicationFilterCondition } from '../publication-filter.mjs';
 import { pickAllowedQueryParams } from '../params.mjs';
 
 const transformParamsToQuery = curry((uid, params)=>{
-    const allowlisted = pickAllowedQueryParams(params ?? {});
+    const rawParams = params ?? {};
+    const allowlisted = pickAllowedQueryParams(rawParams);
     const query = strapi.get('query-params').transform(uid, allowlisted);
-    // Parse and validate hasPublishedVersion if provided (from allowlisted params only)
-    const hasPublishedVersion = parseHasPublishedVersion(allowlisted?.hasPublishedVersion);
-    // If hasPublishedVersion is set, wrap the existing filters function to also
-    // apply the hasPublishedVersion condition. This ensures the condition is
-    // applied to both root and nested (populate) queries.
-    if (hasPublishedVersion !== undefined) {
+    const explicitPublicationFilter = parsePublicationFilter(allowlisted.publicationFilter);
+    const legacyHasPublishedVersion = parseHasPublishedVersionQueryParam(rawParams.hasPublishedVersion);
+    let effectivePublicationFilter = explicitPublicationFilter;
+    if (effectivePublicationFilter === undefined && legacyHasPublishedVersion !== undefined) {
+        effectivePublicationFilter = hasPublishedVersionBooleanToPublicationFilterMode(legacyHasPublishedVersion);
+    }
+    const status = allowlisted.status === 'published' ? 'published' : 'draft';
+    const baseWhere = {
+        ...params?.lookup,
+        ...query.where
+    };
+    // `transformQueryParams` leaves `publicationFilter` / `hasPublishedVersion` on the query object
+    // via `...rest`; the DB layer must not receive them as extra top-level keys.
+    const stripPublicationParamsFromQuery = omit([
+        'publicationFilter',
+        'hasPublishedVersion'
+    ]);
+    // Publication filtering must go through `query.filters`, not only `where`, so the same
+    // cohort logic applies to nested populate queries (each sub-query uses `meta.uid`).
+    // Merging into `where` alone breaks populate cascade — see has-published-version API tests.
+    if (effectivePublicationFilter !== undefined) {
         const existingFilters = query.filters;
-        query.filters = ({ meta, ...rest })=>{
-            // Get the existing filters result (from status param)
+        const wrappedFilters = ({ meta, ...rest })=>{
             let existingResult = {};
             if (typeof existingFilters === 'function') {
                 existingResult = existingFilters({
@@ -23,13 +39,11 @@ const transformParamsToQuery = curry((uid, params)=>{
             } else if (existingFilters) {
                 existingResult = existingFilters;
             }
-            // Get the hasPublishedVersion condition for this specific model
-            const hasPublishedCondition = getHasPublishedVersionCondition(meta.uid, hasPublishedVersion);
-            // Merge both conditions
-            if (hasPublishedCondition) {
+            const publicationCondition = getPublicationFilterCondition(meta.uid, effectivePublicationFilter, status);
+            if (publicationCondition && Object.keys(publicationCondition).length > 0) {
                 const conditions = [
                     existingResult,
-                    hasPublishedCondition
+                    publicationCondition
                 ].filter((c)=>Object.keys(c).length);
                 return {
                     $and: conditions
@@ -37,11 +51,10 @@ const transformParamsToQuery = curry((uid, params)=>{
             }
             return existingResult;
         };
+        const queryWithoutPublicationParams = stripPublicationParamsFromQuery(query);
+        return assoc('where', baseWhere, assoc('filters', wrappedFilters, queryWithoutPublicationParams));
     }
-    return assoc('where', {
-        ...params?.lookup,
-        ...query.where
-    }, query);
+    return assoc('where', baseWhere, stripPublicationParamsFromQuery(query));
 });
 
 export { transformParamsToQuery };

package/dist/services/document-service/transform/query.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"query.mjs","sources":["../../../../src/services/document-service/transform/query.ts"],"sourcesContent":["import type { UID } from '@strapi/types';\n\nimport { curry, assoc } from 'lodash/fp';\nimport { parseHasPublishedVersion, getHasPublishedVersionCondition } from '../draft-and-publish';\n\nimport { pickAllowedQueryParams } from '../params';\n\nconst transformParamsToQuery = curry((uid: UID.Schema, params: any) => {\n  const allowlisted = pickAllowedQueryParams(params ?? {});\n  const query = strapi.get('query-params').transform(uid, allowlisted);\n\n  // Parse and validate hasPublishedVersion if provided (from allowlisted params only)\n  const hasPublishedVersion = parseHasPublishedVersion(allowlisted?.hasPublishedVersion);\n\n  // If hasPublishedVersion is set, wrap the existing filters function to also\n  // apply the hasPublishedVersion condition. This ensures the condition is\n  // applied to both root and nested (populate) queries.\n  if (hasPublishedVersion !== undefined) {\n    const existingFilters = query.filters;\n\n    query.filters = ({ meta, ...rest }: { meta: { uid: UID.Schema } }) => {\n      // Get the existing filters result (from status param)\n      let existingResult = {};\n      if (typeof existingFilters === 'function') {\n        existingResult = existingFilters({ meta, ...rest }) || {};\n      } else if (existingFilters) {\n        existingResult = existingFilters;\n      }\n\n      // Get the hasPublishedVersion condition for this specific model\n      const hasPublishedCondition = getHasPublishedVersionCondition(meta.uid, hasPublishedVersion);\n\n      // Merge both conditions\n      if (hasPublishedCondition) {\n        const conditions = [existingResult, hasPublishedCondition].filter(\n          (c) => Object.keys(c).length\n        );\n        return { $and: conditions };\n      }\n\n      return existingResult;\n    };\n  }\n\n  return assoc('where', { ...params?.lookup, ...query.where }, query);\n});\n\nexport { transformParamsToQuery };\n"],"names":["transformParamsToQuery","curry","uid","params","allowlisted","pickAllowedQueryParams","query","strapi","get","transform","hasPublishedVersion","parseHasPublishedVersion","undefined","existingFilters","filters","meta","rest","existingResult","hasPublishedCondition","getHasPublishedVersionCondition","conditions","filter","c","Object","keys","length","$and","assoc","lookup","where"],"mappings":";;;;AAOA,MAAMA,sBAAAA,GAAyBC,KAAAA,CAAM,CAACC,GAAAA,EAAiBC,MAAAA,GAAAA;IACrD,MAAMC,WAAAA,GAAcC,sBAAAA,CAAuBF,MAAAA,IAAU,EAAC,CAAA;AACtD,IAAA,MAAMG,QAAQC,MAAAA,CAAOC,GAAG,CAAC,cAAA,CAAA,CAAgBC,SAAS,CAACP,GAAAA,EAAKE,WAAAA,CAAAA;;IAGxD,MAAMM,mBAAAA,GAAsBC,yBAAyBP,WAAAA,EAAaM,mBAAAA,CAAAA;;;;AAKlE,IAAA,IAAIA,wBAAwBE,SAAAA,EAAW;QACrC,MAAMC,eAAAA,GAAkBP,MAAMQ,OAAO;AAErCR,QAAAA,KAAAA,CAAMQ,OAAO,GAAG,CAAC,EAAEC,IAAI,EAAE,GAAGC,IAAAA,EAAqC,GAAA;;AAE/D,YAAA,IAAIC,iBAAiB,EAAC;YACtB,IAAI,OAAOJ,oBAAoB,UAAA,EAAY;AACzCI,gBAAAA,cAAAA,GAAiBJ,eAAAA,CAAgB;AAAEE,oBAAAA,IAAAA;AAAM,oBAAA,GAAGC;AAAK,iBAAA,CAAA,IAAM,EAAC;AAC1D,YAAA,CAAA,MAAO,IAAIH,eAAAA,EAAiB;gBAC1BI,cAAAA,GAAiBJ,eAAAA;AACnB,YAAA;;AAGA,YAAA,MAAMK,qBAAAA,GAAwBC,+BAAAA,CAAgCJ,IAAAA,CAAKb,GAAG,EAAEQ,mBAAAA,CAAAA;;AAGxE,YAAA,IAAIQ,qBAAAA,EAAuB;AACzB,gBAAA,MAAME,UAAAA,GAAa;AAACH,oBAAAA,cAAAA;AAAgBC,oBAAAA;iBAAsB,CAACG,MAAM,CAC/D,CAACC,CAAAA,GAAMC,OAAOC,IAAI,CAACF,GAAGG,MAAM,CAAA;gBAE9B,OAAO;oBAAEC,IAAAA,EAAMN;AAAW,iBAAA;AAC5B,YAAA;YAEA,OAAOH,cAAAA;AACT,QAAA,CAAA;AACF,IAAA;AAEA,IAAA,OAAOU,MAAM,OAAA,EAAS;AAAE,QAAA,GAAGxB,QAAQyB,MAAM;AAAE,QAAA,GAAGtB,MAAMuB;KAAM,EAAGvB,KAAAA,CAAAA;AAC/D,CAAA;;;;"}
+{"version":3,"file":"query.mjs","sources":["../../../../src/services/document-service/transform/query.ts"],"sourcesContent":["import type { UID } from '@strapi/types';\n\nimport { curry, assoc, omit } from 'lodash/fp';\nimport {\n  parseHasPublishedVersionQueryParam,\n  hasPublishedVersionBooleanToPublicationFilterMode,\n  type PublicationFilterMode,\n} from '@strapi/utils';\n\nimport { parsePublicationFilter, getPublicationFilterCondition } from '../publication-filter';\n\nimport { pickAllowedQueryParams } from '../params';\n\nconst transformParamsToQuery = curry((uid: UID.Schema, params: any) => {\n  const rawParams = (params ?? {}) as Record<string, unknown>;\n  const allowlisted = pickAllowedQueryParams(rawParams);\n  const query = strapi.get('query-params').transform(uid, allowlisted);\n\n  const explicitPublicationFilter = parsePublicationFilter(allowlisted.publicationFilter);\n  const legacyHasPublishedVersion = parseHasPublishedVersionQueryParam(\n    rawParams.hasPublishedVersion\n  );\n\n  let effectivePublicationFilter: PublicationFilterMode | undefined = explicitPublicationFilter;\n  if (effectivePublicationFilter === undefined && legacyHasPublishedVersion !== undefined) {\n    effectivePublicationFilter =\n      hasPublishedVersionBooleanToPublicationFilterMode(legacyHasPublishedVersion);\n  }\n\n  const status: 'draft' | 'published' = allowlisted.status === 'published' ? 'published' : 'draft';\n\n  const baseWhere = { ...params?.lookup, ...query.where };\n\n  // `transformQueryParams` leaves `publicationFilter` / `hasPublishedVersion` on the query object\n  // via `...rest`; the DB layer must not receive them as extra top-level keys.\n  const stripPublicationParamsFromQuery = omit([\n    'publicationFilter',\n    'hasPublishedVersion',\n  ] as const);\n\n  // Publication filtering must go through `query.filters`, not only `where`, so the same\n  // cohort logic applies to nested populate queries (each sub-query uses `meta.uid`).\n  // Merging into `where` alone breaks populate cascade — see has-published-version API tests.\n  if (effectivePublicationFilter !== undefined) {\n    const existingFilters = query.filters;\n\n    const wrappedFilters = ({ meta, ...rest }: { meta: { uid: UID.Schema } }) => {\n      let existingResult = {};\n      if (typeof existingFilters === 'function') {\n        existingResult = existingFilters({ meta, ...rest }) || {};\n      } else if (existingFilters) {\n        existingResult = existingFilters;\n      }\n\n      const publicationCondition = getPublicationFilterCondition(\n        meta.uid,\n        effectivePublicationFilter,\n        status\n      );\n\n      if (publicationCondition && Object.keys(publicationCondition).length > 0) {\n        const conditions = [existingResult, publicationCondition].filter(\n          (c) => Object.keys(c).length\n        );\n        return { $and: conditions };\n      }\n\n      return existingResult;\n    };\n\n    const queryWithoutPublicationParams = stripPublicationParamsFromQuery(query);\n\n    return assoc(\n      'where',\n      baseWhere,\n      assoc('filters', wrappedFilters, queryWithoutPublicationParams)\n    );\n  }\n\n  return assoc('where', baseWhere, stripPublicationParamsFromQuery(query));\n});\n\nexport { transformParamsToQuery };\n"],"names":["transformParamsToQuery","curry","uid","params","rawParams","allowlisted","pickAllowedQueryParams","query","strapi","get","transform","explicitPublicationFilter","parsePublicationFilter","publicationFilter","legacyHasPublishedVersion","parseHasPublishedVersionQueryParam","hasPublishedVersion","effectivePublicationFilter","undefined","hasPublishedVersionBooleanToPublicationFilterMode","status","baseWhere","lookup","where","stripPublicationParamsFromQuery","omit","existingFilters","filters","wrappedFilters","meta","rest","existingResult","publicationCondition","getPublicationFilterCondition","Object","keys","length","conditions","filter","c","$and","queryWithoutPublicationParams","assoc"],"mappings":";;;;;AAaA,MAAMA,sBAAAA,GAAyBC,KAAAA,CAAM,CAACC,GAAAA,EAAiBC,MAAAA,GAAAA;IACrD,MAAMC,SAAAA,GAAaD,UAAU,EAAC;AAC9B,IAAA,MAAME,cAAcC,sBAAAA,CAAuBF,SAAAA,CAAAA;AAC3C,IAAA,MAAMG,QAAQC,MAAAA,CAAOC,GAAG,CAAC,cAAA,CAAA,CAAgBC,SAAS,CAACR,GAAAA,EAAKG,WAAAA,CAAAA;IAExD,MAAMM,yBAAAA,GAA4BC,sBAAAA,CAAuBP,WAAAA,CAAYQ,iBAAiB,CAAA;IACtF,MAAMC,yBAAAA,GAA4BC,kCAAAA,CAChCX,SAAAA,CAAUY,mBAAmB,CAAA;AAG/B,IAAA,IAAIC,0BAAAA,GAAgEN,yBAAAA;IACpE,IAAIM,0BAAAA,KAA+BC,SAAAA,IAAaJ,yBAAAA,KAA8BI,SAAAA,EAAW;AACvFD,QAAAA,0BAAAA,GACEE,iDAAAA,CAAkDL,yBAAAA,CAAAA;AACtD,IAAA;AAEA,IAAA,MAAMM,MAAAA,GAAgCf,WAAAA,CAAYe,MAAM,KAAK,cAAc,WAAA,GAAc,OAAA;AAEzF,IAAA,MAAMC,SAAAA,GAAY;AAAE,QAAA,GAAGlB,QAAQmB,MAAM;AAAE,QAAA,GAAGf,MAAMgB;AAAM,KAAA;;;AAItD,IAAA,MAAMC,kCAAkCC,IAAAA,CAAK;AAC3C,QAAA,mBAAA;AACA,QAAA;AACD,KAAA,CAAA;;;;AAKD,IAAA,IAAIR,+BAA+BC,SAAAA,EAAW;QAC5C,MAAMQ,eAAAA,GAAkBnB,MAAMoB,OAAO;AAErC,QAAA,MAAMC,iBAAiB,CAAC,EAAEC,IAAI,EAAE,GAAGC,IAAAA,EAAqC,GAAA;AACtE,YAAA,IAAIC,iBAAiB,EAAC;YACtB,IAAI,OAAOL,oBAAoB,UAAA,EAAY;AACzCK,gBAAAA,cAAAA,GAAiBL,eAAAA,CAAgB;AAAEG,oBAAAA,IAAAA;AAAM,oBAAA,GAAGC;AAAK,iBAAA,CAAA,IAAM,EAAC;AAC1D,YAAA,CAAA,MAAO,IAAIJ,eAAAA,EAAiB;gBAC1BK,cAAAA,GAAiBL,eAAAA;AACnB,YAAA;AAEA,YAAA,MAAMM,oBAAAA,GAAuBC,6BAAAA,CAC3BJ,IAAAA,CAAK3B,GAAG,EACRe,0BAAAA,EACAG,MAAAA,CAAAA;AAGF,YAAA,IAAIY,wBAAwBE,MAAAA,CAAOC,IAAI,CAACH,oBAAAA,CAAAA,CAAsBI,MAAM,GAAG,CAAA,EAAG;AACxE,gBAAA,MAAMC,UAAAA,GAAa;AAACN,oBAAAA,cAAAA;AAAgBC,oBAAAA;iBAAqB,CAACM,MAAM,CAC9D,CAACC,CAAAA,GAAML,OAAOC,IAAI,CAACI,GAAGH,MAAM,CAAA;gBAE9B,OAAO;oBAAEI,IAAAA,EAAMH;AAAW,iBAAA;AAC5B,YAAA;YAEA,OAAON,cAAAA;AACT,QAAA,CAAA;AAEA,QAAA,MAAMU,gCAAgCjB,+BAAAA,CAAgCjB,KAAAA,CAAAA;AAEtE,QAAA,OAAOmC,KAAAA,CACL,OAAA,EACArB,SAAAA,EACAqB,KAAAA,CAAM,WAAWd,cAAAA,EAAgBa,6BAAAA,CAAAA,CAAAA;AAErC,IAAA;IAEA,OAAOC,KAAAA,CAAM,OAAA,EAASrB,SAAAA,EAAWG,+BAAAA,CAAgCjB,KAAAA,CAAAA,CAAAA;AACnE,CAAA;;;;"}

package/dist/services/entity-validator/blocks-validator.js

@@ -74,7 +74,7 @@ const codeBlockValidator = strapiUtils.yup.object().shape({
     type: strapiUtils.yup.string().equals([
         'code'
     ]).required(),
-    syntax: strapiUtils.yup.string().nullable(),
+    language: strapiUtils.yup.string().nullable(),
     children: strapiUtils.yup.array().of(textNodeValidator).min(1, 'Quote node children must have at least one Text or Link node').required()
 });
 const listItemNode = strapiUtils.yup.object().shape({