Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: dynamic JSX interface inheritance #71

Merged
merged 1 commit into from
Dec 5, 2024
Merged

feat: dynamic JSX interface inheritance #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 0 additions & 115 deletions src/html.ts
View file
Open in desktop

This file was deleted.

14 changes: 6 additions & 8 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { type PluginCreator } from 'postcss'
import selectorParser = require('postcss-selector-parser')
import atImport = require('postcss-import')
import path = require('node:path')
const html = require('./html')
const key = require('./key')

declare module 'postcss-selector-parser' {
Expand All @@ -27,7 +26,11 @@ type Parsed = Record<
>

function render(parsed: Parsed): string {
let interfaceDefinitions = ''
let interfaceDefinitions = `type ReactHTMLProps<
Tag extends keyof React.ReactHTML
> = React.ReactHTML[Tag] extends React.DetailedHTMLFactory<infer Attributes, infer Element>
? React.DetailedHTMLProps<Attributes, Element>
: React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>\n\n`
const jsxElements: Record<string, string[]> = {}

// Normalize
Expand Down Expand Up @@ -101,12 +104,7 @@ function render(parsed: Parsed): string {

const attributeEntries = Object.entries(attributes)

let htmlElement = 'HTMLElement'
if (tag in html) {
htmlElement = html[tag as keyof typeof html]
}

let interfaceDefinition = `interface ${interfaceName} extends React.DetailedHTMLProps<React.HTMLAttributes<${htmlElement}>, ${htmlElement}> {\n`
let interfaceDefinition = `interface ${interfaceName} extends ReactHTMLProps<'${tag}'> {\n`

discriminatorAttributes.forEach((attr) => {
interfaceDefinition += ` '${attr}'?: never\n`
Expand Down
14 changes: 10 additions & 4 deletions test/mist.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
interface Mist_button extends React.DetailedHTMLProps<React.HTMLAttributes<HTMLButtonElement>, HTMLButtonElement> {
type ReactHTMLProps<
Tag extends keyof React.ReactHTML
> = React.ReactHTML[Tag] extends React.DetailedHTMLFactory<infer Attributes, infer Element>
? React.DetailedHTMLProps<Attributes, Element>
: React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>

interface Mist_button extends ReactHTMLProps<'button'> {
'data-variant'?: 'primary' | 'secondary'
style?: { '--highlightColor'?: string } & React.CSSProperties
}

interface Mist_div extends React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
interface Mist_div extends ReactHTMLProps<'div'> {
'data-component'?: never
}

interface Mist_div_data_component_card extends React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
interface Mist_div_data_component_card extends ReactHTMLProps<'div'> {
'data-component': 'card'
'data-size'?: 'sm' | 'xl'
}

interface Mist_div_data_component_card_title extends React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
interface Mist_div_data_component_card_title extends ReactHTMLProps<'div'> {
'data-component': 'card-title'
}

Expand Down
Loading