From 0a5c1480c8321affa4f8d38ef6f1195fc3339744 Mon Sep 17 00:00:00 2001
From: Vinicius <viblaziusgoulart@gmail.com>
Date: Mon, 15 Jul 2024 17:52:35 -0300
Subject: [PATCH 1/6] fix(toJSON): get the generic type T for toJSON response

related
---
 packages/realm/src/JSONCacheMap.ts | 6 +++---
 packages/realm/src/Object.ts       | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/realm/src/JSONCacheMap.ts b/packages/realm/src/JSONCacheMap.ts
index 6893461601..47f9e95254 100644
--- a/packages/realm/src/JSONCacheMap.ts
+++ b/packages/realm/src/JSONCacheMap.ts
@@ -19,8 +19,8 @@
 import { DefaultObject, INTERNAL, RealmObject } from "./internal";
 
 /** @internal */
-export class JSONCacheMap extends Map<number, Map<string, DefaultObject>> {
-  add<T>(object: RealmObject<T>, value: DefaultObject) {
+export class JSONCacheMap<T = DefaultObject> extends Map<number, Map<string, T>> {
+  add<U>(object: RealmObject<U>, value: T) {
     const tableKey = object[INTERNAL].table.key;
     let cachedMap = this.get(tableKey);
     if (!cachedMap) {
@@ -29,7 +29,7 @@ export class JSONCacheMap extends Map<number, Map<string, DefaultObject>> {
     }
     cachedMap.set(object._objectKey(), value);
   }
-  find<T>(object: RealmObject<T>) {
+  find<U>(object: RealmObject<U>) {
     return this.get(object[INTERNAL].table.key)?.get(object._objectKey());
   }
 }
diff --git a/packages/realm/src/Object.ts b/packages/realm/src/Object.ts
index 4e96620f0e..503b840627 100644
--- a/packages/realm/src/Object.ts
+++ b/packages/realm/src/Object.ts
@@ -382,9 +382,9 @@ export class RealmObject<T = DefaultObject, RequiredProperties extends keyof Omi
    * and [flatted](https://www.npmjs.com/package/flatted) to stringify Realm entities that have circular structures.
    * @returns A plain object.
    */
-  toJSON(_?: string, cache?: unknown): DefaultObject;
+  toJSON(_?: string, cache?: unknown): T | Partial<T>;
   /** @internal */
-  toJSON(_?: string, cache = new JSONCacheMap()): DefaultObject {
+  toJSON(_?: string, cache = new JSONCacheMap<Partial<T>>()): T | Partial<T> {
     // Construct a reference-id of table-name & primaryKey if it exists, or fall back to objectId.
 
     // Check if current objectId has already processed, to keep object references the same.
@@ -392,7 +392,7 @@ export class RealmObject<T = DefaultObject, RequiredProperties extends keyof Omi
     if (existing) {
       return existing;
     }
-    const result: DefaultObject = {};
+    const result: Partial<T> = {};
     cache.add(this, result);
     // Move all enumerable keys to result, triggering any specific toJSON implementation in the process.
     for (const key in this) {
@@ -402,7 +402,7 @@ export class RealmObject<T = DefaultObject, RequiredProperties extends keyof Omi
       }
       if (value instanceof RealmObject || value instanceof OrderedCollection || value instanceof Dictionary) {
         // recursively trigger `toJSON` for Realm instances with the same cache.
-        result[key] = value.toJSON(key, cache);
+        result[key] = value.toJSON(key, cache)
       } else {
         // Other cases, including null and undefined.
         result[key] = value;

From 7bafc419659fbabcebba1a8de7320318318e9dab Mon Sep 17 00:00:00 2001
From: Vinicius <viblaziusgoulart@gmail.com>
Date: Mon, 15 Jul 2024 17:56:45 -0300
Subject: [PATCH 2/6] fix(lint): lint

---
 packages/realm/src/Object.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/realm/src/Object.ts b/packages/realm/src/Object.ts
index 503b840627..4ddf97a226 100644
--- a/packages/realm/src/Object.ts
+++ b/packages/realm/src/Object.ts
@@ -402,7 +402,7 @@ export class RealmObject<T = DefaultObject, RequiredProperties extends keyof Omi
       }
       if (value instanceof RealmObject || value instanceof OrderedCollection || value instanceof Dictionary) {
         // recursively trigger `toJSON` for Realm instances with the same cache.
-        result[key] = value.toJSON(key, cache)
+        result[key] = value.toJSON(key, cache);
       } else {
         // Other cases, including null and undefined.
         result[key] = value;

From eb270f7a54847289dee0f5f27adc0021e8bcc292 Mon Sep 17 00:00:00 2001
From: Vinicius <viblaziusgoulart@gmail.com>
Date: Tue, 16 Jul 2024 14:43:05 -0300
Subject: [PATCH 3/6] fix(return): return the generic type T

---
 packages/realm/src/Object.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/realm/src/Object.ts b/packages/realm/src/Object.ts
index 4ddf97a226..29543357f0 100644
--- a/packages/realm/src/Object.ts
+++ b/packages/realm/src/Object.ts
@@ -382,9 +382,9 @@ export class RealmObject<T = DefaultObject, RequiredProperties extends keyof Omi
    * and [flatted](https://www.npmjs.com/package/flatted) to stringify Realm entities that have circular structures.
    * @returns A plain object.
    */
-  toJSON(_?: string, cache?: unknown): T | Partial<T>;
+  toJSON(_?: string, cache?: unknown): T;
   /** @internal */
-  toJSON(_?: string, cache = new JSONCacheMap<Partial<T>>()): T | Partial<T> {
+  toJSON(_?: string, cache = new JSONCacheMap<T>()): T {
     // Construct a reference-id of table-name & primaryKey if it exists, or fall back to objectId.
 
     // Check if current objectId has already processed, to keep object references the same.
@@ -392,7 +392,7 @@ export class RealmObject<T = DefaultObject, RequiredProperties extends keyof Omi
     if (existing) {
       return existing;
     }
-    const result: Partial<T> = {};
+    const result = {} as T;
     cache.add(this, result);
     // Move all enumerable keys to result, triggering any specific toJSON implementation in the process.
     for (const key in this) {

From ff9e13bd5ccb9b92db404547f98847ffe76d29e7 Mon Sep 17 00:00:00 2001
From: Vinicius <viblaziusgoulart@gmail.com>
Date: Wed, 17 Jul 2024 08:20:26 -0300
Subject: [PATCH 4/6] fix(toJSON): return realm ommited types from generic
 return

---
 packages/realm/src/Object.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/realm/src/Object.ts b/packages/realm/src/Object.ts
index 29543357f0..248dce49b1 100644
--- a/packages/realm/src/Object.ts
+++ b/packages/realm/src/Object.ts
@@ -382,9 +382,9 @@ export class RealmObject<T = DefaultObject, RequiredProperties extends keyof Omi
    * and [flatted](https://www.npmjs.com/package/flatted) to stringify Realm entities that have circular structures.
    * @returns A plain object.
    */
-  toJSON(_?: string, cache?: unknown): T;
+  toJSON(_?: string, cache?: unknown): OmittedRealmTypes<T>;
   /** @internal */
-  toJSON(_?: string, cache = new JSONCacheMap<T>()): T {
+  toJSON(_?: string, cache = new JSONCacheMap<T>()): OmittedRealmTypes<T> {
     // Construct a reference-id of table-name & primaryKey if it exists, or fall back to objectId.
 
     // Check if current objectId has already processed, to keep object references the same.

From c98e65b7913f0ae82d4ff8ec7bccb1b52253feab Mon Sep 17 00:00:00 2001
From: Vinicius <viblaziusgoulart@gmail.com>
Date: Wed, 17 Jul 2024 08:27:24 -0300
Subject: [PATCH 5/6] feat(toJSON): accept Unmanaged generic type as toJSON
 return function

---
 packages/realm/src/Object.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/realm/src/Object.ts b/packages/realm/src/Object.ts
index 248dce49b1..d3f20ec465 100644
--- a/packages/realm/src/Object.ts
+++ b/packages/realm/src/Object.ts
@@ -382,9 +382,9 @@ export class RealmObject<T = DefaultObject, RequiredProperties extends keyof Omi
    * and [flatted](https://www.npmjs.com/package/flatted) to stringify Realm entities that have circular structures.
    * @returns A plain object.
    */
-  toJSON(_?: string, cache?: unknown): OmittedRealmTypes<T>;
+  toJSON(_?: string, cache?: unknown): OmittedRealmTypes<T | Unmanaged<T>>;
   /** @internal */
-  toJSON(_?: string, cache = new JSONCacheMap<T>()): OmittedRealmTypes<T> {
+  toJSON(_?: string, cache = new JSONCacheMap<T>()): OmittedRealmTypes<T | Unmanaged<T>> {
     // Construct a reference-id of table-name & primaryKey if it exists, or fall back to objectId.
 
     // Check if current objectId has already processed, to keep object references the same.

From 1959c4b4347e867116f64b231542ce200c55e23b Mon Sep 17 00:00:00 2001
From: Vinicius <viblaziusgoulart@gmail.com>
Date: Tue, 6 Aug 2024 10:12:58 -0300
Subject: [PATCH 6/6] fix(type): ommited type

---
 packages/realm/src/Object.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/realm/src/Object.ts b/packages/realm/src/Object.ts
index d3f20ec465..248dce49b1 100644
--- a/packages/realm/src/Object.ts
+++ b/packages/realm/src/Object.ts
@@ -382,9 +382,9 @@ export class RealmObject<T = DefaultObject, RequiredProperties extends keyof Omi
    * and [flatted](https://www.npmjs.com/package/flatted) to stringify Realm entities that have circular structures.
    * @returns A plain object.
    */
-  toJSON(_?: string, cache?: unknown): OmittedRealmTypes<T | Unmanaged<T>>;
+  toJSON(_?: string, cache?: unknown): OmittedRealmTypes<T>;
   /** @internal */
-  toJSON(_?: string, cache = new JSONCacheMap<T>()): OmittedRealmTypes<T | Unmanaged<T>> {
+  toJSON(_?: string, cache = new JSONCacheMap<T>()): OmittedRealmTypes<T> {
     // Construct a reference-id of table-name & primaryKey if it exists, or fall back to objectId.
 
     // Check if current objectId has already processed, to keep object references the same.