CsfFile: Improve meta error handling and fix failing test

storybookjs · Jan 6, 2025 · 3753cde · 3753cde
1 parent 84f2ae6
commit 3753cde
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/code/core/src/csf-tools/CsfFile.test.ts b/code/core/src/csf-tools/CsfFile.test.ts
@@ -2408,7 +2408,7 @@ describe('CsfFile', () => {
         `);
       });
 
-      it.only('local defineConfig', () => {
+      it('local defineConfig', () => {
         expect(() =>
           parse(
             dedent`

diff --git a/code/core/src/csf-tools/CsfFile.ts b/code/core/src/csf-tools/CsfFile.ts
@@ -521,11 +521,19 @@ export class CsfFile {
                     self._options.fileName
                   );
                 } else if (!self._metaIsFactory && storyIsFactory) {
-                  throw new BadMetaError(
-                    'meta() factory must be imported from .storybook/preview configuration',
-                    storyNode as t.Node,
-                    self._options.fileName
-                  );
+                  if (self._metaNode) {
+                    throw new MixedFactoryError(
+                      'expected non-factory story',
+                      storyNode as t.Node,
+                      self._options.fileName
+                    );
+                  } else {
+                    throw new BadMetaError(
+                      'meta() factory must be imported from .storybook/preview configuration',
+                      storyNode as t.Node,
+                      self._options.fileName
+                    );
+                  }
                 }
                 const parameters: { [key: string]: any } = {};
                 if (t.isObjectExpression(storyNode)) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2408,7 +2408,7 @@ describe('CsfFile', () => { @@
             `);
           });
-          it.only('local defineConfig', () => {
+          it('local defineConfig', () => {
             expect(() =>
               parse(
                 dedent`
@@ Expand Down @@