fix(reflection): allow inference of Ref<boolean> & Opt

Closes #5557
mikro-orm · May 14, 2024 · 534f088 · 534f088
1 parent b35b9ca
commit 534f088
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/core/src/typings.ts b/packages/core/src/typings.ts
@@ -344,11 +344,13 @@ export type EntityRef<T extends object> = true extends IsUnknown<PrimaryProperty
  * Ref type represents a `Reference` instance, and adds the primary keys to its prototype automatically, so you can do
  * `ref.id` instead of `ref.unwrap().id`. It resolves to either `ScalarRef` or `EntityRef`, based on the type argument.
  */
-export type Ref<T> = IsAny<T> extends true
-  ? Reference<T & object>
-  : T extends Scalar
-    ? ScalarReference<T>
-    : EntityRef<T & object>;
+export type Ref<T> = T extends any // we need this to get around `Ref<boolean>` expansion to `Ref<true> | Ref<false>`
+  ? IsAny<T> extends true
+    ? Reference<T & object>
+    : T extends Scalar
+      ? ScalarReference<T>
+      : EntityRef<T & object>
+  : never;
 
 type ExtractHiddenProps<T> = (T extends { [HiddenProps]?: infer K } ? K : never) | ({ [K in keyof T]: T[K] extends Hidden ? K : never }[keyof T] & {});
 type ExcludeHidden<T, K extends keyof T> = K extends ExtractHiddenProps<T> ? never : K;

diff --git a/packages/reflection/src/TsMorphMetadataProvider.ts b/packages/reflection/src/TsMorphMetadataProvider.ts
@@ -93,6 +93,7 @@ export class TsMorphMetadataProvider extends MetadataProvider {
 
     this.processWrapper(prop, 'Ref');
     this.processWrapper(prop, 'Reference');
+    this.processWrapper(prop, 'ScalarReference');
     this.processWrapper(prop, 'Ref');
     this.processWrapper(prop, 'Collection');