Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-10 23:01:26 -05:00
Code Issues Activity

fix(types): Omit data types from polymorphic attributes (#10593)

Browse source 
* fix(types): Omit data types from polymorphic attributes

* chore: changeset
This commit is contained in:
Erika 2024-03-28 15:41:03 +01:00 • committed by GitHub
parent 9b08facb27
commit 61e283e5a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/khaki-ties-carry.md Normal file
View file

@ -0,0 +1,5 @@
---
"astro": patch
---
Fixes Polymorphic type helper causing TypeScript errors in certain cases after the previous update

11
packages/astro/types.d.ts vendored
View file

@ -1,13 +1,13 @@
import './astro-jsx'; import './astro-jsx';
import type { AstroBuiltinAttributes } from './dist/@types/astro.js'; import type { AstroBuiltinAttributes } from './dist/@types/astro.js';
import type { Simplify } from './dist/type-utils.js'; import type { OmitIndexSignature, Simplify } from './dist/type-utils.js';
/** Any supported HTML or SVG element name, as defined by the HTML specification */ /** Any supported HTML or SVG element name, as defined by the HTML specification */
export type HTMLTag = keyof astroHTML.JSX.DefinedIntrinsicElements; export type HTMLTag = keyof astroHTML.JSX.DefinedIntrinsicElements;
/** The built-in attributes for any known HTML or SVG element name */ /** The built-in attributes for any known HTML or SVG element name */
export type HTMLAttributes<Tag extends HTMLTag> = Omit< export type HTMLAttributes<Tag extends HTMLTag> = Omit<
astroHTML.JSX.IntrinsicElements[Tag], astroHTML.JSX.DefinedIntrinsicElements[Tag],
keyof Omit<AstroBuiltinAttributes, 'class:list'> keyof Omit<AstroBuiltinAttributes, 'class:list'>
>; >;
@ -18,7 +18,12 @@ export type CSSProperty = keyof astroHTML.JSX.KebabCSSDOMProperties;
type PolymorphicAttributes<P extends { as: HTMLTag }> = Omit<P, 'as'> & { type PolymorphicAttributes<P extends { as: HTMLTag }> = Omit<P, 'as'> & {
as?: P['as']; as?: P['as'];
} & HTMLAttributes<P['as']>; } & Omit<
// This is the same as HTMLAttributes<P['as']>, except we're using OmitIndexSignature to remove the index signature,
// used for data attribute, because it seems like it get too complex for TypeScript with it, not sure why.
OmitIndexSignature<astroHTML.JSX.DefinedIntrinsicElements[P['as']]>,
keyof Omit<AstroBuiltinAttributes, 'class:list'>
>;
export type Polymorphic<P extends { as: HTMLTag }> = PolymorphicAttributes< export type Polymorphic<P extends { as: HTMLTag }> = PolymorphicAttributes<
Omit<P, 'as'> & { as: NonNullable<P['as']> } Omit<P, 'as'> & { as: NonNullable<P['as']> }