Merge pull request #12099 from petermikitsh/fix-11994

Source-loader: Fix default exports of type TSAsExpression
storybookjs · Aug 19, 2020 · 231886e · 231886e
2 parents 2412c1e + 2ecbd85
commit 231886e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/examples/react-ts/main.ts b/examples/react-ts/main.ts
@@ -3,7 +3,20 @@ import type { StorybookConfig } from '@storybook/core/types';
 module.exports = {
   stories: ['./src/*.stories.*'],
   logLevel: 'debug',
-  addons: ['@storybook/addon-essentials', '@storybook/addon-controls'],
+  addons: [
+    '@storybook/addon-essentials',
+    '@storybook/addon-controls',
+    '@storybook/addon-storysource',
+    {
+      name: '@storybook/addon-docs',
+      options: {
+        sourceLoaderOptions: {
+          parser: 'typescript',
+          injectStoryParameters: false,
+        },
+      },
+    },
+  ],
   typescript: {
     check: true,
     checkOptions: {},

diff --git a/examples/react-ts/src/button.stories.tsx b/examples/react-ts/src/button.stories.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
+import { Meta } from '@storybook/react/types-6-0';
 import { Button } from './button';
 
-export default { component: Button, title: 'Examples / Button' };
+export default { component: Button, title: 'Examples / Button' } as Meta;
 
 export const WithArgs = (args: any) => <Button {...args} />;
 WithArgs.args = { label: 'With args' };

diff --git a/lib/source-loader/src/abstract-syntax-tree/traverse-helpers.js b/lib/source-loader/src/abstract-syntax-tree/traverse-helpers.js
@@ -208,20 +208,26 @@ export function popParametersObjectFromDefaultExport(source, ast) {
     enter: (node) => {
       patchNode(node);
 
+      const isDefaultExport = node.type === 'ExportDefaultDeclaration';
+      const isObjectExpression = node.declaration?.type === 'ObjectExpression';
+      const isTsAsExpression = node.declaration?.type === 'TSAsExpression';
+
+      const targetNode = isObjectExpression ? node.declaration : node.declaration?.expression;
+
       if (
-        node.type === 'ExportDefaultDeclaration' &&
-        node.declaration.type === 'ObjectExpression' &&
-        (node.declaration.properties || []).length
+        isDefaultExport &&
+        (isObjectExpression || isTsAsExpression) &&
+        (targetNode.properties || []).length
       ) {
-        const parametersProperty = node.declaration.properties.find(
+        const parametersProperty = targetNode.properties.find(
           (p) => p.key.name === 'parameters' && p.value.type === 'ObjectExpression'
         );
 
         foundParametersProperty = !!parametersProperty;
         if (foundParametersProperty) {
           patchNode(parametersProperty.value);
         } else {
-          patchNode(node.declaration);
+          patchNode(targetNode);
         }
 
         splicedSource = parametersProperty
@@ -235,7 +241,7 @@ export function popParametersObjectFromDefaultExport(source, ast) {
 
         indexWhereToAppend = parametersProperty
           ? parametersProperty.value.start
-          : node.declaration.start + 1;
+          : targetNode.start + 1;
       }
     },
   });