@mikro-orm/core 6.4.5-dev.7 → 6.4.5-dev.9

package/EntityManager.d.ts

@@ -4,7 +4,7 @@ import { type Configuration, Cursor } from './utils';
 import { type AssignOptions, EntityFactory, type EntityLoaderOptions, type EntityRepository, EntityValidator, Reference } from './entity';
 import { UnitOfWork } from './unit-of-work';
 import type { CountOptions, DeleteOptions, FindAllOptions, FindByCursorOptions, FindOneOptions, FindOneOrFailOptions, FindOptions, GetReferenceOptions, IDatabaseDriver, LockOptions, NativeInsertUpdateOptions, UpdateOptions, UpsertManyOptions, UpsertOptions } from './drivers';
-import type { AnyEntity, AnyString, ArrayElement, AutoPath, ConnectionType, Dictionary, EntityData, EntityDictionary, EntityDTO, EntityMetadata, EntityName, FilterQuery, FromEntityType, GetRepository, IHydrator, IsSubset, Loaded, MaybePromise, MergeLoaded, MergeSelected, ObjectQuery, Primary, Ref, RequiredEntityData, UnboxArray, NoInfer } from './typings';
+import type { AnyEntity, AnyString, ArrayElement, AutoPath, ConnectionType, Dictionary, EntityData, EntityDictionary, EntityDTO, EntityMetadata, EntityName, FilterQuery, FromEntityType, GetRepository, IHydrator, IsSubset, Loaded, MaybePromise, MergeLoaded, MergeSelected, NoInfer, ObjectQuery, Primary, Ref, RequiredEntityData, UnboxArray } from './typings';
 import { FlushMode, LockMode, PopulatePath, type TransactionOptions } from './enums';
 import type { MetadataStorage } from './metadata';
 import type { Transaction } from './connections';

package/EntityManager.js

@@ -384,12 +384,12 @@ class EntityManager {
         const em = this.getContext(false);
         await em.tryFlush(entityName, options);
         options.flushMode = 'commit'; // do not try to auto flush again
-        const copy = utils_1.Utils.copy(where);
-        const [entities, count] = await Promise.all([
-            em.find(entityName, where, options),
-            em.count(entityName, copy, options),
-        ]);
-        return [entities, count];
+        return utils_1.RawQueryFragment.run(async () => {
+            return Promise.all([
+                em.find(entityName, where, options),
+                em.count(entityName, where, options),
+            ]);
+        });
     }
     /**
      * Calls `em.find()` and `em.count()` with the same arguments (where applicable) and returns the results as {@apilink Cursor} object.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.5-dev.7",
+  "version": "6.4.5-dev.9",
   "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.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.4.5-dev.7",
+    "mikro-orm": "6.4.5-dev.9",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/RawQueryFragment.d.ts

@@ -13,6 +13,7 @@ export declare class RawQueryFragment {
     /** @internal */
     assign(): void;
     clone(): RawQueryFragment;
+    static run<T>(cb: (...args: any[]) => Promise<T>): Promise<T>;
     /**
      * @internal allows testing we don't leak memory, as the raw fragments cache needs to be cleared automatically
      */

package/utils/RawQueryFragment.js

@@ -4,12 +4,14 @@ exports.ALIAS_REPLACEMENT_RE = exports.ALIAS_REPLACEMENT = exports.RawQueryFragm
 exports.raw = raw;
 exports.sql = sql;
 exports.createSqlFunction = createSqlFunction;
+const node_async_hooks_1 = require("node:async_hooks");
 const node_util_1 = require("node:util");
 const Utils_1 = require("./Utils");
 class RawQueryFragment {
     sql;
     params;
     static #rawQueryCache = new Map();
+    static #storage = new node_async_hooks_1.AsyncLocalStorage();
     static #index = 0n;
     static cloneRegistry;
     #assigned = false;
@@ -45,6 +47,13 @@ class RawQueryFragment {
         RawQueryFragment.cloneRegistry?.add(this.#key);
         return new RawQueryFragment(this.sql, this.params);
     }
+    static async run(cb) {
+        const removeStack = new Set();
+        const res = await this.#storage.run(removeStack, cb);
+        removeStack.forEach(key => RawQueryFragment.remove(key));
+        removeStack.clear();
+        return res;
+    }
     /**
      * @internal allows testing we don't leak memory, as the raw fragments cache needs to be cleared automatically
      */
@@ -74,7 +83,13 @@ class RawQueryFragment {
         }
         raw.#used--;
         if (raw.#used <= 0) {
-            this.#rawQueryCache.delete(key);
+            const removeStack = this.#storage.getStore();
+            if (removeStack) {
+                removeStack.add(key);
+            }
+            else {
+                this.#rawQueryCache.delete(key);
+            }
         }
     }
     /* istanbul ignore next */

package/utils/Utils.js

@@ -38,7 +38,6 @@ function isRawSql(value) {
     return typeof value === 'object' && !!value && '__raw' in value;
 }
 function compareObjects(a, b) {
-    // eslint-disable-next-line eqeqeq
     if (a === b || (a == null && b == null)) {
         return true;
     }