@mikro-orm/core 7.0.0-dev.220 → 7.0.0-dev.222

package/hydration/ObjectHydrator.js

@@ -354,7 +354,8 @@ export class ObjectHydrator extends Hydrator {
         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 hydrator = Utils.createFunction(context, code);
+        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);
         return hydrator;
     }

package/index.d.ts

@@ -3,7 +3,7 @@
  * @module core
  */
 export { EntityMetadata, PrimaryKeyProp, EntityRepositoryType, OptionalProps, EagerProps, HiddenProps, Config } from './typings.js';
-export type { Constructor, ConnectionType, Dictionary, Primary, IPrimaryKey, ObjectQuery, FilterQuery, IWrappedEntity, EntityName, EntityData, Highlighter, MaybePromise, AnyEntity, EntityClass, EntityProperty, PopulateOptions, Populate, Loaded, New, LoadedReference, LoadedCollection, IMigrator, IMigrationGenerator, MigratorEvent, GetRepository, MigrationObject, DeepPartial, PrimaryProperty, Cast, IsUnknown, EntityDictionary, EntityDTO, MigrationDiff, GenerateOptions, FilterObject, IEntityGenerator, ISeedManager, RequiredEntityData, CheckCallback, IndexCallback, FormulaCallback, FormulaTable, SimpleColumnMeta, Rel, Ref, ScalarRef, EntityRef, ISchemaGenerator, UmzugMigration, 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, } from './typings.js';
+export type { CompiledFunctions, Constructor, ConnectionType, Dictionary, Primary, IPrimaryKey, ObjectQuery, FilterQuery, IWrappedEntity, EntityName, EntityData, Highlighter, MaybePromise, AnyEntity, EntityClass, EntityProperty, PopulateOptions, Populate, Loaded, New, LoadedReference, LoadedCollection, IMigrator, IMigrationGenerator, MigratorEvent, GetRepository, MigrationObject, DeepPartial, PrimaryProperty, Cast, IsUnknown, EntityDictionary, EntityDTO, MigrationDiff, GenerateOptions, FilterObject, IEntityGenerator, ISeedManager, RequiredEntityData, CheckCallback, IndexCallback, FormulaCallback, FormulaTable, SimpleColumnMeta, Rel, Ref, ScalarRef, EntityRef, ISchemaGenerator, UmzugMigration, 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, } from './typings.js';
 export * from './enums.js';
 export * from './errors.js';
 export * from './exceptions.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.220",
+  "version": "7.0.0-dev.222",
   "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.",
   "exports": {
     "./package.json": "./package.json",

package/typings.d.ts

@@ -22,6 +22,7 @@ export type Constructor<T = unknown> = new (...args: any[]) => T;
 export type Dictionary<T = any> = {
     [k: string]: T;
 };
+export type CompiledFunctions = Record<string, (...args: any[]) => any>;
 export type EntityKey<T = unknown, B extends boolean = false> = string & {
     [K in keyof T]-?: CleanKeys<T, K, B> extends never ? never : K;
 }[keyof T];

package/utils/Configuration.d.ts

@@ -1,7 +1,7 @@
 import type { NamingStrategy } from '../naming-strategy/NamingStrategy.js';
 import { type CacheAdapter, type SyncCacheAdapter } from '../cache/CacheAdapter.js';
 import type { EntityRepository } from '../entity/EntityRepository.js';
-import type { AnyEntity, Constructor, Dictionary, EnsureDatabaseOptions, EntityClass, EntityMetadata, FilterDef, GenerateOptions, Highlighter, HydratorConstructor, IHydrator, IMigrationGenerator, IPrimaryKey, MaybePromise, Migration, MigrationObject } from '../typings.js';
+import type { AnyEntity, CompiledFunctions, Constructor, Dictionary, EnsureDatabaseOptions, EntityClass, EntityMetadata, FilterDef, GenerateOptions, Highlighter, HydratorConstructor, IHydrator, IMigrationGenerator, IPrimaryKey, MaybePromise, Migration, MigrationObject } 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';
@@ -682,6 +682,12 @@ export interface Options<Driver extends IDatabaseDriver = IDatabaseDriver, EM ex
      * @default ObjectHydrator
      */
     hydrator?: HydratorConstructor;
+    /**
+     * Pre-generated compiled functions for hydration and comparison.
+     * Use the `compile` CLI command to create these functions.
+     * Enables deployment to runtimes that prohibit `new Function`/eval (e.g. Cloudflare Workers).
+     */
+    compiledFunctions?: CompiledFunctions;
     /**
      * Default loading strategy for relations.
      * - `'joined'`: Use SQL JOINs (single query, may cause cartesian product)

package/utils/Configuration.js

@@ -152,6 +152,10 @@ export class Configuration {
             highlighter: this.options.highlighter,
             writer: this.options.logger,
         });
+        const cf = this.options.compiledFunctions;
+        if (cf && cf.__version !== Utils.getORMVersion()) {
+            this.logger.warn('discovery', `Compiled functions were generated with MikroORM v${cf.__version ?? 'unknown'}, but the current version is v${Utils.getORMVersion()}. Please regenerate with \`npx mikro-orm compile\`.`);
+        }
         if (this.options.driver) {
             this.driver = new this.options.driver(this);
             this.platform = this.driver.getPlatform();
@@ -242,7 +246,7 @@ export class Configuration {
      * Gets instance of Comparator. (cached)
      */
     getComparator(metadata) {
-        return this.getCachedService(EntityComparator, metadata, this.platform);
+        return this.getCachedService(EntityComparator, metadata, this.platform, this);
     }
     /**
      * Gets instance of MetadataProvider. (cached)

package/utils/EntityComparator.d.ts

@@ -1,5 +1,6 @@
 import type { EntityData, EntityDictionary, EntityMetadata, EntityName, EntityProperty, IMetadataStorage } from '../typings.js';
 import type { Platform } from '../platforms/Platform.js';
+import type { Configuration } from './Configuration.js';
 type Comparator<T> = (a: T, b: T, options?: {
     includeInverseSides?: boolean;
 }) => EntityData<T>;
@@ -9,6 +10,7 @@ type CompositeKeyPart = string | CompositeKeyPart[];
 export declare class EntityComparator {
     private readonly metadata;
     private readonly platform;
+    private readonly config?;
     private readonly comparators;
     private readonly mappers;
     private readonly snapshotGenerators;
@@ -16,7 +18,7 @@ export declare class EntityComparator {
     private readonly pkGettersConverted;
     private readonly pkSerializers;
     private tmpIndex;
-    constructor(metadata: IMetadataStorage, platform: Platform);
+    constructor(metadata: IMetadataStorage, platform: Platform, config?: Configuration | undefined);
     /**
      * Computes difference between two entities.
      */

package/utils/EntityComparator.js

@@ -7,6 +7,7 @@ import { EntityIdentifier } from '../entity/EntityIdentifier.js';
 export class EntityComparator {
     metadata;
     platform;
+    config;
     comparators = new Map();
     mappers = new Map();
     snapshotGenerators = new Map();
@@ -14,9 +15,10 @@ export class EntityComparator {
     pkGettersConverted = new Map();
     pkSerializers = new Map();
     tmpIndex = 0;
-    constructor(metadata, platform) {
+    constructor(metadata, platform, config) {
         this.metadata = metadata;
         this.platform = platform;
+        this.config = config;
     }
     /**
      * Computes difference between two entities.
@@ -88,9 +90,10 @@ export class EntityComparator {
             }
             lines.push(`  return entity${this.wrap(pk)};`);
         }
-        const code = `// compiled pk serializer for entity ${meta.className}\n`
+        const code = `// compiled pk getter for entity ${meta.className}\n`
             + `return function(entity) {\n${lines.join('\n')}\n}`;
-        const pkSerializer = Utils.createFunction(context, code);
+        const fnKey = `pkGetter-${meta.uniqueName}`;
+        const pkSerializer = Utils.createFunction(context, code, this.config?.get('compiledFunctions'), fnKey);
         this.pkGetters.set(meta, pkSerializer);
         return pkSerializer;
     }
@@ -140,7 +143,8 @@ export class EntityComparator {
         }
         const code = `// compiled pk getter (with converted custom types) for entity ${meta.className}\n`
             + `return function(entity) {\n${lines.join('\n')}\n}`;
-        const pkSerializer = Utils.createFunction(context, code);
+        const fnKey = `pkGetterConverted-${meta.uniqueName}`;
+        const pkSerializer = Utils.createFunction(context, code, this.config?.get('compiledFunctions'), fnKey);
         this.pkGettersConverted.set(meta, pkSerializer);
         return pkSerializer;
     }
@@ -192,7 +196,8 @@ export class EntityComparator {
         }
         const code = `// compiled pk serializer for entity ${meta.className}\n`
             + `return function(entity) {\n${lines.join('\n')}\n}`;
-        const pkSerializer = Utils.createFunction(context, code);
+        const fnKey = `pkSerializer-${meta.uniqueName}`;
+        const pkSerializer = Utils.createFunction(context, code, this.config?.get('compiledFunctions'), fnKey);
         this.pkSerializers.set(meta, pkSerializer);
         return pkSerializer;
     }
@@ -221,7 +226,8 @@ export class EntityComparator {
         })
             .forEach(prop => lines.push(this.getPropertySnapshot(meta, prop, context, this.wrap(prop.name), this.wrap(prop.name), [prop.name])));
         const code = `return function(entity) {\n  const ret = {};\n${lines.join('\n')}\n  return ret;\n}`;
-        const snapshotGenerator = Utils.createFunction(context, code);
+        const fnKey = `snapshotGenerator-${meta.uniqueName}`;
+        const snapshotGenerator = Utils.createFunction(context, code, this.config?.get('compiledFunctions'), fnKey);
         this.snapshotGenerators.set(meta, snapshotGenerator);
         return snapshotGenerator;
     }
@@ -369,7 +375,8 @@ export class EntityComparator {
         lines.push(`  for (let k in result) { if (Object.hasOwn(result, k) && !mapped[k] && ret[k] === undefined) ret[k] = result[k]; }`);
         const code = `// compiled mapper for entity ${meta.className}\n`
             + `return function(result) {\n  const ret = {};\n${lines.join('\n')}\n  return ret;\n}`;
-        const resultMapper = Utils.createFunction(context, code);
+        const fnKey = `resultMapper-${meta.uniqueName}`;
+        const resultMapper = Utils.createFunction(context, code, this.config?.get('compiledFunctions'), fnKey);
         this.mappers.set(meta, resultMapper);
         return resultMapper;
     }
@@ -588,7 +595,8 @@ export class EntityComparator {
         lines.push(`}`);
         const code = `// compiled comparator for entity ${meta.className}\n`
             + `return function(last, current, options) {\n  const diff = {};\n${lines.join('\n')}\n  return diff;\n}`;
-        const comparator = Utils.createFunction(context, code);
+        const fnKey = `comparator-${meta.uniqueName}`;
+        const comparator = Utils.createFunction(context, code, this.config?.get('compiledFunctions'), fnKey);
         this.comparators.set(meta, comparator);
         return comparator;
     }

package/utils/Utils.d.ts

@@ -1,4 +1,4 @@
-import type { Dictionary, EntityData, EntityDictionary, EntityKey, EntityMetadata, EntityName, EntityProperty, Primary } from '../typings.js';
+import type { CompiledFunctions, Dictionary, EntityData, EntityDictionary, EntityKey, EntityMetadata, EntityName, EntityProperty, Primary } from '../typings.js';
 import type { Collection } from '../entity/Collection.js';
 import type { Platform } from '../platforms/Platform.js';
 import type { ScalarReference } from '../entity/Reference.js';
@@ -143,7 +143,7 @@ export declare class Utils {
     static isOperator(key: PropertyKey, includeGroupOperators?: boolean): boolean;
     static hasNestedKey(object: unknown, key: string): boolean;
     static getORMVersion(): string;
-    static createFunction(context: Map<string, any>, code: string): any;
+    static createFunction(context: Map<string, any>, code: string, compiledFunctions?: CompiledFunctions, key?: string): any;
     static callCompiledFunction<T extends unknown[], R>(fn: (...args: T) => R, ...args: T): R;
     static unwrapProperty<T>(entity: T, meta: EntityMetadata<T>, prop: EntityProperty<T>, payload?: boolean): [unknown, number[]][];
     static setPayloadProperty<T>(entity: EntityDictionary<T>, meta: EntityMetadata<T>, prop: EntityProperty<T>, value: unknown, idx: number[]): void;

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.220';
+    static #ORM_VERSION = '7.0.0-dev.222';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */
@@ -666,7 +666,10 @@ export class Utils {
     static getORMVersion() {
         return this.#ORM_VERSION;
     }
-    static createFunction(context, code) {
+    static createFunction(context, code, compiledFunctions, key) {
+        if (key && compiledFunctions?.[key]) {
+            return compiledFunctions[key](...context.values());
+        }
         try {
             return new Function(...context.keys(), `'use strict';\n` + code)(...context.values());
             /* v8 ignore next */