@mikro-orm/core 6.6.10-dev.0 → 6.6.10

package/entity/ArrayCollection.d.ts

@@ -110,6 +110,7 @@ export declare class ArrayCollection<T extends object, O extends object> {
     protected propagateToOwningSide(item: T, method: 'add' | 'remove' | 'takeSnapshot'): void;
     protected shouldPropagateToCollection(collection: ArrayCollection<O, T>, method: 'add' | 'remove' | 'takeSnapshot'): boolean;
     protected incrementCount(value: number): void;
+    static isCollection<T extends object, O extends object>(item: any): item is ArrayCollection<T, O>;
     /** @ignore */
     [inspect.custom](depth?: number): string;
 }

package/entity/ArrayCollection.js

@@ -7,6 +7,7 @@ const wrap_1 = require("./wrap");
 const errors_1 = require("../errors");
 const enums_1 = require("../enums");
 const Utils_1 = require("../utils/Utils");
+const collectionSymbol = Symbol('Collection');
 class ArrayCollection {
     owner;
     items = new Set();
@@ -18,6 +19,7 @@ class ArrayCollection {
     _property;
     constructor(owner, items) {
         this.owner = owner;
+        Object.defineProperty(this, collectionSymbol, { value: true, enumerable: false });
         /* istanbul ignore next */
         if (items) {
             let i = 0;
@@ -395,6 +397,9 @@ class ArrayCollection {
             this._count += value;
         }
     }
+    static isCollection(item) {
+        return item != null && Object.hasOwn(item, collectionSymbol);
+    }
     /** @ignore */
     [node_util_1.inspect.custom](depth = 2) {
         const object = { ...this };
@@ -406,6 +411,3 @@ class ArrayCollection {
     }
 }
 exports.ArrayCollection = ArrayCollection;
-Object.defineProperties(ArrayCollection.prototype, {
-    __collection: { value: true, enumerable: false, writable: false },
-});

package/entity/EntityFactory.js

@@ -30,7 +30,7 @@ class EntityFactory {
     create(entityName, data, options = {}) {
         data = Reference_1.Reference.unwrapReference(data);
         options.initialized ??= true;
-        if (data.__entity) {
+        if (EntityHelper_1.EntityHelper.isEntity(data)) {
             return data;
         }
         entityName = Utils_1.Utils.className(entityName);

package/entity/EntityHelper.d.ts

@@ -4,6 +4,7 @@ import { type EntityMetadata, type EntityProperty, type IHydrator } from '../typ
  * @internal
  */
 export declare class EntityHelper {
+    static isEntity(data: any): boolean;
     static decorate<T extends object>(meta: EntityMetadata<T>, em: EntityManager): void;
     /**
      * As a performance optimization, we create entity state methods in a lazy manner. We first add

package/entity/EntityHelper.js

@@ -9,10 +9,14 @@ const Utils_1 = require("../utils/Utils");
 const WrappedEntity_1 = require("./WrappedEntity");
 const enums_1 = require("../enums");
 const wrap_1 = require("./wrap");
+const entitySymbol = Symbol('Entity');
 /**
  * @internal
  */
 class EntityHelper {
+    static isEntity(data) {
+        return data != null && typeof data === 'object' && !!data[entitySymbol];
+    }
     static decorate(meta, em) {
         const fork = em.fork(); // use fork so we can access `EntityFactory`
         const serializedPrimaryKey = meta.props.find(p => p.serializedPrimaryKey);
@@ -58,7 +62,7 @@ class EntityHelper {
     static defineBaseProperties(meta, prototype, em) {
         const helperParams = meta.embeddable || meta.virtual ? [] : [em.getComparator().getPkGetter(meta), em.getComparator().getPkSerializer(meta), em.getComparator().getPkGetterConverted(meta)];
         Object.defineProperties(prototype, {
-            __entity: { value: !meta.embeddable, configurable: true },
+            [entitySymbol]: { value: !meta.embeddable, enumerable: false, configurable: true },
             __meta: { value: meta, configurable: true },
             __config: { value: em.config, configurable: true },
             __platform: { value: em.getPlatform(), configurable: true },

package/entity/Reference.d.ts

@@ -66,6 +66,7 @@ export declare class ScalarReference<Value> {
     bind<Entity extends object>(entity: Entity, property: EntityKey<Entity>): void;
     unwrap(): Value | undefined;
     isInitialized(): boolean;
+    static isScalarReference(data: any): data is ScalarReference<any>;
     /** @ignore */
     [inspect.custom](): string;
 }

package/entity/Reference.js

@@ -6,13 +6,18 @@ exports.rel = rel;
 const node_util_1 = require("node:util");
 const enums_1 = require("../enums");
 const wrap_1 = require("./wrap");
-const utils_1 = require("../utils");
+const DataloaderUtils_1 = require("../utils/DataloaderUtils");
+const QueryHelper_1 = require("../utils/QueryHelper");
+const Utils_1 = require("../utils/Utils");
 const errors_1 = require("../errors");
+const referenceSymbol = Symbol('Reference');
+const scalarReferenceSymbol = Symbol('ScalarReference');
 class Reference {
     entity;
     property;
     constructor(entity) {
         this.entity = entity;
+        Object.defineProperty(this, referenceSymbol, { value: true, enumerable: false });
         this.set(entity);
         const meta = (0, wrap_1.helper)(this.entity).__meta;
         meta.primaryKeys.forEach(primaryKey => {
@@ -63,7 +68,7 @@ class Reference {
      * Checks whether the argument is instance of `Reference` wrapper.
      */
     static isReference(data) {
-        return data && !!data.__reference;
+        return data != null && Object.hasOwn(data, referenceSymbol);
     }
     /**
      * Wraps the entity in a `Reference` wrapper if the property is defined as `ref`.
@@ -92,12 +97,12 @@ class Reference {
         if (!wrapped.__em) {
             return this.entity;
         }
-        options = { ...options, filters: utils_1.QueryHelper.mergePropertyFilters(this.property?.filters, options.filters) };
+        options = { ...options, filters: QueryHelper_1.QueryHelper.mergePropertyFilters(this.property?.filters, options.filters) };
         if (this.isInitialized() && !options.refresh && options.populate) {
             await wrapped.__em.populate(this.entity, options.populate, options);
         }
         if (!this.isInitialized() || options.refresh) {
-            if (options.dataloader ?? [enums_1.DataloaderType.ALL, enums_1.DataloaderType.REFERENCE].includes(utils_1.DataloaderUtils.getDataloaderType(wrapped.__em.config.get('dataloader')))) {
+            if (options.dataloader ?? [enums_1.DataloaderType.ALL, enums_1.DataloaderType.REFERENCE].includes(DataloaderUtils_1.DataloaderUtils.getDataloaderType(wrapped.__em.config.get('dataloader')))) {
                 // eslint-disable-next-line dot-notation
                 return wrapped.__em['refLoader'].load([this, options]);
             }
@@ -173,6 +178,7 @@ class ScalarReference {
     constructor(value, initialized = value != null) {
         this.value = value;
         this.initialized = initialized;
+        Object.defineProperty(this, scalarReferenceSymbol, { value: true, enumerable: false });
     }
     /**
      * Ensures the underlying entity is loaded first (without reloading it if it already is loaded).
@@ -219,6 +225,9 @@ class ScalarReference {
     isInitialized() {
         return this.initialized;
     }
+    static isScalarReference(data) {
+        return data != null && typeof data === 'object' && Object.hasOwn(data, scalarReferenceSymbol);
+    }
     /* istanbul ignore next */
     /** @ignore */
     [node_util_1.inspect.custom]() {
@@ -227,7 +236,6 @@ class ScalarReference {
 }
 exports.ScalarReference = ScalarReference;
 Object.defineProperties(Reference.prototype, {
-    __reference: { value: true, enumerable: false },
     __meta: { get() { return this.entity.__meta; } },
     __platform: { get() { return this.entity.__platform; } },
     __helper: { get() { return this.entity.__helper; } },
@@ -235,7 +243,6 @@ Object.defineProperties(Reference.prototype, {
     get: { get() { return () => this.entity; } },
 });
 Object.defineProperties(ScalarReference.prototype, {
-    __scalarReference: { value: true, enumerable: false },
     $: { get() { return this.value; } },
     get: { get() { return () => this.value; } },
 });
@@ -246,10 +253,10 @@ function ref(entityOrType, pk) {
     if (entityOrType == null) {
         return entityOrType;
     }
-    if (utils_1.Utils.isEntity(entityOrType, true)) {
+    if (Utils_1.Utils.isEntity(entityOrType, true)) {
         return (0, wrap_1.helper)(entityOrType).toReference();
     }
-    if (utils_1.Utils.isEntity(pk, true)) {
+    if (Utils_1.Utils.isEntity(pk, true)) {
         return (0, wrap_1.helper)(pk).toReference();
     }
     if (arguments.length === 1) {
@@ -264,7 +271,7 @@ function ref(entityOrType, pk) {
  * shortcut for `Reference.createNakedFromPK(entityType, pk)`
  */
 function rel(entityType, pk) {
-    if (pk == null || utils_1.Utils.isEntity(pk)) {
+    if (pk == null || Utils_1.Utils.isEntity(pk)) {
         return pk;
     }
     return Reference.createNakedFromPK(entityType, pk);

package/hydration/ObjectHydrator.js

@@ -4,6 +4,7 @@ exports.ObjectHydrator = void 0;
 const Hydrator_1 = require("./Hydrator");
 const Collection_1 = require("../entity/Collection");
 const Reference_1 = require("../entity/Reference");
+const EntityHelper_1 = require("../entity/EntityHelper");
 const Utils_1 = require("../utils/Utils");
 const enums_1 = require("../enums");
 const RawQueryFragment_1 = require("../utils/RawQueryFragment");
@@ -50,6 +51,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
         const context = new Map();
         const props = this.getProperties(meta, type);
         context.set('isPrimaryKey', Utils_1.Utils.isPrimaryKey);
+        context.set('isEntity', EntityHelper_1.EntityHelper.isEntity);
         context.set('Collection', Collection_1.Collection);
         context.set('Reference', Reference_1.Reference);
         const registerCustomType = (prop, convertorKey, method, context) => {
@@ -364,7 +366,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
             lines.push(`    }`);
         }
         lines.push(`    if (isPrimaryKey(value, ${meta.compositePK})) return factory.createReference('${prop.type}', value, { convertCustomTypes, schema, normalizeAccessors, merge: true });`);
-        lines.push(`    if (value && value.__entity) return value;`);
+        lines.push(`    if (value && isEntity(value)) return value;`);
         lines.push(`    return factory.create('${prop.type}', value, { newEntity, convertCustomTypes, schema, normalizeAccessors, merge: true });`);
         lines.push(`  }`);
         return lines;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.6.10-dev.0",
+  "version": "6.6.10",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.3.3",
     "globby": "11.1.0",
-    "mikro-orm": "6.6.10-dev.0",
+    "mikro-orm": "6.6.10",
     "reflect-metadata": "0.2.2"
   }
 }

package/platforms/Platform.d.ts

@@ -1,4 +1,4 @@
-import { EntityRepository } from '../entity';
+import { EntityRepository } from '../entity/EntityRepository';
 import { type NamingStrategy } from '../naming-strategy';
 import type { Constructor, EntityProperty, IPrimaryKey, ISchemaGenerator, PopulateOptions, Primary, EntityMetadata, SimpleColumnMeta } from '../typings';
 import { ExceptionConverter } from './ExceptionConverter';

package/platforms/Platform.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Platform = exports.JsonProperty = void 0;
 const clone_1 = require("../utils/clone");
-const entity_1 = require("../entity");
+const RawQueryFragment_1 = require("../utils/RawQueryFragment");
+const EntityRepository_1 = require("../entity/EntityRepository");
 const naming_strategy_1 = require("../naming-strategy");
 const ExceptionConverter_1 = require("./ExceptionConverter");
 const types_1 = require("../types");
@@ -133,7 +134,7 @@ class Platform {
         return prop.columnTypes?.[0] === 'bigint';
     }
     isRaw(value) {
-        return typeof value === 'object' && value !== null && '__raw' in value;
+        return RawQueryFragment_1.RawQueryFragment.isRaw(value);
     }
     getDefaultSchemaName() {
         return undefined;
@@ -309,7 +310,7 @@ class Platform {
         return date;
     }
     getRepositoryClass() {
-        return entity_1.EntityRepository;
+        return EntityRepository_1.EntityRepository;
     }
     getDefaultCharset() {
         return 'utf8';

package/typings.d.ts

@@ -6,7 +6,8 @@ import type { SerializationContext, SerializeOptions } from './serialization';
 import type { EntitySchema, MetadataStorage } from './metadata';
 import type { Type, types } from './types';
 import type { Platform } from './platforms';
-import type { Configuration, RawQueryFragment } from './utils';
+import type { Configuration } from './utils/Configuration';
+import { RawQueryFragment } from './utils/RawQueryFragment';
 import type { EntityManager } from './EntityManager';
 import type { EmbeddedPrefixMode } from './decorators/Embedded';
 import type { EventSubscriber } from './events';

package/typings.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityMetadata = exports.Config = exports.HiddenProps = exports.EagerProps = exports.OptionalProps = exports.PrimaryKeyProp = exports.EntityRepositoryType = void 0;
 const enums_1 = require("./enums");
 const entity_1 = require("./entity");
+const RawQueryFragment_1 = require("./utils/RawQueryFragment");
 const Utils_1 = require("./utils/Utils");
 const EntityComparator_1 = require("./utils/EntityComparator");
 exports.EntityRepositoryType = Symbol('EntityRepositoryType');
@@ -151,7 +152,7 @@ class EntityMetadata {
                     return this.__helper.__data[prop.name];
                 },
                 set(val) {
-                    if (typeof val === 'object' && !!val && '__raw' in val) {
+                    if (RawQueryFragment_1.RawQueryFragment.isRaw(val)) {
                         val.assign();
                     }
                     this.__helper.__data[prop.name] = val;

package/utils/EntityComparator.js

@@ -58,11 +58,12 @@ class EntityComparator {
         }
         const lines = [];
         const context = new Map();
+        context.set('isEntityOrRef', (val) => Utils_1.Utils.isEntity(val, true));
         if (meta.primaryKeys.length > 1) {
             lines.push(`  const cond = {`);
             meta.primaryKeys.forEach(pk => {
                 if (meta.properties[pk].kind !== enums_1.ReferenceKind.SCALAR) {
-                    lines.push(`    ${pk}: (entity${this.wrap(pk)} != null && (entity${this.wrap(pk)}.__entity || entity${this.wrap(pk)}.__reference)) ? entity${this.wrap(pk)}.__helper.getPrimaryKey() : entity${this.wrap(pk)},`);
+                    lines.push(`    ${pk}: (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getPrimaryKey() : entity${this.wrap(pk)},`);
                 }
                 else {
                     lines.push(`    ${pk}: entity${this.wrap(pk)},`);
@@ -75,7 +76,7 @@ class EntityComparator {
         else {
             const pk = meta.primaryKeys[0];
             if (meta.properties[pk].kind !== enums_1.ReferenceKind.SCALAR) {
-                lines.push(`  if (entity${this.wrap(pk)} != null && (entity${this.wrap(pk)}.__entity || entity${this.wrap(pk)}.__reference)) {`);
+                lines.push(`  if (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) {`);
                 lines.push(`    const pk = entity${this.wrap(pk)}.__helper.getPrimaryKey();`);
                 if (meta.properties[pk].targetMeta.compositePK) {
                     lines.push(`    if (typeof pk === 'object' && pk != null) {`);
@@ -108,11 +109,12 @@ class EntityComparator {
         }
         const lines = [];
         const context = new Map();
+        context.set('isEntityOrRef', (val) => Utils_1.Utils.isEntity(val, true));
         if (meta.primaryKeys.length > 1) {
             lines.push(`  const cond = {`);
             meta.primaryKeys.forEach(pk => {
                 if (meta.properties[pk].kind !== enums_1.ReferenceKind.SCALAR) {
-                    lines.push(`    ${pk}: (entity${this.wrap(pk)} != null && (entity${this.wrap(pk)}.__entity || entity${this.wrap(pk)}.__reference)) ? entity${this.wrap(pk)}.__helper.getPrimaryKey(true) : entity${this.wrap(pk)},`);
+                    lines.push(`    ${pk}: (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getPrimaryKey(true) : entity${this.wrap(pk)},`);
                 }
                 else {
                     if (meta.properties[pk].customType) {
@@ -131,7 +133,7 @@ class EntityComparator {
         else {
             const pk = meta.primaryKeys[0];
             if (meta.properties[pk].kind !== enums_1.ReferenceKind.SCALAR) {
-                lines.push(`  if (entity${this.wrap(pk)} != null && (entity${this.wrap(pk)}.__entity || entity${this.wrap(pk)}.__reference)) return entity${this.wrap(pk)}.__helper.getPrimaryKey(true);`);
+                lines.push(`  if (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) return entity${this.wrap(pk)}.__helper.getPrimaryKey(true);`);
             }
             if (meta.properties[pk].customType) {
                 const convertorKey = this.registerCustomType(meta.properties[pk], context);
@@ -158,13 +160,14 @@ class EntityComparator {
         }
         const lines = [];
         const context = new Map();
+        context.set('isEntityOrRef', (val) => Utils_1.Utils.isEntity(val, true));
         context.set('getCompositeKeyValue', (val) => Utils_1.Utils.flatten(Utils_1.Utils.getCompositeKeyValue(val, meta, 'convertToDatabaseValue', this.platform)));
         context.set('getPrimaryKeyHash', (val) => Utils_1.Utils.getPrimaryKeyHash(Utils_1.Utils.asArray(val)));
         if (meta.primaryKeys.length > 1) {
             lines.push(`  const pks = entity.__helper.__pk ? getCompositeKeyValue(entity.__helper.__pk) : [`);
             meta.primaryKeys.forEach(pk => {
                 if (meta.properties[pk].kind !== enums_1.ReferenceKind.SCALAR) {
-                    lines.push(`    (entity${this.wrap(pk)} != null && (entity${this.wrap(pk)}.__entity || entity${this.wrap(pk)}.__reference)) ? entity${this.wrap(pk)}.__helper.getSerializedPrimaryKey() : entity${this.wrap(pk)},`);
+                    lines.push(`    (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getSerializedPrimaryKey() : entity${this.wrap(pk)},`);
                 }
                 else {
                     lines.push(`    entity${this.wrap(pk)},`);
@@ -177,7 +180,7 @@ class EntityComparator {
             const pk = meta.primaryKeys[0];
             const prop = meta.properties[pk];
             if (prop.kind !== enums_1.ReferenceKind.SCALAR) {
-                lines.push(`  if (entity${this.wrap(pk)} != null && (entity${this.wrap(pk)}.__entity || entity${this.wrap(pk)}.__reference)) return entity${this.wrap(pk)}.__helper.getSerializedPrimaryKey();`);
+                lines.push(`  if (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) return entity${this.wrap(pk)}.__helper.getSerializedPrimaryKey();`);
             }
             const serializedPrimaryKey = meta.props.find(p => p.serializedPrimaryKey);
             if (serializedPrimaryKey) {

package/utils/RawQueryFragment.d.ts

@@ -18,6 +18,10 @@ export declare class RawQueryFragment {
      * @internal allows testing we don't leak memory, as the raw fragments cache needs to be cleared automatically
      */
     static checkCacheSize(): number;
+    /** @internal */
+    static isRaw(value: unknown): boolean;
+    /** @internal */
+    static markRaw(obj: object): void;
     static isKnownFragment(key: string | RawQueryFragment): boolean;
     static getKnownFragment(key: string | RawQueryFragment, cleanup?: boolean): RawQueryFragment | undefined;
     static remove(key: string): void;

package/utils/RawQueryFragment.js

@@ -8,6 +8,7 @@ exports.quote = quote;
 const node_async_hooks_1 = require("node:async_hooks");
 const node_util_1 = require("node:util");
 const Utils_1 = require("./Utils");
+const rawSymbol = Symbol('RawQueryFragment');
 class RawQueryFragment {
     sql;
     params;
@@ -22,6 +23,7 @@ class RawQueryFragment {
         this.sql = sql;
         this.params = params;
         this.#key = `[raw]: ${this.sql} (#${RawQueryFragment.#index++})`;
+        Object.defineProperty(this, rawSymbol, { value: true, enumerable: false });
     }
     as(alias) {
         // TODO: to be removed in v7
@@ -66,6 +68,14 @@ class RawQueryFragment {
     static checkCacheSize() {
         return this.#rawQueryCache.size;
     }
+    /** @internal */
+    static isRaw(value) {
+        return typeof value === 'object' && !!value && Object.hasOwn(value, rawSymbol);
+    }
+    /** @internal */
+    static markRaw(obj) {
+        Object.defineProperty(obj, rawSymbol, { value: true, enumerable: false });
+    }
     static isKnownFragment(key) {
         if (key instanceof RawQueryFragment) {
             return true;
@@ -108,9 +118,6 @@ class RawQueryFragment {
     }
 }
 exports.RawQueryFragment = RawQueryFragment;
-Object.defineProperties(RawQueryFragment.prototype, {
-    __raw: { value: true, enumerable: false },
-});
 /** @internal */
 exports.ALIAS_REPLACEMENT = '[::alias::]';
 /** @internal */

package/utils/Utils.d.ts

@@ -2,7 +2,7 @@ import { type GlobbyOptions } from 'globby';
 import type { Dictionary, EntityData, EntityDictionary, EntityKey, EntityMetadata, EntityName, EntityProperty, IMetadataStorage, Primary } from '../typings';
 import type { Collection } from '../entity/Collection';
 import type { Platform } from '../platforms';
-import type { ScalarReference } from '../entity/Reference';
+import { ScalarReference } from '../entity/Reference';
 export declare const ObjectBindingPattern: unique symbol;
 export declare function compareObjects(a: any, b: any): boolean;
 export declare function compareArrays(a: any[] | string, b: any[] | string): boolean;
@@ -149,7 +149,7 @@ export declare class Utils {
     /**
      * Checks whether given object is a scalar reference.
      */
-    static isScalarReference<T = unknown>(data: any, allowReference?: boolean): data is ScalarReference<any> & {};
+    static isScalarReference<T = unknown>(data: any): data is ScalarReference<any> & {};
     /**
      * Checks whether the argument is ObjectId instance
      */

package/utils/Utils.js

@@ -19,8 +19,12 @@ const fs_extra_1 = require("fs-extra");
 const node_crypto_1 = require("node:crypto");
 const esprima_1 = require("esprima");
 const clone_1 = require("./clone");
+const RawQueryFragment_1 = require("./RawQueryFragment");
 const enums_1 = require("../enums");
 const wrap_1 = require("../entity/wrap");
+const Reference_1 = require("../entity/Reference");
+const ArrayCollection_1 = require("../entity/ArrayCollection");
+const EntityHelper_1 = require("../entity/EntityHelper");
 exports.ObjectBindingPattern = Symbol('ObjectBindingPattern');
 function compareConstructors(a, b) {
     if (a.constructor === b.constructor) {
@@ -35,7 +39,7 @@ function compareConstructors(a, b) {
     return false;
 }
 function isRawSql(value) {
-    return typeof value === 'object' && !!value && '__raw' in value;
+    return RawQueryFragment_1.RawQueryFragment.isRaw(value);
 }
 function compareObjects(a, b) {
     if (a === b || (a == null && b == null)) {
@@ -289,6 +293,9 @@ class Utils {
         const source = sources.shift();
         if (Utils.isObject(target) && Utils.isPlainObject(source)) {
             for (const [key, value] of Object.entries(source)) {
+                if (['__proto__', 'constructor', 'prototype'].includes(key)) {
+                    continue;
+                }
                 if (ignoreUndefined && typeof value === 'undefined') {
                     continue;
                 }
@@ -610,16 +617,16 @@ class Utils {
         if (!Utils.isObject(data)) {
             return false;
         }
-        if (allowReference && !!data.__reference) {
+        if (allowReference && Reference_1.Reference.isReference(data)) {
             return true;
         }
-        return !!data.__entity;
+        return EntityHelper_1.EntityHelper.isEntity(data);
     }
     /**
      * Checks whether given object is a scalar reference.
      */
-    static isScalarReference(data, allowReference = false) {
-        return typeof data === 'object' && data?.__scalarReference;
+    static isScalarReference(data) {
+        return Reference_1.ScalarReference.isScalarReference(data);
     }
     /**
      * Checks whether the argument is ObjectId instance
@@ -745,7 +752,7 @@ class Utils {
         return ret;
     }
     static isCollection(item) {
-        return item?.__collection;
+        return ArrayCollection_1.ArrayCollection.isCollection(item);
     }
     static fileURLToPath(url) {
         // expose `fileURLToPath` on Utils so that it can be properly mocked in tests