@types/mdx 2.0.5 → 2.0.7

mdx/README.md

@@ -8,7 +8,7 @@ This package contains type definitions for mdx (https://github.com/mdx-js/mdx).
 Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/mdx.
 
 ### Additional Details
- * Last updated: Thu, 27 Apr 2023 10:02:45 GMT
+ * Last updated: Tue, 22 Aug 2023 18:04:26 GMT
  * Dependencies: none
  * Global values: none
 

mdx/index.d.ts

@@ -59,7 +59,7 @@
  * It should now be possible to import both the MDX component and the exported constant `message`.
  */
 declare module '*.mdx' {
-    // eslint-disable-next-line no-self-import
+    // eslint-disable-next-line @definitelytyped/no-self-import
     import { MDXProps } from 'mdx/types';
 
     /**

mdx/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@types/mdx",
-    "version": "2.0.5",
+    "version": "2.0.7",
     "description": "TypeScript definitions for mdx",
     "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/mdx",
     "license": "MIT",
@@ -30,6 +30,6 @@
     },
     "scripts": {},
     "dependencies": {},
-    "typesPublisherContentHash": "08c145be25e7de13f9272bcde2549ae1b24ce6e7063f0cf6f7364234e09e9f20",
+    "typesPublisherContentHash": "91e24fb42a72ce9b37c45fb6ed3028c4f46b6b6bb7d9a21e89793a984f7cfd22",
     "typeScriptVersion": "4.3"
 }

mdx/types.d.ts

@@ -1,12 +1,56 @@
 // Internal helper types
 
-// tslint:disable-next-line: strict-export-declare-modifiers
-type FunctionComponent<Props> = (props: Props) => JSX.Element | null;
-// tslint:disable-next-line: strict-export-declare-modifiers
-type ClassComponent<Props> = new (props: Props) => JSX.ElementClass;
-// tslint:disable-next-line: strict-export-declare-modifiers
-type Component<Props> = FunctionComponent<Props> | ClassComponent<Props> | keyof JSX.IntrinsicElements;
-// tslint:disable-next-line: strict-export-declare-modifiers
+/**
+ * This is the global JSX.ElementType if it’s defined, otherwise never.
+ */
+// @ts-ignore JSX runtimes may optionally define JSX.ElementType. The MDX types need to work regardless whether this is
+// defined or not.
+type ElementType = any extends JSX.ElementType ? never : JSX.ElementType;
+
+/**
+ * This matches any function component types that ar part of `ElementType`.
+ */
+type FunctionElementType = Extract<ElementType, (props: Record<string, any>) => any>;
+
+/**
+ * This matches any class component types that ar part of `ElementType`.
+ */
+type ClassElementType = Extract<ElementType, new (props: Record<string, any>) => any>;
+
+/**
+ * A valid JSX string component.
+ */
+type StringComponent = Extract<keyof JSX.IntrinsicElements, ElementType extends never ? string : ElementType>;
+
+/**
+ * A valid JSX function component.
+ */
+type FunctionComponent<Props> = ElementType extends never
+    ? // If JSX.ElementType isn’t defined, the valid return type is JSX.Element
+      (props: Props) => JSX.Element | null
+    : FunctionElementType extends never
+    ? // If JSX.ElementType is defined, but doesn’t allow function components, function components are disallowed.
+      never
+    : // If JSX.ElementType allows function components, its return value determines what is a valid.
+      (props: Props) => ReturnType<FunctionElementType>;
+
+/**
+ * A valid JSX class component.
+ */
+type ClassComponent<Props> = ElementType extends never
+    ? // If JSX.ElementType isn’t defined, the valid return type is a constructor that returns JSX.ElementClass
+      new (props: Props) => JSX.ElementClass
+    : ClassElementType extends never
+    ? // If JSX.ElementType is defined, but doesn’t allow constructors, function components are disallowed.
+      never
+    : // If JSX.ElementType allows class components, its return value determines what is a valid.
+      new (props: Props) => InstanceType<ClassElementType>;
+
+/**
+ * Any allowed JSX component.
+ */
+type Component<Props> = FunctionComponent<Props> | ClassComponent<Props> | StringComponent;
+
 interface NestedMDXComponents {
     [key: string]: NestedMDXComponents | Component<any>;
 }
@@ -19,7 +63,7 @@ interface NestedMDXComponents {
  * The key is the name of the element to override. The value is the component to render instead.
  */
 export type MDXComponents = NestedMDXComponents & {
-    [Key in keyof JSX.IntrinsicElements]?: Component<JSX.IntrinsicElements[Key]>;
+    [Key in StringComponent]?: Component<JSX.IntrinsicElements[Key]>;
 } & {
     /**
      * If a wrapper component is defined, the MDX content will be wrapped inside of it.
@@ -62,3 +106,6 @@ export interface MDXModule {
      */
     default: MDXContent;
 }
+
+// This marks the file as a module, meaning not all types are implicitly exported.
+export {};