@mikro-orm/core 7.0.10-dev.3 → 7.0.10-dev.5

package/metadata/MetadataDiscovery.js

@@ -393,7 +393,7 @@ export class MetadataDiscovery {
             }
             if (prop.joinColumns.length > 1) {
                 prop.ownColumns = prop.joinColumns.filter(col => {
-                    return !meta.props.find(p => p.name !== prop.name && (!p.fieldNames || p.fieldNames.includes(col)));
+                    return !meta.props.find(p => p.name !== prop.name && p.fieldNames?.includes(col));
                 });
             }
             if (!prop.ownColumns || prop.ownColumns.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.10-dev.3",
+  "version": "7.0.10-dev.5",
   "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/utils/Utils.js

@@ -132,7 +132,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.10-dev.3';
+    static #ORM_VERSION = '7.0.10-dev.5';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */
@@ -647,8 +647,10 @@ export class Utils {
      * Extracts all possible values of a TS enum. Works with both string and numeric enums.
      */
     static extractEnumValues(target) {
-        const keys = Object.keys(target);
-        const values = Object.values(target);
+        // skip namespace-merged functions (GH #7500)
+        const entries = Object.entries(target).filter(([, v]) => typeof v !== 'function');
+        const keys = entries.map(([k]) => k);
+        const values = entries.map(([, v]) => v);
         const numeric = !!values.find(v => typeof v === 'number');
         const constEnum = values.length % 2 === 0 && // const enum will have even number of items
             values.slice(0, values.length / 2).every(v => typeof v === 'string') && // first half are strings