@mikro-orm/core 7.0.0-dev.303 → 7.0.0-dev.305

package/cache/index.d.ts

@@ -1,4 +1,4 @@
-export * from './CacheAdapter.js';
+export type * from './CacheAdapter.js';
 export * from './NullCacheAdapter.js';
 export * from './MemoryCacheAdapter.js';
 export * from './GeneratedCacheAdapter.js';

package/cache/index.js

@@ -1,4 +1,3 @@
-export * from './CacheAdapter.js';
 export * from './NullCacheAdapter.js';
 export * from './MemoryCacheAdapter.js';
 export * from './GeneratedCacheAdapter.js';

package/errors.js

@@ -34,19 +34,12 @@ export class ValidationError extends Error {
         return new ValidationError(`Entity ${entity.constructor.name} is not managed. An entity is managed if its fetched from the database or registered as new through EntityManager.persist()`);
     }
     static notEntity(owner, prop, data) {
-        const type = Object.prototype.toString
-            .call(data)
-            .match(/\[object (\w+)]/)[1]
-            .toLowerCase();
+        const type = /\[object (\w+)]/.exec(Object.prototype.toString.call(data))[1].toLowerCase();
         return new ValidationError(`Entity of type ${prop.type} expected for property ${owner.constructor.name}.${prop.name}, ${inspect(data)} of type ${type} given. If you are using Object.assign(entity, data), use em.assign(entity, data) instead.`);
     }
     static notDiscoveredEntity(data, meta, action = 'persist') {
         /* v8 ignore next */
-        const type = meta?.className ??
-            Object.prototype.toString
-                .call(data)
-                .match(/\[object (\w+)]/)[1]
-                .toLowerCase();
+        const type = meta?.className ?? /\[object (\w+)]/.exec(Object.prototype.toString.call(data))[1].toLowerCase();
         let err = `Trying to ${action} not discovered entity of type ${type}.`;
         if (meta) {
             err += ` Entity with this name was discovered, but not the prototype you are passing to the ORM. If using EntitySchema, be sure to point to the implementation via \`class\`.`;
@@ -63,10 +56,7 @@ export class ValidationError extends Error {
         return new ValidationError(`Invalid enum array items provided in ${entityName}: ${inspect(invalid)}`);
     }
     static invalidType(type, value, mode) {
-        const valueType = Object.prototype.toString
-            .call(value)
-            .match(/\[object (\w+)]/)[1]
-            .toLowerCase();
+        const valueType = /\[object (\w+)]/.exec(Object.prototype.toString.call(value))[1].toLowerCase();
         if (value instanceof Date) {
             value = value.toISOString();
         }

package/events/EventManager.js

@@ -45,7 +45,10 @@ export class EventManager {
             }
         }
         if (event === EventType.onInit) {
-            return listeners.forEach(listener => listener(args));
+            for (const listener of listeners) {
+                void listener(args);
+            }
+            return;
         }
         return Utils.runSerial(listeners, listener => listener(args));
     }

package/events/index.d.ts

@@ -1,3 +1,3 @@
-export * from './EventSubscriber.js';
+export type * from './EventSubscriber.js';
 export * from './EventManager.js';
 export * from './TransactionEventBroadcaster.js';

package/events/index.js

@@ -1,3 +1,2 @@
-export * from './EventSubscriber.js';
 export * from './EventManager.js';
 export * from './TransactionEventBroadcaster.js';

package/hydration/ObjectHydrator.js

@@ -67,7 +67,7 @@ export class ObjectHydrator extends Hydrator {
             const entityKey = path.map(k => this.wrap(k)).join('');
             const tz = this.platform.getTimezone();
             const convertorKey = path
-                .filter(k => !k.match(/\[idx_\d+]/))
+                .filter(k => !/\[idx_\d+]/.exec(k))
                 .map(k => this.safeKey(k))
                 .join('_');
             const ret = [];
@@ -238,7 +238,7 @@ export class ObjectHydrator extends Hydrator {
         };
         const registerEmbeddedPrototype = (prop, path) => {
             const convertorKey = path
-                .filter(k => !k.match(/\[idx_\d+]/))
+                .filter(k => !/\[idx_\d+]/.exec(k))
                 .map(k => this.safeKey(k))
                 .join('_');
             if (prop.targetMeta?.polymorphs) {
@@ -287,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(`    };`);
@@ -424,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/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/MetadataDiscovery.js

@@ -1481,13 +1481,13 @@ export class MetadataDiscovery {
     }
     initGeneratedColumn(meta, prop) {
         if (!prop.generated && prop.columnTypes) {
-            const match = prop.columnTypes[0]?.match(/(.*) generated always as (.*)/i);
+            const match = /(.*) generated always as (.*)/i.exec(prop.columnTypes[0]);
             if (match) {
                 prop.columnTypes[0] = match[1];
                 prop.generated = match[2];
                 return;
             }
-            const match2 = prop.columnTypes[0]?.trim().match(/^as (.*)/i);
+            const match2 = /^as (.*)/i.exec(prop.columnTypes[0]?.trim());
             if (match2) {
                 prop.generated = match2[1];
             }
@@ -1775,7 +1775,7 @@ export class MetadataDiscovery {
                 // it could be a runtime type from reflect-metadata
                 !SCALAR_TYPES.includes(prop.type) &&
                 // or it might be inferred via ts-morph to some generic type alias
-                !prop.type.match(/[<>:"';{}]/)) {
+                !/[<>:"';{}]/.exec(prop.type)) {
                 const type = prop.length != null && !prop.type.endsWith(`(${prop.length})`) ? `${prop.type}(${prop.length})` : prop.type;
                 prop.columnTypes = [type];
             }

package/metadata/discover-entities.js

@@ -31,7 +31,7 @@ export async function discoverEntities(paths, options) {
     const found = new Map();
     for (const filepath of files) {
         const filename = basename(filepath);
-        if (!filename.match(/\.[cm]?[jt]s$/) || filename.match(/\.d\.[cm]?ts/)) {
+        if (!/\.[cm]?[jt]s$/.exec(filename) || /\.d\.[cm]?ts/.exec(filename)) {
             continue;
         }
         await getEntityClassOrSchema(filepath, found, baseDir);

package/metadata/index.d.ts

@@ -1,4 +1,4 @@
-export * from './types.js';
+export type * from './types.js';
 export * from './EntitySchema.js';
 export * from './MetadataDiscovery.js';
 export * from './MetadataStorage.js';

package/metadata/index.js

@@ -1,4 +1,3 @@
-export * from './types.js';
 export * from './EntitySchema.js';
 export * from './MetadataDiscovery.js';
 export * from './MetadataStorage.js';

package/naming-strategy/AbstractNamingStrategy.js

@@ -34,7 +34,7 @@ export class AbstractNamingStrategy {
      * @inheritDoc
      */
     getEntityName(tableName, schemaName) {
-        const name = tableName.match(/^[^$_\p{ID_Start}]/u) ? `E_${tableName}` : tableName;
+        const name = /^[^$_\p{ID_Start}]/u.exec(tableName) ? `E_${tableName}` : tableName;
         return this.getClassName(name.replaceAll(/[^\u200C\u200D\p{ID_Continue}]+/gu, r => r
             .split('')
             .map(c => `$${c.codePointAt(0)}`)

package/naming-strategy/index.d.ts

@@ -1,4 +1,4 @@
-export * from './NamingStrategy.js';
+export type * from './NamingStrategy.js';
 export * from './AbstractNamingStrategy.js';
 export * from './MongoNamingStrategy.js';
 export * from './UnderscoreNamingStrategy.js';

package/naming-strategy/index.js

@@ -1,4 +1,3 @@
-export * from './NamingStrategy.js';
 export * from './AbstractNamingStrategy.js';
 export * from './MongoNamingStrategy.js';
 export * from './UnderscoreNamingStrategy.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.0-dev.303",
+  "version": "7.0.0-dev.305",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",

package/platforms/Platform.js

@@ -180,7 +180,7 @@ export class Platform {
         return this.getVarcharTypeDeclarationSQL(column);
     }
     extractSimpleType(type) {
-        return type.toLowerCase().match(/[^(), ]+/)[0];
+        return /[^(), ]+/.exec(type.toLowerCase())[0];
     }
     /**
      * This should be used only to compare types, it can strip some information like the length.
@@ -380,7 +380,7 @@ export class Platform {
         let j = 0;
         let pos = 0;
         let ret = '';
-        if (sql[0] === '?') {
+        if (sql.startsWith('?')) {
             if (sql[1] === '?') {
                 ret += this.quoteIdentifier(params[j++]);
                 pos = 2;

package/types/index.d.ts

@@ -23,7 +23,8 @@ import { type IType, type TransformContext, Type } from './Type.js';
 import { Uint8ArrayType } from './Uint8ArrayType.js';
 import { UnknownType } from './UnknownType.js';
 import { UuidType } from './UuidType.js';
-export { Type, DateType, TimeType, DateTimeType, BigIntType, BlobType, Uint8ArrayType, ArrayType, EnumArrayType, EnumType, JsonType, IntegerType, SmallIntType, TinyIntType, MediumIntType, FloatType, DoubleType, BooleanType, DecimalType, StringType, UuidType, TextType, UnknownType, TransformContext, IntervalType, IType, CharacterType, };
+export type { TransformContext, IType };
+export { Type, DateType, TimeType, DateTimeType, BigIntType, BlobType, Uint8ArrayType, ArrayType, EnumArrayType, EnumType, JsonType, IntegerType, SmallIntType, TinyIntType, MediumIntType, FloatType, DoubleType, BooleanType, DecimalType, StringType, UuidType, TextType, UnknownType, IntervalType, CharacterType, };
 export declare const types: {
     readonly date: typeof DateType;
     readonly time: typeof TimeType;

package/unit-of-work/UnitOfWork.js

@@ -327,7 +327,7 @@ export class UnitOfWork {
                 }
                 continue;
             }
-            const target = relation && relation[inverseProp];
+            const target = relation?.[inverseProp];
             if (relation && Utils.isCollection(target)) {
                 target.removeWithoutPropagation(entity);
             }

package/utils/AbstractMigrator.js

@@ -255,7 +255,7 @@ export class AbstractMigrator {
     }
     getMigrationFilename(name) {
         name = name.replace(/\.[jt]s$/, '');
-        return name.match(/^\d{14}$/) ? this.options.fileName(name) : name;
+        return /^\d{14}$/.exec(name) ? this.options.fileName(name) : name;
     }
     prefix(options) {
         if (typeof options === 'string' || Array.isArray(options)) {

package/utils/Configuration.js

@@ -310,7 +310,7 @@ export class Configuration {
             }
         }
         catch {
-            const url = this.options.clientUrl.match(/:\/\/.*\/([^?]+)/);
+            const url = /:\/\/.*\/([^?]+)/.exec(this.options.clientUrl);
             if (url) {
                 this.options.dbName = this.get('dbName', decodeURIComponent(url[1]));
             }

package/utils/Cursor.js

@@ -151,7 +151,7 @@ export class Cursor {
     }
     static decode(value) {
         return JSON.parse(Buffer.from(value, 'base64url').toString('utf8')).map((value) => {
-            if (typeof value === 'string' && value.match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}/)) {
+            if (typeof value === 'string' && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}/.exec(value)) {
                 return new Date(value);
             }
             return value;

package/utils/EntityComparator.js

@@ -271,7 +271,7 @@ export class EntityComparator {
         if (part.length === 1) {
             return this.formatCompositeKeyPart(part[0]);
         }
-        const formatted = part.map(this.formatCompositeKeyPart).join(', ');
+        const formatted = part.map(p => this.formatCompositeKeyPart(p)).join(', ');
         return `[${formatted}]`;
     }
     /**
@@ -404,7 +404,7 @@ export class EntityComparator {
         let tail = '';
         return parts
             .map(k => {
-            if (k.match(/^\[idx_\d+]$/)) {
+            if (/^\[idx_\d+]$/.exec(k)) {
                 tail += k;
                 return '';
             }
@@ -445,7 +445,7 @@ export class EntityComparator {
     getEmbeddedPropertySnapshot(meta, prop, context, level, path, dataKey, object = prop.object) {
         const padding = ' '.repeat(level * 2);
         const nullCond = `entity${path.map(k => this.wrap(k)).join('')} === null`;
-        let ret = `${level === 1 ? '' : '\n'}`;
+        let ret = level === 1 ? '' : '\n';
         if (object) {
             ret += `${padding}if (${nullCond}) ret${dataKey} = null;\n`;
         }
@@ -708,10 +708,10 @@ export class EntityComparator {
         return this.getGenericComparator(this.wrap(prop.name), `!equals(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`);
     }
     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/utils/Utils.d.ts

@@ -22,7 +22,7 @@ export declare class Utils {
     /**
      * Removes `undefined` properties (recursively) so they are not saved as nulls
      */
-    static dropUndefinedProperties(o: any, value?: undefined | null, visited?: Set<unknown>): void;
+    static dropUndefinedProperties(o: any, value?: null, visited?: Set<unknown>): void;
     /**
      * Returns the number of properties on `obj`. This is 20x faster than Object.keys(obj).length.
      * @see https://github.com/deepkit/deepkit-framework/blob/master/packages/core/src/core.ts

package/utils/Utils.js

@@ -123,7 +123,7 @@ export function parseJsonSafe(value) {
 }
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.0-dev.303';
+    static #ORM_VERSION = '7.0.0-dev.305';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */
@@ -543,7 +543,7 @@ export class Utils {
             !!process.env?.TS_JEST || // check if ts-jest is used
             !!process.env?.VITEST || // check if vitest is used
             !!process.versions?.bun || // check if bun is used
-            process.argv?.slice(1).some(arg => arg.match(/\.([mc]?ts|tsx)$/)) || // executing `.ts` file
+            process.argv?.slice(1).some(arg => /\.([mc]?ts|tsx)$/.exec(arg)) || // executing `.ts` file
             process.execArgv?.some(arg => {
                 return (arg.includes('ts-node') || // check for ts-node loader
                     arg.includes('@swc-node/register') || // check for swc-node/register loader
@@ -559,7 +559,7 @@ export class Utils {
             return simple;
         }
         const objectType = Object.prototype.toString.call(value);
-        const type = objectType.match(/^\[object (.+)]$/)[1];
+        const type = /^\[object (.+)]$/.exec(objectType)[1];
         if (type === 'Uint8Array') {
             return 'Buffer';
         }
@@ -613,7 +613,7 @@ export class Utils {
     }
     static findDuplicates(items) {
         return items.reduce((acc, v, i, arr) => {
-            return arr.indexOf(v) !== i && acc.indexOf(v) === -1 ? acc.concat(v) : acc;
+            return arr.indexOf(v) !== i && !acc.includes(v) ? acc.concat(v) : acc;
         }, []);
     }
     static removeDuplicates(items) {
@@ -677,6 +677,7 @@ export class Utils {
             return compiledFunctions[key](...context.values());
         }
         try {
+            // eslint-disable-next-line @typescript-eslint/no-implied-eval
             return new Function(...context.keys(), `'use strict';\n` + code)(...context.values());
             /* v8 ignore next */
         }

package/utils/fs-utils.js

@@ -150,7 +150,7 @@ export const fs = {
         }
         let path = parts.join('/').replace(/\\/g, '/').replace(/\/$/, '');
         path = normalize(path).replace(/\\/g, '/');
-        return path.match(/^[/.]|[a-zA-Z]:/) || path.startsWith('!') ? path : './' + path;
+        return /^[/.]|[a-zA-Z]:/.exec(path) || path.startsWith('!') ? path : './' + path;
     },
     /**
      * Determines the relative path between two paths. If either path is a `file:` URL,

package/utils/upsert-utils.js

@@ -101,7 +101,7 @@ export function getOnConflictReturningFields(meta, data, uniqueFields, options)
     return keys.filter(key => !(key in data));
 }
 function getPropertyValue(obj, key) {
-    if (key.indexOf('.') === -1) {
+    if (!key.includes('.')) {
         return obj[key];
     }
     const parts = key.split('.');