@strapi/database 5.47.1 → 5.48.1

package/dist/fields/number.mjs

@@ -3,11 +3,27 @@ import Field from './field.mjs';
 
 class NumberField extends Field {
     toDB(value) {
-        const numberValue = toNumber(value);
-        if (Number.isNaN(numberValue)) {
-            throw new Error(`Expected a valid Number, got ${value}`);
+        if (value === null || value === undefined) {
+            return value;
         }
-        return numberValue;
+        if (typeof value === 'number') {
+            if (!Number.isFinite(value)) {
+                throw new Error(`Expected a valid Number, got ${value}`);
+            }
+            return value;
+        }
+        if (typeof value === 'string') {
+            const trimmedValue = value.trim();
+            if (trimmedValue.length === 0) {
+                throw new Error(`Expected a valid Number, got ${value}`);
+            }
+            const numberValue = Number(trimmedValue);
+            if (!Number.isFinite(numberValue)) {
+                throw new Error(`Expected a valid Number, got ${value}`);
+            }
+            return numberValue;
+        }
+        throw new Error(`Expected a valid Number, got ${value}`);
     }
     fromDB(value) {
         return toNumber(value);

package/dist/fields/number.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"number.mjs","sources":["../../src/fields/number.ts"],"sourcesContent":["import { toNumber } from 'lodash/fp';\nimport Field from './field';\n\nexport default class NumberField extends Field {\n  toDB(value: unknown) {\n    const numberValue = toNumber(value);\n\n    if (Number.isNaN(numberValue)) {\n      throw new Error(`Expected a valid Number, got ${value}`);\n    }\n\n    return numberValue;\n  }\n\n  fromDB(value: unknown) {\n    return toNumber(value);\n  }\n}\n"],"names":["NumberField","Field","toDB","value","numberValue","toNumber","Number","isNaN","Error","fromDB"],"mappings":";;;AAGe,MAAMA,WAAAA,SAAoBC,KAAAA,CAAAA;AACvCC,IAAAA,IAAAA,CAAKC,KAAc,EAAE;AACnB,QAAA,MAAMC,cAAcC,QAAAA,CAASF,KAAAA,CAAAA;QAE7B,IAAIG,MAAAA,CAAOC,KAAK,CAACH,WAAAA,CAAAA,EAAc;AAC7B,YAAA,MAAM,IAAII,KAAAA,CAAM,CAAC,6BAA6B,EAAEL,KAAAA,CAAAA,CAAO,CAAA;AACzD,QAAA;QAEA,OAAOC,WAAAA;AACT,IAAA;AAEAK,IAAAA,MAAAA,CAAON,KAAc,EAAE;AACrB,QAAA,OAAOE,QAAAA,CAASF,KAAAA,CAAAA;AAClB,IAAA;AACF;;;;"}
+{"version":3,"file":"number.mjs","sources":["../../src/fields/number.ts"],"sourcesContent":["import { toNumber } from 'lodash/fp';\nimport Field from './field';\n\nexport default class NumberField extends Field {\n  toDB(value: unknown) {\n    if (value === null || value === undefined) {\n      return value;\n    }\n\n    if (typeof value === 'number') {\n      if (!Number.isFinite(value)) {\n        throw new Error(`Expected a valid Number, got ${value}`);\n      }\n\n      return value;\n    }\n\n    if (typeof value === 'string') {\n      const trimmedValue = value.trim();\n\n      if (trimmedValue.length === 0) {\n        throw new Error(`Expected a valid Number, got ${value}`);\n      }\n\n      const numberValue = Number(trimmedValue);\n\n      if (!Number.isFinite(numberValue)) {\n        throw new Error(`Expected a valid Number, got ${value}`);\n      }\n\n      return numberValue;\n    }\n\n    throw new Error(`Expected a valid Number, got ${value}`);\n  }\n\n  fromDB(value: unknown) {\n    return toNumber(value);\n  }\n}\n"],"names":["NumberField","Field","toDB","value","undefined","Number","isFinite","Error","trimmedValue","trim","length","numberValue","fromDB","toNumber"],"mappings":";;;AAGe,MAAMA,WAAAA,SAAoBC,KAAAA,CAAAA;AACvCC,IAAAA,IAAAA,CAAKC,KAAc,EAAE;QACnB,IAAIA,KAAAA,KAAU,IAAA,IAAQA,KAAAA,KAAUC,SAAAA,EAAW;YACzC,OAAOD,KAAAA;AACT,QAAA;QAEA,IAAI,OAAOA,UAAU,QAAA,EAAU;AAC7B,YAAA,IAAI,CAACE,MAAAA,CAAOC,QAAQ,CAACH,KAAAA,CAAAA,EAAQ;AAC3B,gBAAA,MAAM,IAAII,KAAAA,CAAM,CAAC,6BAA6B,EAAEJ,KAAAA,CAAAA,CAAO,CAAA;AACzD,YAAA;YAEA,OAAOA,KAAAA;AACT,QAAA;QAEA,IAAI,OAAOA,UAAU,QAAA,EAAU;YAC7B,MAAMK,YAAAA,GAAeL,MAAMM,IAAI,EAAA;YAE/B,IAAID,YAAAA,CAAaE,MAAM,KAAK,CAAA,EAAG;AAC7B,gBAAA,MAAM,IAAIH,KAAAA,CAAM,CAAC,6BAA6B,EAAEJ,KAAAA,CAAAA,CAAO,CAAA;AACzD,YAAA;AAEA,YAAA,MAAMQ,cAAcN,MAAAA,CAAOG,YAAAA,CAAAA;AAE3B,YAAA,IAAI,CAACH,MAAAA,CAAOC,QAAQ,CAACK,WAAAA,CAAAA,EAAc;AACjC,gBAAA,MAAM,IAAIJ,KAAAA,CAAM,CAAC,6BAA6B,EAAEJ,KAAAA,CAAAA,CAAO,CAAA;AACzD,YAAA;YAEA,OAAOQ,WAAAA;AACT,QAAA;AAEA,QAAA,MAAM,IAAIJ,KAAAA,CAAM,CAAC,6BAA6B,EAAEJ,KAAAA,CAAAA,CAAO,CAAA;AACzD,IAAA;AAEAS,IAAAA,MAAAA,CAAOT,KAAc,EAAE;AACrB,QAAA,OAAOU,QAAAA,CAASV,KAAAA,CAAAA;AAClB,IAAA;AACF;;;;"}

package/dist/index.d.ts

@@ -42,6 +42,13 @@ declare class Database {
     }): Promise<this>;
     query(uid: string): import("./entity-manager").Repository;
     inTransaction(): boolean;
+    /**
+     * Run work inside a DB transaction. On a fulfilled callback, the transaction
+     * is committed; on rejection, it is rolled back. The callback receives Knex
+     * `commit` and `rollback` helpers: if you call `rollback` and return without
+     * throwing, the implementation avoids attempting a second `commit` on an
+     * already-finalised transactor.
+     */
     transaction(): Promise<TransactionObject>;
     transaction<TCallback extends Callback>(c: TCallback): Promise<ReturnType<TCallback>>;
     getSchemaName(): string | undefined;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAIjC,OAAO,EAAE,OAAO,EAAc,MAAM,YAAY,CAAC;AACjD,OAAO,EAAwB,cAAc,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,EAAkB,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAuB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAA4B,iBAAiB,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3F,OAAO,EAA4B,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAE3E,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAkB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAEpF,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,UAAU,QAAQ;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,CACzB,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,EACnC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CACpD,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;IACxB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAcD,cAAM,QAAQ;IACZ,UAAU,EAAE,IAAI,CAAC;IAEjB,OAAO,EAAE,OAAO,CAAC;IAEjB,MAAM,EAAE,cAAc,CAAC;IAEvB,QAAQ,EAAE,QAAQ,CAAC;IAEnB,MAAM,EAAE,cAAc,CAAC;IAEvB,UAAU,EAAE,iBAAiB,CAAC;IAE9B,UAAU,EAAE,iBAAiB,CAAC;IAE9B,aAAa,EAAE,aAAa,CAAC;IAE7B,MAAM,EAAE,aAAa,CAAC;IAEtB,MAAM,EAAE,MAAM,CAAC;gBAEH,MAAM,EAAE,cAAc;IAqD5B,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,EAAE,KAAK,EAAE,CAAA;KAAE;IA2B1C,KAAK,CAAC,GAAG,EAAE,MAAM;IAQjB,aAAa;IAIb,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IACzC,WAAW,CAAC,SAAS,SAAS,QAAQ,EAAE,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IA4CrF,aAAa,IAAI,MAAM,GAAG,SAAS;IAInC,aAAa,IAAI,IAAI;IACrB,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,YAAY;IAQpD,OAAO;;;;;IA2BP,mBAAmB,CAAC,GAAG,mBAAkB;IAKzC,YAAY,CAAC,GAAG,EAAE,MAAM;IAIlB,OAAO;CAId;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC5B,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAIjC,OAAO,EAAE,OAAO,EAAc,MAAM,YAAY,CAAC;AACjD,OAAO,EAAwB,cAAc,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,EAAkB,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAuB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAA4B,iBAAiB,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3F,OAAO,EAA4B,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAE3E,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAkB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAEpF,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,UAAU,QAAQ;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,CACzB,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,EACnC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CACpD,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;IACxB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAcD,cAAM,QAAQ;IACZ,UAAU,EAAE,IAAI,CAAC;IAEjB,OAAO,EAAE,OAAO,CAAC;IAEjB,MAAM,EAAE,cAAc,CAAC;IAEvB,QAAQ,EAAE,QAAQ,CAAC;IAEnB,MAAM,EAAE,cAAc,CAAC;IAEvB,UAAU,EAAE,iBAAiB,CAAC;IAE9B,UAAU,EAAE,iBAAiB,CAAC;IAE9B,aAAa,EAAE,aAAa,CAAC;IAE7B,MAAM,EAAE,aAAa,CAAC;IAEtB,MAAM,EAAE,MAAM,CAAC;gBAEH,MAAM,EAAE,cAAc;IAqD5B,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,EAAE,KAAK,EAAE,CAAA;KAAE;IA2B1C,KAAK,CAAC,GAAG,EAAE,MAAM;IAQjB,aAAa;IAIb;;;;;;OAMG;IACH,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IACzC,WAAW,CAAC,SAAS,SAAS,QAAQ,EAAE,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IA4CrF,aAAa,IAAI,MAAM,GAAG,SAAS;IAInC,aAAa,IAAI,IAAI;IACrB,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,YAAY;IAQpD,OAAO;;;;;IA2BP,mBAAmB,CAAC,GAAG,mBAAkB;IAKzC,YAAY,CAAC,GAAG,EAAE,MAAM;IAIlB,OAAO;CAId;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC5B,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC"}

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/index.ts"],"sourcesContent":["import type { Knex } from 'knex';\n\nimport path from 'node:path';\n\nimport { Dialect, getDialect } from './dialects';\nimport { createSchemaProvider, SchemaProvider } from './schema';\nimport { createMetadata, Metadata } from './metadata';\nimport { createEntityManager, EntityManager } from './entity-manager';\nimport { createMigrationsProvider, MigrationProvider, type Migration } from './migrations';\nimport { createLifecyclesProvider, LifecycleProvider } from './lifecycles';\nimport { createConnection } from './connection';\nimport * as errors from './errors';\nimport { Callback, transactionCtx, TransactionObject } from './transaction-context';\nimport { validateDatabase } from './validations';\nimport type { Model, JoinTable } from './types';\nimport type { Identifiers } from './utils/identifiers';\nimport { createRepairManager, type RepairManager } from './repairs';\n\nexport { isKnexQuery } from './utils/knex';\n\ninterface Settings {\n  forceMigration?: boolean;\n  runMigrations?: boolean;\n  migrations: {\n    dir: string;\n  };\n  [key: string]: unknown;\n}\n\nexport type Logger = Record<\n  'info' | 'warn' | 'error' | 'debug',\n  (message: string | Record<string, unknown>) => void\n>;\n\nexport interface DatabaseConfig {\n  connection: Knex.Config;\n  settings: Settings;\n  logger?: Logger;\n}\n\nconst afterCreate =\n  (db: Database) =>\n  (\n    nativeConnection: unknown,\n    done: (error: Error | null, nativeConnection: unknown) => Promise<void>\n  ) => {\n    // run initialize for it since commands such as postgres SET and sqlite PRAGMA are per-connection\n    db.dialect.initialize(nativeConnection).then(() => {\n      return done(null, nativeConnection);\n    });\n  };\n\nclass Database {\n  connection: Knex;\n\n  dialect: Dialect;\n\n  config: DatabaseConfig;\n\n  metadata: Metadata;\n\n  schema: SchemaProvider;\n\n  migrations: MigrationProvider;\n\n  lifecycles: LifecycleProvider;\n\n  entityManager: EntityManager;\n\n  repair: RepairManager;\n\n  logger: Logger;\n\n  constructor(config: DatabaseConfig) {\n    this.config = {\n      ...config,\n      settings: {\n        forceMigration: true,\n        runMigrations: true,\n        ...(config.settings ?? {}),\n      },\n    };\n\n    this.logger = config.logger ?? console;\n\n    this.dialect = getDialect(this);\n\n    let knexConfig: Knex.Config = this.config.connection;\n\n    // for object connections, we can configure the dialect synchronously\n    if (typeof this.config.connection.connection !== 'function') {\n      this.dialect.configure();\n    }\n    // for connection functions, we wrap it so that we can modify it with dialect configure before it reaches knex\n    else {\n      this.logger.warn(\n        'Knex connection functions are currently experimental. Attempting to access the connection object before database initialization will result in errors.'\n      );\n\n      knexConfig = {\n        ...this.config.connection,\n        connection: async () => {\n          // @ts-expect-error confirmed it was a function above\n          const conn = await this.config.connection.connection();\n          this.dialect.configure(conn);\n          return conn;\n        },\n      };\n    }\n\n    this.metadata = createMetadata([]);\n\n    this.connection = createConnection(knexConfig, {\n      pool: { afterCreate: afterCreate(this) },\n    });\n\n    this.schema = createSchemaProvider(this);\n\n    this.migrations = createMigrationsProvider(this);\n    this.lifecycles = createLifecyclesProvider(this);\n\n    this.entityManager = createEntityManager(this);\n\n    this.repair = createRepairManager(this);\n  }\n\n  async init({ models }: { models: Model[] }) {\n    if (typeof this.config.connection.connection === 'function') {\n      /*\n       * User code needs to be able to access `connection.connection` directly as if\n       * it were always an object. For a connection function, that doesn't happen\n       * until the pool is created, so we need to do that here\n       *\n       * TODO: In the next major version, we need to replace all internal code that\n       * directly references `connection.connection` prior to init, and make a breaking\n       * change that it cannot be relied on to exist before init so that we can call\n       * this feature stable.\n       */\n      this.logger.debug('Forcing Knex to make real connection to db');\n\n      // sqlite does not support connection pooling so acquireConnection doesn't work\n      if (this.config.connection.client === 'sqlite') {\n        await this.connection.raw('SELECT 1');\n      } else {\n        await this.connection.client.acquireConnection();\n      }\n    }\n\n    this.metadata.loadModels(models);\n    await validateDatabase(this);\n    return this;\n  }\n\n  query(uid: string) {\n    if (!this.metadata.has(uid)) {\n      throw new Error(`Model ${uid} not found`);\n    }\n\n    return this.entityManager.getRepository(uid);\n  }\n\n  inTransaction() {\n    return !!transactionCtx.get();\n  }\n\n  transaction(): Promise<TransactionObject>;\n  transaction<TCallback extends Callback>(c: TCallback): Promise<ReturnType<TCallback>>;\n  async transaction<TCallback extends Callback>(\n    cb?: TCallback\n  ): Promise<ReturnType<TCallback> | TransactionObject> {\n    const notNestedTransaction = !transactionCtx.get();\n    const trx = notNestedTransaction\n      ? await this.connection.transaction()\n      : (transactionCtx.get() as Knex.Transaction);\n\n    async function commit() {\n      if (notNestedTransaction) {\n        await transactionCtx.commit(trx);\n      }\n    }\n\n    async function rollback() {\n      if (notNestedTransaction) {\n        await transactionCtx.rollback(trx);\n      }\n    }\n\n    if (!cb) {\n      return { commit, rollback, get: () => trx };\n    }\n\n    return transactionCtx.run(trx, async () => {\n      try {\n        const callbackParams = {\n          trx,\n          commit,\n          rollback,\n          onCommit: transactionCtx.onCommit,\n          onRollback: transactionCtx.onRollback,\n        };\n        const res = await cb(callbackParams);\n        await commit();\n        return res;\n      } catch (error) {\n        await rollback();\n        throw error;\n      }\n    });\n  }\n\n  getSchemaName(): string | undefined {\n    return this.connection.client.connectionSettings.schema;\n  }\n\n  getConnection(): Knex;\n  getConnection(tableName?: string): Knex.QueryBuilder;\n  getConnection(tableName?: string): Knex | Knex.QueryBuilder {\n    const schema = this.getSchemaName();\n    const connection = tableName ? this.connection(tableName) : this.connection;\n    return schema ? connection.withSchema(schema) : connection;\n  }\n\n  // Returns basic info about the database connection\n  getInfo() {\n    const connectionSettings = this.connection?.client?.connectionSettings || {};\n    const client = this.dialect?.client || '';\n\n    let displayName = '';\n    let schema;\n\n    // For SQLite, get the relative filename\n    if (client === 'sqlite') {\n      const absolutePath = connectionSettings?.filename;\n      if (absolutePath) {\n        displayName = path.relative(process.cwd(), absolutePath);\n      }\n    }\n    // For other dialects, get the database name\n    else {\n      displayName = connectionSettings?.database;\n      schema = connectionSettings?.schema;\n    }\n\n    return {\n      displayName,\n      schema,\n      client,\n    };\n  }\n\n  getSchemaConnection(trx = this.connection) {\n    const schema = this.getSchemaName();\n    return schema ? trx.schema.withSchema(schema) : trx.schema;\n  }\n\n  queryBuilder(uid: string) {\n    return this.entityManager.createQueryBuilder(uid);\n  }\n\n  async destroy() {\n    await this.lifecycles.clear();\n    await this.connection.destroy();\n  }\n}\n\nexport { Database, errors };\nexport type { Model, JoinTable, Identifiers, Migration };\n"],"names":["afterCreate","db","nativeConnection","done","dialect","initialize","then","Database","init","models","config","connection","logger","debug","client","raw","acquireConnection","metadata","loadModels","validateDatabase","query","uid","has","Error","entityManager","getRepository","inTransaction","transactionCtx","get","transaction","cb","notNestedTransaction","trx","commit","rollback","run","callbackParams","onCommit","onRollback","res","error","getSchemaName","connectionSettings","schema","getConnection","tableName","withSchema","getInfo","displayName","absolutePath","filename","path","relative","process","cwd","database","getSchemaConnection","queryBuilder","createQueryBuilder","destroy","lifecycles","clear","settings","forceMigration","runMigrations","console","getDialect","knexConfig","configure","warn","conn","createMetadata","createConnection","pool","createSchemaProvider","migrations","createMigrationsProvider","createLifecyclesProvider","createEntityManager","repair","createRepairManager"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../src/index.ts"],"sourcesContent":["import type { Knex } from 'knex';\n\nimport path from 'node:path';\n\nimport { Dialect, getDialect } from './dialects';\nimport { createSchemaProvider, SchemaProvider } from './schema';\nimport { createMetadata, Metadata } from './metadata';\nimport { createEntityManager, EntityManager } from './entity-manager';\nimport { createMigrationsProvider, MigrationProvider, type Migration } from './migrations';\nimport { createLifecyclesProvider, LifecycleProvider } from './lifecycles';\nimport { createConnection } from './connection';\nimport * as errors from './errors';\nimport { Callback, transactionCtx, TransactionObject } from './transaction-context';\nimport { validateDatabase } from './validations';\nimport type { Model, JoinTable } from './types';\nimport type { Identifiers } from './utils/identifiers';\nimport { createRepairManager, type RepairManager } from './repairs';\n\nexport { isKnexQuery } from './utils/knex';\n\ninterface Settings {\n  forceMigration?: boolean;\n  runMigrations?: boolean;\n  migrations: {\n    dir: string;\n  };\n  [key: string]: unknown;\n}\n\nexport type Logger = Record<\n  'info' | 'warn' | 'error' | 'debug',\n  (message: string | Record<string, unknown>) => void\n>;\n\nexport interface DatabaseConfig {\n  connection: Knex.Config;\n  settings: Settings;\n  logger?: Logger;\n}\n\nconst afterCreate =\n  (db: Database) =>\n  (\n    nativeConnection: unknown,\n    done: (error: Error | null, nativeConnection: unknown) => Promise<void>\n  ) => {\n    // run initialize for it since commands such as postgres SET and sqlite PRAGMA are per-connection\n    db.dialect.initialize(nativeConnection).then(() => {\n      return done(null, nativeConnection);\n    });\n  };\n\nclass Database {\n  connection: Knex;\n\n  dialect: Dialect;\n\n  config: DatabaseConfig;\n\n  metadata: Metadata;\n\n  schema: SchemaProvider;\n\n  migrations: MigrationProvider;\n\n  lifecycles: LifecycleProvider;\n\n  entityManager: EntityManager;\n\n  repair: RepairManager;\n\n  logger: Logger;\n\n  constructor(config: DatabaseConfig) {\n    this.config = {\n      ...config,\n      settings: {\n        forceMigration: true,\n        runMigrations: true,\n        ...(config.settings ?? {}),\n      },\n    };\n\n    this.logger = config.logger ?? console;\n\n    this.dialect = getDialect(this);\n\n    let knexConfig: Knex.Config = this.config.connection;\n\n    // for object connections, we can configure the dialect synchronously\n    if (typeof this.config.connection.connection !== 'function') {\n      this.dialect.configure();\n    }\n    // for connection functions, we wrap it so that we can modify it with dialect configure before it reaches knex\n    else {\n      this.logger.warn(\n        'Knex connection functions are currently experimental. Attempting to access the connection object before database initialization will result in errors.'\n      );\n\n      knexConfig = {\n        ...this.config.connection,\n        connection: async () => {\n          // @ts-expect-error confirmed it was a function above\n          const conn = await this.config.connection.connection();\n          this.dialect.configure(conn);\n          return conn;\n        },\n      };\n    }\n\n    this.metadata = createMetadata([]);\n\n    this.connection = createConnection(knexConfig, {\n      pool: { afterCreate: afterCreate(this) },\n    });\n\n    this.schema = createSchemaProvider(this);\n\n    this.migrations = createMigrationsProvider(this);\n    this.lifecycles = createLifecyclesProvider(this);\n\n    this.entityManager = createEntityManager(this);\n\n    this.repair = createRepairManager(this);\n  }\n\n  async init({ models }: { models: Model[] }) {\n    if (typeof this.config.connection.connection === 'function') {\n      /*\n       * User code needs to be able to access `connection.connection` directly as if\n       * it were always an object. For a connection function, that doesn't happen\n       * until the pool is created, so we need to do that here\n       *\n       * TODO: In the next major version, we need to replace all internal code that\n       * directly references `connection.connection` prior to init, and make a breaking\n       * change that it cannot be relied on to exist before init so that we can call\n       * this feature stable.\n       */\n      this.logger.debug('Forcing Knex to make real connection to db');\n\n      // sqlite does not support connection pooling so acquireConnection doesn't work\n      if (this.config.connection.client === 'sqlite') {\n        await this.connection.raw('SELECT 1');\n      } else {\n        await this.connection.client.acquireConnection();\n      }\n    }\n\n    this.metadata.loadModels(models);\n    await validateDatabase(this);\n    return this;\n  }\n\n  query(uid: string) {\n    if (!this.metadata.has(uid)) {\n      throw new Error(`Model ${uid} not found`);\n    }\n\n    return this.entityManager.getRepository(uid);\n  }\n\n  inTransaction() {\n    return !!transactionCtx.get();\n  }\n\n  /**\n   * Run work inside a DB transaction. On a fulfilled callback, the transaction\n   * is committed; on rejection, it is rolled back. The callback receives Knex\n   * `commit` and `rollback` helpers: if you call `rollback` and return without\n   * throwing, the implementation avoids attempting a second `commit` on an\n   * already-finalised transactor.\n   */\n  transaction(): Promise<TransactionObject>;\n  transaction<TCallback extends Callback>(c: TCallback): Promise<ReturnType<TCallback>>;\n  async transaction<TCallback extends Callback>(\n    cb?: TCallback\n  ): Promise<ReturnType<TCallback> | TransactionObject> {\n    const notNestedTransaction = !transactionCtx.get();\n    const trx = notNestedTransaction\n      ? await this.connection.transaction()\n      : (transactionCtx.get() as Knex.Transaction);\n\n    async function commit() {\n      if (notNestedTransaction) {\n        await transactionCtx.commit(trx);\n      }\n    }\n\n    async function rollback() {\n      if (notNestedTransaction) {\n        await transactionCtx.rollback(trx);\n      }\n    }\n\n    if (!cb) {\n      return { commit, rollback, get: () => trx };\n    }\n\n    return transactionCtx.run(trx, async () => {\n      try {\n        const callbackParams = {\n          trx,\n          commit,\n          rollback,\n          onCommit: transactionCtx.onCommit,\n          onRollback: transactionCtx.onRollback,\n        };\n        const res = await cb(callbackParams);\n        await commit();\n        return res;\n      } catch (error) {\n        await rollback();\n        throw error;\n      }\n    });\n  }\n\n  getSchemaName(): string | undefined {\n    return this.connection.client.connectionSettings.schema;\n  }\n\n  getConnection(): Knex;\n  getConnection(tableName?: string): Knex.QueryBuilder;\n  getConnection(tableName?: string): Knex | Knex.QueryBuilder {\n    const schema = this.getSchemaName();\n    const connection = tableName ? this.connection(tableName) : this.connection;\n    return schema ? connection.withSchema(schema) : connection;\n  }\n\n  // Returns basic info about the database connection\n  getInfo() {\n    const connectionSettings = this.connection?.client?.connectionSettings || {};\n    const client = this.dialect?.client || '';\n\n    let displayName = '';\n    let schema;\n\n    // For SQLite, get the relative filename\n    if (client === 'sqlite') {\n      const absolutePath = connectionSettings?.filename;\n      if (absolutePath) {\n        displayName = path.relative(process.cwd(), absolutePath);\n      }\n    }\n    // For other dialects, get the database name\n    else {\n      displayName = connectionSettings?.database;\n      schema = connectionSettings?.schema;\n    }\n\n    return {\n      displayName,\n      schema,\n      client,\n    };\n  }\n\n  getSchemaConnection(trx = this.connection) {\n    const schema = this.getSchemaName();\n    return schema ? trx.schema.withSchema(schema) : trx.schema;\n  }\n\n  queryBuilder(uid: string) {\n    return this.entityManager.createQueryBuilder(uid);\n  }\n\n  async destroy() {\n    await this.lifecycles.clear();\n    await this.connection.destroy();\n  }\n}\n\nexport { Database, errors };\nexport type { Model, JoinTable, Identifiers, Migration };\n"],"names":["afterCreate","db","nativeConnection","done","dialect","initialize","then","Database","init","models","config","connection","logger","debug","client","raw","acquireConnection","metadata","loadModels","validateDatabase","query","uid","has","Error","entityManager","getRepository","inTransaction","transactionCtx","get","transaction","cb","notNestedTransaction","trx","commit","rollback","run","callbackParams","onCommit","onRollback","res","error","getSchemaName","connectionSettings","schema","getConnection","tableName","withSchema","getInfo","displayName","absolutePath","filename","path","relative","process","cwd","database","getSchemaConnection","queryBuilder","createQueryBuilder","destroy","lifecycles","clear","settings","forceMigration","runMigrations","console","getDialect","knexConfig","configure","warn","conn","createMetadata","createConnection","pool","createSchemaProvider","migrations","createMigrationsProvider","createLifecyclesProvider","createEntityManager","repair","createRepairManager"],"mappings":"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"}

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../src/index.ts"],"sourcesContent":["import type { Knex } from 'knex';\n\nimport path from 'node:path';\n\nimport { Dialect, getDialect } from './dialects';\nimport { createSchemaProvider, SchemaProvider } from './schema';\nimport { createMetadata, Metadata } from './metadata';\nimport { createEntityManager, EntityManager } from './entity-manager';\nimport { createMigrationsProvider, MigrationProvider, type Migration } from './migrations';\nimport { createLifecyclesProvider, LifecycleProvider } from './lifecycles';\nimport { createConnection } from './connection';\nimport * as errors from './errors';\nimport { Callback, transactionCtx, TransactionObject } from './transaction-context';\nimport { validateDatabase } from './validations';\nimport type { Model, JoinTable } from './types';\nimport type { Identifiers } from './utils/identifiers';\nimport { createRepairManager, type RepairManager } from './repairs';\n\nexport { isKnexQuery } from './utils/knex';\n\ninterface Settings {\n  forceMigration?: boolean;\n  runMigrations?: boolean;\n  migrations: {\n    dir: string;\n  };\n  [key: string]: unknown;\n}\n\nexport type Logger = Record<\n  'info' | 'warn' | 'error' | 'debug',\n  (message: string | Record<string, unknown>) => void\n>;\n\nexport interface DatabaseConfig {\n  connection: Knex.Config;\n  settings: Settings;\n  logger?: Logger;\n}\n\nconst afterCreate =\n  (db: Database) =>\n  (\n    nativeConnection: unknown,\n    done: (error: Error | null, nativeConnection: unknown) => Promise<void>\n  ) => {\n    // run initialize for it since commands such as postgres SET and sqlite PRAGMA are per-connection\n    db.dialect.initialize(nativeConnection).then(() => {\n      return done(null, nativeConnection);\n    });\n  };\n\nclass Database {\n  connection: Knex;\n\n  dialect: Dialect;\n\n  config: DatabaseConfig;\n\n  metadata: Metadata;\n\n  schema: SchemaProvider;\n\n  migrations: MigrationProvider;\n\n  lifecycles: LifecycleProvider;\n\n  entityManager: EntityManager;\n\n  repair: RepairManager;\n\n  logger: Logger;\n\n  constructor(config: DatabaseConfig) {\n    this.config = {\n      ...config,\n      settings: {\n        forceMigration: true,\n        runMigrations: true,\n        ...(config.settings ?? {}),\n      },\n    };\n\n    this.logger = config.logger ?? console;\n\n    this.dialect = getDialect(this);\n\n    let knexConfig: Knex.Config = this.config.connection;\n\n    // for object connections, we can configure the dialect synchronously\n    if (typeof this.config.connection.connection !== 'function') {\n      this.dialect.configure();\n    }\n    // for connection functions, we wrap it so that we can modify it with dialect configure before it reaches knex\n    else {\n      this.logger.warn(\n        'Knex connection functions are currently experimental. Attempting to access the connection object before database initialization will result in errors.'\n      );\n\n      knexConfig = {\n        ...this.config.connection,\n        connection: async () => {\n          // @ts-expect-error confirmed it was a function above\n          const conn = await this.config.connection.connection();\n          this.dialect.configure(conn);\n          return conn;\n        },\n      };\n    }\n\n    this.metadata = createMetadata([]);\n\n    this.connection = createConnection(knexConfig, {\n      pool: { afterCreate: afterCreate(this) },\n    });\n\n    this.schema = createSchemaProvider(this);\n\n    this.migrations = createMigrationsProvider(this);\n    this.lifecycles = createLifecyclesProvider(this);\n\n    this.entityManager = createEntityManager(this);\n\n    this.repair = createRepairManager(this);\n  }\n\n  async init({ models }: { models: Model[] }) {\n    if (typeof this.config.connection.connection === 'function') {\n      /*\n       * User code needs to be able to access `connection.connection` directly as if\n       * it were always an object. For a connection function, that doesn't happen\n       * until the pool is created, so we need to do that here\n       *\n       * TODO: In the next major version, we need to replace all internal code that\n       * directly references `connection.connection` prior to init, and make a breaking\n       * change that it cannot be relied on to exist before init so that we can call\n       * this feature stable.\n       */\n      this.logger.debug('Forcing Knex to make real connection to db');\n\n      // sqlite does not support connection pooling so acquireConnection doesn't work\n      if (this.config.connection.client === 'sqlite') {\n        await this.connection.raw('SELECT 1');\n      } else {\n        await this.connection.client.acquireConnection();\n      }\n    }\n\n    this.metadata.loadModels(models);\n    await validateDatabase(this);\n    return this;\n  }\n\n  query(uid: string) {\n    if (!this.metadata.has(uid)) {\n      throw new Error(`Model ${uid} not found`);\n    }\n\n    return this.entityManager.getRepository(uid);\n  }\n\n  inTransaction() {\n    return !!transactionCtx.get();\n  }\n\n  transaction(): Promise<TransactionObject>;\n  transaction<TCallback extends Callback>(c: TCallback): Promise<ReturnType<TCallback>>;\n  async transaction<TCallback extends Callback>(\n    cb?: TCallback\n  ): Promise<ReturnType<TCallback> | TransactionObject> {\n    const notNestedTransaction = !transactionCtx.get();\n    const trx = notNestedTransaction\n      ? await this.connection.transaction()\n      : (transactionCtx.get() as Knex.Transaction);\n\n    async function commit() {\n      if (notNestedTransaction) {\n        await transactionCtx.commit(trx);\n      }\n    }\n\n    async function rollback() {\n      if (notNestedTransaction) {\n        await transactionCtx.rollback(trx);\n      }\n    }\n\n    if (!cb) {\n      return { commit, rollback, get: () => trx };\n    }\n\n    return transactionCtx.run(trx, async () => {\n      try {\n        const callbackParams = {\n          trx,\n          commit,\n          rollback,\n          onCommit: transactionCtx.onCommit,\n          onRollback: transactionCtx.onRollback,\n        };\n        const res = await cb(callbackParams);\n        await commit();\n        return res;\n      } catch (error) {\n        await rollback();\n        throw error;\n      }\n    });\n  }\n\n  getSchemaName(): string | undefined {\n    return this.connection.client.connectionSettings.schema;\n  }\n\n  getConnection(): Knex;\n  getConnection(tableName?: string): Knex.QueryBuilder;\n  getConnection(tableName?: string): Knex | Knex.QueryBuilder {\n    const schema = this.getSchemaName();\n    const connection = tableName ? this.connection(tableName) : this.connection;\n    return schema ? connection.withSchema(schema) : connection;\n  }\n\n  // Returns basic info about the database connection\n  getInfo() {\n    const connectionSettings = this.connection?.client?.connectionSettings || {};\n    const client = this.dialect?.client || '';\n\n    let displayName = '';\n    let schema;\n\n    // For SQLite, get the relative filename\n    if (client === 'sqlite') {\n      const absolutePath = connectionSettings?.filename;\n      if (absolutePath) {\n        displayName = path.relative(process.cwd(), absolutePath);\n      }\n    }\n    // For other dialects, get the database name\n    else {\n      displayName = connectionSettings?.database;\n      schema = connectionSettings?.schema;\n    }\n\n    return {\n      displayName,\n      schema,\n      client,\n    };\n  }\n\n  getSchemaConnection(trx = this.connection) {\n    const schema = this.getSchemaName();\n    return schema ? trx.schema.withSchema(schema) : trx.schema;\n  }\n\n  queryBuilder(uid: string) {\n    return this.entityManager.createQueryBuilder(uid);\n  }\n\n  async destroy() {\n    await this.lifecycles.clear();\n    await this.connection.destroy();\n  }\n}\n\nexport { Database, errors };\nexport type { Model, JoinTable, Identifiers, Migration };\n"],"names":["afterCreate","db","nativeConnection","done","dialect","initialize","then","Database","init","models","config","connection","logger","debug","client","raw","acquireConnection","metadata","loadModels","validateDatabase","query","uid","has","Error","entityManager","getRepository","inTransaction","transactionCtx","get","transaction","cb","notNestedTransaction","trx","commit","rollback","run","callbackParams","onCommit","onRollback","res","error","getSchemaName","connectionSettings","schema","getConnection","tableName","withSchema","getInfo","displayName","absolutePath","filename","path","relative","process","cwd","database","getSchemaConnection","queryBuilder","createQueryBuilder","destroy","lifecycles","clear","settings","forceMigration","runMigrations","console","getDialect","knexConfig","configure","warn","conn","createMetadata","createConnection","pool","createSchemaProvider","migrations","createMigrationsProvider","createLifecyclesProvider","createEntityManager","repair","createRepairManager"],"mappings":"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"}
+{"version":3,"file":"index.mjs","sources":["../src/index.ts"],"sourcesContent":["import type { Knex } from 'knex';\n\nimport path from 'node:path';\n\nimport { Dialect, getDialect } from './dialects';\nimport { createSchemaProvider, SchemaProvider } from './schema';\nimport { createMetadata, Metadata } from './metadata';\nimport { createEntityManager, EntityManager } from './entity-manager';\nimport { createMigrationsProvider, MigrationProvider, type Migration } from './migrations';\nimport { createLifecyclesProvider, LifecycleProvider } from './lifecycles';\nimport { createConnection } from './connection';\nimport * as errors from './errors';\nimport { Callback, transactionCtx, TransactionObject } from './transaction-context';\nimport { validateDatabase } from './validations';\nimport type { Model, JoinTable } from './types';\nimport type { Identifiers } from './utils/identifiers';\nimport { createRepairManager, type RepairManager } from './repairs';\n\nexport { isKnexQuery } from './utils/knex';\n\ninterface Settings {\n  forceMigration?: boolean;\n  runMigrations?: boolean;\n  migrations: {\n    dir: string;\n  };\n  [key: string]: unknown;\n}\n\nexport type Logger = Record<\n  'info' | 'warn' | 'error' | 'debug',\n  (message: string | Record<string, unknown>) => void\n>;\n\nexport interface DatabaseConfig {\n  connection: Knex.Config;\n  settings: Settings;\n  logger?: Logger;\n}\n\nconst afterCreate =\n  (db: Database) =>\n  (\n    nativeConnection: unknown,\n    done: (error: Error | null, nativeConnection: unknown) => Promise<void>\n  ) => {\n    // run initialize for it since commands such as postgres SET and sqlite PRAGMA are per-connection\n    db.dialect.initialize(nativeConnection).then(() => {\n      return done(null, nativeConnection);\n    });\n  };\n\nclass Database {\n  connection: Knex;\n\n  dialect: Dialect;\n\n  config: DatabaseConfig;\n\n  metadata: Metadata;\n\n  schema: SchemaProvider;\n\n  migrations: MigrationProvider;\n\n  lifecycles: LifecycleProvider;\n\n  entityManager: EntityManager;\n\n  repair: RepairManager;\n\n  logger: Logger;\n\n  constructor(config: DatabaseConfig) {\n    this.config = {\n      ...config,\n      settings: {\n        forceMigration: true,\n        runMigrations: true,\n        ...(config.settings ?? {}),\n      },\n    };\n\n    this.logger = config.logger ?? console;\n\n    this.dialect = getDialect(this);\n\n    let knexConfig: Knex.Config = this.config.connection;\n\n    // for object connections, we can configure the dialect synchronously\n    if (typeof this.config.connection.connection !== 'function') {\n      this.dialect.configure();\n    }\n    // for connection functions, we wrap it so that we can modify it with dialect configure before it reaches knex\n    else {\n      this.logger.warn(\n        'Knex connection functions are currently experimental. Attempting to access the connection object before database initialization will result in errors.'\n      );\n\n      knexConfig = {\n        ...this.config.connection,\n        connection: async () => {\n          // @ts-expect-error confirmed it was a function above\n          const conn = await this.config.connection.connection();\n          this.dialect.configure(conn);\n          return conn;\n        },\n      };\n    }\n\n    this.metadata = createMetadata([]);\n\n    this.connection = createConnection(knexConfig, {\n      pool: { afterCreate: afterCreate(this) },\n    });\n\n    this.schema = createSchemaProvider(this);\n\n    this.migrations = createMigrationsProvider(this);\n    this.lifecycles = createLifecyclesProvider(this);\n\n    this.entityManager = createEntityManager(this);\n\n    this.repair = createRepairManager(this);\n  }\n\n  async init({ models }: { models: Model[] }) {\n    if (typeof this.config.connection.connection === 'function') {\n      /*\n       * User code needs to be able to access `connection.connection` directly as if\n       * it were always an object. For a connection function, that doesn't happen\n       * until the pool is created, so we need to do that here\n       *\n       * TODO: In the next major version, we need to replace all internal code that\n       * directly references `connection.connection` prior to init, and make a breaking\n       * change that it cannot be relied on to exist before init so that we can call\n       * this feature stable.\n       */\n      this.logger.debug('Forcing Knex to make real connection to db');\n\n      // sqlite does not support connection pooling so acquireConnection doesn't work\n      if (this.config.connection.client === 'sqlite') {\n        await this.connection.raw('SELECT 1');\n      } else {\n        await this.connection.client.acquireConnection();\n      }\n    }\n\n    this.metadata.loadModels(models);\n    await validateDatabase(this);\n    return this;\n  }\n\n  query(uid: string) {\n    if (!this.metadata.has(uid)) {\n      throw new Error(`Model ${uid} not found`);\n    }\n\n    return this.entityManager.getRepository(uid);\n  }\n\n  inTransaction() {\n    return !!transactionCtx.get();\n  }\n\n  /**\n   * Run work inside a DB transaction. On a fulfilled callback, the transaction\n   * is committed; on rejection, it is rolled back. The callback receives Knex\n   * `commit` and `rollback` helpers: if you call `rollback` and return without\n   * throwing, the implementation avoids attempting a second `commit` on an\n   * already-finalised transactor.\n   */\n  transaction(): Promise<TransactionObject>;\n  transaction<TCallback extends Callback>(c: TCallback): Promise<ReturnType<TCallback>>;\n  async transaction<TCallback extends Callback>(\n    cb?: TCallback\n  ): Promise<ReturnType<TCallback> | TransactionObject> {\n    const notNestedTransaction = !transactionCtx.get();\n    const trx = notNestedTransaction\n      ? await this.connection.transaction()\n      : (transactionCtx.get() as Knex.Transaction);\n\n    async function commit() {\n      if (notNestedTransaction) {\n        await transactionCtx.commit(trx);\n      }\n    }\n\n    async function rollback() {\n      if (notNestedTransaction) {\n        await transactionCtx.rollback(trx);\n      }\n    }\n\n    if (!cb) {\n      return { commit, rollback, get: () => trx };\n    }\n\n    return transactionCtx.run(trx, async () => {\n      try {\n        const callbackParams = {\n          trx,\n          commit,\n          rollback,\n          onCommit: transactionCtx.onCommit,\n          onRollback: transactionCtx.onRollback,\n        };\n        const res = await cb(callbackParams);\n        await commit();\n        return res;\n      } catch (error) {\n        await rollback();\n        throw error;\n      }\n    });\n  }\n\n  getSchemaName(): string | undefined {\n    return this.connection.client.connectionSettings.schema;\n  }\n\n  getConnection(): Knex;\n  getConnection(tableName?: string): Knex.QueryBuilder;\n  getConnection(tableName?: string): Knex | Knex.QueryBuilder {\n    const schema = this.getSchemaName();\n    const connection = tableName ? this.connection(tableName) : this.connection;\n    return schema ? connection.withSchema(schema) : connection;\n  }\n\n  // Returns basic info about the database connection\n  getInfo() {\n    const connectionSettings = this.connection?.client?.connectionSettings || {};\n    const client = this.dialect?.client || '';\n\n    let displayName = '';\n    let schema;\n\n    // For SQLite, get the relative filename\n    if (client === 'sqlite') {\n      const absolutePath = connectionSettings?.filename;\n      if (absolutePath) {\n        displayName = path.relative(process.cwd(), absolutePath);\n      }\n    }\n    // For other dialects, get the database name\n    else {\n      displayName = connectionSettings?.database;\n      schema = connectionSettings?.schema;\n    }\n\n    return {\n      displayName,\n      schema,\n      client,\n    };\n  }\n\n  getSchemaConnection(trx = this.connection) {\n    const schema = this.getSchemaName();\n    return schema ? trx.schema.withSchema(schema) : trx.schema;\n  }\n\n  queryBuilder(uid: string) {\n    return this.entityManager.createQueryBuilder(uid);\n  }\n\n  async destroy() {\n    await this.lifecycles.clear();\n    await this.connection.destroy();\n  }\n}\n\nexport { Database, errors };\nexport type { Model, JoinTable, Identifiers, Migration };\n"],"names":["afterCreate","db","nativeConnection","done","dialect","initialize","then","Database","init","models","config","connection","logger","debug","client","raw","acquireConnection","metadata","loadModels","validateDatabase","query","uid","has","Error","entityManager","getRepository","inTransaction","transactionCtx","get","transaction","cb","notNestedTransaction","trx","commit","rollback","run","callbackParams","onCommit","onRollback","res","error","getSchemaName","connectionSettings","schema","getConnection","tableName","withSchema","getInfo","displayName","absolutePath","filename","path","relative","process","cwd","database","getSchemaConnection","queryBuilder","createQueryBuilder","destroy","lifecycles","clear","settings","forceMigration","runMigrations","console","getDialect","knexConfig","configure","warn","conn","createMetadata","createConnection","pool","createSchemaProvider","migrations","createMigrationsProvider","createLifecyclesProvider","createEntityManager","repair","createRepairManager"],"mappings":"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"}

package/dist/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.d.ts

@@ -1,3 +1,8 @@
 import type { Migration } from '../common';
+/**
+ * Previously created secondary indexes on `document_id` (and composites) via raw DDL.
+ * Those indexes are now owned by schema sync from model metadata (see transform-content-types-to-models).
+ * Keep this migration as a stable no-op so Umzug / `strapi_migrations_internal` stay consistent.
+ */
 export declare const addDocumentIdIndexes: Migration;
 //# sourceMappingURL=5.0.0-06-add-document-id-indexes.d.ts.map

package/dist/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"5.0.0-06-add-document-id-indexes.d.ts","sourceRoot":"","sources":["../../../src/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAgE3C,eAAO,MAAM,oBAAoB,EAAE,SAelC,CAAC"}
+{"version":3,"file":"5.0.0-06-add-document-id-indexes.d.ts","sourceRoot":"","sources":["../../../src/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C;;;;GAIG;AAEH,eAAO,MAAM,oBAAoB,EAAE,SAQlC,CAAC"}

package/dist/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.js

@@ -1,64 +1,13 @@
 'use strict';
 
-// Add an index if it does not already exist
-const createIndex = async (knex, tableName, columns, indexName)=>{
-    try {
-        // If the database can check for indexes, avoid duplicates
-        const hasIndex = knex.schema.hasIndex;
-        if (hasIndex) {
-            const exists = await hasIndex.call(knex.schema, tableName, indexName);
-            if (exists) {
-                return;
-            }
-        }
-        await knex.schema.alterTable(tableName, (table)=>{
-            table.index(columns, indexName);
-        });
-    } catch (error) {
-    // If the index exists (or cannot be created), move on
-    }
-};
-const addIndexesForTable = async (knex, tableName)=>{
-    // Only add indexes when the column is present
-    const hasDocumentId = await knex.schema.hasColumn(tableName, 'document_id');
-    if (!hasDocumentId) {
-        return;
-    }
-    const hasLocale = await knex.schema.hasColumn(tableName, 'locale');
-    const hasPublishedAt = await knex.schema.hasColumn(tableName, 'published_at');
-    // Single column index for basic lookups
-    await createIndex(knex, tableName, [
-        'document_id'
-    ], `${tableName}_document_id_idx`);
-    if (hasLocale && hasPublishedAt) {
-        // Composite index for common filters
-        await createIndex(knex, tableName, [
-            'document_id',
-            'locale',
-            'published_at'
-        ], `${tableName}_document_id_locale_published_at_idx`);
-    } else if (hasLocale) {
-        await createIndex(knex, tableName, [
-            'document_id',
-            'locale'
-        ], `${tableName}_document_id_locale_idx`);
-    } else if (hasPublishedAt) {
-        await createIndex(knex, tableName, [
-            'document_id',
-            'published_at'
-        ], `${tableName}_document_id_published_at_idx`);
-    }
-};
-const addDocumentIdIndexes = {
+/**
+ * Previously created secondary indexes on `document_id` (and composites) via raw DDL.
+ * Those indexes are now owned by schema sync from model metadata (see transform-content-types-to-models).
+ * Keep this migration as a stable no-op so Umzug / `strapi_migrations_internal` stay consistent.
+ */ const addDocumentIdIndexes = {
     name: '5.0.0-06-add-document-id-indexes',
-    async up (knex, db) {
-        for (const meta of db.metadata.values()){
-            const hasTable = await knex.schema.hasTable(meta.tableName);
-            if (!hasTable) {
-                continue;
-            }
-            await addIndexesForTable(knex, meta.tableName);
-        }
+    async up () {
+    // No-op: the document_id indexes are now created by schema sync (see transform-content-types-to-models).
     },
     async down () {
         throw new Error('not implemented');

package/dist/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.js.map

@@ -1 +1 @@
-{"version":3,"file":"5.0.0-06-add-document-id-indexes.js","sources":["../../../src/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.ts"],"sourcesContent":["import type { Knex } from 'knex';\n\nimport type { Migration } from '../common';\n\n// Add an index if it does not already exist\nconst createIndex = async (knex: Knex, tableName: string, columns: string[], indexName: string) => {\n  try {\n    // If the database can check for indexes, avoid duplicates\n    const hasIndex = (\n      knex.schema as unknown as {\n        hasIndex?: (tableName: string, indexName: string) => Promise<boolean>;\n      }\n    ).hasIndex;\n    if (hasIndex) {\n      const exists = await hasIndex.call(knex.schema, tableName, indexName);\n      if (exists) {\n        return;\n      }\n    }\n\n    await knex.schema.alterTable(tableName, (table) => {\n      table.index(columns, indexName);\n    });\n  } catch (error) {\n    // If the index exists (or cannot be created), move on\n  }\n};\n\nconst addIndexesForTable = async (knex: Knex, tableName: string) => {\n  // Only add indexes when the column is present\n  const hasDocumentId = await knex.schema.hasColumn(tableName, 'document_id');\n  if (!hasDocumentId) {\n    return;\n  }\n\n  const hasLocale = await knex.schema.hasColumn(tableName, 'locale');\n  const hasPublishedAt = await knex.schema.hasColumn(tableName, 'published_at');\n\n  // Single column index for basic lookups\n  await createIndex(knex, tableName, ['document_id'], `${tableName}_document_id_idx`);\n\n  if (hasLocale && hasPublishedAt) {\n    // Composite index for common filters\n    await createIndex(\n      knex,\n      tableName,\n      ['document_id', 'locale', 'published_at'],\n      `${tableName}_document_id_locale_published_at_idx`\n    );\n  } else if (hasLocale) {\n    await createIndex(\n      knex,\n      tableName,\n      ['document_id', 'locale'],\n      `${tableName}_document_id_locale_idx`\n    );\n  } else if (hasPublishedAt) {\n    await createIndex(\n      knex,\n      tableName,\n      ['document_id', 'published_at'],\n      `${tableName}_document_id_published_at_idx`\n    );\n  }\n};\n\nexport const addDocumentIdIndexes: Migration = {\n  name: '5.0.0-06-add-document-id-indexes',\n  async up(knex, db) {\n    for (const meta of db.metadata.values()) {\n      const hasTable = await knex.schema.hasTable(meta.tableName);\n      if (!hasTable) {\n        continue;\n      }\n\n      await addIndexesForTable(knex, meta.tableName);\n    }\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["createIndex","knex","tableName","columns","indexName","hasIndex","schema","exists","call","alterTable","table","index","error","addIndexesForTable","hasDocumentId","hasColumn","hasLocale","hasPublishedAt","addDocumentIdIndexes","name","up","db","meta","metadata","values","hasTable","down","Error"],"mappings":";;AAIA;AACA,MAAMA,WAAAA,GAAc,OAAOC,IAAAA,EAAYC,SAAAA,EAAmBC,OAAAA,EAAmBC,SAAAA,GAAAA;IAC3E,IAAI;;AAEF,QAAA,MAAMC,QAAAA,GACJJ,IAAAA,CAAKK,MAAM,CAGXD,QAAQ;AACV,QAAA,IAAIA,QAAAA,EAAU;YACZ,MAAME,MAAAA,GAAS,MAAMF,QAAAA,CAASG,IAAI,CAACP,IAAAA,CAAKK,MAAM,EAAEJ,SAAAA,EAAWE,SAAAA,CAAAA;AAC3D,YAAA,IAAIG,MAAAA,EAAQ;AACV,gBAAA;AACF,YAAA;AACF,QAAA;AAEA,QAAA,MAAMN,KAAKK,MAAM,CAACG,UAAU,CAACP,WAAW,CAACQ,KAAAA,GAAAA;YACvCA,KAAAA,CAAMC,KAAK,CAACR,OAAAA,EAASC,SAAAA,CAAAA;AACvB,QAAA,CAAA,CAAA;AACF,IAAA,CAAA,CAAE,OAAOQ,KAAAA,EAAO;;AAEhB,IAAA;AACF,CAAA;AAEA,MAAMC,kBAAAA,GAAqB,OAAOZ,IAAAA,EAAYC,SAAAA,GAAAA;;AAE5C,IAAA,MAAMY,gBAAgB,MAAMb,IAAAA,CAAKK,MAAM,CAACS,SAAS,CAACb,SAAAA,EAAW,aAAA,CAAA;AAC7D,IAAA,IAAI,CAACY,aAAAA,EAAe;AAClB,QAAA;AACF,IAAA;AAEA,IAAA,MAAME,YAAY,MAAMf,IAAAA,CAAKK,MAAM,CAACS,SAAS,CAACb,SAAAA,EAAW,QAAA,CAAA;AACzD,IAAA,MAAMe,iBAAiB,MAAMhB,IAAAA,CAAKK,MAAM,CAACS,SAAS,CAACb,SAAAA,EAAW,cAAA,CAAA;;IAG9D,MAAMF,WAAAA,CAAYC,MAAMC,SAAAA,EAAW;AAAC,QAAA;KAAc,EAAE,CAAA,EAAGA,SAAAA,CAAU,gBAAgB,CAAC,CAAA;AAElF,IAAA,IAAIc,aAAaC,cAAAA,EAAgB;;QAE/B,MAAMjB,WAAAA,CACJC,MACAC,SAAAA,EACA;AAAC,YAAA,aAAA;AAAe,YAAA,QAAA;AAAU,YAAA;SAAe,EACzC,CAAA,EAAGA,SAAAA,CAAU,oCAAoC,CAAC,CAAA;AAEtD,IAAA,CAAA,MAAO,IAAIc,SAAAA,EAAW;QACpB,MAAMhB,WAAAA,CACJC,MACAC,SAAAA,EACA;AAAC,YAAA,aAAA;AAAe,YAAA;SAAS,EACzB,CAAA,EAAGA,SAAAA,CAAU,uBAAuB,CAAC,CAAA;AAEzC,IAAA,CAAA,MAAO,IAAIe,cAAAA,EAAgB;QACzB,MAAMjB,WAAAA,CACJC,MACAC,SAAAA,EACA;AAAC,YAAA,aAAA;AAAe,YAAA;SAAe,EAC/B,CAAA,EAAGA,SAAAA,CAAU,6BAA6B,CAAC,CAAA;AAE/C,IAAA;AACF,CAAA;MAEagB,oBAAAA,GAAkC;IAC7CC,IAAAA,EAAM,kCAAA;IACN,MAAMC,EAAAA,CAAAA,CAAGnB,IAAI,EAAEoB,EAAE,EAAA;AACf,QAAA,KAAK,MAAMC,IAAAA,IAAQD,EAAAA,CAAGE,QAAQ,CAACC,MAAM,EAAA,CAAI;YACvC,MAAMC,QAAAA,GAAW,MAAMxB,IAAAA,CAAKK,MAAM,CAACmB,QAAQ,CAACH,KAAKpB,SAAS,CAAA;AAC1D,YAAA,IAAI,CAACuB,QAAAA,EAAU;AACb,gBAAA;AACF,YAAA;YAEA,MAAMZ,kBAAAA,CAAmBZ,IAAAA,EAAMqB,IAAAA,CAAKpB,SAAS,CAAA;AAC/C,QAAA;AACF,IAAA,CAAA;IACA,MAAMwB,IAAAA,CAAAA,GAAAA;AACJ,QAAA,MAAM,IAAIC,KAAAA,CAAM,iBAAA,CAAA;AAClB,IAAA;AACF;;;;"}
+{"version":3,"file":"5.0.0-06-add-document-id-indexes.js","sources":["../../../src/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.ts"],"sourcesContent":["import type { Migration } from '../common';\n\n/**\n * Previously created secondary indexes on `document_id` (and composites) via raw DDL.\n * Those indexes are now owned by schema sync from model metadata (see transform-content-types-to-models).\n * Keep this migration as a stable no-op so Umzug / `strapi_migrations_internal` stay consistent.\n */\n\nexport const addDocumentIdIndexes: Migration = {\n  name: '5.0.0-06-add-document-id-indexes',\n  async up() {\n    // No-op: the document_id indexes are now created by schema sync (see transform-content-types-to-models).\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["addDocumentIdIndexes","name","up","down","Error"],"mappings":";;AAEA;;;;UAMaA,oBAAAA,GAAkC;IAC7CC,IAAAA,EAAM,kCAAA;IACN,MAAMC,EAAAA,CAAAA,GAAAA;;AAEN,IAAA,CAAA;IACA,MAAMC,IAAAA,CAAAA,GAAAA;AACJ,QAAA,MAAM,IAAIC,KAAAA,CAAM,iBAAA,CAAA;AAClB,IAAA;AACF;;;;"}

package/dist/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.mjs

@@ -1,62 +1,11 @@
-// Add an index if it does not already exist
-const createIndex = async (knex, tableName, columns, indexName)=>{
-    try {
-        // If the database can check for indexes, avoid duplicates
-        const hasIndex = knex.schema.hasIndex;
-        if (hasIndex) {
-            const exists = await hasIndex.call(knex.schema, tableName, indexName);
-            if (exists) {
-                return;
-            }
-        }
-        await knex.schema.alterTable(tableName, (table)=>{
-            table.index(columns, indexName);
-        });
-    } catch (error) {
-    // If the index exists (or cannot be created), move on
-    }
-};
-const addIndexesForTable = async (knex, tableName)=>{
-    // Only add indexes when the column is present
-    const hasDocumentId = await knex.schema.hasColumn(tableName, 'document_id');
-    if (!hasDocumentId) {
-        return;
-    }
-    const hasLocale = await knex.schema.hasColumn(tableName, 'locale');
-    const hasPublishedAt = await knex.schema.hasColumn(tableName, 'published_at');
-    // Single column index for basic lookups
-    await createIndex(knex, tableName, [
-        'document_id'
-    ], `${tableName}_document_id_idx`);
-    if (hasLocale && hasPublishedAt) {
-        // Composite index for common filters
-        await createIndex(knex, tableName, [
-            'document_id',
-            'locale',
-            'published_at'
-        ], `${tableName}_document_id_locale_published_at_idx`);
-    } else if (hasLocale) {
-        await createIndex(knex, tableName, [
-            'document_id',
-            'locale'
-        ], `${tableName}_document_id_locale_idx`);
-    } else if (hasPublishedAt) {
-        await createIndex(knex, tableName, [
-            'document_id',
-            'published_at'
-        ], `${tableName}_document_id_published_at_idx`);
-    }
-};
-const addDocumentIdIndexes = {
+/**
+ * Previously created secondary indexes on `document_id` (and composites) via raw DDL.
+ * Those indexes are now owned by schema sync from model metadata (see transform-content-types-to-models).
+ * Keep this migration as a stable no-op so Umzug / `strapi_migrations_internal` stay consistent.
+ */ const addDocumentIdIndexes = {
     name: '5.0.0-06-add-document-id-indexes',
-    async up (knex, db) {
-        for (const meta of db.metadata.values()){
-            const hasTable = await knex.schema.hasTable(meta.tableName);
-            if (!hasTable) {
-                continue;
-            }
-            await addIndexesForTable(knex, meta.tableName);
-        }
+    async up () {
+    // No-op: the document_id indexes are now created by schema sync (see transform-content-types-to-models).
     },
     async down () {
         throw new Error('not implemented');

package/dist/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"5.0.0-06-add-document-id-indexes.mjs","sources":["../../../src/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.ts"],"sourcesContent":["import type { Knex } from 'knex';\n\nimport type { Migration } from '../common';\n\n// Add an index if it does not already exist\nconst createIndex = async (knex: Knex, tableName: string, columns: string[], indexName: string) => {\n  try {\n    // If the database can check for indexes, avoid duplicates\n    const hasIndex = (\n      knex.schema as unknown as {\n        hasIndex?: (tableName: string, indexName: string) => Promise<boolean>;\n      }\n    ).hasIndex;\n    if (hasIndex) {\n      const exists = await hasIndex.call(knex.schema, tableName, indexName);\n      if (exists) {\n        return;\n      }\n    }\n\n    await knex.schema.alterTable(tableName, (table) => {\n      table.index(columns, indexName);\n    });\n  } catch (error) {\n    // If the index exists (or cannot be created), move on\n  }\n};\n\nconst addIndexesForTable = async (knex: Knex, tableName: string) => {\n  // Only add indexes when the column is present\n  const hasDocumentId = await knex.schema.hasColumn(tableName, 'document_id');\n  if (!hasDocumentId) {\n    return;\n  }\n\n  const hasLocale = await knex.schema.hasColumn(tableName, 'locale');\n  const hasPublishedAt = await knex.schema.hasColumn(tableName, 'published_at');\n\n  // Single column index for basic lookups\n  await createIndex(knex, tableName, ['document_id'], `${tableName}_document_id_idx`);\n\n  if (hasLocale && hasPublishedAt) {\n    // Composite index for common filters\n    await createIndex(\n      knex,\n      tableName,\n      ['document_id', 'locale', 'published_at'],\n      `${tableName}_document_id_locale_published_at_idx`\n    );\n  } else if (hasLocale) {\n    await createIndex(\n      knex,\n      tableName,\n      ['document_id', 'locale'],\n      `${tableName}_document_id_locale_idx`\n    );\n  } else if (hasPublishedAt) {\n    await createIndex(\n      knex,\n      tableName,\n      ['document_id', 'published_at'],\n      `${tableName}_document_id_published_at_idx`\n    );\n  }\n};\n\nexport const addDocumentIdIndexes: Migration = {\n  name: '5.0.0-06-add-document-id-indexes',\n  async up(knex, db) {\n    for (const meta of db.metadata.values()) {\n      const hasTable = await knex.schema.hasTable(meta.tableName);\n      if (!hasTable) {\n        continue;\n      }\n\n      await addIndexesForTable(knex, meta.tableName);\n    }\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["createIndex","knex","tableName","columns","indexName","hasIndex","schema","exists","call","alterTable","table","index","error","addIndexesForTable","hasDocumentId","hasColumn","hasLocale","hasPublishedAt","addDocumentIdIndexes","name","up","db","meta","metadata","values","hasTable","down","Error"],"mappings":"AAIA;AACA,MAAMA,WAAAA,GAAc,OAAOC,IAAAA,EAAYC,SAAAA,EAAmBC,OAAAA,EAAmBC,SAAAA,GAAAA;IAC3E,IAAI;;AAEF,QAAA,MAAMC,QAAAA,GACJJ,IAAAA,CAAKK,MAAM,CAGXD,QAAQ;AACV,QAAA,IAAIA,QAAAA,EAAU;YACZ,MAAME,MAAAA,GAAS,MAAMF,QAAAA,CAASG,IAAI,CAACP,IAAAA,CAAKK,MAAM,EAAEJ,SAAAA,EAAWE,SAAAA,CAAAA;AAC3D,YAAA,IAAIG,MAAAA,EAAQ;AACV,gBAAA;AACF,YAAA;AACF,QAAA;AAEA,QAAA,MAAMN,KAAKK,MAAM,CAACG,UAAU,CAACP,WAAW,CAACQ,KAAAA,GAAAA;YACvCA,KAAAA,CAAMC,KAAK,CAACR,OAAAA,EAASC,SAAAA,CAAAA;AACvB,QAAA,CAAA,CAAA;AACF,IAAA,CAAA,CAAE,OAAOQ,KAAAA,EAAO;;AAEhB,IAAA;AACF,CAAA;AAEA,MAAMC,kBAAAA,GAAqB,OAAOZ,IAAAA,EAAYC,SAAAA,GAAAA;;AAE5C,IAAA,MAAMY,gBAAgB,MAAMb,IAAAA,CAAKK,MAAM,CAACS,SAAS,CAACb,SAAAA,EAAW,aAAA,CAAA;AAC7D,IAAA,IAAI,CAACY,aAAAA,EAAe;AAClB,QAAA;AACF,IAAA;AAEA,IAAA,MAAME,YAAY,MAAMf,IAAAA,CAAKK,MAAM,CAACS,SAAS,CAACb,SAAAA,EAAW,QAAA,CAAA;AACzD,IAAA,MAAMe,iBAAiB,MAAMhB,IAAAA,CAAKK,MAAM,CAACS,SAAS,CAACb,SAAAA,EAAW,cAAA,CAAA;;IAG9D,MAAMF,WAAAA,CAAYC,MAAMC,SAAAA,EAAW;AAAC,QAAA;KAAc,EAAE,CAAA,EAAGA,SAAAA,CAAU,gBAAgB,CAAC,CAAA;AAElF,IAAA,IAAIc,aAAaC,cAAAA,EAAgB;;QAE/B,MAAMjB,WAAAA,CACJC,MACAC,SAAAA,EACA;AAAC,YAAA,aAAA;AAAe,YAAA,QAAA;AAAU,YAAA;SAAe,EACzC,CAAA,EAAGA,SAAAA,CAAU,oCAAoC,CAAC,CAAA;AAEtD,IAAA,CAAA,MAAO,IAAIc,SAAAA,EAAW;QACpB,MAAMhB,WAAAA,CACJC,MACAC,SAAAA,EACA;AAAC,YAAA,aAAA;AAAe,YAAA;SAAS,EACzB,CAAA,EAAGA,SAAAA,CAAU,uBAAuB,CAAC,CAAA;AAEzC,IAAA,CAAA,MAAO,IAAIe,cAAAA,EAAgB;QACzB,MAAMjB,WAAAA,CACJC,MACAC,SAAAA,EACA;AAAC,YAAA,aAAA;AAAe,YAAA;SAAe,EAC/B,CAAA,EAAGA,SAAAA,CAAU,6BAA6B,CAAC,CAAA;AAE/C,IAAA;AACF,CAAA;MAEagB,oBAAAA,GAAkC;IAC7CC,IAAAA,EAAM,kCAAA;IACN,MAAMC,EAAAA,CAAAA,CAAGnB,IAAI,EAAEoB,EAAE,EAAA;AACf,QAAA,KAAK,MAAMC,IAAAA,IAAQD,EAAAA,CAAGE,QAAQ,CAACC,MAAM,EAAA,CAAI;YACvC,MAAMC,QAAAA,GAAW,MAAMxB,IAAAA,CAAKK,MAAM,CAACmB,QAAQ,CAACH,KAAKpB,SAAS,CAAA;AAC1D,YAAA,IAAI,CAACuB,QAAAA,EAAU;AACb,gBAAA;AACF,YAAA;YAEA,MAAMZ,kBAAAA,CAAmBZ,IAAAA,EAAMqB,IAAAA,CAAKpB,SAAS,CAAA;AAC/C,QAAA;AACF,IAAA,CAAA;IACA,MAAMwB,IAAAA,CAAAA,GAAAA;AACJ,QAAA,MAAM,IAAIC,KAAAA,CAAM,iBAAA,CAAA;AAClB,IAAA;AACF;;;;"}
+{"version":3,"file":"5.0.0-06-add-document-id-indexes.mjs","sources":["../../../src/migrations/internal-migrations/5.0.0-06-add-document-id-indexes.ts"],"sourcesContent":["import type { Migration } from '../common';\n\n/**\n * Previously created secondary indexes on `document_id` (and composites) via raw DDL.\n * Those indexes are now owned by schema sync from model metadata (see transform-content-types-to-models).\n * Keep this migration as a stable no-op so Umzug / `strapi_migrations_internal` stay consistent.\n */\n\nexport const addDocumentIdIndexes: Migration = {\n  name: '5.0.0-06-add-document-id-indexes',\n  async up() {\n    // No-op: the document_id indexes are now created by schema sync (see transform-content-types-to-models).\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["addDocumentIdIndexes","name","up","down","Error"],"mappings":"AAEA;;;;UAMaA,oBAAAA,GAAkC;IAC7CC,IAAAA,EAAM,kCAAA;IACN,MAAMC,EAAAA,CAAAA,GAAAA;;AAEN,IAAA,CAAA;IACA,MAAMC,IAAAA,CAAAA,GAAAA;AACJ,QAAA,MAAM,IAAIC,KAAAA,CAAM,iBAAA,CAAA;AAClB,IAAA;AACF;;;;"}

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

@@ -12,7 +12,7 @@ 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 (populateValue.orderBy || !joinTable.orderBy) {
+    if (!_.isEmpty(populateValue.orderBy) || !joinTable.orderBy) {
         return undefined;
     }
     return _.mapValues((v)=>populateValue.ordering || v, joinTable.orderBy);