@mikro-orm/core 7.0.4-dev.9 → 7.0.5-dev.0

package/hydration/ObjectHydrator.js

@@ -122,7 +122,7 @@ export class ObjectHydrator extends Hydrator {
                 ret.push(`    entity${entityKey} = data${dataKey};`);
             }
             if (prop.ref) {
-                ret.push(`    const value = entity${entityKey};`);
+                ret.push(`    const value = entity${entityKey}?.__scalarReference ? entity${entityKey}.unwrap() : entity${entityKey};`);
                 ret.push(`    entity${entityKey} = oldValue_${idx} ?? new ScalarReference(value);`);
                 ret.push(`    entity${entityKey}.bind(entity, '${prop.name}');`);
                 ret.push(`    entity${entityKey}.set(value);`);

package/metadata/MetadataDiscovery.js

@@ -1484,15 +1484,22 @@ export class MetadataDiscovery {
         }
         if (this.#platform.usesEnumCheckConstraints() && !meta.embeddable) {
             for (const prop of meta.props) {
-                if (prop.enum &&
-                    prop.persist !== false &&
-                    !prop.nativeEnumName &&
-                    prop.items?.every(item => typeof item === 'string')) {
-                    this.initFieldName(prop);
+                if (prop.persist === false || prop.nativeEnumName || !prop.items?.every(item => typeof item === 'string')) {
+                    continue;
+                }
+                this.initFieldName(prop);
+                let expression = null;
+                if (prop.enum) {
+                    expression = `${this.#platform.quoteIdentifier(prop.fieldNames[0])} in ('${prop.items.join("', '")}')`;
+                }
+                else if (prop.array) {
+                    expression = this.#platform.getEnumArrayCheckConstraintExpression(prop.fieldNames[0], prop.items);
+                }
+                if (expression) {
                     meta.checks.push({
                         name: this.#namingStrategy.indexName(meta.tableName, prop.fieldNames, 'check'),
                         property: prop.name,
-                        expression: `${this.#platform.quoteIdentifier(prop.fieldNames[0])} in ('${prop.items.join("', '")}')`,
+                        expression,
                     });
                 }
             }

package/metadata/discover-entities.js

@@ -18,9 +18,19 @@ async function getEntityClassOrSchema(filepath, allTargets, baseDir) {
         }
     }
     for (const item of targets) {
-        const validTarget = EntitySchema.is(item) || (item instanceof Function && MetadataStorage.isKnownEntity(item.name));
-        if (validTarget && !allTargets.has(item)) {
-            allTargets.set(item, path);
+        if (EntitySchema.is(item)) {
+            if (!allTargets.has(item)) {
+                allTargets.set(item, path);
+            }
+        }
+        else if (item instanceof Function) {
+            const schema = EntitySchema.REGISTRY.get(item);
+            if (schema && !allTargets.has(schema)) {
+                allTargets.set(schema, path);
+            }
+            else if (!schema && MetadataStorage.isKnownEntity(item.name) && !allTargets.has(item)) {
+                allTargets.set(item, path);
+            }
         }
     }
 }

package/metadata/types.d.ts

@@ -499,7 +499,7 @@ export interface EmbeddableOptions<Owner> {
     abstract?: boolean;
 }
 export interface EnumOptions<T> extends PropertyOptions<T> {
-    items?: (number | string)[] | (() => Dictionary);
+    items?: readonly (number | string)[] | (() => Dictionary);
     array?: boolean;
     /** for postgres, by default it uses text column with check constraint */
     nativeEnumName?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.4-dev.9",
+  "version": "7.0.5-dev.0",
   "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.d.ts

@@ -37,6 +37,8 @@ export declare abstract class Platform {
     supportsNativeEnums(): boolean;
     /** for postgres text enums (default) */
     usesEnumCheckConstraints(): boolean;
+    /** Returns the check constraint expression for an enum array column, or null if unsupported. */
+    getEnumArrayCheckConstraintExpression(column: string, items: string[]): string | null;
     /** Whether this platform supports materialized views. */
     supportsMaterializedViews(): boolean;
     /** Returns the schema helper instance for this platform, or undefined if not supported. */

package/platforms/Platform.js

@@ -50,6 +50,10 @@ export class Platform {
     usesEnumCheckConstraints() {
         return false;
     }
+    /** Returns the check constraint expression for an enum array column, or null if unsupported. */
+    getEnumArrayCheckConstraintExpression(column, items) {
+        return null;
+    }
     /** Whether this platform supports materialized views. */
     supportsMaterializedViews() {
         return false;

package/types/EnumArrayType.d.ts

@@ -6,7 +6,7 @@ import type { EntityProperty } from '../typings.js';
 export declare class EnumArrayType<T extends string | number = string> extends ArrayType<T> {
     private readonly owner;
     private readonly items?;
-    constructor(owner: string, items?: T[] | undefined, hydrate?: (i: string) => T);
+    constructor(owner: string, items?: readonly T[] | undefined, hydrate?: (i: string) => T);
     convertToDatabaseValue(value: T[] | null, platform: Platform, context?: TransformContext): string | null;
     getColumnType(prop: EntityProperty, platform: Platform): string;
 }

package/utils/EntityComparator.js

@@ -525,7 +525,11 @@ export class EntityComparator {
     }
     getPropertySnapshot(meta, prop, context, dataKey, entityKey, path, level = 1, object) {
         const unwrap = prop.ref ? '?.unwrap()' : '';
-        let ret = `  if (${this.getPropertyCondition(path)}) {\n`;
+        let ret = `  if (${this.getPropertyCondition(path)}`;
+        if (prop.lazy && prop.ref) {
+            ret += ` && entity${path.map(k => this.wrap(k)).join('')}?.isInitialized()`;
+        }
+        ret += `) {\n`;
         if (['number', 'string', 'boolean'].includes(prop.type.toLowerCase())) {
             return ret + `    ret${dataKey} = entity${entityKey}${unwrap};\n  }\n`;
         }

package/utils/Utils.js

@@ -129,7 +129,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.4-dev.9';
+    static #ORM_VERSION = '7.0.5-dev.0';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */
@@ -553,7 +553,9 @@ export class Utils {
             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
-                    arg.includes('node_modules/tsx/')); // check for tsx loader
+                    arg.includes('node_modules/tsx/') || // check for tsx loader
+                    arg.includes('@oxc-node/core') // check for oxc-node loader
+                );
             }));
     }
     /**