@strapi/database 5.48.1 → 5.50.0

package/dist/migrations/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/migrations/logger.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,UAAW,MAAM,WAAW,OAAO;;;;;;;;CAiBlE,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/migrations/logger.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,GAAI,OAAO,MAAM,EAAE,SAAS,OAAO;;;;;;;;CAiBlE,CAAC"}

package/dist/migrations/storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/migrations/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,QAAQ,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,aAAa,SAAU,OAAO;2BAcV;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;6BAUd;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;;CAelD,CAAC"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/migrations/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,QAAQ,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,OAAO;2BAcV;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;6BAUd;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;;CAelD,CAAC"}

package/dist/migrations/users.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/migrations/users.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAqB,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAiCnC,eAAO,MAAM,2BAA2B,OAAQ,QAAQ,KAAG,qBAmD1D,CAAC"}
+{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/migrations/users.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAqB,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAiCnC,eAAO,MAAM,2BAA2B,GAAI,IAAI,QAAQ,KAAG,qBAmD1D,CAAC"}

package/dist/migrations/users.js

@@ -5,6 +5,10 @@ var storage = require('./storage.js');
 var common = require('./common.js');
 var logger = require('./logger.js');
 
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var fse__default = /*#__PURE__*/_interopDefault(fse);
+
 // TODO: check multiple commands in one sql statement
 const migrationResolver = ({ name, path, context })=>{
     const { db } = context;
@@ -13,7 +17,7 @@ const migrationResolver = ({ name, path, context })=>{
     }
     // if sql file run with knex raw
     if (path.match(/\.sql$/)) {
-        const sql = fse.readFileSync(path, 'utf8');
+        const sql = fse__default.default.readFileSync(path, 'utf8');
         return {
             name,
             up: common.wrapTransaction(db)((knex)=>knex.raw(sql)),
@@ -33,7 +37,7 @@ const migrationResolver = ({ name, path, context })=>{
 };
 const createUserMigrationProvider = (db)=>{
     const dir = db.config.settings.migrations.dir;
-    fse.ensureDirSync(dir);
+    fse__default.default.ensureDirSync(dir);
     const context = {
         db
     };

package/dist/migrations/users.js.map

@@ -1 +1 @@
-{"version":3,"file":"users.js","sources":["../../src/migrations/users.ts"],"sourcesContent":["import fse from 'fs-extra';\nimport type { Umzug } from 'umzug';\n\nimport { createStorage } from './storage';\nimport { wrapTransaction } from './common';\nimport { transformLogMessage } from './logger';\n\nimport type { MigrationResolver, UserMigrationProvider } from './common';\nimport type { Database } from '..';\n\n// TODO: check multiple commands in one sql statement\nconst migrationResolver: MigrationResolver = ({ name, path, context }) => {\n  const { db } = context;\n\n  if (!path) {\n    throw new Error(`Migration ${name} has no path`);\n  }\n\n  // if sql file run with knex raw\n  if (path.match(/\\.sql$/)) {\n    const sql = fse.readFileSync(path, 'utf8');\n\n    return {\n      name,\n      up: wrapTransaction(db)((knex) => knex.raw(sql)),\n      async down() {\n        throw new Error('Down migration is not supported for sql files');\n      },\n    };\n  }\n\n  // NOTE: we can add some ts register if we want to handle ts migration files at some point\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const migration = require(path);\n  return {\n    name,\n    up: wrapTransaction(db)(migration.up),\n    down: wrapTransaction(db)(migration.down),\n  };\n};\n\nexport const createUserMigrationProvider = (db: Database): UserMigrationProvider => {\n  const dir = db.config.settings.migrations.dir;\n\n  fse.ensureDirSync(dir);\n\n  const context = { db };\n\n  // Lazy: defer `umzug` (and its inquirer / @rushstack chain) until first call\n  let lazyProvider: Umzug<typeof context> | undefined;\n  const provider = (): Umzug<typeof context> => {\n    if (lazyProvider) return lazyProvider;\n    // eslint-disable-next-line @typescript-eslint/no-var-requires\n    const { Umzug: UmzugCtor } = require('umzug') as typeof import('umzug');\n    lazyProvider = new UmzugCtor({\n      storage: createStorage({ db, tableName: 'strapi_migrations' }),\n      logger: {\n        info(message) {\n          // NOTE: only log internal migration in debug mode\n          db.logger.info(transformLogMessage('info', message));\n        },\n        warn(message) {\n          db.logger.warn(transformLogMessage('warn', message));\n        },\n        error(message) {\n          db.logger.error(transformLogMessage('error', message));\n        },\n        debug(message) {\n          db.logger.debug(transformLogMessage('debug', message));\n        },\n      },\n      context,\n      migrations: {\n        glob: ['*.{js,sql}', { cwd: dir }],\n        resolve: migrationResolver,\n      },\n    });\n    return lazyProvider;\n  };\n\n  return {\n    async shouldRun() {\n      const pendingMigrations = await provider().pending();\n      return pendingMigrations.length > 0 && db.config?.settings?.runMigrations === true;\n    },\n    async up() {\n      await provider().up();\n    },\n    async down() {\n      await provider().down();\n    },\n  };\n};\n"],"names":["migrationResolver","name","path","context","db","Error","match","sql","fse","readFileSync","up","wrapTransaction","knex","raw","down","migration","require","createUserMigrationProvider","dir","config","settings","migrations","ensureDirSync","lazyProvider","provider","Umzug","UmzugCtor","storage","createStorage","tableName","logger","info","message","transformLogMessage","warn","error","debug","glob","cwd","resolve","shouldRun","pendingMigrations","pending","length","runMigrations"],"mappings":"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"}
+{"version":3,"file":"users.js","sources":["../../src/migrations/users.ts"],"sourcesContent":["import fse from 'fs-extra';\nimport type { Umzug } from 'umzug';\n\nimport { createStorage } from './storage';\nimport { wrapTransaction } from './common';\nimport { transformLogMessage } from './logger';\n\nimport type { MigrationResolver, UserMigrationProvider } from './common';\nimport type { Database } from '..';\n\n// TODO: check multiple commands in one sql statement\nconst migrationResolver: MigrationResolver = ({ name, path, context }) => {\n  const { db } = context;\n\n  if (!path) {\n    throw new Error(`Migration ${name} has no path`);\n  }\n\n  // if sql file run with knex raw\n  if (path.match(/\\.sql$/)) {\n    const sql = fse.readFileSync(path, 'utf8');\n\n    return {\n      name,\n      up: wrapTransaction(db)((knex) => knex.raw(sql)),\n      async down() {\n        throw new Error('Down migration is not supported for sql files');\n      },\n    };\n  }\n\n  // NOTE: we can add some ts register if we want to handle ts migration files at some point\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const migration = require(path);\n  return {\n    name,\n    up: wrapTransaction(db)(migration.up),\n    down: wrapTransaction(db)(migration.down),\n  };\n};\n\nexport const createUserMigrationProvider = (db: Database): UserMigrationProvider => {\n  const dir = db.config.settings.migrations.dir;\n\n  fse.ensureDirSync(dir);\n\n  const context = { db };\n\n  // Lazy: defer `umzug` (and its inquirer / @rushstack chain) until first call\n  let lazyProvider: Umzug<typeof context> | undefined;\n  const provider = (): Umzug<typeof context> => {\n    if (lazyProvider) return lazyProvider;\n    // eslint-disable-next-line @typescript-eslint/no-var-requires\n    const { Umzug: UmzugCtor } = require('umzug') as typeof import('umzug');\n    lazyProvider = new UmzugCtor({\n      storage: createStorage({ db, tableName: 'strapi_migrations' }),\n      logger: {\n        info(message) {\n          // NOTE: only log internal migration in debug mode\n          db.logger.info(transformLogMessage('info', message));\n        },\n        warn(message) {\n          db.logger.warn(transformLogMessage('warn', message));\n        },\n        error(message) {\n          db.logger.error(transformLogMessage('error', message));\n        },\n        debug(message) {\n          db.logger.debug(transformLogMessage('debug', message));\n        },\n      },\n      context,\n      migrations: {\n        glob: ['*.{js,sql}', { cwd: dir }],\n        resolve: migrationResolver,\n      },\n    });\n    return lazyProvider;\n  };\n\n  return {\n    async shouldRun() {\n      const pendingMigrations = await provider().pending();\n      return pendingMigrations.length > 0 && db.config?.settings?.runMigrations === true;\n    },\n    async up() {\n      await provider().up();\n    },\n    async down() {\n      await provider().down();\n    },\n  };\n};\n"],"names":["migrationResolver","name","path","context","db","Error","match","sql","fse","readFileSync","up","wrapTransaction","knex","raw","down","migration","require","createUserMigrationProvider","dir","config","settings","migrations","ensureDirSync","lazyProvider","provider","Umzug","UmzugCtor","storage","createStorage","tableName","logger","info","message","transformLogMessage","warn","error","debug","glob","cwd","resolve","shouldRun","pendingMigrations","pending","length","runMigrations"],"mappings":"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"}

package/dist/query/helpers/join.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../src/query/helpers/join.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,WAAW,IAAI;IACnB,MAAM,CAAC,EAAE,UAAU,GAAG,WAAW,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;CAC1C;AAED,UAAU,WAAW;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,GAAG,CAAC;CAChB;AAED,UAAU,gBAAgB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,GAAG,CAAC;IACf,UAAU,EAAE,GAAG,CAAC;CACjB;AAED,QAAA,MAAM,eAAe,QACd,GAAG,8CACoC,gBAAgB,WAuB7D,CAAC;AAEF,QAAA,MAAM,UAAU,QAAS,GAAG,iDAAiD,WAAW,WAoFvF,CAAC;AAGF,QAAA,MAAM,SAAS,OAAQ,KAAK,YAAY,QAAQ,IAAI,SA6BnD,CAAC;AAEF,QAAA,MAAM,UAAU,OAAQ,KAAK,YAAY,SAAS,IAAI,EAAE,SAEvD,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../src/query/helpers/join.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,WAAW,IAAI;IACnB,MAAM,CAAC,EAAE,UAAU,GAAG,WAAW,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;CAC1C;AAED,UAAU,WAAW;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,GAAG,CAAC;CAChB;AAED,UAAU,gBAAgB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,GAAG,CAAC;IACf,UAAU,EAAE,GAAG,CAAC;CACjB;AAED,QAAA,MAAM,eAAe,GACnB,KAAK,GAAG,EACR,4CAA4C,gBAAgB,WAuB7D,CAAC;AAEF,QAAA,MAAM,UAAU,GAAI,KAAK,GAAG,EAAE,+CAA+C,WAAW,WAoFvF,CAAC;AAGF,QAAA,MAAM,SAAS,GAAI,IAAI,IAAI,CAAC,YAAY,EAAE,MAAM,IAAI,SA6BnD,CAAC;AAEF,QAAA,MAAM,UAAU,GAAI,IAAI,IAAI,CAAC,YAAY,EAAE,OAAO,IAAI,EAAE,SAEvD,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC"}

package/dist/query/helpers/order-by.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-by.d.ts","sourceRoot":"","sources":["../../../src/query/helpers/order-by.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAMxB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,KAAK,UAAU,GAAG,GAAG,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAC3C,KAAK,OAAO,GAAG,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,CAAA;CAAE,GAAG,OAAO,EAAE,CAAC;AACtE,KAAK,kBAAkB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC;AACrE,KAAK,eAAe,GAAG;IAAE,aAAa,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC;AAC7F,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAKhE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,yBAAyB,OAChC;IAAE,UAAU,EAAE;QAAE,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,KAAK,IAAI,CAAC,GAAG,CAAA;KAAE,CAAA;CAAE,aACtE,MAAM,cACL,MAAM,uBAEjB,KAAK,IAAI,CAAC,GAOZ,CAAC;AAEF,+DAA+D;AAC/D,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpE;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAC/B,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CACxB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,uBAAuB,OAC9B,YAAY,aACL,MAAM,kBACD,MAAM,SACf,YAAY,KAClB,2BASF,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,OAAO,OAAO,UAAU,KAAG,YAAY,EA6E9E,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAAY,MAAM,WAIvD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,kBAAmB,KAAK,IAAI,CAAC,YAAY,OAAO,UAAU,qCAoJtF,CAAC"}
+{"version":3,"file":"order-by.d.ts","sourceRoot":"","sources":["../../../src/query/helpers/order-by.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAMxB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,KAAK,UAAU,GAAG,GAAG,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAC3C,KAAK,OAAO,GAAG,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,CAAA;CAAE,GAAG,OAAO,EAAE,CAAC;AACtE,KAAK,kBAAkB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC;AACrE,KAAK,eAAe,GAAG;IAAE,aAAa,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC;AAC7F,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAKhE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,yBAAyB,GACpC,IAAI;IAAE,UAAU,EAAE;QAAE,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;KAAE,CAAA;CAAE,EACjF,WAAW,MAAM,EACjB,YAAY,MAAM,EAClB,gBAAc,KACb,IAAI,CAAC,IAAI,CAAC,GAOZ,CAAC;AAEF,+DAA+D;AAC/D,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpE;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAC/B,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CACxB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,uBAAuB,GAClC,IAAI,YAAY,EAChB,WAAW,MAAM,EACjB,gBAAgB,MAAM,EACtB,OAAO,YAAY,KAClB,2BASF,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,OAAO,EAAE,KAAK,UAAU,KAAG,YAAY,EA6E9E,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,QAAQ,MAAM,WAIvD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,eAAe,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,UAAU,qCAoJtF,CAAC"}

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

@@ -5,6 +5,10 @@ var types = require('../../utils/types.js');
 var join = require('./join.js');
 var transform = require('./transform.js');
 
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var ___default = /*#__PURE__*/_interopDefault(_);
+
 const COL_STRAPI_ROW_NUMBER = '__strapi_row_number';
 const COL_STRAPI_ORDER_BY_PREFIX = '__strapi_order_by';
 /**
@@ -71,7 +75,7 @@ const processOrderBy = (orderBy, ctx)=>{
     if (Array.isArray(orderBy)) {
         return orderBy.flatMap((value)=>processOrderBy(value, ctx));
     }
-    if (_.isPlainObject(orderBy)) {
+    if (___default.default.isPlainObject(orderBy)) {
         return Object.entries(orderBy).flatMap(([key, direction])=>{
             const value = orderBy[key];
             if (key === 'status') {
@@ -134,7 +138,7 @@ const getStrapiOrderColumnAlias = (column)=>{
    */ const { db, qb, uid } = ctx;
     const { tableName } = db.metadata.get(uid);
     // The orderBy is cloned to avoid unwanted mutations of the original object
-    const orderBy = _.cloneDeep(qb.state.orderBy);
+    const orderBy = ___default.default.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);
@@ -168,7 +172,7 @@ const getStrapiOrderColumnAlias = (column)=>{
                 order: orderByClause.order
             }));
         // partitionedQuery select must contain every column used for sorting
-        const orderByColumns = prefixedOrderBy.map(_.prop('column'));
+        const orderByColumns = prefixedOrderBy.map(___default.default.prop('column'));
         partitionedQuery.select(// Always select baseQuery.id
         prefix(baseQueryAlias, 'id'), // Sort columns
         ...orderByColumns)// The row number is used to assign an index to every row in every partition
@@ -183,8 +187,8 @@ const getStrapiOrderColumnAlias = (column)=>{
     // 3. Create the final resultQuery query, that select and sort the wanted data using T
     // 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
+    const originalSelect = ___default.default.difference(stringSelect, // Remove column-based order by columns from the initial select (raw expressions are not in select)
+    columnOrderBy.map(___default.default.prop('column')))// Alias everything in resultQuery
     .map((col)=>`${resultQueryAlias}.${col}`);
     resultQuery.select(originalSelect)// Join T to resultQuery to access sorted data
     // Notes:
@@ -229,8 +233,8 @@ const getStrapiOrderColumnAlias = (column)=>{
     return resultQuery;
 };
 // Utils
-const alias = _.curry((alias, value)=>`${value} as ${alias}`);
-const prefix = _.curry((prefix, value)=>`${prefix}.${value}`);
+const alias = ___default.default.curry((alias, value)=>`${value} as ${alias}`);
+const prefix = ___default.default.curry((prefix, value)=>`${prefix}.${value}`);
 
 exports.buildStatusSortExpression = buildStatusSortExpression;
 exports.getStrapiOrderColumnAlias = getStrapiOrderColumnAlias;

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 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\n/** DB handle accepted by {@link buildStatusSortExpression}. */\ntype StatusSortDb = Parameters<typeof buildStatusSortExpression>[0];\n\n/**\n * Shape passed to Knex `orderBy` for compound ordering. Knex accepts `Knex.Raw` in the column\n * position at runtime; generated typings sometimes only list string.\n */\nexport type KnexOrderByColumnDescriptor = {\n  column: string | knex.Knex.Raw;\n  order?: 'asc' | 'desc';\n};\n\n/**\n * Maps processed {@link OrderByValue} entries to descriptors Knex can consume. Translates the\n * virtual `status` sort into a parameterized raw SQL expression.\n */\nexport const toKnexOrderByDescriptor = (\n  db: StatusSortDb,\n  tableName: string,\n  rootTableAlias: string,\n  entry: OrderByValue\n): KnexOrderByColumnDescriptor => {\n  if ('rawExpression' in entry) {\n    return {\n      column: buildStatusSortExpression(db, tableName, rootTableAlias, entry.isI18n),\n      order: entry.order,\n    };\n  }\n\n  return { column: entry.column, order: entry.order };\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","toKnexOrderByDescriptor","rootTableAlias","entry","column","order","processOrderBy","orderBy","ctx","uid","qb","alias","meta","metadata","get","attributes","publishedAt","documentId","Error","rawExpression","undefined","attribute","columnName","toColumnName","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","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\n/** DB handle accepted by {@link buildStatusSortExpression}. */\ntype StatusSortDb = Parameters<typeof buildStatusSortExpression>[0];\n\n/**\n * Shape passed to Knex `orderBy` for compound ordering. Knex accepts `Knex.Raw` in the column\n * position at runtime; generated typings sometimes only list string.\n */\nexport type KnexOrderByColumnDescriptor = {\n  column: string | knex.Knex.Raw;\n  order?: 'asc' | 'desc';\n};\n\n/**\n * Maps processed {@link OrderByValue} entries to descriptors Knex can consume. Translates the\n * virtual `status` sort into a parameterized raw SQL expression.\n */\nexport const toKnexOrderByDescriptor = (\n  db: StatusSortDb,\n  tableName: string,\n  rootTableAlias: string,\n  entry: OrderByValue\n): KnexOrderByColumnDescriptor => {\n  if ('rawExpression' in entry) {\n    return {\n      column: buildStatusSortExpression(db, tableName, rootTableAlias, entry.isI18n),\n      order: entry.order,\n    };\n  }\n\n  return { column: entry.column, order: entry.order };\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","toKnexOrderByDescriptor","rootTableAlias","entry","column","order","processOrderBy","orderBy","ctx","uid","qb","alias","meta","metadata","get","attributes","publishedAt","documentId","Error","rawExpression","undefined","attribute","columnName","toColumnName","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","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;AAyBzC,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":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AA2BzC,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;AAspBnC,QAAA,MAAM,aAAa,GAAU,SAAS,GAAG,EAAE,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,OAAO,+BA+DvF,CAAC;AAEF,eAAe,aAAa,CAAC"}

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

@@ -1,8 +1,13 @@
 'use strict';
 
 var _ = require('lodash/fp');
+var utils = require('@strapi/utils');
 var transform = require('../transform.js');
 
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var ___default = /*#__PURE__*/_interopDefault(_);
+
 // We must select the join column id, however whatever it is named will overwrite an attribute of the same name
 // Therefore, we will prefix with something unlikely to conflict with a user attribute
 // TODO: ...and completely restrict the strapi_ prefix for an attribute name in the future
@@ -12,10 +17,11 @@ const joinColPrefix = '__strapi';
  * When `populateValue.orderBy` is present, join-table ordering must not take precedence
  * over the target attribute sort (see query-builder join vs root orderBy ordering).
  */ const getJoinTableOrderBy = (populateValue, joinTable)=>{
-    if (!_.isEmpty(populateValue.orderBy) || !joinTable.orderBy) {
+    const explicitSort = populateValue.orderBy ?? populateValue.sort;
+    if (utils.hasSort(explicitSort) || !joinTable.orderBy) {
         return undefined;
     }
-    return _.mapValues((v)=>populateValue.ordering || v, joinTable.orderBy);
+    return ___default.default.mapValues((v)=>populateValue.ordering || v, joinTable.orderBy);
 };
 /**
  * Populate oneToOne and manyToOne relation
@@ -28,8 +34,8 @@ const joinColPrefix = '__strapi';
     const fromTargetRow = (rowOrRows)=>transform.fromRow(targetMeta, rowOrRows);
     if ('joinColumn' in attribute && attribute.joinColumn) {
         const { name: joinColumnName, referencedColumn: referencedColumnName } = attribute.joinColumn;
-        const referencedValues = _.uniq(results.map((r)=>r[joinColumnName]).filter((value)=>!_.isNil(value)));
-        if (_.isEmpty(referencedValues)) {
+        const referencedValues = ___default.default.uniq(results.map((r)=>r[joinColumnName]).filter((value)=>!___default.default.isNil(value)));
+        if (___default.default.isEmpty(referencedValues)) {
             results.forEach((result)=>{
                 result[attributeName] = null;
             });
@@ -40,9 +46,9 @@ const joinColPrefix = '__strapi';
         }).execute({
             mapResults: false
         });
-        const map = _.groupBy(referencedColumnName)(rows);
+        const map = ___default.default.groupBy(referencedColumnName)(rows);
         results.forEach((result)=>{
-            result[attributeName] = fromTargetRow(_.first(map[result[joinColumnName]]));
+            result[attributeName] = fromTargetRow(___default.default.first(map[result[joinColumnName]]));
         });
         return;
     }
@@ -54,9 +60,9 @@ const joinColPrefix = '__strapi';
         const joinColAlias = `${alias}.${joinColumnName}`;
         const joinColRenameAs = `${joinColPrefix}${joinColumnName}`;
         const joinColSelect = `${joinColAlias} as ${joinColRenameAs}`;
-        const referencedValues = _.uniq(results.map((r)=>r[referencedColumnName]).filter((value)=>!_.isNil(value)));
+        const referencedValues = ___default.default.uniq(results.map((r)=>r[referencedColumnName]).filter((value)=>!___default.default.isNil(value)));
         if (isCount) {
-            if (_.isEmpty(referencedValues)) {
+            if (___default.default.isEmpty(referencedValues)) {
                 results.forEach((result)=>{
                     result[attributeName] = {
                         count: 0
@@ -92,7 +98,7 @@ const joinColPrefix = '__strapi';
             });
             return;
         }
-        if (_.isEmpty(referencedValues)) {
+        if (___default.default.isEmpty(referencedValues)) {
             results.forEach((result)=>{
                 result[attributeName] = null;
             });
@@ -111,9 +117,9 @@ const joinColPrefix = '__strapi';
         }).execute({
             mapResults: false
         });
-        const map = _.groupBy(joinColRenameAs)(rows);
+        const map = ___default.default.groupBy(joinColRenameAs)(rows);
         results.forEach((result)=>{
-            result[attributeName] = fromTargetRow(_.first(map[result[referencedColumnName]]));
+            result[attributeName] = fromTargetRow(___default.default.first(map[result[referencedColumnName]]));
         });
     }
 };
@@ -123,8 +129,8 @@ const oneToMany = async (input, ctx)=>{
     const fromTargetRow = (rowOrRows)=>transform.fromRow(targetMeta, rowOrRows);
     if ('joinColumn' in attribute && attribute.joinColumn) {
         const { name: joinColumnName, referencedColumn: referencedColumnName, on } = attribute.joinColumn;
-        const referencedValues = _.uniq(results.map((r)=>r[joinColumnName]).filter((value)=>!_.isNil(value)));
-        if (_.isEmpty(referencedValues)) {
+        const referencedValues = ___default.default.uniq(results.map((r)=>r[joinColumnName]).filter((value)=>!___default.default.isNil(value)));
+        if (___default.default.isEmpty(referencedValues)) {
             results.forEach((result)=>{
                 result[attributeName] = null;
             });
@@ -139,7 +145,7 @@ const oneToMany = async (input, ctx)=>{
         }).execute({
             mapResults: false
         });
-        const map = _.groupBy(referencedColumnName)(rows);
+        const map = ___default.default.groupBy(referencedColumnName)(rows);
         results.forEach((result)=>{
             result[attributeName] = fromTargetRow(map[result[joinColumnName]] || []);
         });
@@ -153,9 +159,9 @@ const oneToMany = async (input, ctx)=>{
         const joinColAlias = `${alias}.${joinColumnName}`;
         const joinColRenameAs = `${joinColPrefix}${joinColumnName}`;
         const joinColSelect = `${joinColAlias} as ${joinColRenameAs}`;
-        const referencedValues = _.uniq(results.map((r)=>r[referencedColumnName]).filter((value)=>!_.isNil(value)));
+        const referencedValues = ___default.default.uniq(results.map((r)=>r[referencedColumnName]).filter((value)=>!___default.default.isNil(value)));
         if (isCount) {
-            if (_.isEmpty(referencedValues)) {
+            if (___default.default.isEmpty(referencedValues)) {
                 results.forEach((result)=>{
                     result[attributeName] = {
                         count: 0
@@ -191,7 +197,7 @@ const oneToMany = async (input, ctx)=>{
             });
             return;
         }
-        if (_.isEmpty(referencedValues)) {
+        if (___default.default.isEmpty(referencedValues)) {
             results.forEach((result)=>{
                 result[attributeName] = [];
             });
@@ -210,7 +216,7 @@ const oneToMany = async (input, ctx)=>{
         }).execute({
             mapResults: false
         });
-        const map = _.groupBy(joinColRenameAs)(rows);
+        const map = ___default.default.groupBy(joinColRenameAs)(rows);
         results.forEach((r)=>{
             r[attributeName] = fromTargetRow(map[r[referencedColumnName]] || []);
         });
@@ -227,9 +233,9 @@ const manyToMany = async (input, ctx)=>{
     const joinColAlias = `${alias}.${joinColumnName}`;
     const joinColRenameAs = `${joinColPrefix}${joinColumnName}`;
     const joinColSelect = `${joinColAlias} as ${joinColRenameAs}`;
-    const referencedValues = _.uniq(results.map((r)=>r[referencedColumnName]).filter((value)=>!_.isNil(value)));
+    const referencedValues = ___default.default.uniq(results.map((r)=>r[referencedColumnName]).filter((value)=>!___default.default.isNil(value)));
     if (isCount) {
-        if (_.isEmpty(referencedValues)) {
+        if (___default.default.isEmpty(referencedValues)) {
             results.forEach((result)=>{
                 result[attributeName] = {
                     count: 0
@@ -265,7 +271,7 @@ const manyToMany = async (input, ctx)=>{
         });
         return;
     }
-    if (_.isEmpty(referencedValues)) {
+    if (___default.default.isEmpty(referencedValues)) {
         results.forEach((result)=>{
             result[attributeName] = [];
         });
@@ -284,7 +290,7 @@ const manyToMany = async (input, ctx)=>{
     }).execute({
         mapResults: false
     });
-    const map = _.groupBy(joinColRenameAs)(rows);
+    const map = ___default.default.groupBy(joinColRenameAs)(rows);
     results.forEach((result)=>{
         result[attributeName] = fromTargetRow(map[result[referencedColumnName]] || []);
     });
@@ -297,8 +303,8 @@ const morphX = async (input, ctx)=>{
     const targetAttribute = db.metadata.get(target).attributes[morphBy];
     if (targetAttribute.type === 'relation' && targetAttribute.relation === 'morphToOne') {
         const { idColumn, typeColumn } = targetAttribute.morphColumn;
-        const referencedValues = _.uniq(results.map((r)=>r[idColumn.referencedColumn]).filter((value)=>!_.isNil(value)));
-        if (_.isEmpty(referencedValues)) {
+        const referencedValues = ___default.default.uniq(results.map((r)=>r[idColumn.referencedColumn]).filter((value)=>!___default.default.isNil(value)));
+        if (___default.default.isEmpty(referencedValues)) {
             results.forEach((result)=>{
                 result[attributeName] = null;
             });
@@ -311,18 +317,18 @@ const morphX = async (input, ctx)=>{
         }).execute({
             mapResults: false
         });
-        const map = _.groupBy(idColumn.name)(rows);
+        const map = ___default.default.groupBy(idColumn.name)(rows);
         results.forEach((result)=>{
             const matchingRows = map[result[idColumn.referencedColumn]];
-            const matchingValue = attribute.relation === 'morphOne' ? _.first(matchingRows) : matchingRows;
+            const matchingValue = attribute.relation === 'morphOne' ? ___default.default.first(matchingRows) : matchingRows;
             result[attributeName] = fromTargetRow(matchingValue);
         });
     } else if (targetAttribute.type === 'relation' && targetAttribute.relation === 'morphToMany') {
         const { joinTable } = targetAttribute;
         const { joinColumn, morphColumn } = joinTable;
         const { idColumn, typeColumn } = morphColumn;
-        const referencedValues = _.uniq(results.map((r)=>r[idColumn.referencedColumn]).filter((value)=>!_.isNil(value)));
-        if (_.isEmpty(referencedValues)) {
+        const referencedValues = ___default.default.uniq(results.map((r)=>r[idColumn.referencedColumn]).filter((value)=>!___default.default.isNil(value)));
+        if (___default.default.isEmpty(referencedValues)) {
             results.forEach((result)=>{
                 result[attributeName] = attribute.relation === 'morphOne' ? null : [];
             });
@@ -351,10 +357,10 @@ const morphX = async (input, ctx)=>{
         }).execute({
             mapResults: false
         });
-        const map = _.groupBy(idColumn.name)(rows);
+        const map = ___default.default.groupBy(idColumn.name)(rows);
         results.forEach((result)=>{
             const matchingRows = map[result[idColumn.referencedColumn]];
-            const matchingValue = attribute.relation === 'morphOne' ? _.first(matchingRows) : matchingRows;
+            const matchingValue = attribute.relation === 'morphOne' ? ___default.default.first(matchingRows) : matchingRows;
             result[attributeName] = fromTargetRow(matchingValue);
         });
     }
@@ -367,30 +373,27 @@ const morphToMany = async (input, ctx)=>{
     const { joinColumn, morphColumn } = joinTable;
     const { idColumn, typeColumn, typeField = '__type' } = morphColumn;
     // fetch join table to create the ids map then do the same as morphToOne without the first
-    const referencedValues = _.uniq(results.map((r)=>r[joinColumn.referencedColumn]).filter((value)=>!_.isNil(value)));
+    const referencedValues = ___default.default.uniq(results.map((r)=>r[joinColumn.referencedColumn]).filter((value)=>!___default.default.isNil(value)));
     const qb = db.entityManager.createQueryBuilder(joinTable.name);
-    const joinRows = await qb.where({
+    const joinRowsRaw = await qb.where({
         [joinColumn.name]: referencedValues,
-        ...joinTable.on || {},
-        // If the populateValue contains an "on" property,
-        // only populate the types defined in it
-        ...'on' in populateValue ? {
-            [morphColumn.typeColumn.name]: Object.keys(populateValue.on ?? {})
-        } : {}
+        ...joinTable.on || {}
     }).orderBy([
         joinColumn.name,
         'order'
     ]).execute({
         mapResults: false
     });
-    const joinMap = _.groupBy(joinColumn.name, joinRows);
+    const allowedTypes = 'on' in populateValue && populateValue.on ? new Set(Object.keys(populateValue.on)) : null;
+    const joinRows = allowedTypes ? joinRowsRaw.filter((row)=>allowedTypes.has(row[typeColumn.name])) : joinRowsRaw;
+    const joinMap = ___default.default.groupBy(joinColumn.name, joinRows);
     const idsByType = joinRows.reduce((acc, result)=>{
         const idValue = result[morphColumn.idColumn.name];
         const typeValue = result[morphColumn.typeColumn.name];
         if (!idValue || !typeValue) {
             return acc;
         }
-        if (!_.has(typeValue, acc)) {
+        if (!___default.default.has(typeValue, acc)) {
             acc[typeValue] = [];
         }
         acc[typeValue].push(idValue);
@@ -411,7 +414,7 @@ const morphToMany = async (input, ctx)=>{
         }).execute({
             mapResults: false
         });
-        map[type] = _.groupBy(idColumn.referencedColumn)(rows);
+        map[type] = ___default.default.groupBy(idColumn.referencedColumn)(rows);
     }));
     results.forEach((result)=>{
         const joinResults = joinMap[result[joinColumn.referencedColumn]] || [];
@@ -465,7 +468,7 @@ const morphToOne = async (input, ctx)=>{
         }).execute({
             mapResults: false
         });
-        map[type] = _.groupBy(idColumn.referencedColumn)(rows);
+        map[type] = ___default.default.groupBy(idColumn.referencedColumn)(rows);
     }
     results.forEach((result)=>{
         const id = result[idColumn.name];
@@ -476,7 +479,7 @@ const morphToOne = async (input, ctx)=>{
         }
         const matchingRows = map[type][id];
         const fromTargetRow = (rowOrRows)=>transform.fromRow(db.metadata.get(type), rowOrRows);
-        const row = fromTargetRow(_.first(matchingRows));
+        const row = fromTargetRow(___default.default.first(matchingRows));
         // Spread target first so a same-named user attribute cannot override the morph type UID
         result[attributeName] = row ? {
             ...row,
@@ -499,7 +502,7 @@ const pickPopulateParams = (populate)=>{
     if (populate.count !== true) {
         fieldsToPick.push('limit', 'offset');
     }
-    return _.pick(fieldsToPick, populate);
+    return ___default.default.pick(fieldsToPick, populate);
 };
 const getPopulateValue = (populate, filters)=>{
     const populateValue = {
@@ -507,8 +510,8 @@ const getPopulateValue = (populate, filters)=>{
         ...pickPopulateParams(populate)
     };
     if ('on' in populateValue) {
-        populateValue.on = _.mapValues((value)=>{
-            if (_.isPlainObject(value)) {
+        populateValue.on = ___default.default.mapValues((value)=>{
+            if (___default.default.isPlainObject(value)) {
                 value.filters = filters;
             }
             return value;
@@ -519,7 +522,7 @@ const getPopulateValue = (populate, filters)=>{
 const applyPopulate = async (results, populate, ctx)=>{
     const { db, uid, qb } = ctx;
     const meta = db.metadata.get(uid);
-    if (_.isEmpty(results)) {
+    if (___default.default.isEmpty(results)) {
         return results;
     }
     const populateAttribute = async (attributeName)=>{