@mikro-orm/core 7.0.0-rc.2 → 7.0.0

package/hydration/ObjectHydrator.js

@@ -7,13 +7,13 @@ import { ReferenceKind } from '../enums.js';
 import { Raw } from '../utils/RawQueryFragment.js';
 import { ValidationError } from '../errors.js';
 export class ObjectHydrator extends Hydrator {
-    hydrators = {
+    #hydrators = {
         'full~true': new Map(),
         'full~false': new Map(),
         'reference~true': new Map(),
         'reference~false': new Map(),
     };
-    tmpIndex = 0;
+    #tmpIndex = 0;
     /**
      * @inheritDoc
      */
@@ -41,7 +41,7 @@ export class ObjectHydrator extends Hydrator {
      */
     getEntityHydrator(meta, type, normalizeAccessors = false) {
         const key = `${type}~${normalizeAccessors}`;
-        const exists = this.hydrators[key].get(meta.class);
+        const exists = this.#hydrators[key].get(meta.class);
         if (exists) {
             return exists;
         }
@@ -66,9 +66,12 @@ export class ObjectHydrator extends Hydrator {
         const hydrateScalar = (prop, path, dataKey) => {
             const entityKey = path.map(k => this.wrap(k)).join('');
             const tz = this.platform.getTimezone();
-            const convertorKey = path.filter(k => !k.match(/\[idx_\d+]/)).map(k => this.safeKey(k)).join('_');
+            const convertorKey = path
+                .filter(k => !/\[idx_\d+]/.exec(k))
+                .map(k => this.safeKey(k))
+                .join('_');
             const ret = [];
-            const idx = this.tmpIndex++;
+            const idx = this.#tmpIndex++;
             const nullVal = this.config.get('forceUndefined') ? 'undefined' : 'null';
             if (prop.getter && !prop.setter && prop.persist === false) {
                 return [];
@@ -139,13 +142,15 @@ export class ObjectHydrator extends Hydrator {
             ret.push(`  if (data${dataKey} === null) {\n    entity${entityKey} = ${nullVal};`);
             ret.push(`  } else if (typeof data${dataKey} !== 'undefined') {`);
             // For polymorphic: instanceof check; for regular: isPrimaryKey() check
-            const pkCheck = prop.polymorphic ? `data${dataKey} instanceof PolymorphicRef` : `isPrimaryKey(data${dataKey}, true)`;
+            const pkCheck = prop.polymorphic
+                ? `data${dataKey} instanceof PolymorphicRef`
+                : `isPrimaryKey(data${dataKey}, true)`;
             ret.push(`    if (${pkCheck}) {`);
             // When targetKey is set, pass the key option to createReference so it uses the alternate key
             const keyOption = prop.targetKey ? `, key: '${prop.targetKey}'` : '';
             if (prop.polymorphic) {
                 // For polymorphic: target class from discriminator map, PK from data.id
-                const discriminatorMapKey = this.safeKey(`discriminatorMap_${prop.name}_${this.tmpIndex++}`);
+                const discriminatorMapKey = this.safeKey(`discriminatorMap_${prop.name}_${this.#tmpIndex++}`);
                 context.set(discriminatorMapKey, prop.discriminatorMap);
                 ret.push(`      const targetClass = ${discriminatorMapKey}[data${dataKey}.discriminator];`);
                 ret.push(`      if (!targetClass) throw new ValidationError(\`Unknown discriminator value '\${data${dataKey}.discriminator}' for polymorphic relation '${prop.name}'. Valid values: \${Object.keys(${discriminatorMapKey}).join(', ')}\`);`);
@@ -158,7 +163,7 @@ export class ObjectHydrator extends Hydrator {
             }
             else {
                 // For regular: fixed target class, PK is the data itself
-                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.tmpIndex++}`);
+                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.#tmpIndex++}`);
                 context.set(targetKey, prop.targetMeta.class);
                 if (prop.ref) {
                     ret.push(`      entity${entityKey} = Reference.create(factory.createReference(${targetKey}, data${dataKey}, { merge: true, convertCustomTypes, normalizeAccessors, schema${keyOption} }));`);
@@ -174,7 +179,7 @@ export class ObjectHydrator extends Hydrator {
                 hydrateTargetExpr = `data${dataKey}.constructor`;
             }
             else {
-                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.tmpIndex++}`);
+                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.#tmpIndex++}`);
                 context.set(targetKey, prop.targetMeta.class);
                 hydrateTargetExpr = targetKey;
             }
@@ -232,7 +237,10 @@ export class ObjectHydrator extends Hydrator {
             return ret;
         };
         const registerEmbeddedPrototype = (prop, path) => {
-            const convertorKey = path.filter(k => !k.match(/\[idx_\d+]/)).map(k => this.safeKey(k)).join('_');
+            const convertorKey = path
+                .filter(k => !/\[idx_\d+]/.exec(k))
+                .map(k => this.safeKey(k))
+                .join('_');
             if (prop.targetMeta?.polymorphs) {
                 prop.targetMeta.polymorphs.forEach(meta => {
                     context.set(`prototype_${convertorKey}_${meta.className}`, meta.prototype);
@@ -279,7 +287,7 @@ export class ObjectHydrator extends Hydrator {
             else {
                 ret.push(`    const embeddedData = {`);
                 for (const childProp of Object.values(prop.embeddedProps)) {
-                    const key = childProp.embedded[1].match(/^\w+$/) ? childProp.embedded[1] : `'${childProp.embedded[1]}'`;
+                    const key = /^\w+$/.exec(childProp.embedded[1]) ? childProp.embedded[1] : `'${childProp.embedded[1]}'`;
                     ret.push(`      ${key}: data${this.wrap(childProp.name)},`);
                 }
                 ret.push(`    };`);
@@ -297,7 +305,9 @@ export class ObjectHydrator extends Hydrator {
                     meta.props
                         .filter(p => p.embedded?.[0] === prop.name)
                         .forEach(childProp => {
-                        const childDataKey = prop.object ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
+                        const childDataKey = prop.object
+                            ? dataKey + this.wrap(childProp.embedded[1])
+                            : this.wrap(childProp.name);
                         const prop2 = childMeta.properties[childProp.embedded[1]];
                         const prop3 = {
                             ...prop2,
@@ -305,14 +315,15 @@ export class ObjectHydrator extends Hydrator {
                             embedded: childProp.embedded,
                             embeddedProps: childProp.embeddedProps,
                         };
-                        // eslint-disable-next-line @typescript-eslint/no-use-before-define
-                        ret.push(...hydrateProperty(prop3, childProp.object, [...path, childProp.embedded[1]], childDataKey).map(l => '    ' + l));
+                        ret.push(
+                        // eslint-disable-next-line @typescript-eslint/no-use-before-define, no-use-before-define
+                        ...hydrateProperty(prop3, childProp.object, [...path, childProp.embedded[1]], childDataKey).map(l => '    ' + l));
                     });
                     ret.push(`    }`);
                 });
             }
             else {
-                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.tmpIndex++}`);
+                const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.#tmpIndex++}`);
                 context.set(targetKey, prop.targetMeta.class);
                 ret.push(`    if (entity${entityKey} == null) {`);
                 ret.push(`      entity${entityKey} = factory.createEmbeddable(${targetKey}, embeddedData, { newEntity, convertCustomTypes, normalizeAccessors });`);
@@ -321,8 +332,9 @@ export class ObjectHydrator extends Hydrator {
                     .filter(p => p.embedded?.[0] === prop.name)
                     .forEach(childProp => {
                     const childDataKey = prop.object ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
-                    // eslint-disable-next-line @typescript-eslint/no-use-before-define
-                    ret.push(...hydrateProperty(childProp, prop.object, [...path, childProp.embedded[1]], childDataKey).map(l => '  ' + l));
+                    ret.push(
+                    // eslint-disable-next-line @typescript-eslint/no-use-before-define, no-use-before-define
+                    ...hydrateProperty(childProp, prop.object, [...path, childProp.embedded[1]], childDataKey).map(l => '  ' + l));
                 });
             }
             /* v8 ignore next */
@@ -340,7 +352,7 @@ export class ObjectHydrator extends Hydrator {
         const hydrateEmbeddedArray = (prop, path, dataKey) => {
             const entityKey = path.map(k => this.wrap(k)).join('');
             const ret = [];
-            const idx = this.tmpIndex++;
+            const idx = this.#tmpIndex++;
             registerEmbeddedPrototype(prop, path);
             parseObjectEmbeddable(prop, dataKey, ret);
             ret.push(`  if (Array.isArray(data${dataKey})) {`);
@@ -353,7 +365,8 @@ export class ObjectHydrator extends Hydrator {
         };
         const hydrateProperty = (prop, object = prop.object, path = [prop.name], dataKey) => {
             const entityKey = path.map(k => this.wrap(k)).join('');
-            dataKey = dataKey ?? (object ? entityKey : this.wrap(normalizeAccessors ? (prop.accessor ?? prop.name) : prop.name));
+            dataKey =
+                dataKey ?? (object ? entityKey : this.wrap(normalizeAccessors ? (prop.accessor ?? prop.name) : prop.name));
             const ret = [];
             if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && !prop.mapToPk) {
                 ret.push(...hydrateToOne(prop, dataKey, entityKey));
@@ -372,7 +385,8 @@ export class ObjectHydrator extends Hydrator {
                     }
                 }
             }
-            else { // ReferenceKind.SCALAR
+            else {
+                // ReferenceKind.SCALAR
                 ret.push(...hydrateScalar(prop, path, dataKey));
             }
             if (this.config.get('forceUndefined')) {
@@ -383,12 +397,12 @@ export class ObjectHydrator extends Hydrator {
         for (const prop of props) {
             lines.push(...hydrateProperty(prop));
         }
-        const code = `// compiled hydrator for entity ${meta.className} (${type + normalizeAccessors ? ' normalized' : ''})\n`
-            + `return function(entity, data, factory, newEntity, convertCustomTypes, schema, parentSchema, normalizeAccessors) {\n`
-            + `${lines.join('\n')}\n}`;
+        const code = `// compiled hydrator for entity ${meta.className} (${type + normalizeAccessors ? ' normalized' : ''})\n` +
+            `return function(entity, data, factory, newEntity, convertCustomTypes, schema, parentSchema, normalizeAccessors) {\n` +
+            `${lines.join('\n')}\n}`;
         const fnKey = `hydrator-${meta.uniqueName}-${type}-${normalizeAccessors}`;
         const hydrator = Utils.createFunction(context, code, this.config.get('compiledFunctions'), fnKey);
-        this.hydrators[key].set(meta.class, hydrator);
+        this.#hydrators[key].set(meta.class, hydrator);
         return hydrator;
     }
     createCollectionItemMapper(prop, context) {
@@ -401,7 +415,7 @@ export class ObjectHydrator extends Hydrator {
             lines.push(`      value = { ...value, ['${prop2.name}']: Reference.wrapReference(entity, { ref: ${prop2.ref} }) };`);
             lines.push(`    }`);
         }
-        const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.tmpIndex++}`);
+        const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.#tmpIndex++}`);
         context.set(targetKey, prop.targetMeta.class);
         lines.push(`    if (isPrimaryKey(value, ${meta.compositePK})) return factory.createReference(${targetKey}, value, { convertCustomTypes, schema, normalizeAccessors, merge: true });`);
         lines.push(`    if (value && value.__entity) return value;`);
@@ -410,10 +424,10 @@ export class ObjectHydrator extends Hydrator {
         return lines;
     }
     wrap(key) {
-        if (key.match(/^\[.*]$/)) {
+        if (/^\[.*]$/.exec(key)) {
             return key;
         }
-        return key.match(/^\w+$/) ? `.${key}` : `['${key}']`;
+        return /^\w+$/.exec(key) ? `.${key}` : `['${key}']`;
     }
     safeKey(key) {
         return key.replace(/\W/g, '_');

package/index.d.ts

@@ -2,7 +2,7 @@
  * @packageDocumentation
  * @module core
  */
-export { EntityMetadata, PrimaryKeyProp, EntityRepositoryType, OptionalProps, EagerProps, HiddenProps, Config, EntityName } from './typings.js';
+export { EntityMetadata, PrimaryKeyProp, EntityRepositoryType, OptionalProps, EagerProps, HiddenProps, Config, EntityName, } from './typings.js';
 export type { CompiledFunctions, Constructor, ConnectionType, Dictionary, Primary, IPrimaryKey, ObjectQuery, FilterQuery, IWrappedEntity, InferEntityName, EntityData, Highlighter, MaybePromise, AnyEntity, EntityClass, EntityProperty, PopulateOptions, Populate, Loaded, New, LoadedReference, LoadedCollection, IMigrator, IMigrationGenerator, MigratorEvent, GetRepository, MigrationObject, DeepPartial, PrimaryProperty, Cast, IsUnknown, EntityDictionary, EntityDTO, EntityDTOFlat, EntityDTOProp, SerializeDTO, MigrationDiff, GenerateOptions, FilterObject, IMigrationRunner, IEntityGenerator, ISeedManager, SeederObject, IMigratorStorage, RequiredEntityData, CheckCallback, IndexCallback, FormulaCallback, FormulaTable, SchemaTable, SchemaColumns, SimpleColumnMeta, Rel, Ref, ScalarRef, EntityRef, ISchemaGenerator, MigrationInfo, MigrateOptions, MigrationResult, MigrationRow, EntityKey, EntityValue, EntityDataValue, FilterKey, EntityType, FromEntityType, Selected, IsSubset, EntityProps, ExpandProperty, ExpandScalar, FilterItemValue, ExpandQuery, Scalar, ExpandHint, FilterValue, MergeLoaded, MergeSelected, TypeConfig, AnyString, ClearDatabaseOptions, CreateSchemaOptions, EnsureDatabaseOptions, UpdateSchemaOptions, DropSchemaOptions, RefreshDatabaseOptions, AutoPath, UnboxArray, MetadataProcessor, ImportsResolver, RequiredNullable, DefineConfig, Opt, Hidden, EntitySchemaWithMeta, InferEntity, CheckConstraint, GeneratedColumnCallback, FilterDef, EntityCtor, Subquery, PopulateHintOptions, Prefixes, } from './typings.js';
 export * from './enums.js';
 export * from './errors.js';

package/index.js

@@ -2,7 +2,7 @@
  * @packageDocumentation
  * @module core
  */
-export { EntityMetadata, PrimaryKeyProp, EntityRepositoryType, OptionalProps, EagerProps, HiddenProps, Config, EntityName } from './typings.js';
+export { EntityMetadata, PrimaryKeyProp, EntityRepositoryType, OptionalProps, EagerProps, HiddenProps, Config, EntityName, } from './typings.js';
 export * from './enums.js';
 export * from './errors.js';
 export * from './exceptions.js';

package/logging/DefaultLogger.js

@@ -29,9 +29,7 @@ export class DefaultLogger {
         if (context?.level === 'warning') {
             message = colors.yellow(message);
         }
-        const label = context?.label
-            ? colors.cyan(`(${context.label}) `)
-            : '';
+        const label = context?.label ? colors.cyan(`(${context.label}) `) : '';
         this.writer(colors.grey(`[${namespace}] `) + label + message);
     }
     /**
@@ -60,8 +58,8 @@ export class DefaultLogger {
         if (namespace === 'deprecated') {
             const { ignoreDeprecations = false } = this.options;
             return Array.isArray(ignoreDeprecations)
-                /* v8 ignore next */
-                ? !ignoreDeprecations.includes(context?.label ?? '')
+                ? /* v8 ignore next */
+                    !ignoreDeprecations.includes(context?.label ?? '')
                 : !ignoreDeprecations;
         }
         return !!debugMode && (!Array.isArray(debugMode) || debugMode.includes(namespace));
@@ -70,7 +68,8 @@ export class DefaultLogger {
      * @inheritDoc
      */
     logQuery(context) {
-        if (!this.isEnabled('query', context)) {
+        const namespace = context.namespace ?? 'query';
+        if (!this.isEnabled(namespace, context)) {
             return;
         }
         /* v8 ignore next */
@@ -88,7 +87,7 @@ export class DefaultLogger {
         if (this.usesReplicas && context.connection) {
             msg += colors.cyan(` (via ${context.connection.type} connection '${context.connection.name}')`);
         }
-        return this.log('query', msg, context);
+        return this.log(namespace, msg, context);
     }
     static create(options) {
         return new DefaultLogger(options);

package/logging/Logger.d.ts

@@ -22,10 +22,11 @@ export interface Logger {
     setDebugMode(debugMode: boolean | LoggerNamespace[]): void;
     isEnabled(namespace: LoggerNamespace, context?: LogContext): boolean;
 }
-export type LoggerNamespace = 'query' | 'query-params' | 'schema' | 'discovery' | 'info' | 'deprecated';
+export type LoggerNamespace = 'query' | 'query-params' | 'schema' | 'discovery' | 'info' | 'deprecated' | 'slow-query';
 export interface LogContext extends Dictionary {
     query?: string;
     label?: string;
+    namespace?: LoggerNamespace;
     params?: readonly unknown[];
     took?: number;
     results?: number;

package/logging/colors.js

@@ -1,10 +1,7 @@
 import { getEnv } from '../utils/env-vars.js';
 const bool = (k) => ['true', 't', '1'].includes(getEnv(k)?.toLowerCase() ?? '');
-const boolIfDefined = (k) => getEnv(k) != null ? bool(k) : true;
-const enabled = () => !bool('NO_COLOR')
-    && !bool('MIKRO_ORM_NO_COLOR')
-    && boolIfDefined('FORCE_COLOR')
-    && boolIfDefined('MIKRO_ORM_COLORS');
+const boolIfDefined = (k) => (getEnv(k) != null ? bool(k) : true);
+const enabled = () => !bool('NO_COLOR') && !bool('MIKRO_ORM_NO_COLOR') && boolIfDefined('FORCE_COLOR') && boolIfDefined('MIKRO_ORM_COLORS');
 const wrap = (fn) => (text) => enabled() ? fn(text) : text;
 /** @internal */
 export const colors = {

package/logging/index.d.ts

@@ -1,5 +1,5 @@
 export * from './colors.js';
-export * from './Logger.js';
+export type * from './Logger.js';
 export * from './DefaultLogger.js';
 export * from './SimpleLogger.js';
 export * from './inspect.js';

package/logging/index.js

@@ -1,5 +1,4 @@
 export * from './colors.js';
-export * from './Logger.js';
 export * from './DefaultLogger.js';
 export * from './SimpleLogger.js';
 export * from './inspect.js';

package/metadata/EntitySchema.d.ts

@@ -1,6 +1,6 @@
 import { EntityMetadata, type AnyEntity, type EntityKey, type Constructor, type DeepPartial, type EntityName, type EntityProperty, type CleanKeys, type ExpandProperty, type IsNever, type EntityCtor } from '../typings.js';
 import { type EventType, ReferenceKind } from '../enums.js';
-import type { EventSubscriber } from '../events/EventSubscriber.js';
+import type { EventArgs } from '../events/EventSubscriber.js';
 import { Type } from '../types/Type.js';
 import type { PropertyOptions, ManyToOneOptions, OneToOneOptions, OneToManyOptions, ManyToManyOptions, EmbeddedOptions, EnumOptions, PrimaryKeyOptions, SerializedPrimaryKeyOptions, IndexOptions, UniqueOptions } from './types.js';
 type TypeType = string | NumberConstructor | StringConstructor | BooleanConstructor | DateConstructor | ArrayConstructor | Constructor<Type<any>> | Type<any>;
@@ -47,7 +47,7 @@ export declare class EntitySchema<Entity = any, Base = never, Class extends Enti
      * When schema links the entity class via `class` option, this registry allows the lookup from opposite side,
      * so we can use the class in `entities` option just like the EntitySchema instance.
      */
-    static REGISTRY: Map<Partial<any>, EntitySchema<any, never, EntityCtor<any>>>;
+    static REGISTRY: Map<AnyEntity, EntitySchema>;
     /** @internal Type-level marker for fast entity type inference */
     readonly '~entity': Entity;
     private readonly _meta;
@@ -108,6 +108,6 @@ export declare class EntitySchema<Entity = any, Base = never, Class extends Enti
      * });
      * ```
      */
-    addHook<Event extends EventType | `${EventType}`, T extends Entity = Entity>(event: Event, handler: NonNullable<EventSubscriber<T>[Event]>): this;
+    addHook<T extends Entity = Entity>(event: EventType | `${EventType}`, handler: (args: EventArgs<T>) => void | Promise<void>): this;
 }
 export {};

package/metadata/EntitySchema.js

@@ -34,7 +34,12 @@ export class EntitySchema {
     }
     addProperty(name, type, options = {}) {
         this.renameCompositeOptions(name, options);
-        const prop = { name, kind: ReferenceKind.SCALAR, ...options, ...this.normalizeType(options, type) };
+        const prop = {
+            name,
+            kind: ReferenceKind.SCALAR,
+            ...options,
+            ...this.normalizeType(options, type),
+        };
         if (type && Type.isMappedType(type.prototype)) {
             prop.type = type;
         }
@@ -299,7 +304,12 @@ export class EntitySchema {
             }
             else if (options.entity) {
                 const tmp = options.entity();
-                type = options.type = Array.isArray(tmp) ? tmp.map(t => Utils.className(t)).sort().join(' | ') : Utils.className(tmp);
+                type = options.type = Array.isArray(tmp)
+                    ? tmp
+                        .map(t => Utils.className(t))
+                        .sort()
+                        .join(' | ')
+                    : Utils.className(tmp);
                 const target = tmp instanceof EntitySchema ? tmp.meta.class : tmp;
                 return { type, target };
             }

package/metadata/MetadataDiscovery.d.ts

@@ -4,15 +4,7 @@ import { MetadataStorage } from './MetadataStorage.js';
 import { EntitySchema } from './EntitySchema.js';
 import type { Platform } from '../platforms/Platform.js';
 export declare class MetadataDiscovery {
-    private readonly metadata;
-    private readonly platform;
-    private readonly config;
-    private readonly namingStrategy;
-    private readonly metadataProvider;
-    private readonly logger;
-    private readonly schemaHelper;
-    private readonly validator;
-    private readonly discovered;
+    #private;
     constructor(metadata: MetadataStorage, platform: Platform, config: Configuration);
     discover(preferTs?: boolean): Promise<MetadataStorage>;
     discoverSync(): MetadataStorage;