From 62bcbff03a373db092b17b3f3bd55c325bb5fb3a Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Mon, 17 Jun 2024 14:17:31 +0200
Subject: [PATCH 1/3] Make counter types requirable

---
 packages/realm/src/Object.ts    |  3 ++-
 packages/realm/src/Unmanaged.ts | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/realm/src/Object.ts b/packages/realm/src/Object.ts
index 6851b1b01a..1d7c479f62 100644
--- a/packages/realm/src/Object.ts
+++ b/packages/realm/src/Object.ts
@@ -31,6 +31,7 @@ import {
   OrderedCollection,
   Realm,
   RealmObjectConstructor,
+  RequirableProperties,
   Results,
   TypeAssertionError,
   TypeHelpers,
@@ -152,7 +153,7 @@ const PROXY_HANDLER: ProxyHandler<RealmObject<any>> = {
  * properties not specified will be optional, and will default to a sensible
  * null value if no default is specified elsewhere.
  */
-export class RealmObject<T = DefaultObject, RequiredProperties extends keyof OmittedRealmTypes<T> = never> {
+export class RealmObject<T = DefaultObject, RequiredProperties extends keyof RequirableProperties<T> = never> {
   /**
    * This property is stored on the per class prototype when transforming the schema.
    * @internal
diff --git a/packages/realm/src/Unmanaged.ts b/packages/realm/src/Unmanaged.ts
index 3d01ce22e1..6cf8d1f8ee 100644
--- a/packages/realm/src/Unmanaged.ts
+++ b/packages/realm/src/Unmanaged.ts
@@ -61,9 +61,9 @@ type RealmSetRemappedModelPart<T> = {
 /**
  * Exchanges properties defined as a {@link Counter} with a `number`.
  */
-type RealmCounterRemappedModelPart<T> = {
-  [K in ExtractPropertyNamesOfTypeExcludingNullability<T, Counter>]?: Counter | number | Exclude<T[K], Counter>;
-};
+type RealmCounterRemappedModelPart<T, RequiredProperties extends keyof RequirableProperties<T>> = OptionalExcept<{
+  [K in ExtractPropertyNamesOfTypeExcludingNullability<T, Counter>]: Counter | number | Exclude<T[K], Counter>;
+}, RequiredProperties & ExtractPropertyNamesOfTypeExcludingNullability<T, Counter>>;
 
 /** Omits all properties of a model which are not defined by the schema */
 export type OmittedRealmTypes<T> = Omit<
@@ -76,6 +76,8 @@ export type OmittedRealmTypes<T> = Omit<
   | ExtractPropertyNamesOfTypeExcludingNullability<T, Counter>
 >;
 
+export type RequirableProperties<T> = Omit<T, keyof AnyRealmObject>;
+
 /** Make all fields optional except those specified in K */
 type OptionalExcept<T, K extends keyof T> = Partial<T> & Pick<T, K>;
 
@@ -83,24 +85,25 @@ type OptionalExcept<T, K extends keyof T> = Partial<T> & Pick<T, K>;
  * Omits all properties of a model which are not defined by the schema,
  * making all properties optional except those specified in RequiredProperties.
  */
-type OmittedRealmTypesWithRequired<T, RequiredProperties extends keyof OmittedRealmTypes<T>> = OptionalExcept<
+type OmittedRealmTypesWithRequired<T, RequiredProperties extends keyof RequirableProperties<T>> = OptionalExcept<
   OmittedRealmTypes<T>,
-  RequiredProperties
+  RequiredProperties & keyof OmittedRealmTypes<T>
 >;
 
 /** Remaps realm types to "simpler" types (arrays and objects) */
-type RemappedRealmTypes<T> = RealmListRemappedModelPart<T> &
+type RemappedRealmTypes<T, RequiredProperties extends keyof RequirableProperties<T>> =
+  RealmListRemappedModelPart<T> &
   RealmDictionaryRemappedModelPart<T> &
   RealmSetRemappedModelPart<T> &
-  RealmCounterRemappedModelPart<T>;
+  RealmCounterRemappedModelPart<T, RequiredProperties>;
 
 /**
  * Joins `T` stripped of all keys which value extends {@link Collection} and all inherited from {@link Realm.Object},
  * with only the keys which value extends {@link List}, remapped as {@link Array}. All properties are optional
  * except those specified in `RequiredProperties`.
  */
-export type Unmanaged<T, RequiredProperties extends keyof OmittedRealmTypes<T> = never> = OmittedRealmTypesWithRequired<
+export type Unmanaged<T, RequiredProperties extends keyof RequirableProperties<T> = never> = OmittedRealmTypesWithRequired<
   T,
   RequiredProperties
 > &
-  RemappedRealmTypes<T>;
+  RemappedRealmTypes<T, RequiredProperties>;
\ No newline at end of file

From 658ef90f6eb0d572c7e460d711dc625dd82d4fdc Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Mon, 17 Jun 2024 14:25:21 +0200
Subject: [PATCH 2/3] Minor tweaks

---
 packages/realm/src/Unmanaged.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/realm/src/Unmanaged.ts b/packages/realm/src/Unmanaged.ts
index 6cf8d1f8ee..42d59f9937 100644
--- a/packages/realm/src/Unmanaged.ts
+++ b/packages/realm/src/Unmanaged.ts
@@ -61,9 +61,9 @@ type RealmSetRemappedModelPart<T> = {
 /**
  * Exchanges properties defined as a {@link Counter} with a `number`.
  */
-type RealmCounterRemappedModelPart<T, RequiredProperties extends keyof RequirableProperties<T>> = OptionalExcept<{
+type RealmCounterRemappedModelPart<T, RequiredProperties extends keyof RequirableProperties<T>> = OptionalExceptRequired<T, {
   [K in ExtractPropertyNamesOfTypeExcludingNullability<T, Counter>]: Counter | number | Exclude<T[K], Counter>;
-}, RequiredProperties & ExtractPropertyNamesOfTypeExcludingNullability<T, Counter>>;
+}, RequiredProperties>;
 
 /** Omits all properties of a model which are not defined by the schema */
 export type OmittedRealmTypes<T> = Omit<
@@ -78,16 +78,17 @@ export type OmittedRealmTypes<T> = Omit<
 
 export type RequirableProperties<T> = Omit<T, keyof AnyRealmObject>;
 
-/** Make all fields optional except those specified in K */
-type OptionalExcept<T, K extends keyof T> = Partial<T> & Pick<T, K>;
+/** Make all fields optional except those specified in RequiredProperties */
+type OptionalExceptRequired<T, TPart, RequiredProperties extends keyof RequirableProperties<T>> = Partial<TPart> & Pick<TPart, RequiredProperties & keyof TPart>;
 
 /**
  * Omits all properties of a model which are not defined by the schema,
  * making all properties optional except those specified in RequiredProperties.
  */
-type OmittedRealmTypesWithRequired<T, RequiredProperties extends keyof RequirableProperties<T>> = OptionalExcept<
+type OmittedRealmTypesWithRequired<T, RequiredProperties extends keyof RequirableProperties<T>> = OptionalExceptRequired<
+  T,
   OmittedRealmTypes<T>,
-  RequiredProperties & keyof OmittedRealmTypes<T>
+  RequiredProperties
 >;
 
 /** Remaps realm types to "simpler" types (arrays and objects) */

From 1b1522141e75daa413c624b52218934d3f114f7b Mon Sep 17 00:00:00 2001
From: Nikola Irinchev <irinchev@me.com>
Date: Mon, 17 Jun 2024 15:11:52 +0200
Subject: [PATCH 3/3] Remap realm objects

---
 packages/realm/src/Unmanaged.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/realm/src/Unmanaged.ts b/packages/realm/src/Unmanaged.ts
index 42d59f9937..081df238ba 100644
--- a/packages/realm/src/Unmanaged.ts
+++ b/packages/realm/src/Unmanaged.ts
@@ -65,6 +65,10 @@ type RealmCounterRemappedModelPart<T, RequiredProperties extends keyof Requirabl
   [K in ExtractPropertyNamesOfTypeExcludingNullability<T, Counter>]: Counter | number | Exclude<T[K], Counter>;
 }, RequiredProperties>;
 
+type RealmObjectRemappedModelPart<T, RequiredProperties extends keyof RequirableProperties<T>> = OptionalExceptRequired<T, {
+  [K in ExtractPropertyNamesOfTypeExcludingNullability<T, Realm.Object<any>>]: Unmanaged<T[K]> | undefined | null;
+}, RequiredProperties>;
+
 /** Omits all properties of a model which are not defined by the schema */
 export type OmittedRealmTypes<T> = Omit<
   T,
@@ -74,6 +78,7 @@ export type OmittedRealmTypes<T> = Omit<
   | ExtractPropertyNamesOfType<T, AnyCollection>
   | ExtractPropertyNamesOfType<T, AnyDictionary>
   | ExtractPropertyNamesOfTypeExcludingNullability<T, Counter>
+  | ExtractPropertyNamesOfTypeExcludingNullability<T, Realm.Object<any>>
 >;
 
 export type RequirableProperties<T> = Omit<T, keyof AnyRealmObject>;
@@ -93,10 +98,11 @@ type OmittedRealmTypesWithRequired<T, RequiredProperties extends keyof Requirabl
 
 /** Remaps realm types to "simpler" types (arrays and objects) */
 type RemappedRealmTypes<T, RequiredProperties extends keyof RequirableProperties<T>> =
-  RealmListRemappedModelPart<T> &
-  RealmDictionaryRemappedModelPart<T> &
-  RealmSetRemappedModelPart<T> &
-  RealmCounterRemappedModelPart<T, RequiredProperties>;
+  & RealmListRemappedModelPart<T>
+  & RealmDictionaryRemappedModelPart<T>
+  & RealmSetRemappedModelPart<T>
+  & RealmCounterRemappedModelPart<T, RequiredProperties>
+  & RealmObjectRemappedModelPart<T, RequiredProperties>;
 
 /**
  * Joins `T` stripped of all keys which value extends {@link Collection} and all inherited from {@link Realm.Object},