chore: update dependencies

Signed-off-by: Martin Adámek <[email protected]>

.eslintrc.js

@@ -10,7 +10,7 @@ module.exports = {
     'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
   ],
-  ignorePatterns: ['node_modules', 'dist', 'coverage', '**/*.js', '**/*.d.ts'],
+  ignorePatterns: ['node_modules', '**/dist', 'coverage', '**/*.js', '**/*.d.ts'],
   parser: '@typescript-eslint/parser',
   parserOptions: {
     'project': 'tsconfig.json',

docker-compose.yml

@@ -21,7 +21,7 @@ services:
       - mysql8:/var/lib/mysql
 
   mariadb:
-    image: mariadb:11.0
+    image: mariadb:11.1
     ports:
       - "3309:3306"
     environment:

package.json

@@ -104,22 +104,22 @@
     "@types/fs-extra": "11.0.1",
     "@types/jest": "29.5.4",
     "@types/mysql2": "https://github.com/types/mysql2.git#commit=89378b2cb3974ea8cdd1d633b8f056e54e5d2384",
-    "@types/node": "20.5.4",
+    "@types/node": "20.5.9",
     "@types/pg": "8.10.2",
     "@types/sqlstring": "2.3.0",
-    "@types/uuid": "9.0.2",
+    "@types/uuid": "9.0.3",
     "@types/webpack-env": "1.18.1",
-    "@typescript-eslint/eslint-plugin": "6.4.1",
-    "@typescript-eslint/parser": "6.4.1",
+    "@typescript-eslint/eslint-plugin": "6.6.0",
+    "@typescript-eslint/parser": "6.6.0",
     "bson": "^5.4.0",
     "conditional-type-checks": "1.0.6",
-    "eslint": "8.47.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint": "8.48.0",
+    "eslint-plugin-import": "^2.28.1",
     "fs-extra": "11.1.1",
     "gen-esm-wrapper": "1.1.3",
     "guid-typescript": "1.0.9",
     "husky": "8.0.3",
-    "jest": "29.6.3",
+    "jest": "29.6.4",
     "lerna": "6.6.2",
     "lint-staged": "14.0.1",
     "mongodb": "5.8.1",
@@ -128,7 +128,7 @@
     "rimraf": "5.0.1",
     "ts-jest": "29.1.1",
     "ts-node": "10.9.1",
-    "typescript": "5.1.6",
+    "typescript": "5.2.2",
     "uuid": "9.0.0"
   },
   "packageManager": "[email protected]"

packages/better-sqlite/package.json

@@ -59,7 +59,7 @@
   },
   "dependencies": {
     "@mikro-orm/knex": "~5.7.14",
-    "better-sqlite3": "8.5.1",
+    "better-sqlite3": "8.6.0",
     "fs-extra": "11.1.1",
     "sqlstring-sqlite": "0.1.1"
   },

packages/better-sqlite/src/BetterSqliteConnection.ts

@@ -1,9 +1,7 @@
 import { ensureDir, readFile } from 'fs-extra';
 import { dirname } from 'path';
-import type { Knex } from '@mikro-orm/knex';
-import { AbstractSqlConnection, MonkeyPatchable } from '@mikro-orm/knex';
-import type { Dictionary } from '@mikro-orm/core';
-import { Utils } from '@mikro-orm/core';
+import { AbstractSqlConnection, MonkeyPatchable, type Knex } from '@mikro-orm/knex';
+import { Utils, type Dictionary } from '@mikro-orm/core';
 
 export class BetterSqliteConnection extends AbstractSqlConnection {
 

packages/better-sqlite/src/BetterSqliteExceptionConverter.ts

@@ -1,8 +1,7 @@
-import type { Dictionary, DriverException } from '@mikro-orm/core';
 import {
   ConnectionException, ExceptionConverter, InvalidFieldNameException, LockWaitTimeoutException, NonUniqueFieldNameException, CheckConstraintViolationException,
   NotNullConstraintViolationException, ReadOnlyException, SyntaxErrorException, TableExistsException, TableNotFoundException, UniqueConstraintViolationException,
-  ForeignKeyConstraintViolationException,
+  ForeignKeyConstraintViolationException, type Dictionary, type DriverException,
 } from '@mikro-orm/core';
 
 export class BetterSqliteExceptionConverter extends ExceptionConverter {

packages/better-sqlite/src/BetterSqliteMikroORM.ts

@@ -1,5 +1,4 @@
-import { defineConfig, MikroORM } from '@mikro-orm/core';
-import type { Options, Configuration, IDatabaseDriver } from '@mikro-orm/core';
+import { defineConfig, MikroORM, type Options, type Configuration, type IDatabaseDriver } from '@mikro-orm/core';
 import { BetterSqliteDriver } from './BetterSqliteDriver';
 
 /**

packages/better-sqlite/src/BetterSqlitePlatform.ts

@@ -1,7 +1,6 @@
 // @ts-ignore
 import { escape } from 'sqlstring-sqlite';
-import type { EntityProperty } from '@mikro-orm/core';
-import { expr, JsonProperty, Utils } from '@mikro-orm/core';
+import { JsonProperty, Utils, type EntityProperty } from '@mikro-orm/core';
 import { AbstractSqlPlatform } from '@mikro-orm/knex';
 import { BetterSqliteSchemaHelper } from './BetterSqliteSchemaHelper';
 import { BetterSqliteExceptionConverter } from './BetterSqliteExceptionConverter';

packages/better-sqlite/src/BetterSqliteSchemaHelper.ts

@@ -1,6 +1,5 @@
 import type { Connection, Dictionary } from '@mikro-orm/core';
-import type { AbstractSqlConnection, Index, Check } from '@mikro-orm/knex';
-import { SchemaHelper } from '@mikro-orm/knex';
+import { SchemaHelper, type AbstractSqlConnection, type Index, type Check } from '@mikro-orm/knex';
 
 export class BetterSqliteSchemaHelper extends SchemaHelper {
 

packages/cli/src/CLIConfigurator.ts

@@ -1,5 +1,4 @@
-import type { Argv } from 'yargs';
-import yargs from 'yargs';
+import yargs, { type Argv } from 'yargs';
 
 import { ConfigurationLoader, Utils } from '@mikro-orm/core';
 import { ClearCacheCommand } from './commands/ClearCacheCommand';

packages/cli/src/CLIHelper.ts

@@ -1,9 +1,6 @@
 import { pathExists } from 'fs-extra';
 import yargs from 'yargs';
-import { platform } from 'os';
-import { fileURLToPath } from 'url';
-import type { Configuration, IDatabaseDriver, Options } from '@mikro-orm/core';
-import { colors, ConfigurationLoader, MikroORM, Utils } from '@mikro-orm/core';
+import { colors, ConfigurationLoader, MikroORM, Utils, type Configuration, type IDatabaseDriver, type Options } from '@mikro-orm/core';
 
 /**
  * @internal

packages/cli/src/commands/DebugCommand.ts

@@ -1,5 +1,4 @@
 import type { CommandModule } from 'yargs';
-import type { Configuration } from '@mikro-orm/core';
 import { ConfigurationLoader, Utils, colors, MikroORM } from '@mikro-orm/core';
 
 import { CLIHelper } from '../CLIHelper';

packages/cli/src/commands/ImportCommand.ts

@@ -1,5 +1,4 @@
-import type { MikroORM } from '@mikro-orm/core';
-import { colors } from '@mikro-orm/core';
+import { colors, type MikroORM } from '@mikro-orm/core';
 import type { AbstractSqlDriver } from '@mikro-orm/knex';
 import type { ArgumentsCamelCase, CommandModule } from 'yargs';
 import { CLIHelper } from '../CLIHelper';

packages/cli/src/commands/MigrationCommandFactory.ts

@@ -1,6 +1,5 @@
 import type { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
-import type { Configuration, MikroORM, MikroORMOptions, IMigrator } from '@mikro-orm/core';
-import { Utils, colors } from '@mikro-orm/core';
+import { Utils, colors, type Configuration, type MikroORM, type MikroORMOptions, type IMigrator } from '@mikro-orm/core';
 import type { MigrateOptions } from '@mikro-orm/migrations';
 import { CLIHelper } from '../CLIHelper';
 

packages/core/src/EntityManager.ts

@@ -1,8 +1,6 @@
 import { inspect } from 'util';
-import type { Configuration } from './utils';
-import { QueryHelper, TransactionContext, Utils } from './utils';
-import type { AssignOptions, EntityLoaderOptions, EntityRepository, IdentifiedReference } from './entity';
-import { EntityAssigner, EntityFactory, EntityLoader, EntityValidator, helper, Reference } from './entity';
+import { QueryHelper, TransactionContext, Utils, type Configuration } from './utils';
+import { EntityAssigner, EntityFactory, EntityLoader, EntityValidator, helper, Reference, type AssignOptions, type EntityLoaderOptions, type EntityRepository, type IdentifiedReference } from './entity';
 import { ChangeSet, ChangeSetType, UnitOfWork } from './unit-of-work';
 import type {
   CountOptions,
@@ -39,12 +37,10 @@ import type {
   Primary,
   RequiredEntityData,
 } from './typings';
-import type { TransactionOptions } from './enums';
-import { EventType, FlushMode, LoadStrategy, LockMode, PopulateHint, ReferenceType, SCALAR_TYPES } from './enums';
+import { EventType, FlushMode, LoadStrategy, LockMode, PopulateHint, ReferenceType, SCALAR_TYPES, type TransactionOptions } from './enums';
 import type { MetadataStorage } from './metadata';
 import type { Transaction } from './connections';
-import type { FlushEventArgs } from './events';
-import { EventManager, TransactionEventBroadcaster } from './events';
+import { EventManager, TransactionEventBroadcaster, type FlushEventArgs } from './events';
 import type { EntityComparator } from './utils/EntityComparator';
 import { OptimisticLockError, ValidationError } from './errors';
 

packages/core/src/MikroORM.ts

@@ -1,12 +1,10 @@
 import type { EntityManagerType, IDatabaseDriver } from './drivers';
 import { MetadataDiscovery, MetadataStorage, MetadataValidator, ReflectMetadataProvider } from './metadata';
-import type { Options } from './utils';
-import type { Logger } from './logging';
-import { Configuration, ConfigurationLoader, Utils } from './utils';
+import { Configuration, ConfigurationLoader, Utils, type Options } from './utils';
+import { colors, type Logger } from './logging';
 import { NullCacheAdapter } from './cache';
 import type { EntityManager } from './EntityManager';
 import type { Constructor, EntityMetadata, EntityName, IEntityGenerator, IMigrator, ISeedManager } from './typings';
-import { colors } from './logging';
 
 /**
  * Helper class for bootstrapping the MikroORM.

packages/core/src/decorators/ManyToMany.ts

@@ -2,8 +2,7 @@ import type { ReferenceOptions } from './Property';
 import { MetadataStorage, MetadataValidator } from '../metadata';
 import { Utils } from '../utils';
 import type { EntityName, EntityProperty, AnyEntity } from '../typings';
-import type { QueryOrderMap } from '../enums';
-import { ReferenceType } from '../enums';
+import { ReferenceType, type QueryOrderMap } from '../enums';
 
 export function ManyToMany<T, O>(
   entity?: ManyToManyOptions<T, O> | string | (() => EntityName<T>),

packages/core/src/decorators/OneToMany.ts

@@ -1,8 +1,7 @@
 import type { ReferenceOptions } from './Property';
 import { MetadataStorage, MetadataValidator } from '../metadata';
 import { Utils } from '../utils';
-import type { QueryOrderMap } from '../enums';
-import { ReferenceType } from '../enums';
+import { ReferenceType, type QueryOrderMap } from '../enums';
 import type { EntityName, EntityProperty, AnyEntity } from '../typings';
 
 export function createOneToDecorator<T, O>(

packages/core/src/decorators/OneToOne.ts

@@ -1,6 +1,5 @@
 import { ReferenceType } from '../enums';
-import type { OneToManyOptions } from './OneToMany';
-import { createOneToDecorator } from './OneToMany';
+import { createOneToDecorator, type OneToManyOptions } from './OneToMany';
 import type { AnyString, EntityName } from '../typings';
 
 export function OneToOne<T, O>(

packages/core/src/decorators/Property.ts

@@ -1,7 +1,6 @@
 import { MetadataStorage, MetadataValidator } from '../metadata';
 import { Utils } from '../utils';
-import type { Cascade, LoadStrategy } from '../enums';
-import { ReferenceType } from '../enums';
+import { ReferenceType, type Cascade, type LoadStrategy } from '../enums';
 import type { EntityName, EntityProperty, Constructor, CheckCallback, Dictionary, AnyString, AnyEntity } from '../typings';
 import type { Type, types } from '../types';
 

packages/core/src/drivers/DatabaseDriver.ts

@@ -1,12 +1,9 @@
-import type { CountOptions, LockOptions, DeleteOptions, FindOneOptions, FindOptions, IDatabaseDriver, NativeInsertUpdateManyOptions, NativeInsertUpdateOptions, DriverMethodOptions } from './IDatabaseDriver';
-import { EntityManagerType } from './IDatabaseDriver';
+import { EntityManagerType, type CountOptions, type LockOptions, type DeleteOptions, type FindOneOptions, type FindOptions, type IDatabaseDriver, type NativeInsertUpdateManyOptions, type NativeInsertUpdateOptions, type DriverMethodOptions } from './IDatabaseDriver';
 import type { ConnectionType, Dictionary, EntityData, EntityDictionary, EntityMetadata, EntityProperty, FilterQuery, PopulateOptions, Primary } from '../typings';
 import type { MetadataStorage } from '../metadata';
 import type { Connection, QueryResult, Transaction } from '../connections';
-import type { Configuration, ConnectionOptions } from '../utils';
-import { EntityComparator, Utils } from '../utils';
-import type { QueryOrderMap } from '../enums';
-import { QueryOrder, ReferenceType } from '../enums';
+import { EntityComparator, Utils, type Configuration, type ConnectionOptions } from '../utils';
+import { QueryOrder, ReferenceType, type QueryOrderMap } from '../enums';
 import type { Platform } from '../platforms';
 import type { Collection } from '../entity/Collection';
 import { EntityManager } from '../EntityManager';

packages/core/src/entity/ArrayCollection.ts

@@ -1,5 +1,5 @@
 import { inspect } from 'util';
-import type { Dictionary, EntityDTO, EntityProperty, IPrimaryKey, Primary } from '../typings';
+import type { EntityDTO, EntityProperty, IPrimaryKey, Primary } from '../typings';
 import { Reference } from './Reference';
 import { helper, wrap } from './wrap';
 import { ReferenceType } from '../enums';
@@ -276,23 +276,23 @@ export class ArrayCollection<T extends object, O extends object> {
    * Maps the collection items to a dictionary, indexed by the key you specify.
    * If there are more items with the same key, only the first one will be present.
    */
-  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1): Record<T[K1], T>;
+  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1): Record<T[K1] & PropertyKey, T>;
 
   /**
    * Maps the collection items to a dictionary, indexed by the key you specify.
    * If there are more items with the same key, only the first one will be present.
    */
-  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1, valueKey: K2): Record<T[K1], T[K2]>;
+  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1, valueKey: K2): Record<T[K1] & PropertyKey, T[K2]>;
 
   /**
    * Maps the collection items to a dictionary, indexed by the key you specify.
    * If there are more items with the same key, only the first one will be present.
    */
-  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1, valueKey?: K2): Record<T[K1], T> | Record<T[K1], T[K2]> {
+  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1, valueKey?: K2): Record<T[K1] & PropertyKey, T> | Record<T[K1] & PropertyKey, T[K2]> {
     return this.reduce((obj, item) => {
       obj[item[key] as string] ??= valueKey ? item[valueKey] : item;
       return obj;
-    }, {} as Dictionary);
+    }, {} as any);
   }
 
   count(): number {

packages/core/src/entity/BaseEntity.ts

@@ -1,8 +1,6 @@
-import type { IdentifiedReference } from './Reference';
-import { Reference } from './Reference';
+import { Reference, type IdentifiedReference } from './Reference';
 import type { AutoPath, EntityData, EntityDTO, Loaded } from '../typings';
-import type { AssignOptions } from './EntityAssigner';
-import { EntityAssigner } from './EntityAssigner';
+import { EntityAssigner, type AssignOptions } from './EntityAssigner';
 import type { EntityLoaderOptions } from './EntityLoader';
 import { helper } from './wrap';
 

packages/core/src/entity/Collection.ts

@@ -2,8 +2,7 @@ import type { AnyEntity, EntityData, EntityDTO, EntityMetadata, FilterQuery, Loa
 import { ArrayCollection } from './ArrayCollection';
 import { Utils } from '../utils/Utils';
 import { ValidationError } from '../errors';
-import type { LockMode, QueryOrderMap } from '../enums';
-import { QueryOrder, ReferenceType } from '../enums';
+import { QueryOrder, ReferenceType, type LockMode, type QueryOrderMap } from '../enums';
 import { Reference } from './Reference';
 import type { Transaction } from '../connections/Connection';
 import type { FindOptions } from '../drivers/IDatabaseDriver';
@@ -248,17 +247,17 @@ export class Collection<T extends object, O extends object = object> extends Arr
   /**
    * @inheritDoc
    */
-  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1): Record<T[K1], T>;
+  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1): Record<T[K1] & PropertyKey, T>;
 
   /**
    * @inheritDoc
    */
-  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1, valueKey: K2): Record<T[K1], T[K2]>;
+  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1, valueKey: K2): Record<T[K1] & PropertyKey, T[K2]>;
 
   /**
    * @inheritDoc
    */
-  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1, valueKey?: K2): Record<T[K1], T> | Record<T[K1], T[K2]> {
+  indexBy<K1 extends keyof T, K2 extends keyof T = never>(key: K1, valueKey?: K2): Record<T[K1] & PropertyKey, T> | Record<T[K1] & PropertyKey, T[K2]> {
     this.checkInitialized();
     return super.indexBy(key, valueKey as never);
   }

packages/core/src/entity/EntityHelper.ts

@@ -1,14 +1,13 @@
 import { inspect } from 'util';
 
 import type { EntityManager } from '../EntityManager';
-import type { AnyEntity, Dictionary, EntityMetadata, EntityProperty, IHydrator } from '../typings';
+import { EntityRepositoryType, OptionalProps, PrimaryKeyProp, PrimaryKeyType, type AnyEntity, type Dictionary, type EntityMetadata, type EntityProperty, type IHydrator } from '../typings';
 import { EntityTransformer } from '../serialization/EntityTransformer';
 import { Reference } from './Reference';
 import { Utils } from '../utils/Utils';
 import { WrappedEntity } from './WrappedEntity';
 import { ReferenceType } from '../enums';
 import { helper } from './wrap';
-import { EntityRepositoryType, OptionalProps, PrimaryKeyProp, PrimaryKeyType } from '../typings';
 
 export class EntityHelper {
 

packages/core/src/entity/EntityLoader.ts

@@ -4,8 +4,7 @@ import { QueryHelper } from '../utils/QueryHelper';
 import { Utils } from '../utils/Utils';
 import { ValidationError } from '../errors';
 import type { Collection } from './Collection';
-import type { LockMode, PopulateHint, QueryOrderMap } from '../enums';
-import { LoadStrategy, QueryOrder, ReferenceType } from '../enums';
+import { LoadStrategy, QueryOrder, ReferenceType, type LockMode, type PopulateHint, type QueryOrderMap } from '../enums';
 import { Reference } from './Reference';
 import type { EntityField, FindOptions } from '../drivers/IDatabaseDriver';
 import type { MetadataStorage } from '../metadata/MetadataStorage';

packages/core/src/entity/WrappedEntity.ts

@@ -4,11 +4,9 @@ import type {
   AnyEntity, ConnectionType, Dictionary, EntityData, EntityDictionary, EntityMetadata, IHydrator,
   IWrappedEntityInternal, Populate, PopulateOptions, Primary, AutoPath, Loaded,
 } from '../typings';
-import type { IdentifiedReference } from './Reference';
-import { Reference } from './Reference';
+import { Reference, type IdentifiedReference } from './Reference';
 import { EntityTransformer } from '../serialization/EntityTransformer';
-import type { AssignOptions } from './EntityAssigner';
-import { EntityAssigner } from './EntityAssigner';
+import { EntityAssigner, type AssignOptions } from './EntityAssigner';
 import type { EntityLoaderOptions } from './EntityLoader';
 import { Utils } from '../utils/Utils';
 import type { LockMode } from '../enums';

packages/core/src/events/EventManager.ts

@@ -1,8 +1,7 @@
 import type { AnyEntity, AsyncFunction, EntityMetadata } from '../typings';
 import type { EventArgs, EventSubscriber, FlushEventArgs, TransactionEventArgs } from './EventSubscriber';
 import { Utils } from '../utils';
-import type { TransactionEventType } from '../enums';
-import { EventType } from '../enums';
+import { EventType, type TransactionEventType } from '../enums';
 
 export class EventManager {
 

packages/core/src/metadata/EntitySchema.ts

@@ -1,5 +1,4 @@
-import type { AnyEntity, Constructor, DeepPartial, Dictionary, EntityName, EntityProperty, ExcludeFunctions, ExpandProperty } from '../typings';
-import { EntityMetadata } from '../typings';
+import { EntityMetadata, type AnyEntity, type Constructor, type DeepPartial, type Dictionary, type EntityName, type EntityProperty, type ExcludeFunctions, type ExpandProperty } from '../typings';
 import type {
   EmbeddedOptions, EnumOptions, IndexOptions, ManyToManyOptions, ManyToOneOptions, OneToManyOptions, OneToOneOptions, PrimaryKeyOptions, PropertyOptions,
   SerializedPrimaryKeyOptions, UniqueOptions,

packages/core/src/metadata/MetadataDiscovery.ts

@@ -1,8 +1,7 @@
 import { basename, extname } from 'path';
 import globby from 'globby';
 
-import type { AnyEntity, Constructor, Dictionary, EntityClass, EntityClassGroup, EntityProperty } from '../typings';
-import { EntityMetadata } from '../typings';
+import { EntityMetadata, type AnyEntity, type Constructor, type Dictionary, type EntityClass, type EntityClassGroup, type EntityProperty } from '../typings';
 import { Utils } from '../utils/Utils';
 import type { Configuration } from '../utils/Configuration';
 import { MetadataValidator } from './MetadataValidator';

packages/core/src/metadata/MetadataStorage.ts

@@ -1,5 +1,4 @@
-import type { Dictionary, EntityData } from '../typings';
-import { EntityMetadata } from '../typings';
+import { EntityMetadata, type Dictionary, type EntityData } from '../typings';
 import { Utils } from '../utils/Utils';
 import { MetadataError } from '../errors';
 import type { EntityManager } from '../EntityManager';