@forklaunch/core 1.6.4 → 1.6.6

package/lib/persistence/index.js

@@ -1283,20 +1283,34 @@ function wrapEmWithTenantContext(em, tenantId) {
   if (tenantId) {
     em.setFilterParams("tenant", { tenantId });
   }
-  return new Proxy(em, {
+  const proxy = new Proxy(em, {
     get(target, prop, receiver) {
       const value = Reflect.get(target, prop, receiver);
       if (typeof value !== "function") {
         return value;
       }
       return function tenantBoundMethod(...args) {
-        return withEncryptionContext(
+        const result = withEncryptionContext(
           tenantId,
           () => value.apply(target, args)
         );
+        return rebind(result, target, proxy, tenantId);
       };
     }
   });
+  return proxy;
+}
+function rebind(result, target, proxy, tenantId) {
+  if (result === target) {
+    return proxy;
+  }
+  if (isEntityManager(result) && result !== proxy) {
+    return wrapEmWithTenantContext(result, tenantId);
+  }
+  return result;
+}
+function isEntityManager(value) {
+  return typeof value === "object" && value !== null && "fork" in value && typeof value.fork === "function" && "flush" in value && typeof value.flush === "function" && "persist" in value && typeof value.persist === "function";
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {