diff --git a/README.md b/README.md index 65d8556..533f5b7 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ The generated definition extends the official `SvelteComponentTyped` interface e import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -57,7 +57,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ButtonProps = Omit & $Props; +export type ButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class Button extends SvelteComponentTyped< ButtonProps, @@ -85,7 +85,7 @@ The accompanying JSDoc annotations would generate the following: ```ts import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -100,7 +100,7 @@ type $Props = { primary?: boolean; }; -export type ButtonProps = Omit & $Props; +export type ButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class Button extends SvelteComponentTyped< ButtonProps, diff --git a/src/writer/writer-ts-definitions.ts b/src/writer/writer-ts-definitions.ts index 2f657e3..40cf76c 100644 --- a/src/writer/writer-ts-definitions.ts +++ b/src/writer/writer-ts-definitions.ts @@ -89,14 +89,14 @@ function genPropDef(def: Pick & $Props${genericsName}; + export type ${props_name}${genericsName} = Omit<$RestProps, keyof $Props${genericsName}> & $Props${genericsName}; `; } else { prop_def = ` diff --git a/tests/__snapshots__/fixtures.test.ts.snap b/tests/__snapshots__/fixtures.test.ts.snap index 326b50c..83a721d 100644 --- a/tests/__snapshots__/fixtures.test.ts.snap +++ b/tests/__snapshots__/fixtures.test.ts.snap @@ -1326,13 +1326,13 @@ exports[`fixtures (TypeScript) "svg-props/input.svelte" 1`] = ` "import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["svg"]; +type $RestProps = SvelteHTMLElements["svg"]; type $Props = { [key: \`data-${string}\`]: any; }; -export type SvgPropsProps = Omit & $Props; +export type SvgPropsProps = Omit<$RestProps, keyof $Props> & $Props; export default class SvgProps extends SvelteComponentTyped, {}> {} " @@ -1597,7 +1597,7 @@ export interface DataTableHeader { value: string; } -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -1613,7 +1613,7 @@ type $Props = { [key: \`data-${string}\`]: any; }; -export type GenericsWithRestPropsProps = Omit> & $Props; +export type GenericsWithRestPropsProps = Omit<$RestProps, keyof $Props> & $Props; export default class GenericsWithRestProps extends SvelteComponentTyped< GenericsWithRestPropsProps, @@ -1822,7 +1822,7 @@ exports[`fixtures (TypeScript) "rest-props-multiple/input.svelte" 1`] = ` "import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["ul"] & SvelteHTMLElements["ol"]; +type $RestProps = SvelteHTMLElements["ul"] & SvelteHTMLElements["ol"]; type $Props = { /** @@ -1833,7 +1833,7 @@ type $Props = { [key: \`data-${string}\`]: any; }; -export type RestPropsMultipleProps = Omit & $Props; +export type RestPropsMultipleProps = Omit<$RestProps, keyof $Props> & $Props; export default class RestPropsMultiple extends SvelteComponentTyped, {}> {} " @@ -1921,13 +1921,13 @@ exports[`fixtures (TypeScript) "rest-props-simple/input.svelte" 1`] = ` "import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["h1"]; +type $RestProps = SvelteHTMLElements["h1"]; type $Props = { [key: \`data-${string}\`]: any; }; -export type RestPropsSimpleProps = Omit & $Props; +export type RestPropsSimpleProps = Omit<$RestProps, keyof $Props> & $Props; export default class RestPropsSimple extends SvelteComponentTyped, {}> {} " @@ -1937,13 +1937,13 @@ exports[`fixtures (TypeScript) "anchor-props/input.svelte" 1`] = ` "import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { [key: \`data-${string}\`]: any; }; -export type AnchorPropsProps = Omit & $Props; +export type AnchorPropsProps = Omit<$RestProps, keyof $Props> & $Props; export default class AnchorProps extends SvelteComponentTyped, { default: {} }> {} " diff --git a/tests/e2e/carbon/types/Accordion/AccordionItem.svelte.d.ts b/tests/e2e/carbon/types/Accordion/AccordionItem.svelte.d.ts index ac31c0a..dad2a42 100644 --- a/tests/e2e/carbon/types/Accordion/AccordionItem.svelte.d.ts +++ b/tests/e2e/carbon/types/Accordion/AccordionItem.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["li"]; +type $RestProps = SvelteHTMLElements["li"]; type $Props = { /** @@ -32,7 +32,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type AccordionItemProps = Omit & $Props; +export type AccordionItemProps = Omit<$RestProps, keyof $Props> & $Props; /** `AccordionItem` is slottable */ export default class AccordionItem extends SvelteComponentTyped< diff --git a/tests/e2e/carbon/types/Accordion/AccordionSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Accordion/AccordionSkeleton.svelte.d.ts index b1cccbf..2ce1dc0 100644 --- a/tests/e2e/carbon/types/Accordion/AccordionSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Accordion/AccordionSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["ul"]; +type $RestProps = SvelteHTMLElements["ul"]; type $Props = { /** @@ -31,7 +31,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type AccordionSkeletonProps = Omit & $Props; +export type AccordionSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class AccordionSkeleton extends SvelteComponentTyped< AccordionSkeletonProps, diff --git a/tests/e2e/carbon/types/AspectRatio/AspectRatio.svelte.d.ts b/tests/e2e/carbon/types/AspectRatio/AspectRatio.svelte.d.ts index f498778..08635be 100644 --- a/tests/e2e/carbon/types/AspectRatio/AspectRatio.svelte.d.ts +++ b/tests/e2e/carbon/types/AspectRatio/AspectRatio.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type AspectRatioProps = Omit & $Props; +export type AspectRatioProps = Omit<$RestProps, keyof $Props> & $Props; export default class AspectRatio extends SvelteComponentTyped< AspectRatioProps, diff --git a/tests/e2e/carbon/types/Breadcrumb/BreadcrumbItem.svelte.d.ts b/tests/e2e/carbon/types/Breadcrumb/BreadcrumbItem.svelte.d.ts index 1d71cf7..f7c12c1 100644 --- a/tests/e2e/carbon/types/Breadcrumb/BreadcrumbItem.svelte.d.ts +++ b/tests/e2e/carbon/types/Breadcrumb/BreadcrumbItem.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["li"]; +type $RestProps = SvelteHTMLElements["li"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type BreadcrumbItemProps = Omit & $Props; +export type BreadcrumbItemProps = Omit<$RestProps, keyof $Props> & $Props; export default class BreadcrumbItem extends SvelteComponentTyped< BreadcrumbItemProps, diff --git a/tests/e2e/carbon/types/Breadcrumb/BreadcrumbSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Breadcrumb/BreadcrumbSkeleton.svelte.d.ts index 10c8056..822b3aa 100644 --- a/tests/e2e/carbon/types/Breadcrumb/BreadcrumbSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Breadcrumb/BreadcrumbSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type BreadcrumbSkeletonProps = Omit & $Props; +export type BreadcrumbSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class BreadcrumbSkeleton extends SvelteComponentTyped< BreadcrumbSkeletonProps, diff --git a/tests/e2e/carbon/types/Button/Button.svelte.d.ts b/tests/e2e/carbon/types/Button/Button.svelte.d.ts index 022dc92..00eb7ba 100644 --- a/tests/e2e/carbon/types/Button/Button.svelte.d.ts +++ b/tests/e2e/carbon/types/Button/Button.svelte.d.ts @@ -3,7 +3,7 @@ import type { SvelteHTMLElements } from "svelte/elements"; import type { ButtonSkeletonProps } from "./ButtonSkeleton.svelte"; -type RestProps = SvelteHTMLElements["button"] & +type $RestProps = SvelteHTMLElements["button"] & SvelteHTMLElements["a"] & SvelteHTMLElements["div"]; @@ -105,7 +105,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ButtonProps = Omit & $Props; +export type ButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class Button extends SvelteComponentTyped< ButtonProps, diff --git a/tests/e2e/carbon/types/Button/ButtonSet.svelte.d.ts b/tests/e2e/carbon/types/Button/ButtonSet.svelte.d.ts index d3398e3..15aacd7 100644 --- a/tests/e2e/carbon/types/Button/ButtonSet.svelte.d.ts +++ b/tests/e2e/carbon/types/Button/ButtonSet.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ButtonSetProps = Omit & $Props; +export type ButtonSetProps = Omit<$RestProps, keyof $Props> & $Props; export default class ButtonSet extends SvelteComponentTyped< ButtonSetProps, diff --git a/tests/e2e/carbon/types/Button/ButtonSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Button/ButtonSkeleton.svelte.d.ts index 6673c4f..9d14624 100644 --- a/tests/e2e/carbon/types/Button/ButtonSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Button/ButtonSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { /** @@ -26,7 +26,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ButtonSkeletonProps = Omit & $Props; +export type ButtonSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class ButtonSkeleton extends SvelteComponentTyped< ButtonSkeletonProps, diff --git a/tests/e2e/carbon/types/Checkbox/CheckboxSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Checkbox/CheckboxSkeleton.svelte.d.ts index 9d3934c..7cff158 100644 --- a/tests/e2e/carbon/types/Checkbox/CheckboxSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Checkbox/CheckboxSkeleton.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { [key: `data-${string}`]: any; }; -export type CheckboxSkeletonProps = Omit & $Props; +export type CheckboxSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class CheckboxSkeleton extends SvelteComponentTyped< CheckboxSkeletonProps, diff --git a/tests/e2e/carbon/types/CodeSnippet/CodeSnippetSkeleton.svelte.d.ts b/tests/e2e/carbon/types/CodeSnippet/CodeSnippetSkeleton.svelte.d.ts index 87b797c..2274cf5 100644 --- a/tests/e2e/carbon/types/CodeSnippet/CodeSnippetSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/CodeSnippet/CodeSnippetSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type CodeSnippetSkeletonProps = Omit & $Props; +export type CodeSnippetSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class CodeSnippetSkeleton extends SvelteComponentTyped< CodeSnippetSkeletonProps, diff --git a/tests/e2e/carbon/types/ComboBox/ComboBox.svelte.d.ts b/tests/e2e/carbon/types/ComboBox/ComboBox.svelte.d.ts index 8e44342..0e54d52 100644 --- a/tests/e2e/carbon/types/ComboBox/ComboBox.svelte.d.ts +++ b/tests/e2e/carbon/types/ComboBox/ComboBox.svelte.d.ts @@ -6,7 +6,7 @@ export interface ComboBoxItem { text: string; } -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -126,7 +126,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ComboBoxProps = Omit & $Props; +export type ComboBoxProps = Omit<$RestProps, keyof $Props> & $Props; export default class ComboBox extends SvelteComponentTyped< ComboBoxProps, diff --git a/tests/e2e/carbon/types/ComposedModal/ComposedModal.svelte.d.ts b/tests/e2e/carbon/types/ComposedModal/ComposedModal.svelte.d.ts index 96c3e6b..af9c933 100644 --- a/tests/e2e/carbon/types/ComposedModal/ComposedModal.svelte.d.ts +++ b/tests/e2e/carbon/types/ComposedModal/ComposedModal.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -49,7 +49,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ComposedModalProps = Omit & $Props; +export type ComposedModalProps = Omit<$RestProps, keyof $Props> & $Props; export default class ComposedModal extends SvelteComponentTyped< ComposedModalProps, diff --git a/tests/e2e/carbon/types/ComposedModal/ModalBody.svelte.d.ts b/tests/e2e/carbon/types/ComposedModal/ModalBody.svelte.d.ts index 43df864..ed9bccb 100644 --- a/tests/e2e/carbon/types/ComposedModal/ModalBody.svelte.d.ts +++ b/tests/e2e/carbon/types/ComposedModal/ModalBody.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ModalBodyProps = Omit & $Props; +export type ModalBodyProps = Omit<$RestProps, keyof $Props> & $Props; export default class ModalBody extends SvelteComponentTyped< ModalBodyProps, diff --git a/tests/e2e/carbon/types/ComposedModal/ModalFooter.svelte.d.ts b/tests/e2e/carbon/types/ComposedModal/ModalFooter.svelte.d.ts index 9c303cd..8d9265c 100644 --- a/tests/e2e/carbon/types/ComposedModal/ModalFooter.svelte.d.ts +++ b/tests/e2e/carbon/types/ComposedModal/ModalFooter.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -43,7 +43,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ModalFooterProps = Omit & $Props; +export type ModalFooterProps = Omit<$RestProps, keyof $Props> & $Props; export default class ModalFooter extends SvelteComponentTyped< ModalFooterProps, diff --git a/tests/e2e/carbon/types/ComposedModal/ModalHeader.svelte.d.ts b/tests/e2e/carbon/types/ComposedModal/ModalHeader.svelte.d.ts index 8c560b3..9f8b2ca 100644 --- a/tests/e2e/carbon/types/ComposedModal/ModalHeader.svelte.d.ts +++ b/tests/e2e/carbon/types/ComposedModal/ModalHeader.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -49,7 +49,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ModalHeaderProps = Omit & $Props; +export type ModalHeaderProps = Omit<$RestProps, keyof $Props> & $Props; export default class ModalHeader extends SvelteComponentTyped< ModalHeaderProps, diff --git a/tests/e2e/carbon/types/ContentSwitcher/ContentSwitcher.svelte.d.ts b/tests/e2e/carbon/types/ContentSwitcher/ContentSwitcher.svelte.d.ts index 4a9da2c..ad34396 100644 --- a/tests/e2e/carbon/types/ContentSwitcher/ContentSwitcher.svelte.d.ts +++ b/tests/e2e/carbon/types/ContentSwitcher/ContentSwitcher.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ContentSwitcherProps = Omit & $Props; +export type ContentSwitcherProps = Omit<$RestProps, keyof $Props> & $Props; export default class ContentSwitcher extends SvelteComponentTyped< ContentSwitcherProps, diff --git a/tests/e2e/carbon/types/ContentSwitcher/Switch.svelte.d.ts b/tests/e2e/carbon/types/ContentSwitcher/Switch.svelte.d.ts index b056bf7..7089240 100644 --- a/tests/e2e/carbon/types/ContentSwitcher/Switch.svelte.d.ts +++ b/tests/e2e/carbon/types/ContentSwitcher/Switch.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -38,7 +38,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SwitchProps = Omit & $Props; +export type SwitchProps = Omit<$RestProps, keyof $Props> & $Props; export default class Switch extends SvelteComponentTyped< SwitchProps, diff --git a/tests/e2e/carbon/types/Copy/Copy.svelte.d.ts b/tests/e2e/carbon/types/Copy/Copy.svelte.d.ts index 4b0e651..9519606 100644 --- a/tests/e2e/carbon/types/Copy/Copy.svelte.d.ts +++ b/tests/e2e/carbon/types/Copy/Copy.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type CopyProps = Omit & $Props; +export type CopyProps = Omit<$RestProps, keyof $Props> & $Props; export default class Copy extends SvelteComponentTyped< CopyProps, diff --git a/tests/e2e/carbon/types/DataTable/DataTable.svelte.d.ts b/tests/e2e/carbon/types/DataTable/DataTable.svelte.d.ts index 0caae64..f3c9331 100644 --- a/tests/e2e/carbon/types/DataTable/DataTable.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/DataTable.svelte.d.ts @@ -42,7 +42,7 @@ export interface DataTableCell { display?: (item: Value, row: DataTableRow) => DataTableValue; } -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -183,7 +183,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type DataTableProps = Omit> & +export type DataTableProps = Omit<$RestProps, keyof $Props> & $Props; export default class DataTable< diff --git a/tests/e2e/carbon/types/DataTable/DataTableSkeleton.svelte.d.ts b/tests/e2e/carbon/types/DataTable/DataTableSkeleton.svelte.d.ts index ea06d4d..1a05749 100644 --- a/tests/e2e/carbon/types/DataTable/DataTableSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/DataTableSkeleton.svelte.d.ts @@ -3,7 +3,7 @@ import type { SvelteHTMLElements } from "svelte/elements"; import type { DataTableHeader } from "../DataTable/DataTable.svelte"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -53,7 +53,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type DataTableSkeletonProps = Omit & $Props; +export type DataTableSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class DataTableSkeleton extends SvelteComponentTyped< DataTableSkeletonProps, diff --git a/tests/e2e/carbon/types/DataTable/Table.svelte.d.ts b/tests/e2e/carbon/types/DataTable/Table.svelte.d.ts index d88ed6d..788ea94 100644 --- a/tests/e2e/carbon/types/DataTable/Table.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/Table.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["section"]; +type $RestProps = SvelteHTMLElements["section"]; type $Props = { /** @@ -43,7 +43,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TableProps = Omit & $Props; +export type TableProps = Omit<$RestProps, keyof $Props> & $Props; export default class Table extends SvelteComponentTyped< TableProps, diff --git a/tests/e2e/carbon/types/DataTable/TableBody.svelte.d.ts b/tests/e2e/carbon/types/DataTable/TableBody.svelte.d.ts index 32e6804..a9a060b 100644 --- a/tests/e2e/carbon/types/DataTable/TableBody.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/TableBody.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["tbody"]; +type $RestProps = SvelteHTMLElements["tbody"]; type $Props = { [key: `data-${string}`]: any; }; -export type TableBodyProps = Omit & $Props; +export type TableBodyProps = Omit<$RestProps, keyof $Props> & $Props; export default class TableBody extends SvelteComponentTyped< TableBodyProps, diff --git a/tests/e2e/carbon/types/DataTable/TableCell.svelte.d.ts b/tests/e2e/carbon/types/DataTable/TableCell.svelte.d.ts index c39d4b7..db31dba 100644 --- a/tests/e2e/carbon/types/DataTable/TableCell.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/TableCell.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["td"]; +type $RestProps = SvelteHTMLElements["td"]; type $Props = { [key: `data-${string}`]: any; }; -export type TableCellProps = Omit & $Props; +export type TableCellProps = Omit<$RestProps, keyof $Props> & $Props; export default class TableCell extends SvelteComponentTyped< TableCellProps, diff --git a/tests/e2e/carbon/types/DataTable/TableContainer.svelte.d.ts b/tests/e2e/carbon/types/DataTable/TableContainer.svelte.d.ts index 9979515..3243568 100644 --- a/tests/e2e/carbon/types/DataTable/TableContainer.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/TableContainer.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TableContainerProps = Omit & $Props; +export type TableContainerProps = Omit<$RestProps, keyof $Props> & $Props; export default class TableContainer extends SvelteComponentTyped< TableContainerProps, diff --git a/tests/e2e/carbon/types/DataTable/TableHead.svelte.d.ts b/tests/e2e/carbon/types/DataTable/TableHead.svelte.d.ts index f91620b..b7be26d 100644 --- a/tests/e2e/carbon/types/DataTable/TableHead.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/TableHead.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["thead"]; +type $RestProps = SvelteHTMLElements["thead"]; type $Props = { [key: `data-${string}`]: any; }; -export type TableHeadProps = Omit & $Props; +export type TableHeadProps = Omit<$RestProps, keyof $Props> & $Props; export default class TableHead extends SvelteComponentTyped< TableHeadProps, diff --git a/tests/e2e/carbon/types/DataTable/TableHeader.svelte.d.ts b/tests/e2e/carbon/types/DataTable/TableHeader.svelte.d.ts index 490d828..2a41148 100644 --- a/tests/e2e/carbon/types/DataTable/TableHeader.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/TableHeader.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["th"]; +type $RestProps = SvelteHTMLElements["th"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TableHeaderProps = Omit & $Props; +export type TableHeaderProps = Omit<$RestProps, keyof $Props> & $Props; export default class TableHeader extends SvelteComponentTyped< TableHeaderProps, diff --git a/tests/e2e/carbon/types/DataTable/TableRow.svelte.d.ts b/tests/e2e/carbon/types/DataTable/TableRow.svelte.d.ts index 548853e..f4b30b8 100644 --- a/tests/e2e/carbon/types/DataTable/TableRow.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/TableRow.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["tr"]; +type $RestProps = SvelteHTMLElements["tr"]; type $Props = { [key: `data-${string}`]: any; }; -export type TableRowProps = Omit & $Props; +export type TableRowProps = Omit<$RestProps, keyof $Props> & $Props; export default class TableRow extends SvelteComponentTyped< TableRowProps, diff --git a/tests/e2e/carbon/types/DataTable/Toolbar.svelte.d.ts b/tests/e2e/carbon/types/DataTable/Toolbar.svelte.d.ts index 691c9fc..e70e195 100644 --- a/tests/e2e/carbon/types/DataTable/Toolbar.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/Toolbar.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["section"]; +type $RestProps = SvelteHTMLElements["section"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ToolbarProps = Omit & $Props; +export type ToolbarProps = Omit<$RestProps, keyof $Props> & $Props; export default class Toolbar extends SvelteComponentTyped< ToolbarProps, diff --git a/tests/e2e/carbon/types/DataTable/ToolbarBatchActions.svelte.d.ts b/tests/e2e/carbon/types/DataTable/ToolbarBatchActions.svelte.d.ts index 1252274..dcf1e91 100644 --- a/tests/e2e/carbon/types/DataTable/ToolbarBatchActions.svelte.d.ts +++ b/tests/e2e/carbon/types/DataTable/ToolbarBatchActions.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ToolbarBatchActionsProps = Omit & $Props; +export type ToolbarBatchActionsProps = Omit<$RestProps, keyof $Props> & $Props; export default class ToolbarBatchActions extends SvelteComponentTyped< ToolbarBatchActionsProps, diff --git a/tests/e2e/carbon/types/DatePicker/DatePicker.svelte.d.ts b/tests/e2e/carbon/types/DatePicker/DatePicker.svelte.d.ts index 36cbe02..87c4222 100644 --- a/tests/e2e/carbon/types/DatePicker/DatePicker.svelte.d.ts +++ b/tests/e2e/carbon/types/DatePicker/DatePicker.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -67,7 +67,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type DatePickerProps = Omit & $Props; +export type DatePickerProps = Omit<$RestProps, keyof $Props> & $Props; export default class DatePicker extends SvelteComponentTyped< DatePickerProps, diff --git a/tests/e2e/carbon/types/DatePicker/DatePickerInput.svelte.d.ts b/tests/e2e/carbon/types/DatePicker/DatePickerInput.svelte.d.ts index 0fc1496..04c6ae7 100644 --- a/tests/e2e/carbon/types/DatePicker/DatePickerInput.svelte.d.ts +++ b/tests/e2e/carbon/types/DatePicker/DatePickerInput.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -85,7 +85,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type DatePickerInputProps = Omit & $Props; +export type DatePickerInputProps = Omit<$RestProps, keyof $Props> & $Props; export default class DatePickerInput extends SvelteComponentTyped< DatePickerInputProps, diff --git a/tests/e2e/carbon/types/DatePicker/DatePickerSkeleton.svelte.d.ts b/tests/e2e/carbon/types/DatePicker/DatePickerSkeleton.svelte.d.ts index 214ad71..d8ed10c 100644 --- a/tests/e2e/carbon/types/DatePicker/DatePickerSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/DatePicker/DatePickerSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type DatePickerSkeletonProps = Omit & $Props; +export type DatePickerSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class DatePickerSkeleton extends SvelteComponentTyped< DatePickerSkeletonProps, diff --git a/tests/e2e/carbon/types/Dropdown/Dropdown.svelte.d.ts b/tests/e2e/carbon/types/Dropdown/Dropdown.svelte.d.ts index f697a35..25c95d8 100644 --- a/tests/e2e/carbon/types/Dropdown/Dropdown.svelte.d.ts +++ b/tests/e2e/carbon/types/Dropdown/Dropdown.svelte.d.ts @@ -10,7 +10,7 @@ export interface DropdownItem { text: DropdownItemText; } -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -137,7 +137,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type DropdownProps = Omit & $Props; +export type DropdownProps = Omit<$RestProps, keyof $Props> & $Props; export default class Dropdown extends SvelteComponentTyped< DropdownProps, diff --git a/tests/e2e/carbon/types/Dropdown/DropdownSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Dropdown/DropdownSkeleton.svelte.d.ts index 00f2dfe..14c1e60 100644 --- a/tests/e2e/carbon/types/Dropdown/DropdownSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Dropdown/DropdownSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type DropdownSkeletonProps = Omit & $Props; +export type DropdownSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class DropdownSkeleton extends SvelteComponentTyped< DropdownSkeletonProps, diff --git a/tests/e2e/carbon/types/FileUploader/FileUploader.svelte.d.ts b/tests/e2e/carbon/types/FileUploader/FileUploader.svelte.d.ts index 019baf9..1f8a241 100644 --- a/tests/e2e/carbon/types/FileUploader/FileUploader.svelte.d.ts +++ b/tests/e2e/carbon/types/FileUploader/FileUploader.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -67,7 +67,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type FileUploaderProps = Omit & $Props; +export type FileUploaderProps = Omit<$RestProps, keyof $Props> & $Props; export default class FileUploader extends SvelteComponentTyped< FileUploaderProps, diff --git a/tests/e2e/carbon/types/FileUploader/FileUploaderButton.svelte.d.ts b/tests/e2e/carbon/types/FileUploader/FileUploaderButton.svelte.d.ts index 0a3dfde..7665c32 100644 --- a/tests/e2e/carbon/types/FileUploader/FileUploaderButton.svelte.d.ts +++ b/tests/e2e/carbon/types/FileUploader/FileUploaderButton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["input"]; +type $RestProps = SvelteHTMLElements["input"]; type $Props = { /** @@ -73,7 +73,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type FileUploaderButtonProps = Omit & $Props; +export type FileUploaderButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class FileUploaderButton extends SvelteComponentTyped< FileUploaderButtonProps, diff --git a/tests/e2e/carbon/types/FileUploader/FileUploaderDropContainer.svelte.d.ts b/tests/e2e/carbon/types/FileUploader/FileUploaderDropContainer.svelte.d.ts index ae31345..943bfb6 100644 --- a/tests/e2e/carbon/types/FileUploader/FileUploaderDropContainer.svelte.d.ts +++ b/tests/e2e/carbon/types/FileUploader/FileUploaderDropContainer.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -68,7 +68,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type FileUploaderDropContainerProps = Omit & +export type FileUploaderDropContainerProps = Omit<$RestProps, keyof $Props> & $Props; export default class FileUploaderDropContainer extends SvelteComponentTyped< diff --git a/tests/e2e/carbon/types/FileUploader/FileUploaderItem.svelte.d.ts b/tests/e2e/carbon/types/FileUploader/FileUploaderItem.svelte.d.ts index c127f64..66a58f5 100644 --- a/tests/e2e/carbon/types/FileUploader/FileUploaderItem.svelte.d.ts +++ b/tests/e2e/carbon/types/FileUploader/FileUploaderItem.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["span"]; +type $RestProps = SvelteHTMLElements["span"]; type $Props = { /** @@ -49,7 +49,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type FileUploaderItemProps = Omit & $Props; +export type FileUploaderItemProps = Omit<$RestProps, keyof $Props> & $Props; export default class FileUploaderItem extends SvelteComponentTyped< FileUploaderItemProps, diff --git a/tests/e2e/carbon/types/FileUploader/FileUploaderSkeleton.svelte.d.ts b/tests/e2e/carbon/types/FileUploader/FileUploaderSkeleton.svelte.d.ts index 91f76f4..4257419 100644 --- a/tests/e2e/carbon/types/FileUploader/FileUploaderSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/FileUploader/FileUploaderSkeleton.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { [key: `data-${string}`]: any; }; -export type FileUploaderSkeletonProps = Omit & $Props; +export type FileUploaderSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class FileUploaderSkeleton extends SvelteComponentTyped< FileUploaderSkeletonProps, diff --git a/tests/e2e/carbon/types/Form/Form.svelte.d.ts b/tests/e2e/carbon/types/Form/Form.svelte.d.ts index fcff157..bfc1d33 100644 --- a/tests/e2e/carbon/types/Form/Form.svelte.d.ts +++ b/tests/e2e/carbon/types/Form/Form.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["form"]; +type $RestProps = SvelteHTMLElements["form"]; type $Props = { [key: `data-${string}`]: any; }; -export type FormProps = Omit & $Props; +export type FormProps = Omit<$RestProps, keyof $Props> & $Props; export default class Form extends SvelteComponentTyped< FormProps, diff --git a/tests/e2e/carbon/types/FormGroup/FormGroup.svelte.d.ts b/tests/e2e/carbon/types/FormGroup/FormGroup.svelte.d.ts index 17808d0..312fa3f 100644 --- a/tests/e2e/carbon/types/FormGroup/FormGroup.svelte.d.ts +++ b/tests/e2e/carbon/types/FormGroup/FormGroup.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["fieldset"]; +type $RestProps = SvelteHTMLElements["fieldset"]; type $Props = { /** @@ -31,7 +31,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type FormGroupProps = Omit & $Props; +export type FormGroupProps = Omit<$RestProps, keyof $Props> & $Props; export default class FormGroup extends SvelteComponentTyped< FormGroupProps, diff --git a/tests/e2e/carbon/types/FormItem/FormItem.svelte.d.ts b/tests/e2e/carbon/types/FormItem/FormItem.svelte.d.ts index 5acd9ec..496356a 100644 --- a/tests/e2e/carbon/types/FormItem/FormItem.svelte.d.ts +++ b/tests/e2e/carbon/types/FormItem/FormItem.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { [key: `data-${string}`]: any; }; -export type FormItemProps = Omit & $Props; +export type FormItemProps = Omit<$RestProps, keyof $Props> & $Props; export default class FormItem extends SvelteComponentTyped< FormItemProps, diff --git a/tests/e2e/carbon/types/FormLabel/FormLabel.svelte.d.ts b/tests/e2e/carbon/types/FormLabel/FormLabel.svelte.d.ts index af4faf1..e7f0765 100644 --- a/tests/e2e/carbon/types/FormLabel/FormLabel.svelte.d.ts +++ b/tests/e2e/carbon/types/FormLabel/FormLabel.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["label"]; +type $RestProps = SvelteHTMLElements["label"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type FormLabelProps = Omit & $Props; +export type FormLabelProps = Omit<$RestProps, keyof $Props> & $Props; export default class FormLabel extends SvelteComponentTyped< FormLabelProps, diff --git a/tests/e2e/carbon/types/Grid/Column.svelte.d.ts b/tests/e2e/carbon/types/Grid/Column.svelte.d.ts index 78f25f3..3dab2a8 100644 --- a/tests/e2e/carbon/types/Grid/Column.svelte.d.ts +++ b/tests/e2e/carbon/types/Grid/Column.svelte.d.ts @@ -10,7 +10,7 @@ export interface ColumnSizeDescriptor { export type ColumnBreakpoint = ColumnSize | ColumnSizeDescriptor; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -83,7 +83,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ColumnProps = Omit & $Props; +export type ColumnProps = Omit<$RestProps, keyof $Props> & $Props; export default class Column extends SvelteComponentTyped< ColumnProps, diff --git a/tests/e2e/carbon/types/Grid/Grid.svelte.d.ts b/tests/e2e/carbon/types/Grid/Grid.svelte.d.ts index a2a1c8f..c589e4c 100644 --- a/tests/e2e/carbon/types/Grid/Grid.svelte.d.ts +++ b/tests/e2e/carbon/types/Grid/Grid.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -56,7 +56,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type GridProps = Omit & $Props; +export type GridProps = Omit<$RestProps, keyof $Props> & $Props; export default class Grid extends SvelteComponentTyped< GridProps, diff --git a/tests/e2e/carbon/types/Grid/Row.svelte.d.ts b/tests/e2e/carbon/types/Grid/Row.svelte.d.ts index 7c480ca..6a53d9a 100644 --- a/tests/e2e/carbon/types/Grid/Row.svelte.d.ts +++ b/tests/e2e/carbon/types/Grid/Row.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -50,7 +50,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type RowProps = Omit & $Props; +export type RowProps = Omit<$RestProps, keyof $Props> & $Props; export default class Row extends SvelteComponentTyped< RowProps, diff --git a/tests/e2e/carbon/types/Icon/Icon.svelte.d.ts b/tests/e2e/carbon/types/Icon/Icon.svelte.d.ts index 8df09e5..4e09f64 100644 --- a/tests/e2e/carbon/types/Icon/Icon.svelte.d.ts +++ b/tests/e2e/carbon/types/Icon/Icon.svelte.d.ts @@ -3,7 +3,7 @@ import type { SvelteHTMLElements } from "svelte/elements"; import type { IconSkeletonProps } from "./IconSkeleton.svelte"; -type RestProps = SvelteHTMLElements["svg"]; +type $RestProps = SvelteHTMLElements["svg"]; type $Props = { /** @@ -21,7 +21,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type IconProps = Omit & $Props; +export type IconProps = Omit<$RestProps, keyof $Props> & $Props; export default class Icon extends SvelteComponentTyped< IconProps, diff --git a/tests/e2e/carbon/types/Icon/IconSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Icon/IconSkeleton.svelte.d.ts index fc0ccc4..349fed8 100644 --- a/tests/e2e/carbon/types/Icon/IconSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Icon/IconSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type IconSkeletonProps = Omit & $Props; +export type IconSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class IconSkeleton extends SvelteComponentTyped< IconSkeletonProps, diff --git a/tests/e2e/carbon/types/InlineLoading/InlineLoading.svelte.d.ts b/tests/e2e/carbon/types/InlineLoading/InlineLoading.svelte.d.ts index c53d2f0..a2701a6 100644 --- a/tests/e2e/carbon/types/InlineLoading/InlineLoading.svelte.d.ts +++ b/tests/e2e/carbon/types/InlineLoading/InlineLoading.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -31,7 +31,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type InlineLoadingProps = Omit & $Props; +export type InlineLoadingProps = Omit<$RestProps, keyof $Props> & $Props; export default class InlineLoading extends SvelteComponentTyped< InlineLoadingProps, diff --git a/tests/e2e/carbon/types/Link/Link.svelte.d.ts b/tests/e2e/carbon/types/Link/Link.svelte.d.ts index b4fa30b..7c886d6 100644 --- a/tests/e2e/carbon/types/Link/Link.svelte.d.ts +++ b/tests/e2e/carbon/types/Link/Link.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"] & SvelteHTMLElements["p"]; +type $RestProps = SvelteHTMLElements["a"] & SvelteHTMLElements["p"]; type $Props = { /** @@ -43,7 +43,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type LinkProps = Omit & $Props; +export type LinkProps = Omit<$RestProps, keyof $Props> & $Props; export default class Link extends SvelteComponentTyped< LinkProps, diff --git a/tests/e2e/carbon/types/ListBox/ListBox.svelte.d.ts b/tests/e2e/carbon/types/ListBox/ListBox.svelte.d.ts index e524888..a0017f7 100644 --- a/tests/e2e/carbon/types/ListBox/ListBox.svelte.d.ts +++ b/tests/e2e/carbon/types/ListBox/ListBox.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -61,7 +61,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ListBoxProps = Omit & $Props; +export type ListBoxProps = Omit<$RestProps, keyof $Props> & $Props; export default class ListBox extends SvelteComponentTyped< ListBoxProps, diff --git a/tests/e2e/carbon/types/ListBox/ListBoxField.svelte.d.ts b/tests/e2e/carbon/types/ListBox/ListBoxField.svelte.d.ts index a76e69a..72e2ab2 100644 --- a/tests/e2e/carbon/types/ListBox/ListBoxField.svelte.d.ts +++ b/tests/e2e/carbon/types/ListBox/ListBoxField.svelte.d.ts @@ -3,7 +3,7 @@ import type { SvelteHTMLElements } from "svelte/elements"; export type ListBoxFieldTranslationId = "close" | "open"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -45,7 +45,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ListBoxFieldProps = Omit & $Props; +export type ListBoxFieldProps = Omit<$RestProps, keyof $Props> & $Props; export default class ListBoxField extends SvelteComponentTyped< ListBoxFieldProps, diff --git a/tests/e2e/carbon/types/ListBox/ListBoxMenu.svelte.d.ts b/tests/e2e/carbon/types/ListBox/ListBoxMenu.svelte.d.ts index 70ea6fd..7244488 100644 --- a/tests/e2e/carbon/types/ListBox/ListBoxMenu.svelte.d.ts +++ b/tests/e2e/carbon/types/ListBox/ListBoxMenu.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ListBoxMenuProps = Omit & $Props; +export type ListBoxMenuProps = Omit<$RestProps, keyof $Props> & $Props; export default class ListBoxMenu extends SvelteComponentTyped< ListBoxMenuProps, diff --git a/tests/e2e/carbon/types/ListBox/ListBoxMenuIcon.svelte.d.ts b/tests/e2e/carbon/types/ListBox/ListBoxMenuIcon.svelte.d.ts index cd80757..a5d71e0 100644 --- a/tests/e2e/carbon/types/ListBox/ListBoxMenuIcon.svelte.d.ts +++ b/tests/e2e/carbon/types/ListBox/ListBoxMenuIcon.svelte.d.ts @@ -3,7 +3,7 @@ import type { SvelteHTMLElements } from "svelte/elements"; export type ListBoxMenuIconTranslationId = "close" | "open"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -21,7 +21,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ListBoxMenuIconProps = Omit & $Props; +export type ListBoxMenuIconProps = Omit<$RestProps, keyof $Props> & $Props; export default class ListBoxMenuIcon extends SvelteComponentTyped< ListBoxMenuIconProps, diff --git a/tests/e2e/carbon/types/ListBox/ListBoxMenuItem.svelte.d.ts b/tests/e2e/carbon/types/ListBox/ListBoxMenuItem.svelte.d.ts index c4a7657..6febd4a 100644 --- a/tests/e2e/carbon/types/ListBox/ListBoxMenuItem.svelte.d.ts +++ b/tests/e2e/carbon/types/ListBox/ListBoxMenuItem.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ListBoxMenuItemProps = Omit & $Props; +export type ListBoxMenuItemProps = Omit<$RestProps, keyof $Props> & $Props; export default class ListBoxMenuItem extends SvelteComponentTyped< ListBoxMenuItemProps, diff --git a/tests/e2e/carbon/types/ListBox/ListBoxSelection.svelte.d.ts b/tests/e2e/carbon/types/ListBox/ListBoxSelection.svelte.d.ts index acd3939..abf119d 100644 --- a/tests/e2e/carbon/types/ListBox/ListBoxSelection.svelte.d.ts +++ b/tests/e2e/carbon/types/ListBox/ListBoxSelection.svelte.d.ts @@ -3,7 +3,7 @@ import type { SvelteHTMLElements } from "svelte/elements"; export type ListBoxSelectionTranslationId = "clearAll" | "clearSelection"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -33,7 +33,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ListBoxSelectionProps = Omit & $Props; +export type ListBoxSelectionProps = Omit<$RestProps, keyof $Props> & $Props; export default class ListBoxSelection extends SvelteComponentTyped< ListBoxSelectionProps, diff --git a/tests/e2e/carbon/types/ListItem/ListItem.svelte.d.ts b/tests/e2e/carbon/types/ListItem/ListItem.svelte.d.ts index 385f544..451c7b0 100644 --- a/tests/e2e/carbon/types/ListItem/ListItem.svelte.d.ts +++ b/tests/e2e/carbon/types/ListItem/ListItem.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["li"]; +type $RestProps = SvelteHTMLElements["li"]; type $Props = { [key: `data-${string}`]: any; }; -export type ListItemProps = Omit & $Props; +export type ListItemProps = Omit<$RestProps, keyof $Props> & $Props; export default class ListItem extends SvelteComponentTyped< ListItemProps, diff --git a/tests/e2e/carbon/types/Loading/Loading.svelte.d.ts b/tests/e2e/carbon/types/Loading/Loading.svelte.d.ts index 01a904b..274b42f 100644 --- a/tests/e2e/carbon/types/Loading/Loading.svelte.d.ts +++ b/tests/e2e/carbon/types/Loading/Loading.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -37,7 +37,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type LoadingProps = Omit & $Props; +export type LoadingProps = Omit<$RestProps, keyof $Props> & $Props; export default class Loading extends SvelteComponentTyped< LoadingProps, diff --git a/tests/e2e/carbon/types/Modal/Modal.svelte.d.ts b/tests/e2e/carbon/types/Modal/Modal.svelte.d.ts index 41f37fa..58c90d9 100644 --- a/tests/e2e/carbon/types/Modal/Modal.svelte.d.ts +++ b/tests/e2e/carbon/types/Modal/Modal.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -121,7 +121,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ModalProps = Omit & $Props; +export type ModalProps = Omit<$RestProps, keyof $Props> & $Props; export default class Modal extends SvelteComponentTyped< ModalProps, diff --git a/tests/e2e/carbon/types/MultiSelect/MultiSelect.svelte.d.ts b/tests/e2e/carbon/types/MultiSelect/MultiSelect.svelte.d.ts index 6803ac5..948ed5b 100644 --- a/tests/e2e/carbon/types/MultiSelect/MultiSelect.svelte.d.ts +++ b/tests/e2e/carbon/types/MultiSelect/MultiSelect.svelte.d.ts @@ -10,7 +10,7 @@ export interface MultiSelectItem { text: MultiSelectItemText; } -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -176,7 +176,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type MultiSelectProps = Omit & $Props; +export type MultiSelectProps = Omit<$RestProps, keyof $Props> & $Props; export default class MultiSelect extends SvelteComponentTyped< MultiSelectProps, diff --git a/tests/e2e/carbon/types/Notification/InlineNotification.svelte.d.ts b/tests/e2e/carbon/types/Notification/InlineNotification.svelte.d.ts index 2b70f8e..84f82a8 100644 --- a/tests/e2e/carbon/types/Notification/InlineNotification.svelte.d.ts +++ b/tests/e2e/carbon/types/Notification/InlineNotification.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -61,7 +61,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type InlineNotificationProps = Omit & $Props; +export type InlineNotificationProps = Omit<$RestProps, keyof $Props> & $Props; export default class InlineNotification extends SvelteComponentTyped< InlineNotificationProps, diff --git a/tests/e2e/carbon/types/Notification/NotificationButton.svelte.d.ts b/tests/e2e/carbon/types/Notification/NotificationButton.svelte.d.ts index a0ce0da..478ad33 100644 --- a/tests/e2e/carbon/types/Notification/NotificationButton.svelte.d.ts +++ b/tests/e2e/carbon/types/Notification/NotificationButton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -31,7 +31,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type NotificationButtonProps = Omit & $Props; +export type NotificationButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class NotificationButton extends SvelteComponentTyped< NotificationButtonProps, diff --git a/tests/e2e/carbon/types/Notification/ToastNotification.svelte.d.ts b/tests/e2e/carbon/types/Notification/ToastNotification.svelte.d.ts index e7ab9a2..31b2dc8 100644 --- a/tests/e2e/carbon/types/Notification/ToastNotification.svelte.d.ts +++ b/tests/e2e/carbon/types/Notification/ToastNotification.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -67,7 +67,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ToastNotificationProps = Omit & $Props; +export type ToastNotificationProps = Omit<$RestProps, keyof $Props> & $Props; export default class ToastNotification extends SvelteComponentTyped< ToastNotificationProps, diff --git a/tests/e2e/carbon/types/NumberInput/NumberInput.svelte.d.ts b/tests/e2e/carbon/types/NumberInput/NumberInput.svelte.d.ts index eb7c588..6a3896d 100644 --- a/tests/e2e/carbon/types/NumberInput/NumberInput.svelte.d.ts +++ b/tests/e2e/carbon/types/NumberInput/NumberInput.svelte.d.ts @@ -3,7 +3,7 @@ import type { SvelteHTMLElements } from "svelte/elements"; export type NumberInputTranslationId = "increment" | "decrement"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -141,7 +141,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type NumberInputProps = Omit & $Props; +export type NumberInputProps = Omit<$RestProps, keyof $Props> & $Props; export default class NumberInput extends SvelteComponentTyped< NumberInputProps, diff --git a/tests/e2e/carbon/types/NumberInput/NumberInputSkeleton.svelte.d.ts b/tests/e2e/carbon/types/NumberInput/NumberInputSkeleton.svelte.d.ts index d0ece42..90a6b84 100644 --- a/tests/e2e/carbon/types/NumberInput/NumberInputSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/NumberInput/NumberInputSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type NumberInputSkeletonProps = Omit & $Props; +export type NumberInputSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class NumberInputSkeleton extends SvelteComponentTyped< NumberInputSkeletonProps, diff --git a/tests/e2e/carbon/types/OrderedList/OrderedList.svelte.d.ts b/tests/e2e/carbon/types/OrderedList/OrderedList.svelte.d.ts index 7cfc230..d3d30f2 100644 --- a/tests/e2e/carbon/types/OrderedList/OrderedList.svelte.d.ts +++ b/tests/e2e/carbon/types/OrderedList/OrderedList.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["ol"]; +type $RestProps = SvelteHTMLElements["ol"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type OrderedListProps = Omit & $Props; +export type OrderedListProps = Omit<$RestProps, keyof $Props> & $Props; export default class OrderedList extends SvelteComponentTyped< OrderedListProps, diff --git a/tests/e2e/carbon/types/OverflowMenu/OverflowMenu.svelte.d.ts b/tests/e2e/carbon/types/OverflowMenu/OverflowMenu.svelte.d.ts index a30cba9..8b300f8 100644 --- a/tests/e2e/carbon/types/OverflowMenu/OverflowMenu.svelte.d.ts +++ b/tests/e2e/carbon/types/OverflowMenu/OverflowMenu.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -79,7 +79,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type OverflowMenuProps = Omit & $Props; +export type OverflowMenuProps = Omit<$RestProps, keyof $Props> & $Props; export default class OverflowMenu extends SvelteComponentTyped< OverflowMenuProps, diff --git a/tests/e2e/carbon/types/OverflowMenu/OverflowMenuItem.svelte.d.ts b/tests/e2e/carbon/types/OverflowMenu/OverflowMenuItem.svelte.d.ts index c642b62..e572d89 100644 --- a/tests/e2e/carbon/types/OverflowMenu/OverflowMenuItem.svelte.d.ts +++ b/tests/e2e/carbon/types/OverflowMenu/OverflowMenuItem.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["li"]; +type $RestProps = SvelteHTMLElements["li"]; type $Props = { /** @@ -62,7 +62,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type OverflowMenuItemProps = Omit & $Props; +export type OverflowMenuItemProps = Omit<$RestProps, keyof $Props> & $Props; export default class OverflowMenuItem extends SvelteComponentTyped< OverflowMenuItemProps, diff --git a/tests/e2e/carbon/types/Pagination/Pagination.svelte.d.ts b/tests/e2e/carbon/types/Pagination/Pagination.svelte.d.ts index b39c4ca..f28da43 100644 --- a/tests/e2e/carbon/types/Pagination/Pagination.svelte.d.ts +++ b/tests/e2e/carbon/types/Pagination/Pagination.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -103,7 +103,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type PaginationProps = Omit & $Props; +export type PaginationProps = Omit<$RestProps, keyof $Props> & $Props; export default class Pagination extends SvelteComponentTyped< PaginationProps, diff --git a/tests/e2e/carbon/types/Pagination/PaginationSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Pagination/PaginationSkeleton.svelte.d.ts index 6ecc82d..8195dc0 100644 --- a/tests/e2e/carbon/types/Pagination/PaginationSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Pagination/PaginationSkeleton.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { [key: `data-${string}`]: any; }; -export type PaginationSkeletonProps = Omit & $Props; +export type PaginationSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class PaginationSkeleton extends SvelteComponentTyped< PaginationSkeletonProps, diff --git a/tests/e2e/carbon/types/PaginationNav/PaginationNav.svelte.d.ts b/tests/e2e/carbon/types/PaginationNav/PaginationNav.svelte.d.ts index 8449a31..95e37a8 100644 --- a/tests/e2e/carbon/types/PaginationNav/PaginationNav.svelte.d.ts +++ b/tests/e2e/carbon/types/PaginationNav/PaginationNav.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["nav"]; +type $RestProps = SvelteHTMLElements["nav"]; type $Props = { /** @@ -43,7 +43,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type PaginationNavProps = Omit & $Props; +export type PaginationNavProps = Omit<$RestProps, keyof $Props> & $Props; export default class PaginationNav extends SvelteComponentTyped< PaginationNavProps, diff --git a/tests/e2e/carbon/types/ProgressIndicator/ProgressIndicator.svelte.d.ts b/tests/e2e/carbon/types/ProgressIndicator/ProgressIndicator.svelte.d.ts index da96465..4e234b6 100644 --- a/tests/e2e/carbon/types/ProgressIndicator/ProgressIndicator.svelte.d.ts +++ b/tests/e2e/carbon/types/ProgressIndicator/ProgressIndicator.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["ul"]; +type $RestProps = SvelteHTMLElements["ul"]; type $Props = { /** @@ -31,7 +31,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ProgressIndicatorProps = Omit & $Props; +export type ProgressIndicatorProps = Omit<$RestProps, keyof $Props> & $Props; export default class ProgressIndicator extends SvelteComponentTyped< ProgressIndicatorProps, diff --git a/tests/e2e/carbon/types/ProgressIndicator/ProgressIndicatorSkeleton.svelte.d.ts b/tests/e2e/carbon/types/ProgressIndicator/ProgressIndicatorSkeleton.svelte.d.ts index b2b2d56..d68ad1a 100644 --- a/tests/e2e/carbon/types/ProgressIndicator/ProgressIndicatorSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/ProgressIndicator/ProgressIndicatorSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["ul"]; +type $RestProps = SvelteHTMLElements["ul"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ProgressIndicatorSkeletonProps = Omit & +export type ProgressIndicatorSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class ProgressIndicatorSkeleton extends SvelteComponentTyped< diff --git a/tests/e2e/carbon/types/ProgressIndicator/ProgressStep.svelte.d.ts b/tests/e2e/carbon/types/ProgressIndicator/ProgressStep.svelte.d.ts index 9ba2813..d85f374 100644 --- a/tests/e2e/carbon/types/ProgressIndicator/ProgressStep.svelte.d.ts +++ b/tests/e2e/carbon/types/ProgressIndicator/ProgressStep.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["li"]; +type $RestProps = SvelteHTMLElements["li"]; type $Props = { /** @@ -55,7 +55,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ProgressStepProps = Omit & $Props; +export type ProgressStepProps = Omit<$RestProps, keyof $Props> & $Props; export default class ProgressStep extends SvelteComponentTyped< ProgressStepProps, diff --git a/tests/e2e/carbon/types/RadioButton/RadioButton.svelte.d.ts b/tests/e2e/carbon/types/RadioButton/RadioButton.svelte.d.ts index 8aa023c..d3d3f28 100644 --- a/tests/e2e/carbon/types/RadioButton/RadioButton.svelte.d.ts +++ b/tests/e2e/carbon/types/RadioButton/RadioButton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -61,7 +61,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type RadioButtonProps = Omit & $Props; +export type RadioButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class RadioButton extends SvelteComponentTyped< RadioButtonProps, diff --git a/tests/e2e/carbon/types/RadioButton/RadioButtonSkeleton.svelte.d.ts b/tests/e2e/carbon/types/RadioButton/RadioButtonSkeleton.svelte.d.ts index b9d90d5..b5f9532 100644 --- a/tests/e2e/carbon/types/RadioButton/RadioButtonSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/RadioButton/RadioButtonSkeleton.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { [key: `data-${string}`]: any; }; -export type RadioButtonSkeletonProps = Omit & $Props; +export type RadioButtonSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class RadioButtonSkeleton extends SvelteComponentTyped< RadioButtonSkeletonProps, diff --git a/tests/e2e/carbon/types/RadioButtonGroup/RadioButtonGroup.svelte.d.ts b/tests/e2e/carbon/types/RadioButtonGroup/RadioButtonGroup.svelte.d.ts index 7001e6e..b85af30 100644 --- a/tests/e2e/carbon/types/RadioButtonGroup/RadioButtonGroup.svelte.d.ts +++ b/tests/e2e/carbon/types/RadioButtonGroup/RadioButtonGroup.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -37,7 +37,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type RadioButtonGroupProps = Omit & $Props; +export type RadioButtonGroupProps = Omit<$RestProps, keyof $Props> & $Props; export default class RadioButtonGroup extends SvelteComponentTyped< RadioButtonGroupProps, diff --git a/tests/e2e/carbon/types/Search/SearchSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Search/SearchSkeleton.svelte.d.ts index b728497..01d8156 100644 --- a/tests/e2e/carbon/types/Search/SearchSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Search/SearchSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -20,7 +20,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SearchSkeletonProps = Omit & $Props; +export type SearchSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class SearchSkeleton extends SvelteComponentTyped< SearchSkeletonProps, diff --git a/tests/e2e/carbon/types/Select/Select.svelte.d.ts b/tests/e2e/carbon/types/Select/Select.svelte.d.ts index 7f032b3..458df14 100644 --- a/tests/e2e/carbon/types/Select/Select.svelte.d.ts +++ b/tests/e2e/carbon/types/Select/Select.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -91,7 +91,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SelectProps = Omit & $Props; +export type SelectProps = Omit<$RestProps, keyof $Props> & $Props; export default class Select extends SvelteComponentTyped< SelectProps, diff --git a/tests/e2e/carbon/types/Select/SelectItemGroup.svelte.d.ts b/tests/e2e/carbon/types/Select/SelectItemGroup.svelte.d.ts index 8b2322c..679202d 100644 --- a/tests/e2e/carbon/types/Select/SelectItemGroup.svelte.d.ts +++ b/tests/e2e/carbon/types/Select/SelectItemGroup.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["optgroup"]; +type $RestProps = SvelteHTMLElements["optgroup"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SelectItemGroupProps = Omit & $Props; +export type SelectItemGroupProps = Omit<$RestProps, keyof $Props> & $Props; export default class SelectItemGroup extends SvelteComponentTyped< SelectItemGroupProps, diff --git a/tests/e2e/carbon/types/Select/SelectSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Select/SelectSkeleton.svelte.d.ts index 11bcf63..52d7f8c 100644 --- a/tests/e2e/carbon/types/Select/SelectSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Select/SelectSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SelectSkeletonProps = Omit & $Props; +export type SelectSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class SelectSkeleton extends SvelteComponentTyped< SelectSkeletonProps, diff --git a/tests/e2e/carbon/types/SkeletonPlaceholder/SkeletonPlaceholder.svelte.d.ts b/tests/e2e/carbon/types/SkeletonPlaceholder/SkeletonPlaceholder.svelte.d.ts index 0add01d..4e63e98 100644 --- a/tests/e2e/carbon/types/SkeletonPlaceholder/SkeletonPlaceholder.svelte.d.ts +++ b/tests/e2e/carbon/types/SkeletonPlaceholder/SkeletonPlaceholder.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { [key: `data-${string}`]: any; }; -export type SkeletonPlaceholderProps = Omit & $Props; +export type SkeletonPlaceholderProps = Omit<$RestProps, keyof $Props> & $Props; export default class SkeletonPlaceholder extends SvelteComponentTyped< SkeletonPlaceholderProps, diff --git a/tests/e2e/carbon/types/SkeletonText/SkeletonText.svelte.d.ts b/tests/e2e/carbon/types/SkeletonText/SkeletonText.svelte.d.ts index f71f5c2..fe46653 100644 --- a/tests/e2e/carbon/types/SkeletonText/SkeletonText.svelte.d.ts +++ b/tests/e2e/carbon/types/SkeletonText/SkeletonText.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -31,7 +31,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SkeletonTextProps = Omit & $Props; +export type SkeletonTextProps = Omit<$RestProps, keyof $Props> & $Props; export default class SkeletonText extends SvelteComponentTyped< SkeletonTextProps, diff --git a/tests/e2e/carbon/types/Slider/Slider.svelte.d.ts b/tests/e2e/carbon/types/Slider/Slider.svelte.d.ts index 3f55afc..9a01e41 100644 --- a/tests/e2e/carbon/types/Slider/Slider.svelte.d.ts +++ b/tests/e2e/carbon/types/Slider/Slider.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -109,7 +109,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SliderProps = Omit & $Props; +export type SliderProps = Omit<$RestProps, keyof $Props> & $Props; export default class Slider extends SvelteComponentTyped< SliderProps, diff --git a/tests/e2e/carbon/types/Slider/SliderSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Slider/SliderSkeleton.svelte.d.ts index 497ffb6..bf98628 100644 --- a/tests/e2e/carbon/types/Slider/SliderSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Slider/SliderSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SliderSkeletonProps = Omit & $Props; +export type SliderSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class SliderSkeleton extends SvelteComponentTyped< SliderSkeletonProps, diff --git a/tests/e2e/carbon/types/StructuredList/StructuredList.svelte.d.ts b/tests/e2e/carbon/types/StructuredList/StructuredList.svelte.d.ts index 526279d..ea20ed0 100644 --- a/tests/e2e/carbon/types/StructuredList/StructuredList.svelte.d.ts +++ b/tests/e2e/carbon/types/StructuredList/StructuredList.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type StructuredListProps = Omit & $Props; +export type StructuredListProps = Omit<$RestProps, keyof $Props> & $Props; export default class StructuredList extends SvelteComponentTyped< StructuredListProps, diff --git a/tests/e2e/carbon/types/StructuredList/StructuredListBody.svelte.d.ts b/tests/e2e/carbon/types/StructuredList/StructuredListBody.svelte.d.ts index 05ad081..d64e16f 100644 --- a/tests/e2e/carbon/types/StructuredList/StructuredListBody.svelte.d.ts +++ b/tests/e2e/carbon/types/StructuredList/StructuredListBody.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { [key: `data-${string}`]: any; }; -export type StructuredListBodyProps = Omit & $Props; +export type StructuredListBodyProps = Omit<$RestProps, keyof $Props> & $Props; export default class StructuredListBody extends SvelteComponentTyped< StructuredListBodyProps, diff --git a/tests/e2e/carbon/types/StructuredList/StructuredListCell.svelte.d.ts b/tests/e2e/carbon/types/StructuredList/StructuredListCell.svelte.d.ts index ceb45af..b05c8e6 100644 --- a/tests/e2e/carbon/types/StructuredList/StructuredListCell.svelte.d.ts +++ b/tests/e2e/carbon/types/StructuredList/StructuredListCell.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type StructuredListCellProps = Omit & $Props; +export type StructuredListCellProps = Omit<$RestProps, keyof $Props> & $Props; export default class StructuredListCell extends SvelteComponentTyped< StructuredListCellProps, diff --git a/tests/e2e/carbon/types/StructuredList/StructuredListHead.svelte.d.ts b/tests/e2e/carbon/types/StructuredList/StructuredListHead.svelte.d.ts index d616696..e06697f 100644 --- a/tests/e2e/carbon/types/StructuredList/StructuredListHead.svelte.d.ts +++ b/tests/e2e/carbon/types/StructuredList/StructuredListHead.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { [key: `data-${string}`]: any; }; -export type StructuredListHeadProps = Omit & $Props; +export type StructuredListHeadProps = Omit<$RestProps, keyof $Props> & $Props; export default class StructuredListHead extends SvelteComponentTyped< StructuredListHeadProps, diff --git a/tests/e2e/carbon/types/StructuredList/StructuredListInput.svelte.d.ts b/tests/e2e/carbon/types/StructuredList/StructuredListInput.svelte.d.ts index b7e6fca..a6c85a3 100644 --- a/tests/e2e/carbon/types/StructuredList/StructuredListInput.svelte.d.ts +++ b/tests/e2e/carbon/types/StructuredList/StructuredListInput.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["input"]; +type $RestProps = SvelteHTMLElements["input"]; type $Props = { /** @@ -43,7 +43,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type StructuredListInputProps = Omit & $Props; +export type StructuredListInputProps = Omit<$RestProps, keyof $Props> & $Props; export default class StructuredListInput extends SvelteComponentTyped< StructuredListInputProps, diff --git a/tests/e2e/carbon/types/StructuredList/StructuredListRow.svelte.d.ts b/tests/e2e/carbon/types/StructuredList/StructuredListRow.svelte.d.ts index eefab56..e64ac5d 100644 --- a/tests/e2e/carbon/types/StructuredList/StructuredListRow.svelte.d.ts +++ b/tests/e2e/carbon/types/StructuredList/StructuredListRow.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["label"]; +type $RestProps = SvelteHTMLElements["label"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type StructuredListRowProps = Omit & $Props; +export type StructuredListRowProps = Omit<$RestProps, keyof $Props> & $Props; export default class StructuredListRow extends SvelteComponentTyped< StructuredListRowProps, diff --git a/tests/e2e/carbon/types/StructuredList/StructuredListSkeleton.svelte.d.ts b/tests/e2e/carbon/types/StructuredList/StructuredListSkeleton.svelte.d.ts index 25cb5c6..0bcfac5 100644 --- a/tests/e2e/carbon/types/StructuredList/StructuredListSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/StructuredList/StructuredListSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type StructuredListSkeletonProps = Omit & +export type StructuredListSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class StructuredListSkeleton extends SvelteComponentTyped< diff --git a/tests/e2e/carbon/types/Tabs/Tab.svelte.d.ts b/tests/e2e/carbon/types/Tabs/Tab.svelte.d.ts index 3503eb1..c22b57d 100644 --- a/tests/e2e/carbon/types/Tabs/Tab.svelte.d.ts +++ b/tests/e2e/carbon/types/Tabs/Tab.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["li"]; +type $RestProps = SvelteHTMLElements["li"]; type $Props = { /** @@ -44,7 +44,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TabProps = Omit & $Props; +export type TabProps = Omit<$RestProps, keyof $Props> & $Props; export default class Tab extends SvelteComponentTyped< TabProps, diff --git a/tests/e2e/carbon/types/Tabs/TabContent.svelte.d.ts b/tests/e2e/carbon/types/Tabs/TabContent.svelte.d.ts index 3113788..65e59e0 100644 --- a/tests/e2e/carbon/types/Tabs/TabContent.svelte.d.ts +++ b/tests/e2e/carbon/types/Tabs/TabContent.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TabContentProps = Omit & $Props; +export type TabContentProps = Omit<$RestProps, keyof $Props> & $Props; export default class TabContent extends SvelteComponentTyped< TabContentProps, diff --git a/tests/e2e/carbon/types/Tabs/Tabs.svelte.d.ts b/tests/e2e/carbon/types/Tabs/Tabs.svelte.d.ts index d839f28..1d0f044 100644 --- a/tests/e2e/carbon/types/Tabs/Tabs.svelte.d.ts +++ b/tests/e2e/carbon/types/Tabs/Tabs.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -31,7 +31,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TabsProps = Omit & $Props; +export type TabsProps = Omit<$RestProps, keyof $Props> & $Props; export default class Tabs extends SvelteComponentTyped< TabsProps, diff --git a/tests/e2e/carbon/types/Tabs/TabsSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Tabs/TabsSkeleton.svelte.d.ts index 1406f5a..7f42f23 100644 --- a/tests/e2e/carbon/types/Tabs/TabsSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Tabs/TabsSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TabsSkeletonProps = Omit & $Props; +export type TabsSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class TabsSkeleton extends SvelteComponentTyped< TabsSkeletonProps, diff --git a/tests/e2e/carbon/types/Tag/Tag.svelte.d.ts b/tests/e2e/carbon/types/Tag/Tag.svelte.d.ts index 9d6ebc5..300899e 100644 --- a/tests/e2e/carbon/types/Tag/Tag.svelte.d.ts +++ b/tests/e2e/carbon/types/Tag/Tag.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"] & SvelteHTMLElements["span"]; +type $RestProps = SvelteHTMLElements["div"] & SvelteHTMLElements["span"]; type $Props = { /** @@ -60,7 +60,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TagProps = Omit & $Props; +export type TagProps = Omit<$RestProps, keyof $Props> & $Props; export default class Tag extends SvelteComponentTyped< TagProps, diff --git a/tests/e2e/carbon/types/Tag/TagSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Tag/TagSkeleton.svelte.d.ts index 1c4dbb1..a284a7e 100644 --- a/tests/e2e/carbon/types/Tag/TagSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Tag/TagSkeleton.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["span"]; +type $RestProps = SvelteHTMLElements["span"]; type $Props = { [key: `data-${string}`]: any; }; -export type TagSkeletonProps = Omit & $Props; +export type TagSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class TagSkeleton extends SvelteComponentTyped< TagSkeletonProps, diff --git a/tests/e2e/carbon/types/TextArea/TextArea.svelte.d.ts b/tests/e2e/carbon/types/TextArea/TextArea.svelte.d.ts index 90dae46..fcd18d0 100644 --- a/tests/e2e/carbon/types/TextArea/TextArea.svelte.d.ts +++ b/tests/e2e/carbon/types/TextArea/TextArea.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["textarea"]; +type $RestProps = SvelteHTMLElements["textarea"]; type $Props = { /** @@ -91,7 +91,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TextAreaProps = Omit & $Props; +export type TextAreaProps = Omit<$RestProps, keyof $Props> & $Props; export default class TextArea extends SvelteComponentTyped< TextAreaProps, diff --git a/tests/e2e/carbon/types/TextArea/TextAreaSkeleton.svelte.d.ts b/tests/e2e/carbon/types/TextArea/TextAreaSkeleton.svelte.d.ts index dbfe465..144ef23 100644 --- a/tests/e2e/carbon/types/TextArea/TextAreaSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/TextArea/TextAreaSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TextAreaSkeletonProps = Omit & $Props; +export type TextAreaSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class TextAreaSkeleton extends SvelteComponentTyped< TextAreaSkeletonProps, diff --git a/tests/e2e/carbon/types/TextInput/PasswordInput.svelte.d.ts b/tests/e2e/carbon/types/TextInput/PasswordInput.svelte.d.ts index 567ceee..7b50663 100644 --- a/tests/e2e/carbon/types/TextInput/PasswordInput.svelte.d.ts +++ b/tests/e2e/carbon/types/TextInput/PasswordInput.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["input"]; +type $RestProps = SvelteHTMLElements["input"]; type $Props = { /** @@ -115,7 +115,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type PasswordInputProps = Omit & $Props; +export type PasswordInputProps = Omit<$RestProps, keyof $Props> & $Props; export default class PasswordInput extends SvelteComponentTyped< PasswordInputProps, diff --git a/tests/e2e/carbon/types/TextInput/TextInput.svelte.d.ts b/tests/e2e/carbon/types/TextInput/TextInput.svelte.d.ts index 09eaa4b..aa34d6d 100644 --- a/tests/e2e/carbon/types/TextInput/TextInput.svelte.d.ts +++ b/tests/e2e/carbon/types/TextInput/TextInput.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["input"]; +type $RestProps = SvelteHTMLElements["input"]; type $Props = { /** @@ -115,7 +115,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TextInputProps = Omit & $Props; +export type TextInputProps = Omit<$RestProps, keyof $Props> & $Props; export default class TextInput extends SvelteComponentTyped< TextInputProps, diff --git a/tests/e2e/carbon/types/TextInput/TextInputSkeleton.svelte.d.ts b/tests/e2e/carbon/types/TextInput/TextInputSkeleton.svelte.d.ts index ccaa3fa..b2893a1 100644 --- a/tests/e2e/carbon/types/TextInput/TextInputSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/TextInput/TextInputSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TextInputSkeletonProps = Omit & $Props; +export type TextInputSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class TextInputSkeleton extends SvelteComponentTyped< TextInputSkeletonProps, diff --git a/tests/e2e/carbon/types/Tile/ClickableTile.svelte.d.ts b/tests/e2e/carbon/types/Tile/ClickableTile.svelte.d.ts index ed91ed3..570f09e 100644 --- a/tests/e2e/carbon/types/Tile/ClickableTile.svelte.d.ts +++ b/tests/e2e/carbon/types/Tile/ClickableTile.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ClickableTileProps = Omit & $Props; +export type ClickableTileProps = Omit<$RestProps, keyof $Props> & $Props; export default class ClickableTile extends SvelteComponentTyped< ClickableTileProps, diff --git a/tests/e2e/carbon/types/Tile/ExpandableTile.svelte.d.ts b/tests/e2e/carbon/types/Tile/ExpandableTile.svelte.d.ts index f62cb5b..09d7064 100644 --- a/tests/e2e/carbon/types/Tile/ExpandableTile.svelte.d.ts +++ b/tests/e2e/carbon/types/Tile/ExpandableTile.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -73,7 +73,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ExpandableTileProps = Omit & $Props; +export type ExpandableTileProps = Omit<$RestProps, keyof $Props> & $Props; export default class ExpandableTile extends SvelteComponentTyped< ExpandableTileProps, diff --git a/tests/e2e/carbon/types/Tile/RadioTile.svelte.d.ts b/tests/e2e/carbon/types/Tile/RadioTile.svelte.d.ts index 4488794..14e5619 100644 --- a/tests/e2e/carbon/types/Tile/RadioTile.svelte.d.ts +++ b/tests/e2e/carbon/types/Tile/RadioTile.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["label"]; +type $RestProps = SvelteHTMLElements["label"]; type $Props = { /** @@ -49,7 +49,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type RadioTileProps = Omit & $Props; +export type RadioTileProps = Omit<$RestProps, keyof $Props> & $Props; export default class RadioTile extends SvelteComponentTyped< RadioTileProps, diff --git a/tests/e2e/carbon/types/Tile/SelectableTile.svelte.d.ts b/tests/e2e/carbon/types/Tile/SelectableTile.svelte.d.ts index c44ea82..d7f206f 100644 --- a/tests/e2e/carbon/types/Tile/SelectableTile.svelte.d.ts +++ b/tests/e2e/carbon/types/Tile/SelectableTile.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["label"]; +type $RestProps = SvelteHTMLElements["label"]; type $Props = { /** @@ -61,7 +61,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SelectableTileProps = Omit & $Props; +export type SelectableTileProps = Omit<$RestProps, keyof $Props> & $Props; export default class SelectableTile extends SvelteComponentTyped< SelectableTileProps, diff --git a/tests/e2e/carbon/types/Tile/Tile.svelte.d.ts b/tests/e2e/carbon/types/Tile/Tile.svelte.d.ts index 7a02684..c3aa83e 100644 --- a/tests/e2e/carbon/types/Tile/Tile.svelte.d.ts +++ b/tests/e2e/carbon/types/Tile/Tile.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TileProps = Omit & $Props; +export type TileProps = Omit<$RestProps, keyof $Props> & $Props; export default class Tile extends SvelteComponentTyped< TileProps, diff --git a/tests/e2e/carbon/types/Tile/TileGroup.svelte.d.ts b/tests/e2e/carbon/types/Tile/TileGroup.svelte.d.ts index b84838e..6785d48 100644 --- a/tests/e2e/carbon/types/Tile/TileGroup.svelte.d.ts +++ b/tests/e2e/carbon/types/Tile/TileGroup.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["fieldset"]; +type $RestProps = SvelteHTMLElements["fieldset"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TileGroupProps = Omit & $Props; +export type TileGroupProps = Omit<$RestProps, keyof $Props> & $Props; export default class TileGroup extends SvelteComponentTyped< TileGroupProps, diff --git a/tests/e2e/carbon/types/TimePicker/TimePicker.svelte.d.ts b/tests/e2e/carbon/types/TimePicker/TimePicker.svelte.d.ts index 39f8c79..e9eec70 100644 --- a/tests/e2e/carbon/types/TimePicker/TimePicker.svelte.d.ts +++ b/tests/e2e/carbon/types/TimePicker/TimePicker.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -97,7 +97,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TimePickerProps = Omit & $Props; +export type TimePickerProps = Omit<$RestProps, keyof $Props> & $Props; export default class TimePicker extends SvelteComponentTyped< TimePickerProps, diff --git a/tests/e2e/carbon/types/TimePicker/TimePickerSelect.svelte.d.ts b/tests/e2e/carbon/types/TimePicker/TimePickerSelect.svelte.d.ts index daa9f37..c1eb902 100644 --- a/tests/e2e/carbon/types/TimePicker/TimePickerSelect.svelte.d.ts +++ b/tests/e2e/carbon/types/TimePicker/TimePickerSelect.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -56,7 +56,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TimePickerSelectProps = Omit & $Props; +export type TimePickerSelectProps = Omit<$RestProps, keyof $Props> & $Props; export default class TimePickerSelect extends SvelteComponentTyped< TimePickerSelectProps, diff --git a/tests/e2e/carbon/types/Toggle/Toggle.svelte.d.ts b/tests/e2e/carbon/types/Toggle/Toggle.svelte.d.ts index ee06f1b..97fbfef 100644 --- a/tests/e2e/carbon/types/Toggle/Toggle.svelte.d.ts +++ b/tests/e2e/carbon/types/Toggle/Toggle.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -55,7 +55,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ToggleProps = Omit & $Props; +export type ToggleProps = Omit<$RestProps, keyof $Props> & $Props; export default class Toggle extends SvelteComponentTyped< ToggleProps, diff --git a/tests/e2e/carbon/types/Toggle/ToggleSkeleton.svelte.d.ts b/tests/e2e/carbon/types/Toggle/ToggleSkeleton.svelte.d.ts index 82e02cf..022e8c3 100644 --- a/tests/e2e/carbon/types/Toggle/ToggleSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/Toggle/ToggleSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ToggleSkeletonProps = Omit & $Props; +export type ToggleSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class ToggleSkeleton extends SvelteComponentTyped< ToggleSkeletonProps, diff --git a/tests/e2e/carbon/types/ToggleSmall/ToggleSmall.svelte.d.ts b/tests/e2e/carbon/types/ToggleSmall/ToggleSmall.svelte.d.ts index d269eb1..8135cd9 100644 --- a/tests/e2e/carbon/types/ToggleSmall/ToggleSmall.svelte.d.ts +++ b/tests/e2e/carbon/types/ToggleSmall/ToggleSmall.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -49,7 +49,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ToggleSmallProps = Omit & $Props; +export type ToggleSmallProps = Omit<$RestProps, keyof $Props> & $Props; export default class ToggleSmall extends SvelteComponentTyped< ToggleSmallProps, diff --git a/tests/e2e/carbon/types/ToggleSmall/ToggleSmallSkeleton.svelte.d.ts b/tests/e2e/carbon/types/ToggleSmall/ToggleSmallSkeleton.svelte.d.ts index 9504f55..956eebc 100644 --- a/tests/e2e/carbon/types/ToggleSmall/ToggleSmallSkeleton.svelte.d.ts +++ b/tests/e2e/carbon/types/ToggleSmall/ToggleSmallSkeleton.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ToggleSmallSkeletonProps = Omit & $Props; +export type ToggleSmallSkeletonProps = Omit<$RestProps, keyof $Props> & $Props; export default class ToggleSmallSkeleton extends SvelteComponentTyped< ToggleSmallSkeletonProps, diff --git a/tests/e2e/carbon/types/Tooltip/Tooltip.svelte.d.ts b/tests/e2e/carbon/types/Tooltip/Tooltip.svelte.d.ts index 75cf1bc..00253d4 100644 --- a/tests/e2e/carbon/types/Tooltip/Tooltip.svelte.d.ts +++ b/tests/e2e/carbon/types/Tooltip/Tooltip.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -92,7 +92,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TooltipProps = Omit & $Props; +export type TooltipProps = Omit<$RestProps, keyof $Props> & $Props; export default class Tooltip extends SvelteComponentTyped< TooltipProps, diff --git a/tests/e2e/carbon/types/TooltipDefinition/TooltipDefinition.svelte.d.ts b/tests/e2e/carbon/types/TooltipDefinition/TooltipDefinition.svelte.d.ts index 6ed32a0..8f9ce2d 100644 --- a/tests/e2e/carbon/types/TooltipDefinition/TooltipDefinition.svelte.d.ts +++ b/tests/e2e/carbon/types/TooltipDefinition/TooltipDefinition.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -37,7 +37,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TooltipDefinitionProps = Omit & $Props; +export type TooltipDefinitionProps = Omit<$RestProps, keyof $Props> & $Props; export default class TooltipDefinition extends SvelteComponentTyped< TooltipDefinitionProps, diff --git a/tests/e2e/carbon/types/TooltipIcon/TooltipIcon.svelte.d.ts b/tests/e2e/carbon/types/TooltipIcon/TooltipIcon.svelte.d.ts index 69b5d0e..a9e9be5 100644 --- a/tests/e2e/carbon/types/TooltipIcon/TooltipIcon.svelte.d.ts +++ b/tests/e2e/carbon/types/TooltipIcon/TooltipIcon.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -38,7 +38,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type TooltipIconProps = Omit & $Props; +export type TooltipIconProps = Omit<$RestProps, keyof $Props> & $Props; export default class TooltipIcon extends SvelteComponentTyped< TooltipIconProps, diff --git a/tests/e2e/carbon/types/UIShell/Content.svelte.d.ts b/tests/e2e/carbon/types/UIShell/Content.svelte.d.ts index 2b42c56..40e98e8 100644 --- a/tests/e2e/carbon/types/UIShell/Content.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/Content.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["main"]; +type $RestProps = SvelteHTMLElements["main"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ContentProps = Omit & $Props; +export type ContentProps = Omit<$RestProps, keyof $Props> & $Props; export default class Content extends SvelteComponentTyped< ContentProps, diff --git a/tests/e2e/carbon/types/UIShell/GlobalHeader/Header.svelte.d.ts b/tests/e2e/carbon/types/UIShell/GlobalHeader/Header.svelte.d.ts index 8872442..e9933ca 100644 --- a/tests/e2e/carbon/types/UIShell/GlobalHeader/Header.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/GlobalHeader/Header.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { /** @@ -56,7 +56,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type HeaderProps = Omit & $Props; +export type HeaderProps = Omit<$RestProps, keyof $Props> & $Props; export default class Header extends SvelteComponentTyped< HeaderProps, diff --git a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderAction.svelte.d.ts b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderAction.svelte.d.ts index e5dd012..485a1f0 100644 --- a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderAction.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderAction.svelte.d.ts @@ -7,7 +7,7 @@ export interface HeaderActionSlideTransition { easing?: (t: number) => number; } -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -45,7 +45,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type HeaderActionProps = Omit & $Props; +export type HeaderActionProps = Omit<$RestProps, keyof $Props> & $Props; export default class HeaderAction extends SvelteComponentTyped< HeaderActionProps, diff --git a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderActionLink.svelte.d.ts b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderActionLink.svelte.d.ts index 28dd783..6a733bc 100644 --- a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderActionLink.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderActionLink.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { /** @@ -31,7 +31,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type HeaderActionLinkProps = Omit & $Props; +export type HeaderActionLinkProps = Omit<$RestProps, keyof $Props> & $Props; export default class HeaderActionLink extends SvelteComponentTyped< HeaderActionLinkProps, diff --git a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNav.svelte.d.ts b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNav.svelte.d.ts index cd29e10..d8b7ecc 100644 --- a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNav.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNav.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["nav"]; +type $RestProps = SvelteHTMLElements["nav"]; type $Props = { /** @@ -14,7 +14,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type HeaderNavProps = Omit & $Props; +export type HeaderNavProps = Omit<$RestProps, keyof $Props> & $Props; export default class HeaderNav extends SvelteComponentTyped< HeaderNavProps, diff --git a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNavItem.svelte.d.ts b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNavItem.svelte.d.ts index 4c5b6a1..20f33ad 100644 --- a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNavItem.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNavItem.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type HeaderNavItemProps = Omit & $Props; +export type HeaderNavItemProps = Omit<$RestProps, keyof $Props> & $Props; export default class HeaderNavItem extends SvelteComponentTyped< HeaderNavItemProps, diff --git a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNavMenu.svelte.d.ts b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNavMenu.svelte.d.ts index 2bb5cf2..775292b 100644 --- a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNavMenu.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderNavMenu.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { /** @@ -37,7 +37,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type HeaderNavMenuProps = Omit & $Props; +export type HeaderNavMenuProps = Omit<$RestProps, keyof $Props> & $Props; export default class HeaderNavMenu extends SvelteComponentTyped< HeaderNavMenuProps, diff --git a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderPanelLink.svelte.d.ts b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderPanelLink.svelte.d.ts index 618d53a..9d85f0f 100644 --- a/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderPanelLink.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/GlobalHeader/HeaderPanelLink.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type HeaderPanelLinkProps = Omit & $Props; +export type HeaderPanelLinkProps = Omit<$RestProps, keyof $Props> & $Props; export default class HeaderPanelLink extends SvelteComponentTyped< HeaderPanelLinkProps, diff --git a/tests/e2e/carbon/types/UIShell/HeaderGlobalAction.svelte.d.ts b/tests/e2e/carbon/types/UIShell/HeaderGlobalAction.svelte.d.ts index d05ada3..8708daf 100644 --- a/tests/e2e/carbon/types/UIShell/HeaderGlobalAction.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/HeaderGlobalAction.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type HeaderGlobalActionProps = Omit & $Props; +export type HeaderGlobalActionProps = Omit<$RestProps, keyof $Props> & $Props; export default class HeaderGlobalAction extends SvelteComponentTyped< HeaderGlobalActionProps, diff --git a/tests/e2e/carbon/types/UIShell/HeaderSearch.svelte.d.ts b/tests/e2e/carbon/types/UIShell/HeaderSearch.svelte.d.ts index 6c40550..d282561 100644 --- a/tests/e2e/carbon/types/UIShell/HeaderSearch.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/HeaderSearch.svelte.d.ts @@ -7,7 +7,7 @@ export interface HeaderSearchResult { description?: string; } -type RestProps = SvelteHTMLElements["input"]; +type $RestProps = SvelteHTMLElements["input"]; type $Props = { /** @@ -43,7 +43,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type HeaderSearchProps = Omit & $Props; +export type HeaderSearchProps = Omit<$RestProps, keyof $Props> & $Props; export default class HeaderSearch extends SvelteComponentTyped< HeaderSearchProps, diff --git a/tests/e2e/carbon/types/UIShell/SideNav/SideNav.svelte.d.ts b/tests/e2e/carbon/types/UIShell/SideNav/SideNav.svelte.d.ts index 28d939c..fe49fa9 100644 --- a/tests/e2e/carbon/types/UIShell/SideNav/SideNav.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/SideNav/SideNav.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["nav"]; +type $RestProps = SvelteHTMLElements["nav"]; type $Props = { /** @@ -25,7 +25,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SideNavProps = Omit & $Props; +export type SideNavProps = Omit<$RestProps, keyof $Props> & $Props; export default class SideNav extends SvelteComponentTyped< SideNavProps, diff --git a/tests/e2e/carbon/types/UIShell/SideNav/SideNavLink.svelte.d.ts b/tests/e2e/carbon/types/UIShell/SideNav/SideNavLink.svelte.d.ts index ba9fdbf..be7dac5 100644 --- a/tests/e2e/carbon/types/UIShell/SideNav/SideNavLink.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/SideNav/SideNavLink.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { /** @@ -37,7 +37,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SideNavLinkProps = Omit & $Props; +export type SideNavLinkProps = Omit<$RestProps, keyof $Props> & $Props; export default class SideNavLink extends SvelteComponentTyped< SideNavLinkProps, diff --git a/tests/e2e/carbon/types/UIShell/SideNav/SideNavMenu.svelte.d.ts b/tests/e2e/carbon/types/UIShell/SideNav/SideNavMenu.svelte.d.ts index 9550bf9..cb923b0 100644 --- a/tests/e2e/carbon/types/UIShell/SideNav/SideNavMenu.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/SideNav/SideNavMenu.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -31,7 +31,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SideNavMenuProps = Omit & $Props; +export type SideNavMenuProps = Omit<$RestProps, keyof $Props> & $Props; export default class SideNavMenu extends SvelteComponentTyped< SideNavMenuProps, diff --git a/tests/e2e/carbon/types/UIShell/SideNav/SideNavMenuItem.svelte.d.ts b/tests/e2e/carbon/types/UIShell/SideNav/SideNavMenuItem.svelte.d.ts index 8bed9ae..2e3277f 100644 --- a/tests/e2e/carbon/types/UIShell/SideNav/SideNavMenuItem.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/SideNav/SideNavMenuItem.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { /** @@ -31,7 +31,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SideNavMenuItemProps = Omit & $Props; +export type SideNavMenuItemProps = Omit<$RestProps, keyof $Props> & $Props; export default class SideNavMenuItem extends SvelteComponentTyped< SideNavMenuItemProps, diff --git a/tests/e2e/carbon/types/UIShell/SkipToContent.svelte.d.ts b/tests/e2e/carbon/types/UIShell/SkipToContent.svelte.d.ts index 386ee55..52c5479 100644 --- a/tests/e2e/carbon/types/UIShell/SkipToContent.svelte.d.ts +++ b/tests/e2e/carbon/types/UIShell/SkipToContent.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type SkipToContentProps = Omit & $Props; +export type SkipToContentProps = Omit<$RestProps, keyof $Props> & $Props; export default class SkipToContent extends SvelteComponentTyped< SkipToContentProps, diff --git a/tests/e2e/carbon/types/UnorderedList/UnorderedList.svelte.d.ts b/tests/e2e/carbon/types/UnorderedList/UnorderedList.svelte.d.ts index 824b3e3..f94d2f0 100644 --- a/tests/e2e/carbon/types/UnorderedList/UnorderedList.svelte.d.ts +++ b/tests/e2e/carbon/types/UnorderedList/UnorderedList.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["ul"]; +type $RestProps = SvelteHTMLElements["ul"]; type $Props = { /** @@ -13,7 +13,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type UnorderedListProps = Omit & $Props; +export type UnorderedListProps = Omit<$RestProps, keyof $Props> & $Props; export default class UnorderedList extends SvelteComponentTyped< UnorderedListProps, diff --git a/tests/e2e/glob/types/button/Button.svelte.d.ts b/tests/e2e/glob/types/button/Button.svelte.d.ts index fc90064..cdea96c 100644 --- a/tests/e2e/glob/types/button/Button.svelte.d.ts +++ b/tests/e2e/glob/types/button/Button.svelte.d.ts @@ -12,7 +12,7 @@ export declare function findParentTreeNode( node: HTMLElement ): null | HTMLElement; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -28,7 +28,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ButtonProps = Omit & $Props; +export type ButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class Button extends SvelteComponentTyped< ButtonProps, diff --git a/tests/e2e/multi-export-typed-ts-only/types/button/button.svelte.d.ts b/tests/e2e/multi-export-typed-ts-only/types/button/button.svelte.d.ts index e1f94e2..397228a 100644 --- a/tests/e2e/multi-export-typed-ts-only/types/button/button.svelte.d.ts +++ b/tests/e2e/multi-export-typed-ts-only/types/button/button.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -18,7 +18,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ButtonProps = Omit & $Props; +export type ButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class Button extends SvelteComponentTyped< ButtonProps, diff --git a/tests/e2e/multi-export-typed-ts-only/types/link/link.svelte.d.ts b/tests/e2e/multi-export-typed-ts-only/types/link/link.svelte.d.ts index dd338dc..b529a39 100644 --- a/tests/e2e/multi-export-typed-ts-only/types/link/link.svelte.d.ts +++ b/tests/e2e/multi-export-typed-ts-only/types/link/link.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { [key: `data-${string}`]: any; }; -export type LinkProps = Omit & $Props; +export type LinkProps = Omit<$RestProps, keyof $Props> & $Props; export default class Link extends SvelteComponentTyped< LinkProps, diff --git a/tests/e2e/multi-export-typed-ts-only/types/quote/quote.svelte.d.ts b/tests/e2e/multi-export-typed-ts-only/types/quote/quote.svelte.d.ts index 632f16d..39b5f5e 100644 --- a/tests/e2e/multi-export-typed-ts-only/types/quote/quote.svelte.d.ts +++ b/tests/e2e/multi-export-typed-ts-only/types/quote/quote.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["blockquote"]; +type $RestProps = SvelteHTMLElements["blockquote"]; type $Props = { /** @@ -17,7 +17,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type QuoteProps = Omit & $Props; +export type QuoteProps = Omit<$RestProps, keyof $Props> & $Props; export default class Quote extends SvelteComponentTyped< QuoteProps, diff --git a/tests/e2e/multi-export-typed/types/Button.svelte.d.ts b/tests/e2e/multi-export-typed/types/Button.svelte.d.ts index e1f94e2..397228a 100644 --- a/tests/e2e/multi-export-typed/types/Button.svelte.d.ts +++ b/tests/e2e/multi-export-typed/types/Button.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -18,7 +18,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ButtonProps = Omit & $Props; +export type ButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class Button extends SvelteComponentTyped< ButtonProps, diff --git a/tests/e2e/multi-export-typed/types/Link.svelte.d.ts b/tests/e2e/multi-export-typed/types/Link.svelte.d.ts index dd338dc..b529a39 100644 --- a/tests/e2e/multi-export-typed/types/Link.svelte.d.ts +++ b/tests/e2e/multi-export-typed/types/Link.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { [key: `data-${string}`]: any; }; -export type LinkProps = Omit & $Props; +export type LinkProps = Omit<$RestProps, keyof $Props> & $Props; export default class Link extends SvelteComponentTyped< LinkProps, diff --git a/tests/e2e/multi-export-typed/types/Quote.svelte.d.ts b/tests/e2e/multi-export-typed/types/Quote.svelte.d.ts index 632f16d..39b5f5e 100644 --- a/tests/e2e/multi-export-typed/types/Quote.svelte.d.ts +++ b/tests/e2e/multi-export-typed/types/Quote.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["blockquote"]; +type $RestProps = SvelteHTMLElements["blockquote"]; type $Props = { /** @@ -17,7 +17,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type QuoteProps = Omit & $Props; +export type QuoteProps = Omit<$RestProps, keyof $Props> & $Props; export default class Quote extends SvelteComponentTyped< QuoteProps, diff --git a/tests/e2e/multi-export/types/Button.svelte.d.ts b/tests/e2e/multi-export/types/Button.svelte.d.ts index 1c64c7c..a8ba48c 100644 --- a/tests/e2e/multi-export/types/Button.svelte.d.ts +++ b/tests/e2e/multi-export/types/Button.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -17,7 +17,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ButtonProps = Omit & $Props; +export type ButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class Button extends SvelteComponentTyped< ButtonProps, diff --git a/tests/e2e/multi-export/types/Link.svelte.d.ts b/tests/e2e/multi-export/types/Link.svelte.d.ts index dd338dc..b529a39 100644 --- a/tests/e2e/multi-export/types/Link.svelte.d.ts +++ b/tests/e2e/multi-export/types/Link.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { [key: `data-${string}`]: any; }; -export type LinkProps = Omit & $Props; +export type LinkProps = Omit<$RestProps, keyof $Props> & $Props; export default class Link extends SvelteComponentTyped< LinkProps, diff --git a/tests/e2e/multi-export/types/Quote.svelte.d.ts b/tests/e2e/multi-export/types/Quote.svelte.d.ts index aec1a72..dafbbf2 100644 --- a/tests/e2e/multi-export/types/Quote.svelte.d.ts +++ b/tests/e2e/multi-export/types/Quote.svelte.d.ts @@ -3,7 +3,7 @@ import type { SvelteHTMLElements } from "svelte/elements"; export type Author = string; -type RestProps = SvelteHTMLElements["blockquote"]; +type $RestProps = SvelteHTMLElements["blockquote"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type QuoteProps = Omit & $Props; +export type QuoteProps = Omit<$RestProps, keyof $Props> & $Props; export default class Quote extends SvelteComponentTyped< QuoteProps, diff --git a/tests/e2e/multi-folders/types/Link.svelte.d.ts b/tests/e2e/multi-folders/types/Link.svelte.d.ts index dd338dc..b529a39 100644 --- a/tests/e2e/multi-folders/types/Link.svelte.d.ts +++ b/tests/e2e/multi-folders/types/Link.svelte.d.ts @@ -1,13 +1,13 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { [key: `data-${string}`]: any; }; -export type LinkProps = Omit & $Props; +export type LinkProps = Omit<$RestProps, keyof $Props> & $Props; export default class Link extends SvelteComponentTyped< LinkProps, diff --git a/tests/e2e/multi-folders/types/Quote.svelte.d.ts b/tests/e2e/multi-folders/types/Quote.svelte.d.ts index aec1a72..dafbbf2 100644 --- a/tests/e2e/multi-folders/types/Quote.svelte.d.ts +++ b/tests/e2e/multi-folders/types/Quote.svelte.d.ts @@ -3,7 +3,7 @@ import type { SvelteHTMLElements } from "svelte/elements"; export type Author = string; -type RestProps = SvelteHTMLElements["blockquote"]; +type $RestProps = SvelteHTMLElements["blockquote"]; type $Props = { /** @@ -19,7 +19,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type QuoteProps = Omit & $Props; +export type QuoteProps = Omit<$RestProps, keyof $Props> & $Props; export default class Quote extends SvelteComponentTyped< QuoteProps, diff --git a/tests/e2e/multi-folders/types/components/Button.svelte.d.ts b/tests/e2e/multi-folders/types/components/Button.svelte.d.ts index e1f94e2..397228a 100644 --- a/tests/e2e/multi-folders/types/components/Button.svelte.d.ts +++ b/tests/e2e/multi-folders/types/components/Button.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -18,7 +18,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ButtonProps = Omit & $Props; +export type ButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class Button extends SvelteComponentTyped< ButtonProps, diff --git a/tests/e2e/single-export-default-only/types/Button.svelte.d.ts b/tests/e2e/single-export-default-only/types/Button.svelte.d.ts index 42f91d0..49e9cae 100644 --- a/tests/e2e/single-export-default-only/types/Button.svelte.d.ts +++ b/tests/e2e/single-export-default-only/types/Button.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -17,7 +17,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ButtonProps = Omit & $Props; +export type ButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class Button extends SvelteComponentTyped< ButtonProps, diff --git a/tests/e2e/single-export/types/Button.svelte.d.ts b/tests/e2e/single-export/types/Button.svelte.d.ts index 42f91d0..49e9cae 100644 --- a/tests/e2e/single-export/types/Button.svelte.d.ts +++ b/tests/e2e/single-export/types/Button.svelte.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["button"]; +type $RestProps = SvelteHTMLElements["button"]; type $Props = { /** @@ -17,7 +17,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type ButtonProps = Omit & $Props; +export type ButtonProps = Omit<$RestProps, keyof $Props> & $Props; export default class Button extends SvelteComponentTyped< ButtonProps, diff --git a/tests/fixtures/anchor-props/output.d.ts b/tests/fixtures/anchor-props/output.d.ts index 21413ae..e9aec4d 100644 --- a/tests/fixtures/anchor-props/output.d.ts +++ b/tests/fixtures/anchor-props/output.d.ts @@ -1,12 +1,12 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["a"]; +type $RestProps = SvelteHTMLElements["a"]; type $Props = { [key: `data-${string}`]: any; }; -export type AnchorPropsProps = Omit & $Props; +export type AnchorPropsProps = Omit<$RestProps, keyof $Props> & $Props; export default class AnchorProps extends SvelteComponentTyped, { default: {} }> {} diff --git a/tests/fixtures/generics-with-rest-props/output.d.ts b/tests/fixtures/generics-with-rest-props/output.d.ts index 835db65..69aed11 100644 --- a/tests/fixtures/generics-with-rest-props/output.d.ts +++ b/tests/fixtures/generics-with-rest-props/output.d.ts @@ -13,7 +13,7 @@ export interface DataTableHeader { value: string; } -type RestProps = SvelteHTMLElements["div"]; +type $RestProps = SvelteHTMLElements["div"]; type $Props = { /** @@ -29,7 +29,7 @@ type $Props = { [key: `data-${string}`]: any; }; -export type GenericsWithRestPropsProps = Omit> & $Props; +export type GenericsWithRestPropsProps = Omit<$RestProps, keyof $Props> & $Props; export default class GenericsWithRestProps extends SvelteComponentTyped< GenericsWithRestPropsProps, diff --git a/tests/fixtures/rest-props-multiple/output.d.ts b/tests/fixtures/rest-props-multiple/output.d.ts index 0e23846..76de29a 100644 --- a/tests/fixtures/rest-props-multiple/output.d.ts +++ b/tests/fixtures/rest-props-multiple/output.d.ts @@ -1,7 +1,7 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["ul"] & SvelteHTMLElements["ol"]; +type $RestProps = SvelteHTMLElements["ul"] & SvelteHTMLElements["ol"]; type $Props = { /** @@ -12,6 +12,6 @@ type $Props = { [key: `data-${string}`]: any; }; -export type RestPropsMultipleProps = Omit & $Props; +export type RestPropsMultipleProps = Omit<$RestProps, keyof $Props> & $Props; export default class RestPropsMultiple extends SvelteComponentTyped, {}> {} diff --git a/tests/fixtures/rest-props-simple/output.d.ts b/tests/fixtures/rest-props-simple/output.d.ts index 30504af..1fdb0b6 100644 --- a/tests/fixtures/rest-props-simple/output.d.ts +++ b/tests/fixtures/rest-props-simple/output.d.ts @@ -1,12 +1,12 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["h1"]; +type $RestProps = SvelteHTMLElements["h1"]; type $Props = { [key: `data-${string}`]: any; }; -export type RestPropsSimpleProps = Omit & $Props; +export type RestPropsSimpleProps = Omit<$RestProps, keyof $Props> & $Props; export default class RestPropsSimple extends SvelteComponentTyped, {}> {} diff --git a/tests/fixtures/svg-props/output.d.ts b/tests/fixtures/svg-props/output.d.ts index 22f77b8..0d6df73 100644 --- a/tests/fixtures/svg-props/output.d.ts +++ b/tests/fixtures/svg-props/output.d.ts @@ -1,12 +1,12 @@ import type { SvelteComponentTyped } from "svelte"; import type { SvelteHTMLElements } from "svelte/elements"; -type RestProps = SvelteHTMLElements["svg"]; +type $RestProps = SvelteHTMLElements["svg"]; type $Props = { [key: `data-${string}`]: any; }; -export type SvgPropsProps = Omit & $Props; +export type SvgPropsProps = Omit<$RestProps, keyof $Props> & $Props; export default class SvgProps extends SvelteComponentTyped, {}> {}