Merge pull request #98 from ComponentDriven/kasper/context-consolidation

Consolidate loader, play and render context and add a self referencing context property
ComponentDriven · Jul 2, 2024 · ed816ed · ed816ed
2 parents 03a4125 + 8b81c0b
commit ed816ed
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -62,6 +62,7 @@
       "@storybook/eslint-config-storybook"
     ],
     "rules": {
+      "@typescript-eslint/no-empty-interface": "off",
       "import/no-unresolved": "error",
       "jest/expect-expect": [
         "warn",

diff --git a/src/story.ts b/src/story.ts
@@ -200,7 +200,7 @@ export interface StrictGlobalTypes {
   [name: string]: StrictInputType;
 }
 
-export type Renderer = {
+export interface Renderer {
   /** What is the type of the `component` annotation in this renderer? */
   component: unknown;
 
@@ -215,7 +215,7 @@ export type Renderer = {
   // This generic type will eventually be filled in with TArgs
   // Credits to Michael Arnaldi.
   T?: unknown;
-};
+}
 
 /** @deprecated - use `Renderer` */
 export type AnyFramework = Renderer;
@@ -247,13 +247,6 @@ export interface StoryContextUpdate<TArgs = Args> {
 }
 
 export type ViewMode = 'story' | 'docs';
-export interface StoryContextForLoaders<TRenderer extends Renderer = Renderer, TArgs = Args>
-  extends StoryContextForEnhancers<TRenderer, TArgs>,
-    Required<StoryContextUpdate<TArgs>> {
-  hooks: unknown;
-  viewMode: ViewMode;
-  originalStoryFn: StoryFn<TRenderer>;
-}
 
 export type LoaderFunction<TRenderer extends Renderer = Renderer, TArgs = Args> = (
   context: StoryContextForLoaders<TRenderer, TArgs>
@@ -268,27 +261,37 @@ export type BeforeEach<TRenderer extends Renderer = Renderer, TArgs = Args> = (
   context: StoryContext<TRenderer, TArgs>
 ) => Awaitable<CleanupCallback | void>;
 
+export interface Canvas {}
+
 export interface StoryContext<TRenderer extends Renderer = Renderer, TArgs = Args>
-  extends StoryContextForLoaders<TRenderer, TArgs> {
+  extends StoryContextForEnhancers<TRenderer, TArgs>,
+    Required<StoryContextUpdate<TArgs>> {
   loaded: Record<string, any>;
   abortSignal: AbortSignal;
   canvasElement: TRenderer['canvasElement'];
+  hooks: unknown;
+  originalStoryFn: StoryFn<TRenderer>;
+  viewMode: ViewMode;
+  step: StepFunction<TRenderer, TArgs>;
+  context: this;
+  canvas: Canvas;
 }
 
+/** @deprecated Use {@link StoryContext} instead. */
+export interface StoryContextForLoaders<TRenderer extends Renderer = Renderer, TArgs = Args>
+  extends StoryContext<TRenderer, TArgs> {}
+
+/** @deprecated Use {@link StoryContext} instead. */
+export interface PlayFunctionContext<TRenderer extends Renderer = Renderer, TArgs = Args>
+  extends StoryContext<TRenderer, TArgs> {}
+
 export type StepLabel = string;
 
 export type StepFunction<TRenderer extends Renderer = Renderer, TArgs = Args> = (
   label: StepLabel,
   play: PlayFunction<TRenderer, TArgs>
 ) => Promise<void> | void;
 
-export type PlayFunctionContext<TRenderer extends Renderer = Renderer, TArgs = Args> = StoryContext<
-  TRenderer,
-  TArgs
-> & {
-  step: StepFunction<TRenderer, TArgs>;
-};
-
 export type PlayFunction<TRenderer extends Renderer = Renderer, TArgs = Args> = (
   context: PlayFunctionContext<TRenderer, TArgs>
 ) => Promise<void> | void;
@@ -327,10 +330,10 @@ export type DecoratorApplicator<TRenderer extends Renderer = Renderer, TArgs = A
 export type StepRunner<TRenderer extends Renderer = Renderer, TArgs = Args> = (
   label: StepLabel,
   play: PlayFunction<TRenderer, TArgs>,
-  context: PlayFunctionContext<TRenderer, TArgs>
+  context: StoryContext<TRenderer, TArgs>
 ) => Promise<void>;
 
-export type BaseAnnotations<TRenderer extends Renderer = Renderer, TArgs = Args> = {
+export interface BaseAnnotations<TRenderer extends Renderer = Renderer, TArgs = Args> {
   /**
    * Wrapper components or Storybook decorators that wrap a story.
    *
@@ -384,12 +387,10 @@ export type BaseAnnotations<TRenderer extends Renderer = Renderer, TArgs = Args>
    * Named tags for a story, used to filter stories in different contexts.
    */
   tags?: Tag[];
-};
+}
 
-export type ProjectAnnotations<
-  TRenderer extends Renderer = Renderer,
-  TArgs = Args
-> = BaseAnnotations<TRenderer, TArgs> & {
+export interface ProjectAnnotations<TRenderer extends Renderer = Renderer, TArgs = Args>
+  extends BaseAnnotations<TRenderer, TArgs> {
   argsEnhancers?: ArgsEnhancer<TRenderer, Args>[];
   argTypesEnhancers?: ArgTypesEnhancer<TRenderer, Args>[];
 
@@ -414,7 +415,7 @@ export type ProjectAnnotations<
   globalTypes?: GlobalTypes;
   applyDecorators?: DecoratorApplicator<TRenderer, Args>;
   runStep?: StepRunner<TRenderer, TArgs>;
-};
+}
 
 type StoryDescriptor = string[] | RegExp;
 export interface ComponentAnnotations<TRenderer extends Renderer = Renderer, TArgs = Args>