@mikro-orm/core 7.0.2-dev.10 → 7.0.2-dev.11

package/metadata/MetadataDiscovery.js

@@ -1612,8 +1612,9 @@ export class MetadataDiscovery {
             !prop.customType) {
             // if the type is an ORM defined mapped type without `ensureComparable: true`,
             // we use just the type name, to have more performant hydration code
+            const brand = Type.getOrmType(prop.type);
             const type = Utils.keys(t).find(type => {
-                return !Type.getType(t[type]).ensureComparable(meta, prop) && prop.type === t[type];
+                return (!Type.getType(t[type]).ensureComparable(meta, prop) && (prop.type === t[type] || brand === type));
             });
             if (type) {
                 prop.type = type === 'datetime' ? 'Date' : type;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.2-dev.10",
+  "version": "7.0.2-dev.11",
   "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/Type.d.ts

@@ -1,5 +1,7 @@
 import type { Platform } from '../platforms/Platform.js';
 import type { Constructor, EntityMetadata, EntityProperty } from '../typings.js';
+/** @internal */
+export declare const ORM_TYPE: unique symbol;
 export interface TransformContext {
     fromQuery?: boolean;
     force?: boolean;
@@ -78,4 +80,10 @@ export declare abstract class Type<JSType = string, DBType = JSType> {
      * Checks whether the argument is instance of `Type`.
      */
     static isMappedType(data: any): data is Type<any>;
+    /**
+     * @internal
+     * Returns the built-in type registry key if the given constructor is a branded ORM type
+     * (not a user subclass). Uses `Symbol.for()` so it works across CJS/ESM module graphs.
+     */
+    static getOrmType(cls: object): string | undefined;
 }

package/types/Type.js

@@ -1,4 +1,6 @@
 import { inspect } from '../logging/inspect.js';
+/** @internal */
+export const ORM_TYPE = Symbol.for('@mikro-orm/type');
 export class Type {
     static types = new Map();
     platform;
@@ -64,6 +66,14 @@ export class Type {
     static isMappedType(data) {
         return !!data?.__mappedType;
     }
+    /**
+     * @internal
+     * Returns the built-in type registry key if the given constructor is a branded ORM type
+     * (not a user subclass). Uses `Symbol.for()` so it works across CJS/ESM module graphs.
+     */
+    static getOrmType(cls) {
+        return Object.hasOwn(cls, ORM_TYPE) ? cls[ORM_TYPE] : undefined;
+    }
     /** @ignore */
     [Symbol.for('nodejs.util.inspect.custom')](depth = 2) {
         const object = { ...this };

package/types/index.js

@@ -19,7 +19,7 @@ import { StringType } from './StringType.js';
 import { TextType } from './TextType.js';
 import { TimeType } from './TimeType.js';
 import { TinyIntType } from './TinyIntType.js';
-import { Type } from './Type.js';
+import { ORM_TYPE, Type } from './Type.js';
 import { Uint8ArrayType } from './Uint8ArrayType.js';
 import { UnknownType } from './UnknownType.js';
 import { UuidType } from './UuidType.js';
@@ -51,3 +51,13 @@ export const types = {
     unknown: UnknownType,
 };
 export const t = types;
+/**
+ * Brand each built-in type constructor with its registry key via a cross-module symbol.
+ * Symbol.for() returns the same symbol across CJS/ESM module graphs, so this survives
+ * the dual-package hazard (e.g. when using tsx or @swc-node/register with "type": "commonjs").
+ * Using Object.defineProperty ensures the brand is an own (non-inherited) property,
+ * so subclasses (e.g. MyJsonType extends JsonType) won't be detected as built-in types.
+ */
+for (const [key, type] of Object.entries(types)) {
+    Object.defineProperty(type, ORM_TYPE, { value: key, enumerable: false });
+}

package/utils/Utils.js

@@ -123,7 +123,7 @@ export function parseJsonSafe(value) {
 }
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.2-dev.10';
+    static #ORM_VERSION = '7.0.2-dev.11';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */