@mikro-orm/core 7.0.4-dev.10 → 7.0.4-dev.12

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.10",
+  "version": "7.0.4-dev.12",
   "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/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/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.10';
+    static #ORM_VERSION = '7.0.4-dev.12';
     /**
      * 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
+                );
             }));
     }
     /**