Skip to content
This repository was archived by the owner on Oct 23, 2023. It is now read-only.

feat: declare exports explicitly #26

Merged
merged 2 commits into from
Nov 15, 2022
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
5 changes: 5 additions & 0 deletions .changeset/hot-insects-jump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@polymorphic-factory/react': minor
---

Declared bundle exports explicitly.
5 changes: 5 additions & 0 deletions .changeset/many-steaks-explode.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@polymorphic-factory/react': patch
---

Fixed an issue where autocomplete for intrinsic element props did not show up.
36 changes: 22 additions & 14 deletions packages/react/src/forwardRef.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {
ComponentProps,
ComponentPropsWithoutRef,
ElementType,
type ComponentProps,
type ComponentPropsWithoutRef,
type ElementType,
type ForwardRefRenderFunction,
type ValidationMap,
type WeakValidationMap,
forwardRef as forwardRefReact,
ForwardRefRenderFunction,
ValidationMap,
WeakValidationMap,
} from 'react'

/**
Expand All @@ -15,20 +15,28 @@ export type PropsOf<T extends ElementType> = ComponentPropsWithoutRef<T> & {
as?: ElementType
}

/**
* Assign property types from right to left.
* Think `Object.assign` for types.
*
* @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign
*/
export type Assign<Target, Source> = Omit<Target, keyof Source> & Source

export type OmitCommonProps<
Target,
OmitAdditionalProps extends string | number | symbol = never,
> = Omit<Target, 'transition' | 'as' | 'color' | OmitAdditionalProps>

export type AssignCommon<
SourceProps extends object = Record<string, unknown>,
OverrideProps extends object = Record<string, unknown>,
> = OmitCommonProps<SourceProps, keyof OverrideProps> & OverrideProps
type AssignCommon<
SourceProps extends Record<string, unknown> = Record<never, never>,
OverrideProps extends Record<string, unknown> = Record<never, never>,
> = Assign<OmitCommonProps<SourceProps>, OverrideProps>

export type MergeWithAs<
type MergeWithAs<
ComponentProps extends Record<string, unknown>,
AsProps extends Record<string, unknown>,
AdditionalProps extends Record<string, unknown> = Record<string, unknown>,
AdditionalProps extends Record<string, unknown> = Record<never, never>,
AsComponent extends ElementType = ElementType,
> = AssignCommon<ComponentProps, AdditionalProps> &
AssignCommon<AsProps, AdditionalProps> & {
Expand All @@ -37,7 +45,7 @@ export type MergeWithAs<

export type ComponentWithAs<
Component extends ElementType,
Props extends Record<string, unknown> = Record<string, unknown>,
Props extends Record<string, unknown> = Record<never, never>,
> = {
<AsComponent extends ElementType = Component>(
props: MergeWithAs<ComponentProps<Component>, ComponentProps<AsComponent>, Props, AsComponent>,
Expand All @@ -52,7 +60,7 @@ export type ComponentWithAs<

export function forwardRef<
Component extends ElementType,
Props extends Record<string, unknown> = Record<string, unknown>,
Props extends Record<string, unknown> = Record<never, never>,
>(
component: ForwardRefRenderFunction<
unknown,
Expand Down
8 changes: 6 additions & 2 deletions packages/react/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
export * from './forwardRef'
export * from './polymorphic-factory'
export { forwardRef, type ComponentWithAs, type PropsOf, type Assign } from './forwardRef'
export {
polymorphicFactory,
type HTMLPolymorphicComponents,
type HTMLPolymorphicProps,
} from './polymorphic-factory'
8 changes: 4 additions & 4 deletions packages/react/src/polymorphic-factory.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ElementType } from 'react'
import { ComponentWithAs, forwardRef, PropsOf } from './forwardRef'
import type { ElementType } from 'react'
import { type ComponentWithAs, forwardRef, type PropsOf } from './forwardRef'

export type DOMElements = keyof JSX.IntrinsicElements
type DOMElements = keyof JSX.IntrinsicElements

export type HTMLPolymorphicComponents = {
[Tag in DOMElements]: ComponentWithAs<Tag>
Expand All @@ -14,7 +14,7 @@ export type HTMLPolymorphicProps<T extends ElementType> = Omit<PropsOf<T>, 'ref'
type PolymorphFactory = {
<
T extends ElementType,
P extends Record<string, unknown> = Record<string, unknown>,
P extends Record<string, unknown> = Record<never, never>,
Options = never,
>(
component: T,
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"isolatedModules": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"noEmit": false
"noEmit": false,
"importsNotUsedAsValues": "error"
}
}