Fix tests

code/lib/codemod/src/transforms/__tests__/mdx-to-csf.test.ts

@@ -15,19 +15,6 @@ beforeEach(() => {
   fs.existsSync.mockImplementation(() => false);
 });
 
-test('rewrite import', () => {
-  const input = dedent`
-      import { Meta, Story } from '@storybook/addon-docs';
-    `;
-
-  const mdx = jscodeshift({ source: input, path: 'Foobar.stories.mdx' });
-
-  expect(mdx).toMatchInlineSnapshot(`
-    import { Meta, Story } from '@storybook/blocks';
-
-  `);
-});
-
 test('drop invalid story nodes', () => {
   const input = dedent`
       import { Meta } from '@storybook/addon-docs';
@@ -35,17 +22,22 @@ test('drop invalid story nodes', () => {
       <Meta title="Foobar" />
       
       <Story>No name!</Story>  
+      
+      <Story name="Primary">Story</Story>
+     
     `;
 
   const mdx = jscodeshift({ source: input, path: 'Foobar.stories.mdx' });
 
   expect(mdx).toMatchInlineSnapshot(`
-    import { Meta } from '@storybook/blocks';
-    import * as FoobarStories from './Foobar.stories';
+    import { Meta } from '@storybook/addon-docs';
 
     <Meta of={FoobarStories} />
 
 
+
+    <Story of={FoobarStories.Primary} />
+
   `);
 });
 
@@ -66,11 +58,11 @@ test('convert story re-definition', () => {
   expect(mdx).toMatchInlineSnapshot(`
     import { Meta, Story } from '@storybook/blocks';
     import { Primary } from './Foobar.stories';
-    import * as Foobar_Stories from './Foobar_.stories';
+    import * as FoobarStories from './Foobar_.stories';
 
-    <Meta of={Foobar_Stories} />
+    <Meta of={FoobarStories} />
 
-    <Story of={Foobar_Stories.Primary} />
+    <Story of={FoobarStories.Primary} />
 
   `);
   const [csfFileName, csf] = fs.writeFileSync.mock.calls[0];
@@ -261,11 +253,13 @@ test('extract esm into csf head code', () => {
 
 test('extract all meta parameters', () => {
   const input = dedent`
-      import { Meta } from '@storybook/addon-docs';
+      import { Meta, Story } from '@storybook/addon-docs';
 
       export const args = { bla: 1 };
       
       <Meta title="foobar" args={{...args}} parameters={{a: '1'}} />
+      
+      <Story name="foo">bar</Story>
     `;
 
   jscodeshift({ source: input, path: 'Foobar.stories.mdx' });
@@ -273,21 +267,26 @@ test('extract all meta parameters', () => {
   const [, csf] = fs.writeFileSync.mock.calls[0];
 
   expect(csf).toMatchInlineSnapshot(`
-      const args = { bla: 1 };
+    const args = { bla: 1 };
 
-      export default {
-        title: 'foobar',
+    export default {
+      title: 'foobar',
 
-        args: {
-          ...args,
-        },
+      args: {
+        ...args,
+      },
 
-        parameters: {
-          a: '1',
-        },
-      };
+      parameters: {
+        a: '1',
+      },
+    };
 
-    `);
+    export const Foo = {
+      render: () => 'bar',
+      name: 'foo',
+    };
+
+  `);
 });
 
 test('extract all story attributes', () => {

code/lib/codemod/src/transforms/mdx-to-csf.ts

@@ -68,11 +68,16 @@ export function transform(source: string, baseName: string): [mdx: string, csf:
     | {
         type: 'reference';
       }
+    | {
+        type: 'id';
+      }
   >();
 
   // rewrite addon docs import
   visit(root, ['mdxjsEsm'], (node: MdxjsEsm) => {
-    node.value = node.value.replace('@storybook/addon-docs', '@storybook/blocks');
+    node.value = node.value
+      .replaceAll('@storybook/addon-docs', '@storybook/blocks')
+      .replaceAll('@storybook/addon-docs/blocks', '@storybook/blocks');
   });
 
   visit(
@@ -129,6 +134,7 @@ export function transform(source: string, baseName: string): [mdx: string, csf:
             type: 'mdxFlowExpression',
             value: `/* ${nodeString} is deprecated, please migrate it to <Story of={referenceToStory} /> */`,
           };
+          storiesMap.set(idAttribute.value as string, { type: 'id' });
           parent.children.splice(index, 0, newNode);
           // current index is the new comment, and index + 1 is current node
           // SKIP traversing current node, and continue with the node after that
@@ -247,11 +253,12 @@ export function transform(source: string, baseName: string): [mdx: string, csf:
   }
 
   newStatements.push(
-    ...[...storiesMap].map(([key, value]) => {
+    ...[...storiesMap].flatMap(([key, value]) => {
+      if (value.type === 'id') return [];
       if (value.type === 'reference') {
-        return t.exportNamedDeclaration(null, [
-          t.exportSpecifier(t.identifier(key), t.identifier(key)),
-        ]);
+        return [
+          t.exportNamedDeclaration(null, [t.exportSpecifier(t.identifier(key), t.identifier(key))]),
+        ];
       }
       const renderProperty = mapChildrenToRender(value.children);
       const newObject = t.objectExpression([
@@ -281,11 +288,13 @@ export function transform(source: string, baseName: string): [mdx: string, csf:
         newExportName += '_';
       }
 
-      return t.exportNamedDeclaration(
-        t.variableDeclaration('const', [
-          t.variableDeclarator(t.identifier(newExportName), newObject),
-        ])
-      );
+      return [
+        t.exportNamedDeclaration(
+          t.variableDeclaration('const', [
+            t.variableDeclarator(t.identifier(newExportName), newObject),
+          ])
+        ),
+      ];
     })
   );