Fix compose story for new TS types

Author: kasperpeulen

src/index.ts

@@ -1,8 +1,9 @@
 import { defaultDecorateStory, combineParameters, addons, applyHooks, HooksContext, mockChannel } from '@storybook/preview-api';
-import type { Meta, ReactRenderer, Args } from '@storybook/react';
-import type { StoryContext } from '@storybook/types';
+import type { ReactRenderer, Args } from '@storybook/react';
+import type { ComponentAnnotations, StoryContext } from '@storybook/types';
 import { isExportStory } from '@storybook/csf';
 
+export { StoriesWithPartialProps } from './types';
 import type { GlobalConfig, StoriesWithPartialProps, StoryFile, TestingStory, TestingStoryPlayContext } from './types';
 import { getStoryName, globalRender, isInvalidStory, objectEntries } from './utils';
 
@@ -63,7 +64,7 @@ export function setGlobalConfig(config: GlobalConfig) {
  */
 export function composeStory<GenericArgs extends Args>(
   story: TestingStory<GenericArgs>,
-  meta: Meta<GenericArgs | any>,
+  meta: ComponentAnnotations<ReactRenderer>,
   globalConfig: GlobalConfig = globalStorybookConfig
 ) {
 

src/types.ts

@@ -1,5 +1,5 @@
-import type { Addon_BaseStoryFn as OriginalBaseStoryFn, BaseAnnotations, ProjectAnnotations, StoryContext, Args } from '@storybook/types';
-import type { StoryFn as OriginalStoryFn, StoryObj, Meta, ReactRenderer } from '@storybook/react';
+import type { Addon_BaseStoryFn as OriginalBaseStoryFn, BaseAnnotations, ProjectAnnotations, StoryContext, Args, StoryAnnotations, AnnotatedStoryFn } from '@storybook/types';
+import type { StoryFn as OriginalStoryFn, Meta, ReactRenderer } from '@storybook/react';
 import type { ReactElement } from 'react';
 
 type StoryFnReactReturnType = ReactElement<unknown>;
@@ -13,7 +13,7 @@ export type BaseStoryFn<Args> = OriginalBaseStoryFn<Args, StoryFnReactReturnType
  */
 export type GlobalConfig = ProjectAnnotations<ReactRenderer>;
 
-export type TestingStory<T = Args> = StoryFn<T> | StoryObj<T>;
+export type TestingStory<T = Args> = AnnotatedStoryFn<ReactRenderer, T> | StoryAnnotations<ReactRenderer, T>;
 
 export type StoryFile = { default: Meta<any>, __esModule?: boolean }