Merge pull request #26113 from storybookjs/kasper/svelte-type

Svelte: Remove deprecated SvelteComponentTyped in favor of SvelteComponent
storybookjs · Feb 20, 2024 · e0bafc2 · e0bafc2
2 parents 332c593 + d112816
commit e0bafc2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/code/renderers/svelte/src/public-types.test.ts b/code/renderers/svelte/src/public-types.test.ts
@@ -3,15 +3,15 @@ import { describe, it } from 'vitest';
 import { satisfies } from '@storybook/core-common';
 import type { ComponentAnnotations, StoryAnnotations } from '@storybook/types';
 import { expectTypeOf } from 'expect-type';
-import type { ComponentProps, SvelteComponentTyped } from 'svelte';
+import type { ComponentProps, SvelteComponent } from 'svelte';
 import Button from './__test__/Button.svelte';
 import Decorator1 from './__test__/Decorator.svelte';
 import Decorator2 from './__test__/Decorator2.svelte';
 
 import type { Decorator, Meta, StoryObj } from './public-types';
 import type { SvelteRenderer } from './types';
 
-type SvelteStory<Component extends SvelteComponentTyped, Args, RequiredArgs> = StoryAnnotations<
+type SvelteStory<Component extends SvelteComponent, Args, RequiredArgs> = StoryAnnotations<
   SvelteRenderer<Component>,
   Args,
   RequiredArgs

diff --git a/code/renderers/svelte/src/public-types.ts b/code/renderers/svelte/src/public-types.ts
@@ -12,7 +12,7 @@ import type {
   ProjectAnnotations,
 } from '@storybook/types';
 
-import type { ComponentType, ComponentProps, SvelteComponentTyped } from 'svelte';
+import type { ComponentType, ComponentProps, SvelteComponent } from 'svelte';
 import type { SetOptional, Simplify } from 'type-fest';
 import type { SvelteRenderer } from './types';
 
@@ -23,15 +23,15 @@ export type { Args, ArgTypes, Parameters, StrictArgs } from '@storybook/types';
  *
  * @see [Default export](https://storybook.js.org/docs/formats/component-story-format/#default-export)
  */
-export type Meta<CmpOrArgs = Args> = CmpOrArgs extends SvelteComponentTyped<infer Props>
+export type Meta<CmpOrArgs = Args> = CmpOrArgs extends SvelteComponent<infer Props>
   ? ComponentAnnotations<SvelteRenderer<CmpOrArgs>, Props>
   : ComponentAnnotations<SvelteRenderer, CmpOrArgs>;
 /**
  * Story function that represents a CSFv2 component example.
  *
  * @see [Named Story exports](https://storybook.js.org/docs/formats/component-story-format/#named-story-exports)
  */
-export type StoryFn<TCmpOrArgs = Args> = TCmpOrArgs extends SvelteComponentTyped<infer Props>
+export type StoryFn<TCmpOrArgs = Args> = TCmpOrArgs extends SvelteComponent<infer Props>
   ? AnnotatedStoryFn<SvelteRenderer, Props>
   : AnnotatedStoryFn<SvelteRenderer, TCmpOrArgs>;
 
@@ -54,7 +54,7 @@ export type StoryObj<MetaOrCmpOrArgs = Args> = MetaOrCmpOrArgs extends {
         SetOptional<TArgs, Extract<keyof TArgs, keyof DefaultArgs>>
       >
     : never
-  : MetaOrCmpOrArgs extends SvelteComponentTyped
+  : MetaOrCmpOrArgs extends SvelteComponent
     ? StoryAnnotations<SvelteRenderer<MetaOrCmpOrArgs>, ComponentProps<MetaOrCmpOrArgs>>
     : StoryAnnotations<SvelteRenderer, MetaOrCmpOrArgs>;
 

diff --git a/code/renderers/svelte/src/types.ts b/code/renderers/svelte/src/types.ts
@@ -1,5 +1,5 @@
 import type { StoryContext as StoryContextBase, WebRenderer } from '@storybook/types';
-import type { ComponentConstructorOptions, ComponentEvents, SvelteComponentTyped } from 'svelte';
+import type { ComponentConstructorOptions, ComponentEvents, SvelteComponent } from 'svelte';
 
 export type StoryContext = StoryContextBase<SvelteRenderer>;
 
@@ -26,13 +26,13 @@ type ComponentType<
   Props extends Record<string, any> = any,
   Events extends Record<string, any> = any,
 > = new (options: ComponentConstructorOptions<Props>) => {
-  [P in keyof SvelteComponentTyped<Props> as P extends `$$${string}`
-    ? never
-    : P]: SvelteComponentTyped<Props, Events>[P];
+  [P in keyof SvelteComponent<Props> as P extends `$$${string}` ? never : P]: SvelteComponent<
+    Props,
+    Events
+  >[P];
 };
 
-export interface SvelteRenderer<C extends SvelteComponentTyped = SvelteComponentTyped>
-  extends WebRenderer {
+export interface SvelteRenderer<C extends SvelteComponent = SvelteComponent> extends WebRenderer {
   component: ComponentType<this['T'] extends Record<string, any> ? this['T'] : any>;
   storyResult: this['T'] extends Record<string, any>
     ? SvelteStoryResult<this['T'], ComponentEvents<C>>