Merge pull request #326 from marko-js/fix-type-internal-types

fix: internal types issue
marko-js · Dec 28, 2024 · 2a4a0e7 · 2a4a0e7
2 parents 3798b67 + b65c79b
commit 2a4a0e7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.changeset/stale-starfishes-sing.md b/.changeset/stale-starfishes-sing.md
@@ -0,0 +1,8 @@
+---
+"@marko/language-tools": patch
+"@marko/language-server": patch
+"@marko/type-check": patch
+"marko-vscode": patch
+---
+
+Fix type issue in the internal language tool types.
diff --git a/packages/language-tools/marko.internal.d.ts b/packages/language-tools/marko.internal.d.ts
@@ -347,14 +347,16 @@ declare global {
             ? NativeTagRenderer<Name>
             : [Name] extends [AnyMarkoBody]
               ? BodyRenderer<Name>
-              : [Name] extends [{ [BodyContentKey]?: AnyMarkoBody }]
-                ? [Name[DefaultBodyContentKey]] extends [AnyMarkoBody]
-                  ? BodyRenderer<Name[DefaultBodyContentKey]>
+              : [Name] extends [
+                    {
+                      [BodyContentKey in DefaultBodyContentKey]?: AnyMarkoBody;
+                    },
+                  ]
+                ? [Name[BodyContentKey]] extends [AnyMarkoBody]
+                  ? BodyRenderer<Name[BodyContentKey]>
                   : BaseRenderer<
                       BodyContentInput<
-                        BodyParameters<
-                          Exclude<Name[DefaultBodyContentKey], void>
-                        >
+                        BodyParameters<Exclude<Name[BodyContentKey], void>>
                       >
                     >
                 : DefaultRenderer;