Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@knighted/jsx",
"version": "1.13.0",
"version": "1.13.1",
"description": "Runtime JSX tagged template that renders DOM or React trees anywhere with or without a build step.",
"keywords": [
"jsx runtime",
Expand Down
2 changes: 1 addition & 1 deletion src/debug/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ import { enableJsxDebugDiagnostics } from './diagnostics.js'
enableJsxDebugDiagnostics({ mode: 'always' })

export { jsx } from '../jsx.js'
export type { JsxRenderable, JsxComponent } from '../jsx.js'
export type { JsxRenderable, JsxChildren, JsxComponent } from '../jsx.js'
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { jsx } from './jsx.js'
export type { JsxRenderable, JsxComponent } from './jsx.js'
export type { JsxRenderable, JsxChildren, JsxComponent } from './jsx.js'
4 changes: 3 additions & 1 deletion src/internal/jsx-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ export type JsxRenderable =
| undefined
| Iterable<JsxRenderable>

export type JsxChildren = JsxRenderable | JsxRenderable[]

export type JsxComponent<Props = Record<string, unknown>> = {
(props: Props & { children?: JsxRenderable | JsxRenderable[] }): JsxRenderable
(props: Props & { children?: JsxChildren }): JsxRenderable
displayName?: string
}
2 changes: 1 addition & 1 deletion src/jsx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import type { JsxComponent, JsxRenderable } from './internal/jsx-types.js'

type JsxContext = TemplateContext<JsxComponent>
type ElementWithIndex = Element & Record<string, unknown>
export type { JsxRenderable, JsxComponent } from './internal/jsx-types.js'
export type { JsxRenderable, JsxChildren, JsxComponent } from './internal/jsx-types.js'

const ensureDomAvailable = () => {
if (typeof document === 'undefined' || typeof document.createElement !== 'function') {
Expand Down
2 changes: 1 addition & 1 deletion src/node/debug/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ enableJsxDebugDiagnostics({ mode: 'always' })
ensureNodeDom()

export const jsx = baseJsx
export type { JsxRenderable, JsxComponent } from '../../jsx.js'
export type { JsxRenderable, JsxChildren, JsxComponent } from '../../jsx.js'
2 changes: 1 addition & 1 deletion src/node/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ import { jsx as baseJsx } from '../jsx.js'
ensureNodeDom()

export const jsx = baseJsx
export type { JsxRenderable, JsxComponent } from '../jsx.js'
export type { JsxRenderable, JsxChildren, JsxComponent } from '../jsx.js'
1 change: 1 addition & 0 deletions src/react/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export { reactJsx } from './react-jsx.js'
export type {
ReactJsxChildren,
ReactJsxComponent,
ReactJsxDomAttributes,
ReactJsxEventHandler,
Expand Down
1 change: 1 addition & 0 deletions src/react/react-jsx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export type ReactJsxComponent<Props = Record<string, unknown>> = ComponentType<
>

export type ReactJsxRenderable = ReactNode
export type ReactJsxChildren = ReactJsxRenderable | ReactJsxRenderable[]
export type ReactJsxRef<T> = Ref<T>
export type ReactJsxEventHandler<E extends SyntheticEvent> = EventHandler<E>
export type ReactJsxDomAttributes<T = unknown> = DOMAttributes<T>
Expand Down
23 changes: 23 additions & 0 deletions test/jsx.types.test-d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* This file is a type-only test suite: declarations are intentionally "unused"
* so TypeScript will fail the build if the jsx typings drift. Linting is
* secondary here, so we disable unused-var checks.
*/
/* eslint-disable @typescript-eslint/no-unused-vars */
import type { JsxChildren, JsxComponent, JsxRenderable } from '../src/index.js'

type Equal<A, B> =
(<T>() => T extends A ? 1 : 2) extends <T>() => T extends B ? 1 : 2 ? true : false

type Expect<T extends true> = T

type ChildrenAliasMatchesRenderableUnion = Expect<
Equal<JsxChildren, JsxRenderable | JsxRenderable[]>
>

type DemoProps = { label: string }
type DemoComponent = JsxComponent<DemoProps>
type DemoComponentProps = Parameters<DemoComponent>[0]
type ComponentChildrenUsesAlias = Expect<
Equal<DemoComponentProps['children'], JsxChildren | undefined>
>
4 changes: 4 additions & 0 deletions test/react-jsx.types.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import type * as React from 'react'
import type {
ReactJsxChildren,
ReactJsxComponent,
ReactJsxDomAttributes,
ReactJsxEventHandler,
Expand Down Expand Up @@ -52,3 +53,6 @@ type DemoPropsArePropsWithChildren = Expect<
>

type RenderableAllowsNull = Expect<null extends ReactJsxRenderable ? true : false>
type ReactChildrenAliasMatchesRenderableUnion = Expect<
Equal<ReactJsxChildren, ReactJsxRenderable | ReactJsxRenderable[]>
>
Loading