Fix CompatibleSlotContent type (#179)

croct-tech · Feb 6, 2023 · 58c78a1 · 58c78a1
1 parent c9f0027
commit 58c78a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/slot.ts b/src/slot.ts
@@ -22,8 +22,8 @@ export interface VersionedSlotMap extends LatestSlotVersionMap {
  */
 type Intersection<T, E> = T extends infer O ? O & E : never;
 
-type UnionContent = {
-    [K in ComponentVersionId]: Intersection<ComponentContent<K>, {_component: K | null}>;
+type UnionContent<T = null> = {
+    [K in ComponentVersionId]: Intersection<ComponentContent<K>, {_component: K | T}>;
 };
 
 type UnknownContent = UnionContent[ComponentVersionId] extends never
@@ -42,7 +42,7 @@ export type SlotVersionId<I extends SlotId = SlotId> = CanonicalVersionId<I, Ver
 
 export type VersionedSlotId<I extends SlotId = SlotId> = VersionedId<I, VersionedSlotMap>;
 
-export type CompatibleSlotContent<T extends ComponentVersionId = ComponentVersionId> = UnionContent[T];
+export type CompatibleSlotContent<T extends ComponentVersionId = ComponentVersionId> = UnionContent<never>[T];
 
 export type SlotContent<I extends VersionedSlotId = VersionedSlotId, C extends JsonObject = JsonObject> =
     JsonObject extends C ? (string extends I ? UnknownContent : VersionedContent<I>) : C;
diff --git a/test/slot.test.ts b/test/slot.test.ts
@@ -252,7 +252,7 @@ describe('Slot typing', () => {
 
         expect(() => compileCode(code)).not.toThrow();
 
-        expect(getTypeName(code)).toBe('Banner & {_component: "banner@1" | null;}');
+        expect(getTypeName(code)).toBe('Banner & {_component: "banner@1";}');
     });
 
     it('should export a CompatibleSlotContent type that resolves the slot content type for multiple components', () => {
@@ -268,9 +268,9 @@ describe('Slot typing', () => {
         expect(() => compileCode(code)).not.toThrow();
 
         expect(getTypeName(code)).toBe(
-            '(Banner & {_component: "banner@1" | null;})'
-            + ' | (HorizontalBanner & {_type: \'horizontal-banner\';} & {_component: "hybrid-banner@1" | null;})'
-            + ' | (VerticalBanner & {...;} & {_component: "hybrid-banner@1" | null;})',
+            '(Banner & {_component: "banner@1";})'
+            + ' | (HorizontalBanner & {_type: \'horizontal-banner\';} & {_component: "hybrid-banner@1";})'
+            + ' | (VerticalBanner & {_type: \'vertical-banner\';} & {_component: "hybrid-banner@1";})',
         );
     });