@strapi/database 5.51.0 → 5.51.2

package/dist/fields/timestamp.js

@@ -1,36 +1,18 @@
 'use strict';
 
-var dateFns = require('date-fns');
 var parsers = require('./shared/parsers.js');
 var field = require('./field.js');
 
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var dateFns__namespace = /*#__PURE__*/_interopNamespace(dateFns);
-
 class TimestampField extends field {
     toDB(value) {
         return parsers.parseDateTimeOrTimestamp(value);
     }
     fromDB(value) {
-        const cast = new Date(value);
-        return dateFns__namespace.isValid(cast) ? dateFns__namespace.format(cast, 'T') : null;
+        // Same redundant re-parse as `datetime`. `format(cast, 'T')` is the epoch in
+        // milliseconds as a string, which `getTime()` already gives us.
+        const cast = value instanceof Date ? value : new Date(value);
+        const time = cast.getTime();
+        return Number.isNaN(time) ? null : String(time);
     }
 }
 

package/dist/fields/timestamp.js.map

@@ -1 +1 @@
-{"version":3,"file":"timestamp.js","sources":["../../src/fields/timestamp.ts"],"sourcesContent":["import * as dateFns from 'date-fns';\n\nimport { parseDateTimeOrTimestamp } from './shared/parsers';\nimport Field from './field';\n\nexport default class TimestampField extends Field {\n  toDB(value: unknown) {\n    return parseDateTimeOrTimestamp(value);\n  }\n\n  fromDB(value: unknown) {\n    const cast = new Date(value as any);\n    return dateFns.isValid(cast) ? dateFns.format(cast, 'T') : null;\n  }\n}\n"],"names":["TimestampField","Field","toDB","value","parseDateTimeOrTimestamp","fromDB","cast","Date","dateFns","isValid","format"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAKe,MAAMA,cAAAA,SAAuBC,KAAAA,CAAAA;AAC1CC,IAAAA,IAAAA,CAAKC,KAAc,EAAE;AACnB,QAAA,OAAOC,gCAAAA,CAAyBD,KAAAA,CAAAA;AAClC,IAAA;AAEAE,IAAAA,MAAAA,CAAOF,KAAc,EAAE;QACrB,MAAMG,IAAAA,GAAO,IAAIC,IAAAA,CAAKJ,KAAAA,CAAAA;QACtB,OAAOK,kBAAAA,CAAQC,OAAO,CAACH,IAAAA,CAAAA,GAAQE,mBAAQE,MAAM,CAACJ,MAAM,GAAA,CAAA,GAAO,IAAA;AAC7D,IAAA;AACF;;;;"}
+{"version":3,"file":"timestamp.js","sources":["../../src/fields/timestamp.ts"],"sourcesContent":["import { parseDateTimeOrTimestamp } from './shared/parsers';\nimport Field from './field';\n\nexport default class TimestampField extends Field {\n  toDB(value: unknown) {\n    return parseDateTimeOrTimestamp(value);\n  }\n\n  fromDB(value: unknown) {\n    // Same redundant re-parse as `datetime`. `format(cast, 'T')` is the epoch in\n    // milliseconds as a string, which `getTime()` already gives us.\n    const cast = value instanceof Date ? value : new Date(value as any);\n    const time = cast.getTime();\n    return Number.isNaN(time) ? null : String(time);\n  }\n}\n"],"names":["TimestampField","Field","toDB","value","parseDateTimeOrTimestamp","fromDB","cast","Date","time","getTime","Number","isNaN","String"],"mappings":";;;;;AAGe,MAAMA,cAAAA,SAAuBC,KAAAA,CAAAA;AAC1CC,IAAAA,IAAAA,CAAKC,KAAc,EAAE;AACnB,QAAA,OAAOC,gCAAAA,CAAyBD,KAAAA,CAAAA;AAClC,IAAA;AAEAE,IAAAA,MAAAA,CAAOF,KAAc,EAAE;;;AAGrB,QAAA,MAAMG,IAAAA,GAAOH,KAAAA,YAAiBI,IAAAA,GAAOJ,KAAAA,GAAQ,IAAII,IAAAA,CAAKJ,KAAAA,CAAAA;QACtD,MAAMK,IAAAA,GAAOF,KAAKG,OAAO,EAAA;AACzB,QAAA,OAAOC,MAAAA,CAAOC,KAAK,CAACH,IAAAA,CAAAA,GAAQ,OAAOI,MAAAA,CAAOJ,IAAAA,CAAAA;AAC5C,IAAA;AACF;;;;"}

package/dist/fields/timestamp.mjs

@@ -1,4 +1,3 @@
-import * as dateFns from 'date-fns';
 import { parseDateTimeOrTimestamp } from './shared/parsers.mjs';
 import Field from './field.mjs';
 
@@ -7,8 +6,11 @@ class TimestampField extends Field {
         return parseDateTimeOrTimestamp(value);
     }
     fromDB(value) {
-        const cast = new Date(value);
-        return dateFns.isValid(cast) ? dateFns.format(cast, 'T') : null;
+        // Same redundant re-parse as `datetime`. `format(cast, 'T')` is the epoch in
+        // milliseconds as a string, which `getTime()` already gives us.
+        const cast = value instanceof Date ? value : new Date(value);
+        const time = cast.getTime();
+        return Number.isNaN(time) ? null : String(time);
     }
 }
 

package/dist/fields/timestamp.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"timestamp.mjs","sources":["../../src/fields/timestamp.ts"],"sourcesContent":["import * as dateFns from 'date-fns';\n\nimport { parseDateTimeOrTimestamp } from './shared/parsers';\nimport Field from './field';\n\nexport default class TimestampField extends Field {\n  toDB(value: unknown) {\n    return parseDateTimeOrTimestamp(value);\n  }\n\n  fromDB(value: unknown) {\n    const cast = new Date(value as any);\n    return dateFns.isValid(cast) ? dateFns.format(cast, 'T') : null;\n  }\n}\n"],"names":["TimestampField","Field","toDB","value","parseDateTimeOrTimestamp","fromDB","cast","Date","dateFns","isValid","format"],"mappings":";;;;AAKe,MAAMA,cAAAA,SAAuBC,KAAAA,CAAAA;AAC1CC,IAAAA,IAAAA,CAAKC,KAAc,EAAE;AACnB,QAAA,OAAOC,wBAAAA,CAAyBD,KAAAA,CAAAA;AAClC,IAAA;AAEAE,IAAAA,MAAAA,CAAOF,KAAc,EAAE;QACrB,MAAMG,IAAAA,GAAO,IAAIC,IAAAA,CAAKJ,KAAAA,CAAAA;QACtB,OAAOK,OAAAA,CAAQC,OAAO,CAACH,IAAAA,CAAAA,GAAQE,QAAQE,MAAM,CAACJ,MAAM,GAAA,CAAA,GAAO,IAAA;AAC7D,IAAA;AACF;;;;"}
+{"version":3,"file":"timestamp.mjs","sources":["../../src/fields/timestamp.ts"],"sourcesContent":["import { parseDateTimeOrTimestamp } from './shared/parsers';\nimport Field from './field';\n\nexport default class TimestampField extends Field {\n  toDB(value: unknown) {\n    return parseDateTimeOrTimestamp(value);\n  }\n\n  fromDB(value: unknown) {\n    // Same redundant re-parse as `datetime`. `format(cast, 'T')` is the epoch in\n    // milliseconds as a string, which `getTime()` already gives us.\n    const cast = value instanceof Date ? value : new Date(value as any);\n    const time = cast.getTime();\n    return Number.isNaN(time) ? null : String(time);\n  }\n}\n"],"names":["TimestampField","Field","toDB","value","parseDateTimeOrTimestamp","fromDB","cast","Date","time","getTime","Number","isNaN","String"],"mappings":";;;AAGe,MAAMA,cAAAA,SAAuBC,KAAAA,CAAAA;AAC1CC,IAAAA,IAAAA,CAAKC,KAAc,EAAE;AACnB,QAAA,OAAOC,wBAAAA,CAAyBD,KAAAA,CAAAA;AAClC,IAAA;AAEAE,IAAAA,MAAAA,CAAOF,KAAc,EAAE;;;AAGrB,QAAA,MAAMG,IAAAA,GAAOH,KAAAA,YAAiBI,IAAAA,GAAOJ,KAAAA,GAAQ,IAAII,IAAAA,CAAKJ,KAAAA,CAAAA;QACtD,MAAMK,IAAAA,GAAOF,KAAKG,OAAO,EAAA;AACzB,QAAA,OAAOC,MAAAA,CAAOC,KAAK,CAACH,IAAAA,CAAAA,GAAQ,OAAOI,MAAAA,CAAOJ,IAAAA,CAAAA;AAC5C,IAAA;AACF;;;;"}

package/dist/index.js

@@ -142,7 +142,7 @@ class Database {
             settings: {
                 forceMigration: true,
                 runMigrations: true,
-                ...config.settings ?? {}
+                ...config.settings
             }
         };
         this.logger = config.logger ?? console;

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 type { Event } 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';\nexport { isDatabaseClientKind } from './connection';\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, Event };\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 type { Event } 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';\nexport { isDatabaseClientKind } from './connection';\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, Event };\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":";;;;;;;;;;;;;;;;;;;;AA0CA,MAAMA,WAAAA,GACJ,CAACC,EAAAA,GACD,CACEC,gBAAAA,EACAC,IAAAA,GAAAA;;AAGAF,QAAAA,EAAAA,CAAGG,OAAO,CAACC,UAAU,CAACH,gBAAAA,CAAAA,CAAkBI,IAAI,CAAC,IAAA;AAC3C,YAAA,OAAOH,KAAK,IAAA,EAAMD,gBAAAA,CAAAA;AACpB,QAAA,CAAA,CAAA;AACF,IAAA,CAAA;AAEF,MAAMK,QAAAA,CAAAA;AA0EJ,IAAA,MAAMC,IAAAA,CAAK,EAAEC,MAAM,EAAuB,EAAE;QAC1C,IAAI,OAAO,IAAI,CAACC,MAAM,CAACC,UAAU,CAACA,UAAU,KAAK,UAAA,EAAY;AAC3D;;;;;;;;;AASC,UACD,IAAI,CAACC,MAAM,CAACC,KAAK,CAAC,4CAAA,CAAA;;YAGlB,IAAI,IAAI,CAACH,MAAM,CAACC,UAAU,CAACG,MAAM,KAAK,QAAA,EAAU;AAC9C,gBAAA,MAAM,IAAI,CAACH,UAAU,CAACI,GAAG,CAAC,UAAA,CAAA;YAC5B,CAAA,MAAO;AACL,gBAAA,MAAM,IAAI,CAACJ,UAAU,CAACG,MAAM,CAACE,iBAAiB,EAAA;AAChD,YAAA;AACF,QAAA;AAEA,QAAA,IAAI,CAACC,QAAQ,CAACC,UAAU,CAACT,MAAAA,CAAAA;AACzB,QAAA,MAAMU,yBAAiB,IAAI,CAAA;AAC3B,QAAA,OAAO,IAAI;AACb,IAAA;AAEAC,IAAAA,KAAAA,CAAMC,GAAW,EAAE;AACjB,QAAA,IAAI,CAAC,IAAI,CAACJ,QAAQ,CAACK,GAAG,CAACD,GAAAA,CAAAA,EAAM;AAC3B,YAAA,MAAM,IAAIE,KAAAA,CAAM,CAAC,MAAM,EAAEF,GAAAA,CAAI,UAAU,CAAC,CAAA;AAC1C,QAAA;AAEA,QAAA,OAAO,IAAI,CAACG,aAAa,CAACC,aAAa,CAACJ,GAAAA,CAAAA;AAC1C,IAAA;IAEAK,aAAAA,GAAgB;QACd,OAAO,CAAC,CAACC,iCAAAA,CAAeC,GAAG,EAAA;AAC7B,IAAA;IAWA,MAAMC,WAAAA,CACJC,EAAc,EACsC;QACpD,MAAMC,oBAAAA,GAAuB,CAACJ,iCAAAA,CAAeC,GAAG,EAAA;QAChD,MAAMI,GAAAA,GAAMD,oBAAAA,GACR,MAAM,IAAI,CAACpB,UAAU,CAACkB,WAAW,EAAA,GAChCF,iCAAAA,CAAeC,GAAG,EAAA;QAEvB,eAAeK,MAAAA,GAAAA;AACb,YAAA,IAAIF,oBAAAA,EAAsB;gBACxB,MAAMJ,iCAAAA,CAAeM,MAAM,CAACD,GAAAA,CAAAA;AAC9B,YAAA;AACF,QAAA;QAEA,eAAeE,QAAAA,GAAAA;AACb,YAAA,IAAIH,oBAAAA,EAAsB;gBACxB,MAAMJ,iCAAAA,CAAeO,QAAQ,CAACF,GAAAA,CAAAA;AAChC,YAAA;AACF,QAAA;AAEA,QAAA,IAAI,CAACF,EAAAA,EAAI;YACP,OAAO;AAAEG,gBAAAA,MAAAA;AAAQC,gBAAAA,QAAAA;AAAUN,gBAAAA,GAAAA,EAAK,IAAMI;AAAI,aAAA;AAC5C,QAAA;QAEA,OAAOL,iCAAAA,CAAeQ,GAAG,CAACH,GAAAA,EAAK,UAAA;YAC7B,IAAI;AACF,gBAAA,MAAMI,cAAAA,GAAiB;AACrBJ,oBAAAA,GAAAA;AACAC,oBAAAA,MAAAA;AACAC,oBAAAA,QAAAA;AACAG,oBAAAA,QAAAA,EAAUV,kCAAeU,QAAQ;AACjCC,oBAAAA,UAAAA,EAAYX,kCAAeW;AAC7B,iBAAA;gBACA,MAAMC,GAAAA,GAAM,MAAMT,EAAAA,CAAGM,cAAAA,CAAAA;gBACrB,MAAMH,MAAAA,EAAAA;gBACN,OAAOM,GAAAA;AACT,YAAA,CAAA,CAAE,OAAOC,KAAAA,EAAO;gBACd,MAAMN,QAAAA,EAAAA;gBACN,MAAMM,KAAAA;AACR,YAAA;AACF,QAAA,CAAA,CAAA;AACF,IAAA;IAEAC,aAAAA,GAAoC;QAClC,OAAO,IAAI,CAAC9B,UAAU,CAACG,MAAM,CAAC4B,kBAAkB,CAACC,MAAM;AACzD,IAAA;AAIAC,IAAAA,aAAAA,CAAcC,SAAkB,EAA4B;QAC1D,MAAMF,MAAAA,GAAS,IAAI,CAACF,aAAa,EAAA;QACjC,MAAM9B,UAAAA,GAAakC,YAAY,IAAI,CAAClC,UAAU,CAACkC,SAAAA,CAAAA,GAAa,IAAI,CAAClC,UAAU;AAC3E,QAAA,OAAOgC,MAAAA,GAAShC,UAAAA,CAAWmC,UAAU,CAACH,MAAAA,CAAAA,GAAUhC,UAAAA;AAClD,IAAA;;IAGAoC,OAAAA,GAAU;AACR,QAAA,MAAML,qBAAqB,IAAI,CAAC/B,UAAU,EAAEG,MAAAA,EAAQ4B,sBAAsB,EAAC;AAC3E,QAAA,MAAM5B,MAAAA,GAAS,IAAI,CAACV,OAAO,EAAEU,MAAAA,IAAU,EAAA;AAEvC,QAAA,IAAIkC,WAAAA,GAAc,EAAA;QAClB,IAAIL,MAAAA;;AAGJ,QAAA,IAAI7B,WAAW,QAAA,EAAU;AACvB,YAAA,MAAMmC,eAAeP,kBAAAA,EAAoBQ,QAAAA;AACzC,YAAA,IAAID,YAAAA,EAAc;AAChBD,gBAAAA,WAAAA,GAAcG,qBAAAA,CAAKC,QAAQ,CAACC,OAAAA,CAAQC,GAAG,EAAA,EAAIL,YAAAA,CAAAA;AAC7C,YAAA;QACF,CAAA,MAEK;AACHD,YAAAA,WAAAA,GAAcN,kBAAAA,EAAoBa,QAAAA;AAClCZ,YAAAA,MAAAA,GAASD,kBAAAA,EAAoBC,MAAAA;AAC/B,QAAA;QAEA,OAAO;AACLK,YAAAA,WAAAA;AACAL,YAAAA,MAAAA;AACA7B,YAAAA;AACF,SAAA;AACF,IAAA;AAEA0C,IAAAA,mBAAAA,CAAoBxB,GAAAA,GAAM,IAAI,CAACrB,UAAU,EAAE;QACzC,MAAMgC,MAAAA,GAAS,IAAI,CAACF,aAAa,EAAA;QACjC,OAAOE,MAAAA,GAASX,IAAIW,MAAM,CAACG,UAAU,CAACH,MAAAA,CAAAA,GAAUX,IAAIW,MAAM;AAC5D,IAAA;AAEAc,IAAAA,YAAAA,CAAapC,GAAW,EAAE;AACxB,QAAA,OAAO,IAAI,CAACG,aAAa,CAACkC,kBAAkB,CAACrC,GAAAA,CAAAA;AAC/C,IAAA;AAEA,IAAA,MAAMsC,OAAAA,GAAU;AACd,QAAA,MAAM,IAAI,CAACC,UAAU,CAACC,KAAK,EAAA;AAC3B,QAAA,MAAM,IAAI,CAAClD,UAAU,CAACgD,OAAO,EAAA;AAC/B,IAAA;AApMA,IAAA,WAAA,CAAYjD,MAAsB,CAAE;QAClC,IAAI,CAACA,MAAM,GAAG;AACZ,YAAA,GAAGA,MAAM;YACToD,QAAAA,EAAU;gBACRC,cAAAA,EAAgB,IAAA;gBAChBC,aAAAA,EAAe,IAAA;AACf,gBAAA,GAAGtD,OAAOoD;AACZ;AACF,SAAA;AAEA,QAAA,IAAI,CAAClD,MAAM,GAAGF,MAAAA,CAAOE,MAAM,IAAIqD,OAAAA;AAE/B,QAAA,IAAI,CAAC7D,OAAO,GAAG8D,kBAAAA,CAAW,IAAI,CAAA;AAE9B,QAAA,IAAIC,UAAAA,GAA0B,IAAI,CAACzD,MAAM,CAACC,UAAU;;QAGpD,IAAI,OAAO,IAAI,CAACD,MAAM,CAACC,UAAU,CAACA,UAAU,KAAK,UAAA,EAAY;YAC3D,IAAI,CAACP,OAAO,CAACgE,SAAS,EAAA;QACxB,CAAA,MAEK;AACH,YAAA,IAAI,CAACxD,MAAM,CAACyD,IAAI,CACd,wJAAA,CAAA;YAGFF,UAAAA,GAAa;AACX,gBAAA,GAAG,IAAI,CAACzD,MAAM,CAACC,UAAU;gBACzBA,UAAAA,EAAY,UAAA;;oBAEV,MAAM2D,IAAAA,GAAO,MAAM,IAAI,CAAC5D,MAAM,CAACC,UAAU,CAACA,UAAU,EAAA;AACpD,oBAAA,IAAI,CAACP,OAAO,CAACgE,SAAS,CAACE,IAAAA,CAAAA;oBACvB,OAAOA,IAAAA;AACT,gBAAA;AACF,aAAA;AACF,QAAA;AAEA,QAAA,IAAI,CAACrD,QAAQ,GAAGsD,sBAAAA,CAAe,EAAE,CAAA;AAEjC,QAAA,IAAI,CAAC5D,UAAU,GAAG6D,2BAAAA,CAAiBL,UAAAA,EAAY;YAC7CM,IAAAA,EAAM;AAAEzE,gBAAAA,WAAAA,EAAaA,YAAY,IAAI;AAAE;AACzC,SAAA,CAAA;AAEA,QAAA,IAAI,CAAC2C,MAAM,GAAG+B,4BAAAA,CAAqB,IAAI,CAAA;AAEvC,QAAA,IAAI,CAACC,UAAU,GAAGC,gCAAAA,CAAyB,IAAI,CAAA;AAC/C,QAAA,IAAI,CAAChB,UAAU,GAAGiB,gCAAAA,CAAyB,IAAI,CAAA;AAE/C,QAAA,IAAI,CAACrD,aAAa,GAAGsD,2BAAAA,CAAoB,IAAI,CAAA;AAE7C,QAAA,IAAI,CAACC,MAAM,GAAGC,2BAAAA,CAAoB,IAAI,CAAA;AACxC,IAAA;AAkJF;;;;;;;"}

package/dist/index.mjs

@@ -138,7 +138,7 @@ class Database {
             settings: {
                 forceMigration: true,
                 runMigrations: true,
-                ...config.settings ?? {}
+                ...config.settings
             }
         };
         this.logger = config.logger ?? console;

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 type { Event } 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';\nexport { isDatabaseClientKind } from './connection';\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, Event };\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 type { Event } 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';\nexport { isDatabaseClientKind } from './connection';\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, Event };\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-05-drop-slug-unique-index.js

@@ -15,7 +15,7 @@
                 columnName
             ], `${tableName}_${columnName}_unique`);
         });
-    } catch (error) {
+    } catch  {
     // If unique index does not exist, do nothing
     }
 };

package/dist/migrations/internal-migrations/5.0.0-05-drop-slug-unique-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"5.0.0-05-drop-slug-unique-index.js","sources":["../../../src/migrations/internal-migrations/5.0.0-05-drop-slug-unique-index.ts"],"sourcesContent":["/**\n * In V4 slug fields contained a unique index.\n * In V5 slug fields should not have a unique index.\n *\n * This migration drops existing unique indexes from slug fields so downstream migrations\n * can work on the data without violating the unique index.\n */\nimport type { Knex } from 'knex';\n\nimport type { Migration } from '../common';\n\nconst dropIndex = async (knex: Knex, tableName: string, columnName: string) => {\n  try {\n    await knex.schema.alterTable(tableName, (table) => {\n      // NOTE: Can not use \"identifiers\" utility, as the 5.0.0-01 migration does not rename this particular index\n      // to `tableName_columnName_uq`.\n      table.dropUnique([columnName], `${tableName}_${columnName}_unique`);\n    });\n  } catch (error) {\n    // If unique index does not exist, do nothing\n  }\n};\n\nexport const dropSlugFieldsIndex: Migration = {\n  name: '5.0.0-05-drop-slug-fields-index',\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      for (const attribute of Object.values(meta.attributes)) {\n        if (attribute.type === 'uid' && attribute.columnName) {\n          await dropIndex(knex, meta.tableName, attribute.columnName);\n        }\n      }\n    }\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["dropIndex","knex","tableName","columnName","schema","alterTable","table","dropUnique","error","dropSlugFieldsIndex","name","up","db","meta","metadata","values","hasTable","attribute","Object","attributes","type","down","Error"],"mappings":";;AAAA;;;;;;AAMC,IAKD,MAAMA,SAAAA,GAAY,OAAOC,IAAAA,EAAYC,SAAAA,EAAmBC,UAAAA,GAAAA;IACtD,IAAI;AACF,QAAA,MAAMF,KAAKG,MAAM,CAACC,UAAU,CAACH,WAAW,CAACI,KAAAA,GAAAA;;;AAGvCA,YAAAA,KAAAA,CAAMC,UAAU,CAAC;AAACJ,gBAAAA;AAAW,aAAA,EAAE,GAAGD,SAAAA,CAAU,CAAC,EAAEC,UAAAA,CAAW,OAAO,CAAC,CAAA;AACpE,QAAA,CAAA,CAAA;AACF,IAAA,CAAA,CAAE,OAAOK,KAAAA,EAAO;;AAEhB,IAAA;AACF,CAAA;MAEaC,mBAAAA,GAAiC;IAC5CC,IAAAA,EAAM,iCAAA;IACN,MAAMC,EAAAA,CAAAA,CAAGV,IAAI,EAAEW,EAAE,EAAA;AACf,QAAA,KAAK,MAAMC,IAAAA,IAAQD,EAAAA,CAAGE,QAAQ,CAACC,MAAM,EAAA,CAAI;YACvC,MAAMC,QAAAA,GAAW,MAAMf,IAAAA,CAAKG,MAAM,CAACY,QAAQ,CAACH,KAAKX,SAAS,CAAA;AAC1D,YAAA,IAAI,CAACc,QAAAA,EAAU;AACb,gBAAA;AACF,YAAA;AAEA,YAAA,KAAK,MAAMC,SAAAA,IAAaC,MAAAA,CAAOH,MAAM,CAACF,IAAAA,CAAKM,UAAU,CAAA,CAAG;AACtD,gBAAA,IAAIF,UAAUG,IAAI,KAAK,KAAA,IAASH,SAAAA,CAAUd,UAAU,EAAE;AACpD,oBAAA,MAAMH,UAAUC,IAAAA,EAAMY,IAAAA,CAAKX,SAAS,EAAEe,UAAUd,UAAU,CAAA;AAC5D,gBAAA;AACF,YAAA;AACF,QAAA;AACF,IAAA,CAAA;IACA,MAAMkB,IAAAA,CAAAA,GAAAA;AACJ,QAAA,MAAM,IAAIC,KAAAA,CAAM,iBAAA,CAAA;AAClB,IAAA;AACF;;;;"}
+{"version":3,"file":"5.0.0-05-drop-slug-unique-index.js","sources":["../../../src/migrations/internal-migrations/5.0.0-05-drop-slug-unique-index.ts"],"sourcesContent":["/**\n * In V4 slug fields contained a unique index.\n * In V5 slug fields should not have a unique index.\n *\n * This migration drops existing unique indexes from slug fields so downstream migrations\n * can work on the data without violating the unique index.\n */\nimport type { Knex } from 'knex';\n\nimport type { Migration } from '../common';\n\nconst dropIndex = async (knex: Knex, tableName: string, columnName: string) => {\n  try {\n    await knex.schema.alterTable(tableName, (table) => {\n      // NOTE: Can not use \"identifiers\" utility, as the 5.0.0-01 migration does not rename this particular index\n      // to `tableName_columnName_uq`.\n      table.dropUnique([columnName], `${tableName}_${columnName}_unique`);\n    });\n  } catch {\n    // If unique index does not exist, do nothing\n  }\n};\n\nexport const dropSlugFieldsIndex: Migration = {\n  name: '5.0.0-05-drop-slug-fields-index',\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      for (const attribute of Object.values(meta.attributes)) {\n        if (attribute.type === 'uid' && attribute.columnName) {\n          await dropIndex(knex, meta.tableName, attribute.columnName);\n        }\n      }\n    }\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["dropIndex","knex","tableName","columnName","schema","alterTable","table","dropUnique","dropSlugFieldsIndex","name","up","db","meta","metadata","values","hasTable","attribute","Object","attributes","type","down","Error"],"mappings":";;AAAA;;;;;;AAMC,IAKD,MAAMA,SAAAA,GAAY,OAAOC,IAAAA,EAAYC,SAAAA,EAAmBC,UAAAA,GAAAA;IACtD,IAAI;AACF,QAAA,MAAMF,KAAKG,MAAM,CAACC,UAAU,CAACH,WAAW,CAACI,KAAAA,GAAAA;;;AAGvCA,YAAAA,KAAAA,CAAMC,UAAU,CAAC;AAACJ,gBAAAA;AAAW,aAAA,EAAE,GAAGD,SAAAA,CAAU,CAAC,EAAEC,UAAAA,CAAW,OAAO,CAAC,CAAA;AACpE,QAAA,CAAA,CAAA;AACF,IAAA,CAAA,CAAE,OAAM;;AAER,IAAA;AACF,CAAA;MAEaK,mBAAAA,GAAiC;IAC5CC,IAAAA,EAAM,iCAAA;IACN,MAAMC,EAAAA,CAAAA,CAAGT,IAAI,EAAEU,EAAE,EAAA;AACf,QAAA,KAAK,MAAMC,IAAAA,IAAQD,EAAAA,CAAGE,QAAQ,CAACC,MAAM,EAAA,CAAI;YACvC,MAAMC,QAAAA,GAAW,MAAMd,IAAAA,CAAKG,MAAM,CAACW,QAAQ,CAACH,KAAKV,SAAS,CAAA;AAC1D,YAAA,IAAI,CAACa,QAAAA,EAAU;AACb,gBAAA;AACF,YAAA;AAEA,YAAA,KAAK,MAAMC,SAAAA,IAAaC,MAAAA,CAAOH,MAAM,CAACF,IAAAA,CAAKM,UAAU,CAAA,CAAG;AACtD,gBAAA,IAAIF,UAAUG,IAAI,KAAK,KAAA,IAASH,SAAAA,CAAUb,UAAU,EAAE;AACpD,oBAAA,MAAMH,UAAUC,IAAAA,EAAMW,IAAAA,CAAKV,SAAS,EAAEc,UAAUb,UAAU,CAAA;AAC5D,gBAAA;AACF,YAAA;AACF,QAAA;AACF,IAAA,CAAA;IACA,MAAMiB,IAAAA,CAAAA,GAAAA;AACJ,QAAA,MAAM,IAAIC,KAAAA,CAAM,iBAAA,CAAA;AAClB,IAAA;AACF;;;;"}

package/dist/migrations/internal-migrations/5.0.0-05-drop-slug-unique-index.mjs

@@ -13,7 +13,7 @@
                 columnName
             ], `${tableName}_${columnName}_unique`);
         });
-    } catch (error) {
+    } catch  {
     // If unique index does not exist, do nothing
     }
 };

package/dist/migrations/internal-migrations/5.0.0-05-drop-slug-unique-index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"5.0.0-05-drop-slug-unique-index.mjs","sources":["../../../src/migrations/internal-migrations/5.0.0-05-drop-slug-unique-index.ts"],"sourcesContent":["/**\n * In V4 slug fields contained a unique index.\n * In V5 slug fields should not have a unique index.\n *\n * This migration drops existing unique indexes from slug fields so downstream migrations\n * can work on the data without violating the unique index.\n */\nimport type { Knex } from 'knex';\n\nimport type { Migration } from '../common';\n\nconst dropIndex = async (knex: Knex, tableName: string, columnName: string) => {\n  try {\n    await knex.schema.alterTable(tableName, (table) => {\n      // NOTE: Can not use \"identifiers\" utility, as the 5.0.0-01 migration does not rename this particular index\n      // to `tableName_columnName_uq`.\n      table.dropUnique([columnName], `${tableName}_${columnName}_unique`);\n    });\n  } catch (error) {\n    // If unique index does not exist, do nothing\n  }\n};\n\nexport const dropSlugFieldsIndex: Migration = {\n  name: '5.0.0-05-drop-slug-fields-index',\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      for (const attribute of Object.values(meta.attributes)) {\n        if (attribute.type === 'uid' && attribute.columnName) {\n          await dropIndex(knex, meta.tableName, attribute.columnName);\n        }\n      }\n    }\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["dropIndex","knex","tableName","columnName","schema","alterTable","table","dropUnique","error","dropSlugFieldsIndex","name","up","db","meta","metadata","values","hasTable","attribute","Object","attributes","type","down","Error"],"mappings":"AAAA;;;;;;AAMC,IAKD,MAAMA,SAAAA,GAAY,OAAOC,IAAAA,EAAYC,SAAAA,EAAmBC,UAAAA,GAAAA;IACtD,IAAI;AACF,QAAA,MAAMF,KAAKG,MAAM,CAACC,UAAU,CAACH,WAAW,CAACI,KAAAA,GAAAA;;;AAGvCA,YAAAA,KAAAA,CAAMC,UAAU,CAAC;AAACJ,gBAAAA;AAAW,aAAA,EAAE,GAAGD,SAAAA,CAAU,CAAC,EAAEC,UAAAA,CAAW,OAAO,CAAC,CAAA;AACpE,QAAA,CAAA,CAAA;AACF,IAAA,CAAA,CAAE,OAAOK,KAAAA,EAAO;;AAEhB,IAAA;AACF,CAAA;MAEaC,mBAAAA,GAAiC;IAC5CC,IAAAA,EAAM,iCAAA;IACN,MAAMC,EAAAA,CAAAA,CAAGV,IAAI,EAAEW,EAAE,EAAA;AACf,QAAA,KAAK,MAAMC,IAAAA,IAAQD,EAAAA,CAAGE,QAAQ,CAACC,MAAM,EAAA,CAAI;YACvC,MAAMC,QAAAA,GAAW,MAAMf,IAAAA,CAAKG,MAAM,CAACY,QAAQ,CAACH,KAAKX,SAAS,CAAA;AAC1D,YAAA,IAAI,CAACc,QAAAA,EAAU;AACb,gBAAA;AACF,YAAA;AAEA,YAAA,KAAK,MAAMC,SAAAA,IAAaC,MAAAA,CAAOH,MAAM,CAACF,IAAAA,CAAKM,UAAU,CAAA,CAAG;AACtD,gBAAA,IAAIF,UAAUG,IAAI,KAAK,KAAA,IAASH,SAAAA,CAAUd,UAAU,EAAE;AACpD,oBAAA,MAAMH,UAAUC,IAAAA,EAAMY,IAAAA,CAAKX,SAAS,EAAEe,UAAUd,UAAU,CAAA;AAC5D,gBAAA;AACF,YAAA;AACF,QAAA;AACF,IAAA,CAAA;IACA,MAAMkB,IAAAA,CAAAA,GAAAA;AACJ,QAAA,MAAM,IAAIC,KAAAA,CAAM,iBAAA,CAAA;AAClB,IAAA;AACF;;;;"}
+{"version":3,"file":"5.0.0-05-drop-slug-unique-index.mjs","sources":["../../../src/migrations/internal-migrations/5.0.0-05-drop-slug-unique-index.ts"],"sourcesContent":["/**\n * In V4 slug fields contained a unique index.\n * In V5 slug fields should not have a unique index.\n *\n * This migration drops existing unique indexes from slug fields so downstream migrations\n * can work on the data without violating the unique index.\n */\nimport type { Knex } from 'knex';\n\nimport type { Migration } from '../common';\n\nconst dropIndex = async (knex: Knex, tableName: string, columnName: string) => {\n  try {\n    await knex.schema.alterTable(tableName, (table) => {\n      // NOTE: Can not use \"identifiers\" utility, as the 5.0.0-01 migration does not rename this particular index\n      // to `tableName_columnName_uq`.\n      table.dropUnique([columnName], `${tableName}_${columnName}_unique`);\n    });\n  } catch {\n    // If unique index does not exist, do nothing\n  }\n};\n\nexport const dropSlugFieldsIndex: Migration = {\n  name: '5.0.0-05-drop-slug-fields-index',\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      for (const attribute of Object.values(meta.attributes)) {\n        if (attribute.type === 'uid' && attribute.columnName) {\n          await dropIndex(knex, meta.tableName, attribute.columnName);\n        }\n      }\n    }\n  },\n  async down() {\n    throw new Error('not implemented');\n  },\n};\n"],"names":["dropIndex","knex","tableName","columnName","schema","alterTable","table","dropUnique","dropSlugFieldsIndex","name","up","db","meta","metadata","values","hasTable","attribute","Object","attributes","type","down","Error"],"mappings":"AAAA;;;;;;AAMC,IAKD,MAAMA,SAAAA,GAAY,OAAOC,IAAAA,EAAYC,SAAAA,EAAmBC,UAAAA,GAAAA;IACtD,IAAI;AACF,QAAA,MAAMF,KAAKG,MAAM,CAACC,UAAU,CAACH,WAAW,CAACI,KAAAA,GAAAA;;;AAGvCA,YAAAA,KAAAA,CAAMC,UAAU,CAAC;AAACJ,gBAAAA;AAAW,aAAA,EAAE,GAAGD,SAAAA,CAAU,CAAC,EAAEC,UAAAA,CAAW,OAAO,CAAC,CAAA;AACpE,QAAA,CAAA,CAAA;AACF,IAAA,CAAA,CAAE,OAAM;;AAER,IAAA;AACF,CAAA;MAEaK,mBAAAA,GAAiC;IAC5CC,IAAAA,EAAM,iCAAA;IACN,MAAMC,EAAAA,CAAAA,CAAGT,IAAI,EAAEU,EAAE,EAAA;AACf,QAAA,KAAK,MAAMC,IAAAA,IAAQD,EAAAA,CAAGE,QAAQ,CAACC,MAAM,EAAA,CAAI;YACvC,MAAMC,QAAAA,GAAW,MAAMd,IAAAA,CAAKG,MAAM,CAACW,QAAQ,CAACH,KAAKV,SAAS,CAAA;AAC1D,YAAA,IAAI,CAACa,QAAAA,EAAU;AACb,gBAAA;AACF,YAAA;AAEA,YAAA,KAAK,MAAMC,SAAAA,IAAaC,MAAAA,CAAOH,MAAM,CAACF,IAAAA,CAAKM,UAAU,CAAA,CAAG;AACtD,gBAAA,IAAIF,UAAUG,IAAI,KAAK,KAAA,IAASH,SAAAA,CAAUb,UAAU,EAAE;AACpD,oBAAA,MAAMH,UAAUC,IAAAA,EAAMW,IAAAA,CAAKV,SAAS,EAAEc,UAAUb,UAAU,CAAA;AAC5D,gBAAA;AACF,YAAA;AACF,QAAA;AACF,IAAA,CAAA;IACA,MAAMiB,IAAAA,CAAAA,GAAAA;AACJ,QAAA,MAAM,IAAIC,KAAAA,CAAM,iBAAA,CAAA;AAClB,IAAA;AACF;;;;"}

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":"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"}
+{"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;AAwpBnC,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

@@ -306,7 +306,7 @@ const morphX = async (input, ctx)=>{
         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;
+                result[attributeName] = attribute.relation === 'morphOne' ? null : [];
             });
             return;
         }
@@ -320,7 +320,8 @@ const morphX = async (input, ctx)=>{
         const map = ___default.default.groupBy(idColumn.name)(rows);
         results.forEach((result)=>{
             const matchingRows = map[result[idColumn.referencedColumn]];
-            const matchingValue = attribute.relation === 'morphOne' ? ___default.default.first(matchingRows) : matchingRows;
+            // Match oneToMany/manyToMany: empty morphMany collections serialize as [], not null.
+            const matchingValue = attribute.relation === 'morphOne' ? ___default.default.first(matchingRows) : matchingRows || [];
             result[attributeName] = fromTargetRow(matchingValue);
         });
     } else if (targetAttribute.type === 'relation' && targetAttribute.relation === 'morphToMany') {
@@ -344,7 +345,7 @@ const morphX = async (input, ctx)=>{
             rootColumn: joinColumn.referencedColumn,
             rootTable: qb.alias,
             on: {
-                ...joinTable.on || {},
+                ...joinTable.on,
                 field: attributeName
             },
             orderBy: getJoinTableOrderBy(populateValue, joinTable)
@@ -360,7 +361,8 @@ const morphX = async (input, ctx)=>{
         const map = ___default.default.groupBy(idColumn.name)(rows);
         results.forEach((result)=>{
             const matchingRows = map[result[idColumn.referencedColumn]];
-            const matchingValue = attribute.relation === 'morphOne' ? ___default.default.first(matchingRows) : matchingRows;
+            // Match oneToMany/manyToMany: empty morphMany collections serialize as [], not null.
+            const matchingValue = attribute.relation === 'morphOne' ? ___default.default.first(matchingRows) : matchingRows || [];
             result[attributeName] = fromTargetRow(matchingValue);
         });
     }
@@ -377,7 +379,7 @@ const morphToMany = async (input, ctx)=>{
     const qb = db.entityManager.createQueryBuilder(joinTable.name);
     const joinRowsRaw = await qb.where({
         [joinColumn.name]: referencedValues,
-        ...joinTable.on || {}
+        ...joinTable.on
     }).orderBy([
         joinColumn.name,
         'order'