@strapi/database 5.43.0 → 5.45.0

package/dist/query/helpers/order-by.js

@@ -7,11 +7,41 @@ var transform = require('./transform.js');
 
 const COL_STRAPI_ROW_NUMBER = '__strapi_row_number';
 const COL_STRAPI_ORDER_BY_PREFIX = '__strapi_order_by';
+/**
+ * Builds a SQL CASE expression that maps each row to a numeric status rank:
+ *   0 = draft/created (no published sibling with same documentId [+ locale])
+ *   1 = modified (draft updated_at > published updated_at for same documentId [+ locale])
+ *   2 = published
+ *
+ * @param db - Database instance (used to access knex raw)
+ * @param tableName - Actual DB table name (used in correlated subqueries)
+ * @param tableAlias - Alias of the table in the outer query (e.g. "t0")
+ * @param isI18n - When true, adds a locale condition to avoid cross-locale contamination
+ */ const buildStatusSortExpression = (db, tableName, tableAlias, isI18n = false)=>{
+    const localeCondition = isI18n ? ` AND sub.locale = ${tableAlias}.locale` : '';
+    return db.connection.raw(`CASE WHEN NOT EXISTS(SELECT 1 FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 0 WHEN ${tableAlias}.updated_at > (SELECT MAX(sub.updated_at) FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 1 ELSE 2 END`, [
+        tableName,
+        tableName
+    ]);
+};
 const processOrderBy = (orderBy, ctx)=>{
     const { db, uid, qb, alias } = ctx;
     const meta = db.metadata.get(uid);
     const { attributes } = meta;
     if (typeof orderBy === 'string') {
+        if (orderBy === 'status') {
+            if (!attributes.publishedAt || !attributes.documentId) {
+                throw new Error(`Cannot order by status on model ${uid}: missing publishedAt or documentId`);
+            }
+            const isI18n = 'locale' in attributes;
+            return [
+                {
+                    rawExpression: 'status',
+                    isI18n,
+                    order: undefined
+                }
+            ];
+        }
         const attribute = attributes[orderBy];
         if (!attribute) {
             throw new Error(`Attribute ${orderBy} not found on model ${uid}`);
@@ -29,6 +59,19 @@ const processOrderBy = (orderBy, ctx)=>{
     if (_.isPlainObject(orderBy)) {
         return Object.entries(orderBy).flatMap(([key, direction])=>{
             const value = orderBy[key];
+            if (key === 'status') {
+                if (!attributes.publishedAt || !attributes.documentId) {
+                    throw new Error(`Cannot order by status on model ${uid}: missing publishedAt or documentId`);
+                }
+                const isI18n = 'locale' in attributes;
+                return [
+                    {
+                        rawExpression: 'status',
+                        isI18n,
+                        order: direction
+                    }
+                ];
+            }
             const attribute = attributes[key];
             if (!attribute) {
                 throw new Error(`Attribute ${key} not found on model ${uid}`);
@@ -77,6 +120,9 @@ const getStrapiOrderColumnAlias = (column)=>{
     const { tableName } = db.metadata.get(uid);
     // The orderBy is cloned to avoid unwanted mutations of the original object
     const orderBy = _.cloneDeep(qb.state.orderBy);
+    // Separate column-based entries from raw-expression entries (e.g. status)
+    const columnOrderBy = orderBy.filter((ob)=>'column' in ob);
+    const rawExpressionOrderBy = orderBy.filter((ob)=>'rawExpression' in ob);
     // 0. Init a new Knex query instance (referenced as resultQuery) using the DB connection
     //    The connection reuse the original table name (aliased if needed)
     const resultQueryAlias = qb.getAlias();
@@ -92,16 +138,17 @@ const getStrapiOrderColumnAlias = (column)=>{
     .clear('select')// Pagination and sorting
     .clear('order').clear('limit').clear('offset');
     // Override the initial select and return only the columns needed for the partitioning.
+    // Only column-based orderBy entries are included here; raw expressions are applied later.
     baseQuery.select(// Always select the row id for future manipulation
     prefix(qb.alias, 'id'), // Select every column used in an order by clause, but alias it for future reference
     // i.e. if t2.name is present in an order by clause:
     //      Then, "t2.name" will become "t2.name as __strapi_order_by__t2_name"
-    ...orderBy.map((orderByClause)=>alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)));
+    ...columnOrderBy.map((orderByClause)=>alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)));
     // 2. Create a sub-query callback to extract and sort the partitions using row number
     const partitionedQueryAlias = qb.getAlias();
     const selectRowsAsNumberedPartitions = (partitionedQuery)=>{
         // Transform order by clause to their alias to reference them from baseQuery
-        const prefixedOrderBy = orderBy.map((orderByClause)=>({
+        const prefixedOrderBy = columnOrderBy.map((orderByClause)=>({
                 column: prefix(baseQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),
                 order: orderByClause.order
             }));
@@ -119,9 +166,11 @@ const getStrapiOrderColumnAlias = (column)=>{
         }).from(baseQuery.as(baseQueryAlias)).as(partitionedQueryAlias);
     };
     // 3. Create the final resultQuery query, that select and sort the wanted data using T
-    const originalSelect = _.difference(qb.state.select, // Remove order by columns from the initial select
-    qb.state.orderBy.map(_.prop('column')))// Alias everything in resultQuery
-    .map(prefix(resultQueryAlias));
+    // Filter to string-only select items before diffing (Knex.Raw items are passed through as-is)
+    const stringSelect = qb.state.select.filter((s)=>typeof s === 'string');
+    const originalSelect = _.difference(stringSelect, // Remove column-based order by columns from the initial select (raw expressions are not in select)
+    columnOrderBy.map(_.prop('column')))// Alias everything in resultQuery
+    .map((col)=>`${resultQueryAlias}.${col}`);
     resultQuery.select(originalSelect)// Join T to resultQuery to access sorted data
     // Notes:
     // - Only select the first row for each partition
@@ -142,13 +191,20 @@ const getStrapiOrderColumnAlias = (column)=>{
     if (qb.state.first) {
         resultQuery.first();
     }
-    // Re-apply the sort using T values
+    // Re-apply the sort using T values (column-based), then append raw expression sorts.
+    // Cast to any[] because Knex's TS types don't accept Knex.Raw in the column position,
+    // even though Knex supports it at runtime.
     resultQuery.orderBy([
-        // Transform "order by" clause to their T alias and prefix them with T alias
-        ...orderBy.map((orderByClause)=>({
+        // Transform column-based "order by" clause to their T alias and prefix them with T alias
+        ...columnOrderBy.map((orderByClause)=>({
                 column: prefix(partitionedQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),
                 order: orderByClause.order
             })),
+        // Rebuild raw expression entries with the correct outer alias (resultQueryAlias)
+        ...rawExpressionOrderBy.map((entry)=>({
+                column: buildStatusSortExpression(db, tableName, resultQueryAlias, entry.isI18n),
+                order: entry.order
+            })),
         // Add T.id to the order by clause to get consistent results in case several rows have the exact same order
         {
             column: `${partitionedQueryAlias}.id`,
@@ -161,6 +217,7 @@ const getStrapiOrderColumnAlias = (column)=>{
 const alias = _.curry((alias, value)=>`${value} as ${alias}`);
 const prefix = _.curry((prefix, value)=>`${prefix}.${value}`);
 
+exports.buildStatusSortExpression = buildStatusSortExpression;
 exports.getStrapiOrderColumnAlias = getStrapiOrderColumnAlias;
 exports.processOrderBy = processOrderBy;
 exports.wrapWithDeepSort = wrapWithDeepSort;

package/dist/query/helpers/order-by.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-by.js","sources":["../../../src/query/helpers/order-by.ts"],"sourcesContent":["import _ from 'lodash/fp';\nimport knex from 'knex';\n\nimport * as types from '../../utils/types';\nimport { createJoin } from './join';\nimport { toColumnName } from './transform';\n\nimport type { Ctx } from '../types';\n\ntype OrderByCtx = Ctx & { alias?: string };\ntype OrderBy = string | { [key: string]: 'asc' | 'desc' } | OrderBy[];\ntype OrderByValue = { column: string; order?: 'asc' | 'desc' };\n\nconst COL_STRAPI_ROW_NUMBER = '__strapi_row_number';\nconst COL_STRAPI_ORDER_BY_PREFIX = '__strapi_order_by';\n\nexport const processOrderBy = (orderBy: OrderBy, ctx: OrderByCtx): OrderByValue[] => {\n  const { db, uid, qb, alias } = ctx;\n  const meta = db.metadata.get(uid);\n  const { attributes } = meta;\n\n  if (typeof orderBy === 'string') {\n    const attribute = attributes[orderBy];\n\n    if (!attribute) {\n      throw new Error(`Attribute ${orderBy} not found on model ${uid}`);\n    }\n\n    const columnName = toColumnName(meta, orderBy);\n\n    return [{ column: qb.aliasColumn(columnName, alias) }];\n  }\n\n  if (Array.isArray(orderBy)) {\n    return orderBy.flatMap((value) => processOrderBy(value, ctx));\n  }\n\n  if (_.isPlainObject(orderBy)) {\n    return Object.entries(orderBy).flatMap(([key, direction]) => {\n      const value = orderBy[key];\n      const attribute = attributes[key];\n\n      if (!attribute) {\n        throw new Error(`Attribute ${key} not found on model ${uid}`);\n      }\n\n      if (types.isScalar(attribute.type)) {\n        const columnName = toColumnName(meta, key);\n\n        return { column: qb.aliasColumn(columnName, alias), order: direction };\n      }\n\n      if (attribute.type === 'relation' && 'target' in attribute) {\n        const subAlias = createJoin(ctx, {\n          alias: alias || qb.alias,\n          attributeName: key,\n          attribute,\n        });\n\n        return processOrderBy(value, {\n          db,\n          qb,\n          alias: subAlias,\n          uid: attribute.target,\n        });\n      }\n\n      throw new Error(`You cannot order on ${attribute.type} types`);\n    });\n  }\n\n  throw new Error('Invalid orderBy syntax');\n};\n\nexport const getStrapiOrderColumnAlias = (column: string) => {\n  const trimmedColumnName = column.replaceAll('.', '_');\n\n  return `${COL_STRAPI_ORDER_BY_PREFIX}__${trimmedColumnName}`;\n};\n\n/**\n * Wraps the original Knex query with deep sorting functionality.\n *\n * The function takes an original query and an OrderByCtx object as parameters and returns a new Knex query with deep sorting applied.\n */\nexport const wrapWithDeepSort = (originalQuery: knex.Knex.QueryBuilder, ctx: OrderByCtx) => {\n  /**\n   * Notes:\n   * - The generated query has the following flow: baseQuery (filtered unsorted data) -> T (partitioned/sorted data) --> resultQuery (distinct, paginated, sorted data)\n   * - Pagination and selection are transferred from the original query to the outer one to avoid pruning rows too early\n   * - Filtering (where) has to be done in the deepest sub query possible to avoid processing invalid rows and corrupting the final results\n   * - We assume that all necessary joins are done in the original query (`originalQuery`), and every needed column is available with the right name and alias.\n   */\n\n  const { db, qb, uid } = ctx;\n\n  const { tableName } = db.metadata.get(uid);\n\n  // The orderBy is cloned to avoid unwanted mutations of the original object\n  const orderBy = _.cloneDeep<OrderByValue[]>(qb.state.orderBy);\n\n  // 0. Init a new Knex query instance (referenced as resultQuery) using the DB connection\n  //    The connection reuse the original table name (aliased if needed)\n  const resultQueryAlias = qb.getAlias();\n  const aliasedTableName = qb.mustUseAlias() ? alias(resultQueryAlias, tableName) : tableName;\n\n  const resultQuery = db.getConnection(aliasedTableName);\n\n  // 1. Clone the original query to create the sub-query (referenced as baseQuery) and avoid any mutation on the initial object\n  const baseQuery = originalQuery.clone();\n  const baseQueryAlias = qb.getAlias();\n\n  // Clear unwanted statements from the sub-query 'baseQuery'\n  // Note: `first()` is cleared through the combination of `baseQuery.clear('limit')` and calling `baseQuery.select(...)` again\n  // Note: Those statements will be re-applied when duplicates are removed from the final selection\n  baseQuery\n    // Columns selection\n    .clear('select')\n    // Pagination and sorting\n    .clear('order')\n    .clear('limit')\n    .clear('offset');\n\n  // Override the initial select and return only the columns needed for the partitioning.\n  baseQuery.select(\n    // Always select the row id for future manipulation\n    prefix(qb.alias, 'id'),\n    // Select every column used in an order by clause, but alias it for future reference\n    // i.e. if t2.name is present in an order by clause:\n    //      Then, \"t2.name\" will become \"t2.name as __strapi_order_by__t2_name\"\n    ...orderBy.map((orderByClause) =>\n      alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)\n    )\n  );\n\n  // 2. Create a sub-query callback to extract and sort the partitions using row number\n  const partitionedQueryAlias = qb.getAlias();\n\n  const selectRowsAsNumberedPartitions = (partitionedQuery: knex.Knex.QueryBuilder) => {\n    // Transform order by clause to their alias to reference them from baseQuery\n    const prefixedOrderBy = orderBy.map((orderByClause) => ({\n      column: prefix(baseQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n      order: orderByClause.order,\n    }));\n\n    // partitionedQuery select must contain every column used for sorting\n    const orderByColumns = prefixedOrderBy.map<string>(_.prop('column'));\n\n    partitionedQuery\n      .select(\n        // Always select baseQuery.id\n        prefix(baseQueryAlias, 'id'),\n        // Sort columns\n        ...orderByColumns\n      )\n      // The row number is used to assign an index to every row in every partition\n      .rowNumber(COL_STRAPI_ROW_NUMBER, (subQuery) => {\n        for (const orderByClause of prefixedOrderBy) {\n          subQuery.orderBy(orderByClause.column, orderByClause.order, 'last');\n        }\n\n        // And each partition/group is created based on baseQuery.id\n        subQuery.partitionBy(`${baseQueryAlias}.id`);\n      })\n      .from(baseQuery.as(baseQueryAlias))\n      .as(partitionedQueryAlias);\n  };\n\n  // 3. Create the final resultQuery query, that select and sort the wanted data using T\n\n  const originalSelect = _.difference(\n    qb.state.select,\n    // Remove order by columns from the initial select\n    qb.state.orderBy.map(_.prop('column'))\n  )\n    // Alias everything in resultQuery\n    .map(prefix(resultQueryAlias));\n\n  resultQuery\n    .select(originalSelect)\n    // Join T to resultQuery to access sorted data\n    // Notes:\n    // - Only select the first row for each partition\n    // - Since we're applying the \"where\" statement directly on baseQuery (and not on resultQuery), we're using an inner join to avoid unwanted rows\n    .innerJoin(selectRowsAsNumberedPartitions, function () {\n      this\n        // Only select rows that are returned by T\n        .on(`${partitionedQueryAlias}.id`, `${resultQueryAlias}.id`)\n        // By only selecting the rows number equal to 1, we make sure we don't have duplicate, and that\n        // we're selecting rows in the correct order amongst the groups created by the \"partition by\"\n        .andOnVal(`${partitionedQueryAlias}.${COL_STRAPI_ROW_NUMBER}`, '=', 1);\n    });\n\n  // Re-apply pagination params\n\n  if (qb.state.limit) {\n    resultQuery.limit(qb.state.limit);\n  }\n\n  if (qb.state.offset) {\n    resultQuery.offset(qb.state.offset);\n  }\n\n  if (qb.state.first) {\n    resultQuery.first();\n  }\n\n  // Re-apply the sort using T values\n  resultQuery.orderBy([\n    // Transform \"order by\" clause to their T alias and prefix them with T alias\n    ...orderBy.map((orderByClause) => ({\n      column: prefix(partitionedQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n      order: orderByClause.order,\n    })),\n    // Add T.id to the order by clause to get consistent results in case several rows have the exact same order\n    { column: `${partitionedQueryAlias}.id`, order: 'asc' },\n  ]);\n\n  return resultQuery;\n};\n\n// Utils\nconst alias = _.curry((alias: string, value: string) => `${value} as ${alias}`);\nconst prefix = _.curry((prefix: string, value: string) => `${prefix}.${value}`);\n"],"names":["COL_STRAPI_ROW_NUMBER","COL_STRAPI_ORDER_BY_PREFIX","processOrderBy","orderBy","ctx","db","uid","qb","alias","meta","metadata","get","attributes","attribute","Error","columnName","toColumnName","column","aliasColumn","Array","isArray","flatMap","value","_","isPlainObject","Object","entries","key","direction","types","type","order","subAlias","createJoin","attributeName","target","getStrapiOrderColumnAlias","trimmedColumnName","replaceAll","wrapWithDeepSort","originalQuery","tableName","cloneDeep","state","resultQueryAlias","getAlias","aliasedTableName","mustUseAlias","resultQuery","getConnection","baseQuery","clone","baseQueryAlias","clear","select","prefix","map","orderByClause","partitionedQueryAlias","selectRowsAsNumberedPartitions","partitionedQuery","prefixedOrderBy","orderByColumns","prop","rowNumber","subQuery","partitionBy","from","as","originalSelect","difference","innerJoin","on","andOnVal","limit","offset","first","curry"],"mappings":"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"}
+{"version":3,"file":"order-by.js","sources":["../../../src/query/helpers/order-by.ts"],"sourcesContent":["import _ from 'lodash/fp';\nimport knex from 'knex';\n\nimport * as types from '../../utils/types';\nimport { createJoin } from './join';\nimport { toColumnName } from './transform';\n\nimport type { Ctx } from '../types';\n\ntype OrderByCtx = Ctx & { alias?: string };\ntype OrderBy = string | { [key: string]: 'asc' | 'desc' } | OrderBy[];\ntype OrderByColumnValue = { column: string; order?: 'asc' | 'desc' };\ntype OrderByRawValue = { rawExpression: 'status'; isI18n?: boolean; order?: 'asc' | 'desc' };\nexport type OrderByValue = OrderByColumnValue | OrderByRawValue;\n\nconst COL_STRAPI_ROW_NUMBER = '__strapi_row_number';\nconst COL_STRAPI_ORDER_BY_PREFIX = '__strapi_order_by';\n\n/**\n * Builds a SQL CASE expression that maps each row to a numeric status rank:\n *   0 = draft/created (no published sibling with same documentId [+ locale])\n *   1 = modified (draft updated_at > published updated_at for same documentId [+ locale])\n *   2 = published\n *\n * @param db - Database instance (used to access knex raw)\n * @param tableName - Actual DB table name (used in correlated subqueries)\n * @param tableAlias - Alias of the table in the outer query (e.g. \"t0\")\n * @param isI18n - When true, adds a locale condition to avoid cross-locale contamination\n */\nexport const buildStatusSortExpression = (\n  db: { connection: { raw: (sql: string, bindings?: unknown[]) => knex.Knex.Raw } },\n  tableName: string,\n  tableAlias: string,\n  isI18n = false\n): knex.Knex.Raw => {\n  const localeCondition = isI18n ? ` AND sub.locale = ${tableAlias}.locale` : '';\n\n  return db.connection.raw(\n    `CASE WHEN NOT EXISTS(SELECT 1 FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 0 WHEN ${tableAlias}.updated_at > (SELECT MAX(sub.updated_at) FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 1 ELSE 2 END`,\n    [tableName, tableName]\n  );\n};\n\nexport const processOrderBy = (orderBy: OrderBy, ctx: OrderByCtx): OrderByValue[] => {\n  const { db, uid, qb, alias } = ctx;\n  const meta = db.metadata.get(uid);\n  const { attributes } = meta;\n\n  if (typeof orderBy === 'string') {\n    if (orderBy === 'status') {\n      if (!attributes.publishedAt || !attributes.documentId) {\n        throw new Error(\n          `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n        );\n      }\n      const isI18n = 'locale' in attributes;\n      return [{ rawExpression: 'status' as const, isI18n, order: undefined }];\n    }\n\n    const attribute = attributes[orderBy];\n\n    if (!attribute) {\n      throw new Error(`Attribute ${orderBy} not found on model ${uid}`);\n    }\n\n    const columnName = toColumnName(meta, orderBy);\n\n    return [{ column: qb.aliasColumn(columnName, alias) }];\n  }\n\n  if (Array.isArray(orderBy)) {\n    return orderBy.flatMap((value) => processOrderBy(value, ctx));\n  }\n\n  if (_.isPlainObject(orderBy)) {\n    return Object.entries(orderBy).flatMap(([key, direction]) => {\n      const value = orderBy[key];\n\n      if (key === 'status') {\n        if (!attributes.publishedAt || !attributes.documentId) {\n          throw new Error(\n            `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n          );\n        }\n        const isI18n = 'locale' in attributes;\n        return [{ rawExpression: 'status' as const, isI18n, order: direction as 'asc' | 'desc' }];\n      }\n\n      const attribute = attributes[key];\n\n      if (!attribute) {\n        throw new Error(`Attribute ${key} not found on model ${uid}`);\n      }\n\n      if (types.isScalar(attribute.type)) {\n        const columnName = toColumnName(meta, key);\n\n        return { column: qb.aliasColumn(columnName, alias), order: direction };\n      }\n\n      if (attribute.type === 'relation' && 'target' in attribute) {\n        const subAlias = createJoin(ctx, {\n          alias: alias || qb.alias,\n          attributeName: key,\n          attribute,\n        });\n\n        return processOrderBy(value, {\n          db,\n          qb,\n          alias: subAlias,\n          uid: attribute.target,\n        });\n      }\n\n      throw new Error(`You cannot order on ${attribute.type} types`);\n    });\n  }\n\n  throw new Error('Invalid orderBy syntax');\n};\n\nexport const getStrapiOrderColumnAlias = (column: string) => {\n  const trimmedColumnName = column.replaceAll('.', '_');\n\n  return `${COL_STRAPI_ORDER_BY_PREFIX}__${trimmedColumnName}`;\n};\n\n/**\n * Wraps the original Knex query with deep sorting functionality.\n *\n * The function takes an original query and an OrderByCtx object as parameters and returns a new Knex query with deep sorting applied.\n */\nexport const wrapWithDeepSort = (originalQuery: knex.Knex.QueryBuilder, ctx: OrderByCtx) => {\n  /**\n   * Notes:\n   * - The generated query has the following flow: baseQuery (filtered unsorted data) -> T (partitioned/sorted data) --> resultQuery (distinct, paginated, sorted data)\n   * - Pagination and selection are transferred from the original query to the outer one to avoid pruning rows too early\n   * - Filtering (where) has to be done in the deepest sub query possible to avoid processing invalid rows and corrupting the final results\n   * - We assume that all necessary joins are done in the original query (`originalQuery`), and every needed column is available with the right name and alias.\n   */\n\n  const { db, qb, uid } = ctx;\n\n  const { tableName } = db.metadata.get(uid);\n\n  // The orderBy is cloned to avoid unwanted mutations of the original object\n  const orderBy = _.cloneDeep<OrderByValue[]>(qb.state.orderBy);\n\n  // Separate column-based entries from raw-expression entries (e.g. status)\n  const columnOrderBy = orderBy.filter((ob): ob is OrderByColumnValue => 'column' in ob);\n  const rawExpressionOrderBy = orderBy.filter((ob): ob is OrderByRawValue => 'rawExpression' in ob);\n\n  // 0. Init a new Knex query instance (referenced as resultQuery) using the DB connection\n  //    The connection reuse the original table name (aliased if needed)\n  const resultQueryAlias = qb.getAlias();\n  const aliasedTableName = qb.mustUseAlias() ? alias(resultQueryAlias, tableName) : tableName;\n\n  const resultQuery = db.getConnection(aliasedTableName);\n\n  // 1. Clone the original query to create the sub-query (referenced as baseQuery) and avoid any mutation on the initial object\n  const baseQuery = originalQuery.clone();\n  const baseQueryAlias = qb.getAlias();\n\n  // Clear unwanted statements from the sub-query 'baseQuery'\n  // Note: `first()` is cleared through the combination of `baseQuery.clear('limit')` and calling `baseQuery.select(...)` again\n  // Note: Those statements will be re-applied when duplicates are removed from the final selection\n  baseQuery\n    // Columns selection\n    .clear('select')\n    // Pagination and sorting\n    .clear('order')\n    .clear('limit')\n    .clear('offset');\n\n  // Override the initial select and return only the columns needed for the partitioning.\n  // Only column-based orderBy entries are included here; raw expressions are applied later.\n  baseQuery.select(\n    // Always select the row id for future manipulation\n    prefix(qb.alias, 'id'),\n    // Select every column used in an order by clause, but alias it for future reference\n    // i.e. if t2.name is present in an order by clause:\n    //      Then, \"t2.name\" will become \"t2.name as __strapi_order_by__t2_name\"\n    ...columnOrderBy.map((orderByClause) =>\n      alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)\n    )\n  );\n\n  // 2. Create a sub-query callback to extract and sort the partitions using row number\n  const partitionedQueryAlias = qb.getAlias();\n\n  const selectRowsAsNumberedPartitions = (partitionedQuery: knex.Knex.QueryBuilder) => {\n    // Transform order by clause to their alias to reference them from baseQuery\n    const prefixedOrderBy = columnOrderBy.map((orderByClause) => ({\n      column: prefix(baseQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n      order: orderByClause.order,\n    }));\n\n    // partitionedQuery select must contain every column used for sorting\n    const orderByColumns = prefixedOrderBy.map<string>(_.prop('column'));\n\n    partitionedQuery\n      .select(\n        // Always select baseQuery.id\n        prefix(baseQueryAlias, 'id'),\n        // Sort columns\n        ...orderByColumns\n      )\n      // The row number is used to assign an index to every row in every partition\n      .rowNumber(COL_STRAPI_ROW_NUMBER, (subQuery) => {\n        for (const orderByClause of prefixedOrderBy) {\n          subQuery.orderBy(orderByClause.column, orderByClause.order, 'last');\n        }\n\n        // And each partition/group is created based on baseQuery.id\n        subQuery.partitionBy(`${baseQueryAlias}.id`);\n      })\n      .from(baseQuery.as(baseQueryAlias))\n      .as(partitionedQueryAlias);\n  };\n\n  // 3. Create the final resultQuery query, that select and sort the wanted data using T\n\n  // Filter to string-only select items before diffing (Knex.Raw items are passed through as-is)\n  const stringSelect = qb.state.select.filter((s): s is string => typeof s === 'string');\n  const originalSelect = _.difference(\n    stringSelect,\n    // Remove column-based order by columns from the initial select (raw expressions are not in select)\n    columnOrderBy.map(_.prop('column'))\n  )\n    // Alias everything in resultQuery\n    .map((col) => `${resultQueryAlias}.${col}`);\n\n  resultQuery\n    .select(originalSelect)\n    // Join T to resultQuery to access sorted data\n    // Notes:\n    // - Only select the first row for each partition\n    // - Since we're applying the \"where\" statement directly on baseQuery (and not on resultQuery), we're using an inner join to avoid unwanted rows\n    .innerJoin(selectRowsAsNumberedPartitions, function () {\n      this\n        // Only select rows that are returned by T\n        .on(`${partitionedQueryAlias}.id`, `${resultQueryAlias}.id`)\n        // By only selecting the rows number equal to 1, we make sure we don't have duplicate, and that\n        // we're selecting rows in the correct order amongst the groups created by the \"partition by\"\n        .andOnVal(`${partitionedQueryAlias}.${COL_STRAPI_ROW_NUMBER}`, '=', 1);\n    });\n\n  // Re-apply pagination params\n\n  if (qb.state.limit) {\n    resultQuery.limit(qb.state.limit);\n  }\n\n  if (qb.state.offset) {\n    resultQuery.offset(qb.state.offset);\n  }\n\n  if (qb.state.first) {\n    resultQuery.first();\n  }\n\n  // Re-apply the sort using T values (column-based), then append raw expression sorts.\n  // Cast to any[] because Knex's TS types don't accept Knex.Raw in the column position,\n  // even though Knex supports it at runtime.\n  resultQuery.orderBy([\n    // Transform column-based \"order by\" clause to their T alias and prefix them with T alias\n    ...columnOrderBy.map((orderByClause) => ({\n      column: prefix(partitionedQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n      order: orderByClause.order,\n    })),\n    // Rebuild raw expression entries with the correct outer alias (resultQueryAlias)\n    ...rawExpressionOrderBy.map((entry) => ({\n      column: buildStatusSortExpression(db, tableName, resultQueryAlias, entry.isI18n),\n      order: entry.order,\n    })),\n    // Add T.id to the order by clause to get consistent results in case several rows have the exact same order\n    { column: `${partitionedQueryAlias}.id`, order: 'asc' },\n  ] as any);\n\n  return resultQuery;\n};\n\n// Utils\nconst alias = _.curry((alias: string, value: string) => `${value} as ${alias}`);\nconst prefix = _.curry((prefix: string, value: string) => `${prefix}.${value}`);\n"],"names":["COL_STRAPI_ROW_NUMBER","COL_STRAPI_ORDER_BY_PREFIX","buildStatusSortExpression","db","tableName","tableAlias","isI18n","localeCondition","connection","raw","processOrderBy","orderBy","ctx","uid","qb","alias","meta","metadata","get","attributes","publishedAt","documentId","Error","rawExpression","order","undefined","attribute","columnName","toColumnName","column","aliasColumn","Array","isArray","flatMap","value","_","isPlainObject","Object","entries","key","direction","types","type","subAlias","createJoin","attributeName","target","getStrapiOrderColumnAlias","trimmedColumnName","replaceAll","wrapWithDeepSort","originalQuery","cloneDeep","state","columnOrderBy","filter","ob","rawExpressionOrderBy","resultQueryAlias","getAlias","aliasedTableName","mustUseAlias","resultQuery","getConnection","baseQuery","clone","baseQueryAlias","clear","select","prefix","map","orderByClause","partitionedQueryAlias","selectRowsAsNumberedPartitions","partitionedQuery","prefixedOrderBy","orderByColumns","prop","rowNumber","subQuery","partitionBy","from","as","stringSelect","s","originalSelect","difference","col","innerJoin","on","andOnVal","limit","offset","first","entry","curry"],"mappings":"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"}

package/dist/query/helpers/order-by.mjs

@@ -5,11 +5,41 @@ import { toColumnName } from './transform.mjs';
 
 const COL_STRAPI_ROW_NUMBER = '__strapi_row_number';
 const COL_STRAPI_ORDER_BY_PREFIX = '__strapi_order_by';
+/**
+ * Builds a SQL CASE expression that maps each row to a numeric status rank:
+ *   0 = draft/created (no published sibling with same documentId [+ locale])
+ *   1 = modified (draft updated_at > published updated_at for same documentId [+ locale])
+ *   2 = published
+ *
+ * @param db - Database instance (used to access knex raw)
+ * @param tableName - Actual DB table name (used in correlated subqueries)
+ * @param tableAlias - Alias of the table in the outer query (e.g. "t0")
+ * @param isI18n - When true, adds a locale condition to avoid cross-locale contamination
+ */ const buildStatusSortExpression = (db, tableName, tableAlias, isI18n = false)=>{
+    const localeCondition = isI18n ? ` AND sub.locale = ${tableAlias}.locale` : '';
+    return db.connection.raw(`CASE WHEN NOT EXISTS(SELECT 1 FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 0 WHEN ${tableAlias}.updated_at > (SELECT MAX(sub.updated_at) FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 1 ELSE 2 END`, [
+        tableName,
+        tableName
+    ]);
+};
 const processOrderBy = (orderBy, ctx)=>{
     const { db, uid, qb, alias } = ctx;
     const meta = db.metadata.get(uid);
     const { attributes } = meta;
     if (typeof orderBy === 'string') {
+        if (orderBy === 'status') {
+            if (!attributes.publishedAt || !attributes.documentId) {
+                throw new Error(`Cannot order by status on model ${uid}: missing publishedAt or documentId`);
+            }
+            const isI18n = 'locale' in attributes;
+            return [
+                {
+                    rawExpression: 'status',
+                    isI18n,
+                    order: undefined
+                }
+            ];
+        }
         const attribute = attributes[orderBy];
         if (!attribute) {
             throw new Error(`Attribute ${orderBy} not found on model ${uid}`);
@@ -27,6 +57,19 @@ const processOrderBy = (orderBy, ctx)=>{
     if (_.isPlainObject(orderBy)) {
         return Object.entries(orderBy).flatMap(([key, direction])=>{
             const value = orderBy[key];
+            if (key === 'status') {
+                if (!attributes.publishedAt || !attributes.documentId) {
+                    throw new Error(`Cannot order by status on model ${uid}: missing publishedAt or documentId`);
+                }
+                const isI18n = 'locale' in attributes;
+                return [
+                    {
+                        rawExpression: 'status',
+                        isI18n,
+                        order: direction
+                    }
+                ];
+            }
             const attribute = attributes[key];
             if (!attribute) {
                 throw new Error(`Attribute ${key} not found on model ${uid}`);
@@ -75,6 +118,9 @@ const getStrapiOrderColumnAlias = (column)=>{
     const { tableName } = db.metadata.get(uid);
     // The orderBy is cloned to avoid unwanted mutations of the original object
     const orderBy = _.cloneDeep(qb.state.orderBy);
+    // Separate column-based entries from raw-expression entries (e.g. status)
+    const columnOrderBy = orderBy.filter((ob)=>'column' in ob);
+    const rawExpressionOrderBy = orderBy.filter((ob)=>'rawExpression' in ob);
     // 0. Init a new Knex query instance (referenced as resultQuery) using the DB connection
     //    The connection reuse the original table name (aliased if needed)
     const resultQueryAlias = qb.getAlias();
@@ -90,16 +136,17 @@ const getStrapiOrderColumnAlias = (column)=>{
     .clear('select')// Pagination and sorting
     .clear('order').clear('limit').clear('offset');
     // Override the initial select and return only the columns needed for the partitioning.
+    // Only column-based orderBy entries are included here; raw expressions are applied later.
     baseQuery.select(// Always select the row id for future manipulation
     prefix(qb.alias, 'id'), // Select every column used in an order by clause, but alias it for future reference
     // i.e. if t2.name is present in an order by clause:
     //      Then, "t2.name" will become "t2.name as __strapi_order_by__t2_name"
-    ...orderBy.map((orderByClause)=>alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)));
+    ...columnOrderBy.map((orderByClause)=>alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)));
     // 2. Create a sub-query callback to extract and sort the partitions using row number
     const partitionedQueryAlias = qb.getAlias();
     const selectRowsAsNumberedPartitions = (partitionedQuery)=>{
         // Transform order by clause to their alias to reference them from baseQuery
-        const prefixedOrderBy = orderBy.map((orderByClause)=>({
+        const prefixedOrderBy = columnOrderBy.map((orderByClause)=>({
                 column: prefix(baseQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),
                 order: orderByClause.order
             }));
@@ -117,9 +164,11 @@ const getStrapiOrderColumnAlias = (column)=>{
         }).from(baseQuery.as(baseQueryAlias)).as(partitionedQueryAlias);
     };
     // 3. Create the final resultQuery query, that select and sort the wanted data using T
-    const originalSelect = _.difference(qb.state.select, // Remove order by columns from the initial select
-    qb.state.orderBy.map(_.prop('column')))// Alias everything in resultQuery
-    .map(prefix(resultQueryAlias));
+    // Filter to string-only select items before diffing (Knex.Raw items are passed through as-is)
+    const stringSelect = qb.state.select.filter((s)=>typeof s === 'string');
+    const originalSelect = _.difference(stringSelect, // Remove column-based order by columns from the initial select (raw expressions are not in select)
+    columnOrderBy.map(_.prop('column')))// Alias everything in resultQuery
+    .map((col)=>`${resultQueryAlias}.${col}`);
     resultQuery.select(originalSelect)// Join T to resultQuery to access sorted data
     // Notes:
     // - Only select the first row for each partition
@@ -140,13 +189,20 @@ const getStrapiOrderColumnAlias = (column)=>{
     if (qb.state.first) {
         resultQuery.first();
     }
-    // Re-apply the sort using T values
+    // Re-apply the sort using T values (column-based), then append raw expression sorts.
+    // Cast to any[] because Knex's TS types don't accept Knex.Raw in the column position,
+    // even though Knex supports it at runtime.
     resultQuery.orderBy([
-        // Transform "order by" clause to their T alias and prefix them with T alias
-        ...orderBy.map((orderByClause)=>({
+        // Transform column-based "order by" clause to their T alias and prefix them with T alias
+        ...columnOrderBy.map((orderByClause)=>({
                 column: prefix(partitionedQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),
                 order: orderByClause.order
             })),
+        // Rebuild raw expression entries with the correct outer alias (resultQueryAlias)
+        ...rawExpressionOrderBy.map((entry)=>({
+                column: buildStatusSortExpression(db, tableName, resultQueryAlias, entry.isI18n),
+                order: entry.order
+            })),
         // Add T.id to the order by clause to get consistent results in case several rows have the exact same order
         {
             column: `${partitionedQueryAlias}.id`,
@@ -159,5 +215,5 @@ const getStrapiOrderColumnAlias = (column)=>{
 const alias = _.curry((alias, value)=>`${value} as ${alias}`);
 const prefix = _.curry((prefix, value)=>`${prefix}.${value}`);
 
-export { getStrapiOrderColumnAlias, processOrderBy, wrapWithDeepSort };
+export { buildStatusSortExpression, getStrapiOrderColumnAlias, processOrderBy, wrapWithDeepSort };
 //# sourceMappingURL=order-by.mjs.map

package/dist/query/helpers/order-by.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"order-by.mjs","sources":["../../../src/query/helpers/order-by.ts"],"sourcesContent":["import _ from 'lodash/fp';\nimport knex from 'knex';\n\nimport * as types from '../../utils/types';\nimport { createJoin } from './join';\nimport { toColumnName } from './transform';\n\nimport type { Ctx } from '../types';\n\ntype OrderByCtx = Ctx & { alias?: string };\ntype OrderBy = string | { [key: string]: 'asc' | 'desc' } | OrderBy[];\ntype OrderByValue = { column: string; order?: 'asc' | 'desc' };\n\nconst COL_STRAPI_ROW_NUMBER = '__strapi_row_number';\nconst COL_STRAPI_ORDER_BY_PREFIX = '__strapi_order_by';\n\nexport const processOrderBy = (orderBy: OrderBy, ctx: OrderByCtx): OrderByValue[] => {\n  const { db, uid, qb, alias } = ctx;\n  const meta = db.metadata.get(uid);\n  const { attributes } = meta;\n\n  if (typeof orderBy === 'string') {\n    const attribute = attributes[orderBy];\n\n    if (!attribute) {\n      throw new Error(`Attribute ${orderBy} not found on model ${uid}`);\n    }\n\n    const columnName = toColumnName(meta, orderBy);\n\n    return [{ column: qb.aliasColumn(columnName, alias) }];\n  }\n\n  if (Array.isArray(orderBy)) {\n    return orderBy.flatMap((value) => processOrderBy(value, ctx));\n  }\n\n  if (_.isPlainObject(orderBy)) {\n    return Object.entries(orderBy).flatMap(([key, direction]) => {\n      const value = orderBy[key];\n      const attribute = attributes[key];\n\n      if (!attribute) {\n        throw new Error(`Attribute ${key} not found on model ${uid}`);\n      }\n\n      if (types.isScalar(attribute.type)) {\n        const columnName = toColumnName(meta, key);\n\n        return { column: qb.aliasColumn(columnName, alias), order: direction };\n      }\n\n      if (attribute.type === 'relation' && 'target' in attribute) {\n        const subAlias = createJoin(ctx, {\n          alias: alias || qb.alias,\n          attributeName: key,\n          attribute,\n        });\n\n        return processOrderBy(value, {\n          db,\n          qb,\n          alias: subAlias,\n          uid: attribute.target,\n        });\n      }\n\n      throw new Error(`You cannot order on ${attribute.type} types`);\n    });\n  }\n\n  throw new Error('Invalid orderBy syntax');\n};\n\nexport const getStrapiOrderColumnAlias = (column: string) => {\n  const trimmedColumnName = column.replaceAll('.', '_');\n\n  return `${COL_STRAPI_ORDER_BY_PREFIX}__${trimmedColumnName}`;\n};\n\n/**\n * Wraps the original Knex query with deep sorting functionality.\n *\n * The function takes an original query and an OrderByCtx object as parameters and returns a new Knex query with deep sorting applied.\n */\nexport const wrapWithDeepSort = (originalQuery: knex.Knex.QueryBuilder, ctx: OrderByCtx) => {\n  /**\n   * Notes:\n   * - The generated query has the following flow: baseQuery (filtered unsorted data) -> T (partitioned/sorted data) --> resultQuery (distinct, paginated, sorted data)\n   * - Pagination and selection are transferred from the original query to the outer one to avoid pruning rows too early\n   * - Filtering (where) has to be done in the deepest sub query possible to avoid processing invalid rows and corrupting the final results\n   * - We assume that all necessary joins are done in the original query (`originalQuery`), and every needed column is available with the right name and alias.\n   */\n\n  const { db, qb, uid } = ctx;\n\n  const { tableName } = db.metadata.get(uid);\n\n  // The orderBy is cloned to avoid unwanted mutations of the original object\n  const orderBy = _.cloneDeep<OrderByValue[]>(qb.state.orderBy);\n\n  // 0. Init a new Knex query instance (referenced as resultQuery) using the DB connection\n  //    The connection reuse the original table name (aliased if needed)\n  const resultQueryAlias = qb.getAlias();\n  const aliasedTableName = qb.mustUseAlias() ? alias(resultQueryAlias, tableName) : tableName;\n\n  const resultQuery = db.getConnection(aliasedTableName);\n\n  // 1. Clone the original query to create the sub-query (referenced as baseQuery) and avoid any mutation on the initial object\n  const baseQuery = originalQuery.clone();\n  const baseQueryAlias = qb.getAlias();\n\n  // Clear unwanted statements from the sub-query 'baseQuery'\n  // Note: `first()` is cleared through the combination of `baseQuery.clear('limit')` and calling `baseQuery.select(...)` again\n  // Note: Those statements will be re-applied when duplicates are removed from the final selection\n  baseQuery\n    // Columns selection\n    .clear('select')\n    // Pagination and sorting\n    .clear('order')\n    .clear('limit')\n    .clear('offset');\n\n  // Override the initial select and return only the columns needed for the partitioning.\n  baseQuery.select(\n    // Always select the row id for future manipulation\n    prefix(qb.alias, 'id'),\n    // Select every column used in an order by clause, but alias it for future reference\n    // i.e. if t2.name is present in an order by clause:\n    //      Then, \"t2.name\" will become \"t2.name as __strapi_order_by__t2_name\"\n    ...orderBy.map((orderByClause) =>\n      alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)\n    )\n  );\n\n  // 2. Create a sub-query callback to extract and sort the partitions using row number\n  const partitionedQueryAlias = qb.getAlias();\n\n  const selectRowsAsNumberedPartitions = (partitionedQuery: knex.Knex.QueryBuilder) => {\n    // Transform order by clause to their alias to reference them from baseQuery\n    const prefixedOrderBy = orderBy.map((orderByClause) => ({\n      column: prefix(baseQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n      order: orderByClause.order,\n    }));\n\n    // partitionedQuery select must contain every column used for sorting\n    const orderByColumns = prefixedOrderBy.map<string>(_.prop('column'));\n\n    partitionedQuery\n      .select(\n        // Always select baseQuery.id\n        prefix(baseQueryAlias, 'id'),\n        // Sort columns\n        ...orderByColumns\n      )\n      // The row number is used to assign an index to every row in every partition\n      .rowNumber(COL_STRAPI_ROW_NUMBER, (subQuery) => {\n        for (const orderByClause of prefixedOrderBy) {\n          subQuery.orderBy(orderByClause.column, orderByClause.order, 'last');\n        }\n\n        // And each partition/group is created based on baseQuery.id\n        subQuery.partitionBy(`${baseQueryAlias}.id`);\n      })\n      .from(baseQuery.as(baseQueryAlias))\n      .as(partitionedQueryAlias);\n  };\n\n  // 3. Create the final resultQuery query, that select and sort the wanted data using T\n\n  const originalSelect = _.difference(\n    qb.state.select,\n    // Remove order by columns from the initial select\n    qb.state.orderBy.map(_.prop('column'))\n  )\n    // Alias everything in resultQuery\n    .map(prefix(resultQueryAlias));\n\n  resultQuery\n    .select(originalSelect)\n    // Join T to resultQuery to access sorted data\n    // Notes:\n    // - Only select the first row for each partition\n    // - Since we're applying the \"where\" statement directly on baseQuery (and not on resultQuery), we're using an inner join to avoid unwanted rows\n    .innerJoin(selectRowsAsNumberedPartitions, function () {\n      this\n        // Only select rows that are returned by T\n        .on(`${partitionedQueryAlias}.id`, `${resultQueryAlias}.id`)\n        // By only selecting the rows number equal to 1, we make sure we don't have duplicate, and that\n        // we're selecting rows in the correct order amongst the groups created by the \"partition by\"\n        .andOnVal(`${partitionedQueryAlias}.${COL_STRAPI_ROW_NUMBER}`, '=', 1);\n    });\n\n  // Re-apply pagination params\n\n  if (qb.state.limit) {\n    resultQuery.limit(qb.state.limit);\n  }\n\n  if (qb.state.offset) {\n    resultQuery.offset(qb.state.offset);\n  }\n\n  if (qb.state.first) {\n    resultQuery.first();\n  }\n\n  // Re-apply the sort using T values\n  resultQuery.orderBy([\n    // Transform \"order by\" clause to their T alias and prefix them with T alias\n    ...orderBy.map((orderByClause) => ({\n      column: prefix(partitionedQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n      order: orderByClause.order,\n    })),\n    // Add T.id to the order by clause to get consistent results in case several rows have the exact same order\n    { column: `${partitionedQueryAlias}.id`, order: 'asc' },\n  ]);\n\n  return resultQuery;\n};\n\n// Utils\nconst alias = _.curry((alias: string, value: string) => `${value} as ${alias}`);\nconst prefix = _.curry((prefix: string, value: string) => `${prefix}.${value}`);\n"],"names":["COL_STRAPI_ROW_NUMBER","COL_STRAPI_ORDER_BY_PREFIX","processOrderBy","orderBy","ctx","db","uid","qb","alias","meta","metadata","get","attributes","attribute","Error","columnName","toColumnName","column","aliasColumn","Array","isArray","flatMap","value","_","isPlainObject","Object","entries","key","direction","types","type","order","subAlias","createJoin","attributeName","target","getStrapiOrderColumnAlias","trimmedColumnName","replaceAll","wrapWithDeepSort","originalQuery","tableName","cloneDeep","state","resultQueryAlias","getAlias","aliasedTableName","mustUseAlias","resultQuery","getConnection","baseQuery","clone","baseQueryAlias","clear","select","prefix","map","orderByClause","partitionedQueryAlias","selectRowsAsNumberedPartitions","partitionedQuery","prefixedOrderBy","orderByColumns","prop","rowNumber","subQuery","partitionBy","from","as","originalSelect","difference","innerJoin","on","andOnVal","limit","offset","first","curry"],"mappings":"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"}
+{"version":3,"file":"order-by.mjs","sources":["../../../src/query/helpers/order-by.ts"],"sourcesContent":["import _ from 'lodash/fp';\nimport knex from 'knex';\n\nimport * as types from '../../utils/types';\nimport { createJoin } from './join';\nimport { toColumnName } from './transform';\n\nimport type { Ctx } from '../types';\n\ntype OrderByCtx = Ctx & { alias?: string };\ntype OrderBy = string | { [key: string]: 'asc' | 'desc' } | OrderBy[];\ntype OrderByColumnValue = { column: string; order?: 'asc' | 'desc' };\ntype OrderByRawValue = { rawExpression: 'status'; isI18n?: boolean; order?: 'asc' | 'desc' };\nexport type OrderByValue = OrderByColumnValue | OrderByRawValue;\n\nconst COL_STRAPI_ROW_NUMBER = '__strapi_row_number';\nconst COL_STRAPI_ORDER_BY_PREFIX = '__strapi_order_by';\n\n/**\n * Builds a SQL CASE expression that maps each row to a numeric status rank:\n *   0 = draft/created (no published sibling with same documentId [+ locale])\n *   1 = modified (draft updated_at > published updated_at for same documentId [+ locale])\n *   2 = published\n *\n * @param db - Database instance (used to access knex raw)\n * @param tableName - Actual DB table name (used in correlated subqueries)\n * @param tableAlias - Alias of the table in the outer query (e.g. \"t0\")\n * @param isI18n - When true, adds a locale condition to avoid cross-locale contamination\n */\nexport const buildStatusSortExpression = (\n  db: { connection: { raw: (sql: string, bindings?: unknown[]) => knex.Knex.Raw } },\n  tableName: string,\n  tableAlias: string,\n  isI18n = false\n): knex.Knex.Raw => {\n  const localeCondition = isI18n ? ` AND sub.locale = ${tableAlias}.locale` : '';\n\n  return db.connection.raw(\n    `CASE WHEN NOT EXISTS(SELECT 1 FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 0 WHEN ${tableAlias}.updated_at > (SELECT MAX(sub.updated_at) FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 1 ELSE 2 END`,\n    [tableName, tableName]\n  );\n};\n\nexport const processOrderBy = (orderBy: OrderBy, ctx: OrderByCtx): OrderByValue[] => {\n  const { db, uid, qb, alias } = ctx;\n  const meta = db.metadata.get(uid);\n  const { attributes } = meta;\n\n  if (typeof orderBy === 'string') {\n    if (orderBy === 'status') {\n      if (!attributes.publishedAt || !attributes.documentId) {\n        throw new Error(\n          `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n        );\n      }\n      const isI18n = 'locale' in attributes;\n      return [{ rawExpression: 'status' as const, isI18n, order: undefined }];\n    }\n\n    const attribute = attributes[orderBy];\n\n    if (!attribute) {\n      throw new Error(`Attribute ${orderBy} not found on model ${uid}`);\n    }\n\n    const columnName = toColumnName(meta, orderBy);\n\n    return [{ column: qb.aliasColumn(columnName, alias) }];\n  }\n\n  if (Array.isArray(orderBy)) {\n    return orderBy.flatMap((value) => processOrderBy(value, ctx));\n  }\n\n  if (_.isPlainObject(orderBy)) {\n    return Object.entries(orderBy).flatMap(([key, direction]) => {\n      const value = orderBy[key];\n\n      if (key === 'status') {\n        if (!attributes.publishedAt || !attributes.documentId) {\n          throw new Error(\n            `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n          );\n        }\n        const isI18n = 'locale' in attributes;\n        return [{ rawExpression: 'status' as const, isI18n, order: direction as 'asc' | 'desc' }];\n      }\n\n      const attribute = attributes[key];\n\n      if (!attribute) {\n        throw new Error(`Attribute ${key} not found on model ${uid}`);\n      }\n\n      if (types.isScalar(attribute.type)) {\n        const columnName = toColumnName(meta, key);\n\n        return { column: qb.aliasColumn(columnName, alias), order: direction };\n      }\n\n      if (attribute.type === 'relation' && 'target' in attribute) {\n        const subAlias = createJoin(ctx, {\n          alias: alias || qb.alias,\n          attributeName: key,\n          attribute,\n        });\n\n        return processOrderBy(value, {\n          db,\n          qb,\n          alias: subAlias,\n          uid: attribute.target,\n        });\n      }\n\n      throw new Error(`You cannot order on ${attribute.type} types`);\n    });\n  }\n\n  throw new Error('Invalid orderBy syntax');\n};\n\nexport const getStrapiOrderColumnAlias = (column: string) => {\n  const trimmedColumnName = column.replaceAll('.', '_');\n\n  return `${COL_STRAPI_ORDER_BY_PREFIX}__${trimmedColumnName}`;\n};\n\n/**\n * Wraps the original Knex query with deep sorting functionality.\n *\n * The function takes an original query and an OrderByCtx object as parameters and returns a new Knex query with deep sorting applied.\n */\nexport const wrapWithDeepSort = (originalQuery: knex.Knex.QueryBuilder, ctx: OrderByCtx) => {\n  /**\n   * Notes:\n   * - The generated query has the following flow: baseQuery (filtered unsorted data) -> T (partitioned/sorted data) --> resultQuery (distinct, paginated, sorted data)\n   * - Pagination and selection are transferred from the original query to the outer one to avoid pruning rows too early\n   * - Filtering (where) has to be done in the deepest sub query possible to avoid processing invalid rows and corrupting the final results\n   * - We assume that all necessary joins are done in the original query (`originalQuery`), and every needed column is available with the right name and alias.\n   */\n\n  const { db, qb, uid } = ctx;\n\n  const { tableName } = db.metadata.get(uid);\n\n  // The orderBy is cloned to avoid unwanted mutations of the original object\n  const orderBy = _.cloneDeep<OrderByValue[]>(qb.state.orderBy);\n\n  // Separate column-based entries from raw-expression entries (e.g. status)\n  const columnOrderBy = orderBy.filter((ob): ob is OrderByColumnValue => 'column' in ob);\n  const rawExpressionOrderBy = orderBy.filter((ob): ob is OrderByRawValue => 'rawExpression' in ob);\n\n  // 0. Init a new Knex query instance (referenced as resultQuery) using the DB connection\n  //    The connection reuse the original table name (aliased if needed)\n  const resultQueryAlias = qb.getAlias();\n  const aliasedTableName = qb.mustUseAlias() ? alias(resultQueryAlias, tableName) : tableName;\n\n  const resultQuery = db.getConnection(aliasedTableName);\n\n  // 1. Clone the original query to create the sub-query (referenced as baseQuery) and avoid any mutation on the initial object\n  const baseQuery = originalQuery.clone();\n  const baseQueryAlias = qb.getAlias();\n\n  // Clear unwanted statements from the sub-query 'baseQuery'\n  // Note: `first()` is cleared through the combination of `baseQuery.clear('limit')` and calling `baseQuery.select(...)` again\n  // Note: Those statements will be re-applied when duplicates are removed from the final selection\n  baseQuery\n    // Columns selection\n    .clear('select')\n    // Pagination and sorting\n    .clear('order')\n    .clear('limit')\n    .clear('offset');\n\n  // Override the initial select and return only the columns needed for the partitioning.\n  // Only column-based orderBy entries are included here; raw expressions are applied later.\n  baseQuery.select(\n    // Always select the row id for future manipulation\n    prefix(qb.alias, 'id'),\n    // Select every column used in an order by clause, but alias it for future reference\n    // i.e. if t2.name is present in an order by clause:\n    //      Then, \"t2.name\" will become \"t2.name as __strapi_order_by__t2_name\"\n    ...columnOrderBy.map((orderByClause) =>\n      alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)\n    )\n  );\n\n  // 2. Create a sub-query callback to extract and sort the partitions using row number\n  const partitionedQueryAlias = qb.getAlias();\n\n  const selectRowsAsNumberedPartitions = (partitionedQuery: knex.Knex.QueryBuilder) => {\n    // Transform order by clause to their alias to reference them from baseQuery\n    const prefixedOrderBy = columnOrderBy.map((orderByClause) => ({\n      column: prefix(baseQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n      order: orderByClause.order,\n    }));\n\n    // partitionedQuery select must contain every column used for sorting\n    const orderByColumns = prefixedOrderBy.map<string>(_.prop('column'));\n\n    partitionedQuery\n      .select(\n        // Always select baseQuery.id\n        prefix(baseQueryAlias, 'id'),\n        // Sort columns\n        ...orderByColumns\n      )\n      // The row number is used to assign an index to every row in every partition\n      .rowNumber(COL_STRAPI_ROW_NUMBER, (subQuery) => {\n        for (const orderByClause of prefixedOrderBy) {\n          subQuery.orderBy(orderByClause.column, orderByClause.order, 'last');\n        }\n\n        // And each partition/group is created based on baseQuery.id\n        subQuery.partitionBy(`${baseQueryAlias}.id`);\n      })\n      .from(baseQuery.as(baseQueryAlias))\n      .as(partitionedQueryAlias);\n  };\n\n  // 3. Create the final resultQuery query, that select and sort the wanted data using T\n\n  // Filter to string-only select items before diffing (Knex.Raw items are passed through as-is)\n  const stringSelect = qb.state.select.filter((s): s is string => typeof s === 'string');\n  const originalSelect = _.difference(\n    stringSelect,\n    // Remove column-based order by columns from the initial select (raw expressions are not in select)\n    columnOrderBy.map(_.prop('column'))\n  )\n    // Alias everything in resultQuery\n    .map((col) => `${resultQueryAlias}.${col}`);\n\n  resultQuery\n    .select(originalSelect)\n    // Join T to resultQuery to access sorted data\n    // Notes:\n    // - Only select the first row for each partition\n    // - Since we're applying the \"where\" statement directly on baseQuery (and not on resultQuery), we're using an inner join to avoid unwanted rows\n    .innerJoin(selectRowsAsNumberedPartitions, function () {\n      this\n        // Only select rows that are returned by T\n        .on(`${partitionedQueryAlias}.id`, `${resultQueryAlias}.id`)\n        // By only selecting the rows number equal to 1, we make sure we don't have duplicate, and that\n        // we're selecting rows in the correct order amongst the groups created by the \"partition by\"\n        .andOnVal(`${partitionedQueryAlias}.${COL_STRAPI_ROW_NUMBER}`, '=', 1);\n    });\n\n  // Re-apply pagination params\n\n  if (qb.state.limit) {\n    resultQuery.limit(qb.state.limit);\n  }\n\n  if (qb.state.offset) {\n    resultQuery.offset(qb.state.offset);\n  }\n\n  if (qb.state.first) {\n    resultQuery.first();\n  }\n\n  // Re-apply the sort using T values (column-based), then append raw expression sorts.\n  // Cast to any[] because Knex's TS types don't accept Knex.Raw in the column position,\n  // even though Knex supports it at runtime.\n  resultQuery.orderBy([\n    // Transform column-based \"order by\" clause to their T alias and prefix them with T alias\n    ...columnOrderBy.map((orderByClause) => ({\n      column: prefix(partitionedQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n      order: orderByClause.order,\n    })),\n    // Rebuild raw expression entries with the correct outer alias (resultQueryAlias)\n    ...rawExpressionOrderBy.map((entry) => ({\n      column: buildStatusSortExpression(db, tableName, resultQueryAlias, entry.isI18n),\n      order: entry.order,\n    })),\n    // Add T.id to the order by clause to get consistent results in case several rows have the exact same order\n    { column: `${partitionedQueryAlias}.id`, order: 'asc' },\n  ] as any);\n\n  return resultQuery;\n};\n\n// Utils\nconst alias = _.curry((alias: string, value: string) => `${value} as ${alias}`);\nconst prefix = _.curry((prefix: string, value: string) => `${prefix}.${value}`);\n"],"names":["COL_STRAPI_ROW_NUMBER","COL_STRAPI_ORDER_BY_PREFIX","buildStatusSortExpression","db","tableName","tableAlias","isI18n","localeCondition","connection","raw","processOrderBy","orderBy","ctx","uid","qb","alias","meta","metadata","get","attributes","publishedAt","documentId","Error","rawExpression","order","undefined","attribute","columnName","toColumnName","column","aliasColumn","Array","isArray","flatMap","value","_","isPlainObject","Object","entries","key","direction","types","type","subAlias","createJoin","attributeName","target","getStrapiOrderColumnAlias","trimmedColumnName","replaceAll","wrapWithDeepSort","originalQuery","cloneDeep","state","columnOrderBy","filter","ob","rawExpressionOrderBy","resultQueryAlias","getAlias","aliasedTableName","mustUseAlias","resultQuery","getConnection","baseQuery","clone","baseQueryAlias","clear","select","prefix","map","orderByClause","partitionedQueryAlias","selectRowsAsNumberedPartitions","partitionedQuery","prefixedOrderBy","orderByColumns","prop","rowNumber","subQuery","partitionBy","from","as","stringSelect","s","originalSelect","difference","col","innerJoin","on","andOnVal","limit","offset","first","entry","curry"],"mappings":"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"}

package/dist/query/helpers/populate/apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../../src/query/helpers/populate/apply.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AASzC,KAAK,OAAO,GAAG;IACb,EAAE,EAAE,QAAQ,CAAC;IACb,EAAE,EAAE,YAAY,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAoBF,KAAK,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAopBnC,QAAA,MAAM,aAAa,YAAmB,GAAG,EAAE,YAAY,OAAO,MAAM,EAAE,GAAG,CAAC,OAAO,OAAO,+BA+DvF,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../../src/query/helpers/populate/apply.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AASzC,KAAK,OAAO,GAAG;IACb,EAAE,EAAE,QAAQ,CAAC;IACb,EAAE,EAAE,YAAY,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAoBF,KAAK,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAqpBnC,QAAA,MAAM,aAAa,YAAmB,GAAG,EAAE,YAAY,OAAO,MAAM,EAAE,GAAG,CAAC,OAAO,OAAO,+BA+DvF,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/query/helpers/populate/apply.js

@@ -424,7 +424,7 @@ const morphToOne = async (input, ctx)=>{
     const { attribute, attributeName, results, populateValue } = input;
     const { db } = ctx;
     const { morphColumn } = attribute;
-    const { idColumn, typeColumn } = morphColumn;
+    const { idColumn, typeColumn, typeField = '__type' } = morphColumn;
     // make a map for each type what ids to return
     // make a nested map per id
     const idsByType = results.reduce((acc, result)=>{
@@ -465,7 +465,11 @@ const morphToOne = async (input, ctx)=>{
         }
         const matchingRows = map[type][id];
         const fromTargetRow = (rowOrRows)=>transform.fromRow(db.metadata.get(type), rowOrRows);
-        result[attributeName] = fromTargetRow(_.first(matchingRows));
+        const row = fromTargetRow(_.first(matchingRows));
+        result[attributeName] = row ? {
+            [typeField]: type,
+            ...row
+        } : row;
     });
 };
 //  TODO: Omit limit & offset to avoid needing a query per result to avoid making too many queries