@mikro-orm/core 7.0.0-dev.1 → 7.0.0-dev.3

package/unit-of-work/index.d.ts

@@ -1,6 +1,6 @@
-export * from './ChangeSet';
-export * from './ChangeSetComputer';
-export * from './ChangeSetPersister';
-export * from './CommitOrderCalculator';
-export * from './UnitOfWork';
-export * from './IdentityMap';
+export * from './ChangeSet.js';
+export * from './ChangeSetComputer.js';
+export * from './ChangeSetPersister.js';
+export * from './CommitOrderCalculator.js';
+export * from './UnitOfWork.js';
+export * from './IdentityMap.js';

package/unit-of-work/index.js

@@ -1,22 +1,6 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./ChangeSet"), exports);
-__exportStar(require("./ChangeSetComputer"), exports);
-__exportStar(require("./ChangeSetPersister"), exports);
-__exportStar(require("./CommitOrderCalculator"), exports);
-__exportStar(require("./UnitOfWork"), exports);
-__exportStar(require("./IdentityMap"), exports);
+export * from './ChangeSet.js';
+export * from './ChangeSetComputer.js';
+export * from './ChangeSetPersister.js';
+export * from './CommitOrderCalculator.js';
+export * from './UnitOfWork.js';
+export * from './IdentityMap.js';

package/utils/AbstractSchemaGenerator.d.ts

@@ -1,15 +1,15 @@
-import type { ClearDatabaseOptions, DropSchemaOptions, EntityMetadata, ISchemaGenerator, UpdateSchemaOptions, CreateSchemaOptions, RefreshDatabaseOptions, EnsureDatabaseOptions } from '../typings';
-import type { IDatabaseDriver } from '../drivers/IDatabaseDriver';
-import type { MetadataStorage } from '../metadata/MetadataStorage';
-import type { Configuration } from './Configuration';
+import type { ClearDatabaseOptions, DropSchemaOptions, EntityMetadata, ISchemaGenerator, UpdateSchemaOptions, CreateSchemaOptions, RefreshDatabaseOptions, EnsureDatabaseOptions } from '../typings.js';
+import { type EntityManagerType, type IDatabaseDriver } from '../drivers/IDatabaseDriver.js';
+import type { MetadataStorage } from '../metadata/MetadataStorage.js';
+import type { Configuration } from './Configuration.js';
 export declare abstract class AbstractSchemaGenerator<D extends IDatabaseDriver> implements ISchemaGenerator {
-    protected readonly em?: ReturnType<D['createEntityManager']>;
+    protected readonly em?: D[typeof EntityManagerType];
     protected readonly driver: D;
     protected readonly config: Configuration;
     protected readonly metadata: MetadataStorage;
     protected readonly platform: ReturnType<D['getPlatform']>;
     protected readonly connection: ReturnType<D['getConnection']>;
-    constructor(em: D | ReturnType<D['createEntityManager']>);
+    constructor(em: D | D[typeof EntityManagerType]);
     createSchema(options?: CreateSchemaOptions): Promise<void>;
     /**
      * Returns true if the database was created.

package/utils/AbstractSchemaGenerator.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbstractSchemaGenerator = void 0;
-const CommitOrderCalculator_1 = require("../unit-of-work/CommitOrderCalculator");
-const EntityManager_1 = require("../EntityManager");
-class AbstractSchemaGenerator {
+import { CommitOrderCalculator } from '../unit-of-work/CommitOrderCalculator.js';
+import { EntityManager } from '../EntityManager.js';
+export class AbstractSchemaGenerator {
     em;
     driver;
     config;
@@ -11,8 +8,8 @@ class AbstractSchemaGenerator {
     platform;
     connection;
     constructor(em) {
-        this.em = em instanceof EntityManager_1.EntityManager ? em : undefined;
-        this.driver = em instanceof EntityManager_1.EntityManager ? em.getDriver() : em;
+        this.em = em instanceof EntityManager ? em : undefined;
+        this.driver = em instanceof EntityManager ? em.getDriver() : em;
         this.config = this.driver.config;
         this.metadata = this.driver.getMetadata();
         this.platform = this.driver.getPlatform();
@@ -48,7 +45,7 @@ class AbstractSchemaGenerator {
         this.clearIdentityMap();
     }
     clearIdentityMap() {
-        /* istanbul ignore next */
+        /* v8 ignore next 3 */
         if (!this.em) {
             return;
         }
@@ -95,7 +92,7 @@ class AbstractSchemaGenerator {
             const isRootEntity = meta.root.className === meta.className;
             return isRootEntity && !meta.embeddable && !meta.virtual;
         });
-        const calc = new CommitOrderCalculator_1.CommitOrderCalculator();
+        const calc = new CommitOrderCalculator();
         metadata.forEach(meta => calc.addNode(meta.root.className));
         let meta = metadata.pop();
         while (meta) {
@@ -112,4 +109,3 @@ class AbstractSchemaGenerator {
         throw new Error(`This method is not supported by ${this.driver.constructor.name} driver`);
     }
 }
-exports.AbstractSchemaGenerator = AbstractSchemaGenerator;

package/utils/Configuration.d.ts

@@ -1,26 +1,27 @@
-import type { NamingStrategy } from '../naming-strategy';
-import { FileCacheAdapter, type SyncCacheAdapter, type CacheAdapter } from '../cache';
-import type { EntityRepository } from '../entity/EntityRepository';
-import type { AnyEntity, Constructor, Dictionary, EntityClass, EntityClassGroup, FilterDef, Highlighter, HydratorConstructor, IHydrator, IMigrationGenerator, IPrimaryKey, MaybePromise, MigrationObject, EntityMetadata, EnsureDatabaseOptions, GenerateOptions, Migration } from '../typings';
-import { ObjectHydrator } from '../hydration/ObjectHydrator';
-import { NullHighlighter } from '../utils/NullHighlighter';
-import { type Logger, type LoggerNamespace, type LoggerOptions } from '../logging';
-import type { EntityManager } from '../EntityManager';
-import type { Platform } from '../platforms';
-import type { EntitySchema } from '../metadata/EntitySchema';
-import type { MetadataProvider } from '../metadata/MetadataProvider';
-import type { MetadataStorage } from '../metadata/MetadataStorage';
-import { ReflectMetadataProvider } from '../metadata/ReflectMetadataProvider';
-import type { EmbeddedPrefixMode } from '../decorators/Embedded';
-import type { EventSubscriber } from '../events';
-import type { AssignOptions } from '../entity/EntityAssigner';
-import type { EntityManagerType, IDatabaseDriver } from '../drivers/IDatabaseDriver';
-import { NotFoundError } from '../errors';
-import { DataloaderType, FlushMode, LoadStrategy, PopulateHint } from '../enums';
-import { MemoryCacheAdapter } from '../cache/MemoryCacheAdapter';
-import { EntityComparator } from './EntityComparator';
-import type { Type } from '../types/Type';
-import type { MikroORM } from '../MikroORM';
+import type { NamingStrategy } from '../naming-strategy/NamingStrategy.js';
+import { FileCacheAdapter } from '../cache/FileCacheAdapter.js';
+import { type SyncCacheAdapter, type CacheAdapter } from '../cache/CacheAdapter.js';
+import type { EntityRepository } from '../entity/EntityRepository.js';
+import type { AnyEntity, Constructor, Dictionary, EntityClass, EntityClassGroup, FilterDef, Highlighter, HydratorConstructor, IHydrator, IMigrationGenerator, IPrimaryKey, MaybePromise, MigrationObject, EntityMetadata, EnsureDatabaseOptions, GenerateOptions, Migration } from '../typings.js';
+import { ObjectHydrator } from '../hydration/ObjectHydrator.js';
+import { NullHighlighter } from '../utils/NullHighlighter.js';
+import { type Logger, type LoggerNamespace, type LoggerOptions } from '../logging/Logger.js';
+import type { EntityManager } from '../EntityManager.js';
+import type { Platform } from '../platforms/Platform.js';
+import type { EntitySchema } from '../metadata/EntitySchema.js';
+import type { MetadataProvider } from '../metadata/MetadataProvider.js';
+import type { MetadataStorage } from '../metadata/MetadataStorage.js';
+import { ReflectMetadataProvider } from '../metadata/ReflectMetadataProvider.js';
+import type { EmbeddedPrefixMode } from '../decorators/Embedded.js';
+import type { EventSubscriber } from '../events/EventSubscriber.js';
+import type { AssignOptions } from '../entity/EntityAssigner.js';
+import type { EntityManagerType, IDatabaseDriver } from '../drivers/IDatabaseDriver.js';
+import { NotFoundError } from '../errors.js';
+import { DataloaderType, FlushMode, LoadStrategy, PopulateHint } from '../enums.js';
+import { MemoryCacheAdapter } from '../cache/MemoryCacheAdapter.js';
+import { EntityComparator } from './EntityComparator.js';
+import type { Type } from '../types/Type.js';
+import type { MikroORM } from '../MikroORM.js';
 export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver, EM extends EntityManager = D[typeof EntityManagerType] & EntityManager> {
     static readonly DEFAULTS: {
         pool: {};
@@ -43,7 +44,7 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
         strict: false;
         validate: false;
         validateRequired: true;
-        context: (name: string) => EntityManager<IDatabaseDriver<import("..").Connection>> | undefined;
+        context: (name: string) => EntityManager<IDatabaseDriver<import("../index.js").Connection>> | undefined;
         contextName: string;
         allowGlobalContext: false;
         logger: (message?: any, ...optionalParams: any[]) => void;
@@ -231,7 +232,7 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
 /**
  * Type helper to make it easier to use `mikro-orm.config.js`.
  */
-export declare function defineConfig<D extends IDatabaseDriver>(options: Options<D>): Options<D, D[typeof EntityManagerType] & EntityManager<IDatabaseDriver<import("..").Connection>>>;
+export declare function defineConfig<D extends IDatabaseDriver>(options: Options<D>): Options<D, D[typeof EntityManagerType] & EntityManager<IDatabaseDriver<import("../index.js").Connection>>>;
 export interface ConnectionOptions {
     dbName?: string;
     schema?: string;
@@ -367,8 +368,6 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
      * seeders. Should be used only for tests and stay disabled for production builds.
      */
     preferTs?: boolean;
-    /** @deprecated use `preferTs` instead */
-    tsNode?: boolean;
     baseDir: string;
     migrations: MigrationsOptions;
     schemaGenerator: {

package/utils/Configuration.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Configuration = void 0;
-exports.defineConfig = defineConfig;
-const fs_extra_1 = require("fs-extra");
-const cache_1 = require("../cache");
-const ObjectHydrator_1 = require("../hydration/ObjectHydrator");
-const NullHighlighter_1 = require("../utils/NullHighlighter");
-const logging_1 = require("../logging");
-const Utils_1 = require("../utils/Utils");
-const ReflectMetadataProvider_1 = require("../metadata/ReflectMetadataProvider");
-const errors_1 = require("../errors");
-const RequestContext_1 = require("./RequestContext");
-const enums_1 = require("../enums");
-const MemoryCacheAdapter_1 = require("../cache/MemoryCacheAdapter");
-const EntityComparator_1 = require("./EntityComparator");
-class Configuration {
+import { FileCacheAdapter } from '../cache/FileCacheAdapter.js';
+import { NullCacheAdapter } from '../cache/NullCacheAdapter.js';
+import { ObjectHydrator } from '../hydration/ObjectHydrator.js';
+import { NullHighlighter } from '../utils/NullHighlighter.js';
+import { DefaultLogger } from '../logging/DefaultLogger.js';
+import { colors } from '../logging/colors.js';
+import { Utils } from '../utils/Utils.js';
+import { ReflectMetadataProvider } from '../metadata/ReflectMetadataProvider.js';
+import { NotFoundError } from '../errors.js';
+import { RequestContext } from './RequestContext.js';
+import { DataloaderType, FlushMode, LoadStrategy, PopulateHint } from '../enums.js';
+import { MemoryCacheAdapter } from '../cache/MemoryCacheAdapter.js';
+import { EntityComparator } from './EntityComparator.js';
+export class Configuration {
     static DEFAULTS = {
         pool: {},
         entities: [],
@@ -36,20 +33,20 @@ class Configuration {
         strict: false,
         validate: false,
         validateRequired: true,
-        context: (name) => RequestContext_1.RequestContext.getEntityManager(name),
+        context: (name) => RequestContext.getEntityManager(name),
         contextName: 'default',
         allowGlobalContext: false,
         // eslint-disable-next-line no-console
         logger: console.log.bind(console),
         colors: true,
-        findOneOrFailHandler: (entityName, where) => errors_1.NotFoundError.findOneFailed(entityName, where),
-        findExactlyOneOrFailHandler: (entityName, where) => errors_1.NotFoundError.findExactlyOneFailed(entityName, where),
+        findOneOrFailHandler: (entityName, where) => NotFoundError.findOneFailed(entityName, where),
+        findExactlyOneOrFailHandler: (entityName, where) => NotFoundError.findExactlyOneFailed(entityName, where),
         baseDir: process.cwd(),
-        hydrator: ObjectHydrator_1.ObjectHydrator,
-        flushMode: enums_1.FlushMode.AUTO,
-        loadStrategy: enums_1.LoadStrategy.JOINED,
-        dataloader: enums_1.DataloaderType.NONE,
-        populateWhere: enums_1.PopulateHint.ALL,
+        hydrator: ObjectHydrator,
+        flushMode: FlushMode.AUTO,
+        loadStrategy: LoadStrategy.JOINED,
+        dataloader: DataloaderType.NONE,
+        populateWhere: PopulateHint.ALL,
         connect: true,
         ignoreUndefinedInQuery: false,
         onQuery: sql => sql,
@@ -115,16 +112,16 @@ class Configuration {
         },
         metadataCache: {
             pretty: false,
-            adapter: cache_1.FileCacheAdapter,
+            adapter: FileCacheAdapter,
             options: { cacheDir: process.cwd() + '/temp' },
         },
         resultCache: {
-            adapter: MemoryCacheAdapter_1.MemoryCacheAdapter,
+            adapter: MemoryCacheAdapter,
             expiration: 1000, // 1s
             options: {},
         },
-        metadataProvider: ReflectMetadataProvider_1.ReflectMetadataProvider,
-        highlighter: new NullHighlighter_1.NullHighlighter(),
+        metadataProvider: ReflectMetadataProvider,
+        highlighter: new NullHighlighter(),
         seeder: {
             path: './seeders',
             defaultSeeder: 'DatabaseSeeder',
@@ -133,7 +130,7 @@ class Configuration {
             fileName: (className) => className,
         },
         preferReadReplicas: true,
-        dynamicImportProvider: /* istanbul ignore next */ (id) => import(id),
+        dynamicImportProvider: /* v8 ignore next */ (id) => import(id),
     };
     options;
     logger;
@@ -143,15 +140,15 @@ class Configuration {
     extensions = new Map();
     constructor(options, validate = true) {
         if (options.dynamicImportProvider) {
-            Utils_1.Utils.setDynamicImportProvider(options.dynamicImportProvider);
+            Utils.setDynamicImportProvider(options.dynamicImportProvider);
         }
-        this.options = Utils_1.Utils.mergeConfig({}, Configuration.DEFAULTS, options);
-        this.options.baseDir = Utils_1.Utils.absolutePath(this.options.baseDir);
-        this.options.preferTs ??= options.tsNode;
+        this.options = Utils.mergeConfig({}, Configuration.DEFAULTS, options);
+        this.options.baseDir = Utils.absolutePath(this.options.baseDir);
+        this.options.preferTs ??= options.preferTs;
         if (validate) {
             this.validateOptions();
         }
-        this.options.loggerFactory ??= logging_1.DefaultLogger.create;
+        this.options.loggerFactory ??= DefaultLogger.create;
         this.logger = this.options.loggerFactory({
             debugMode: this.options.debug,
             ignoreDeprecations: this.options.ignoreDeprecations,
@@ -203,7 +200,7 @@ class Configuration {
     }
     getDataloaderType() {
         if (typeof this.options.dataloader === 'boolean') {
-            return this.options.dataloader ? enums_1.DataloaderType.ALL : enums_1.DataloaderType.NONE;
+            return this.options.dataloader ? DataloaderType.ALL : DataloaderType.NONE;
         }
         return this.options.dataloader;
     }
@@ -236,12 +233,12 @@ class Configuration {
             return this.cache.get(name);
         }
         const ext = this.extensions.get(name);
-        if (ext) {
-            this.cache.set(name, ext());
-            return this.cache.get(name);
+        /* v8 ignore next 3 */
+        if (!ext) {
+            return undefined;
         }
-        /* istanbul ignore next */
-        return undefined;
+        this.cache.set(name, ext());
+        return this.cache.get(name);
     }
     /**
      * Gets instance of NamingStrategy. (cached)
@@ -259,7 +256,7 @@ class Configuration {
      * Gets instance of Comparator. (cached)
      */
     getComparator(metadata) {
-        return this.getCachedService(EntityComparator_1.EntityComparator, metadata, this.platform);
+        return this.getCachedService(EntityComparator, metadata, this.platform);
     }
     /**
      * Gets instance of MetadataProvider. (cached)
@@ -306,7 +303,7 @@ class Configuration {
     }
     init(validate) {
         if (!this.getMetadataProvider().useCache()) {
-            this.options.metadataCache.adapter = cache_1.NullCacheAdapter;
+            this.options.metadataCache.adapter = NullCacheAdapter;
         }
         if (!('enabled' in this.options.metadataCache)) {
             this.options.metadataCache.enabled = this.getMetadataProvider().useCache();
@@ -341,17 +338,16 @@ class Configuration {
         Object.keys(this.options.filters).forEach(key => {
             this.options.filters[key].default ??= true;
         });
-        this.options.subscribers = Utils_1.Utils.unique(this.options.subscribers).map(subscriber => {
+        this.options.subscribers = Utils.unique(this.options.subscribers).map(subscriber => {
             return subscriber.constructor.name === 'Function' ? new subscriber() : subscriber;
         });
         this.sync();
-        if (!logging_1.colors.enabled()) {
-            this.options.highlighter = new NullHighlighter_1.NullHighlighter();
+        if (!colors.enabled()) {
+            this.options.highlighter = new NullHighlighter();
         }
     }
     sync() {
         process.env.MIKRO_ORM_COLORS = '' + this.options.colors;
-        this.options.tsNode = this.options.preferTs;
         this.logger.setDebugMode(this.options.debug);
     }
     /**
@@ -363,13 +359,13 @@ class Configuration {
      * break existing projects, only help with the new ones.
      */
     detectSourceFolder(options) {
-        if (!(0, fs_extra_1.pathExistsSync)(this.options.baseDir + '/src')) {
+        if (!Utils.pathExistsSync(this.options.baseDir + '/src')) {
             return;
         }
-        const migrationsPathExists = (0, fs_extra_1.pathExistsSync)(this.options.baseDir + '/' + this.options.migrations.path);
-        const seedersPathExists = (0, fs_extra_1.pathExistsSync)(this.options.baseDir + '/' + this.options.seeder.path);
-        const distDir = (0, fs_extra_1.pathExistsSync)(this.options.baseDir + '/dist');
-        const buildDir = (0, fs_extra_1.pathExistsSync)(this.options.baseDir + '/build');
+        const migrationsPathExists = Utils.pathExistsSync(this.options.baseDir + '/' + this.options.migrations.path);
+        const seedersPathExists = Utils.pathExistsSync(this.options.baseDir + '/' + this.options.seeder.path);
+        const distDir = Utils.pathExistsSync(this.options.baseDir + '/dist');
+        const buildDir = Utils.pathExistsSync(this.options.baseDir + '/build');
         // if neither `dist` nor `build` exist, we use the `src` folder as it might be a JS project without building, but with `src` folder
         const path = distDir ? './dist' : (buildDir ? './build' : './src');
         // only if the user did not provide any values and if the default path does not exist
@@ -384,7 +380,7 @@ class Configuration {
         }
     }
     validateOptions() {
-        /* istanbul ignore next */
+        /* v8 ignore next 3 */
         if ('type' in this.options) {
             throw new Error('The `type` option has been removed in v6, please fill in the `driver` option instead or use `defineConfig` helper (to define your ORM config) or `MikroORM` class (to call the `init` method) exported from the driver package (e.g. `import { defineConfig } from \'@mikro-orm/mysql\'; export default defineConfig({ ... })`).');
         }
@@ -399,10 +395,9 @@ class Configuration {
         }
     }
 }
-exports.Configuration = Configuration;
 /**
  * Type helper to make it easier to use `mikro-orm.config.js`.
  */
-function defineConfig(options) {
+export function defineConfig(options) {
     return options;
 }

package/utils/ConfigurationLoader.d.ts

@@ -1,7 +1,7 @@
-import type { EntityManager } from '../EntityManager';
-import type { EntityManagerType, IDatabaseDriver } from '../drivers';
-import type { Dictionary } from '../typings';
-import { Configuration, type Options } from './Configuration';
+import type { EntityManager } from '../EntityManager.js';
+import type { EntityManagerType, IDatabaseDriver } from '../drivers/IDatabaseDriver.js';
+import type { Dictionary } from '../typings.js';
+import { Configuration, type Options } from './Configuration.js';
 /**
  * @internal
  */
@@ -35,9 +35,10 @@ export declare class ConfigurationLoader {
     static configPathsFromArg(): string[] | undefined;
     static getConfigPaths(): string[];
     static isESM(): boolean;
-    static registerTsNode(configPath?: string): boolean;
-    static registerDotenv<D extends IDatabaseDriver>(options?: Options<D> | Configuration<D>): void;
-    static loadEnvironmentVars<D extends IDatabaseDriver>(): Partial<Options<D>>;
+    static registerTypeScriptSupport(configPath?: string): Promise<boolean>;
+    static registerDotenv<D extends IDatabaseDriver>(options?: Options<D>): void;
+    static loadEnvironmentVars<D extends IDatabaseDriver>(): Promise<Partial<Options<D>>>;
+    static loadEnvironmentVarsSync<D extends IDatabaseDriver>(): Partial<Options<D>>;
     static getORMPackages(): Set<string>;
     /** @internal */
     static commonJSCompat(options: Partial<Options>): void;
@@ -47,7 +48,7 @@ export declare class ConfigurationLoader {
 export interface Settings {
     alwaysAllowTs?: boolean;
     verbose?: boolean;
-    useTsNode?: boolean;
+    preferTs?: boolean;
     tsConfigPath?: string;
     configPaths?: string[];
 }