From b8df411f88abefb49607284431c21ab4760cf2cf Mon Sep 17 00:00:00 2001
From: Artem Sapegin <artem@sapegin.ru>
Date: Sat, 20 Feb 2021 08:29:44 +0100
Subject: [PATCH] Don't prepend the current component import if it's the only
 import

---
 .../rehype/__tests__/exportStories.spec.ts    | 62 ++++++++++++++++++-
 src/loaders/rehype/exportStories.ts           | 27 +++++---
 2 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/src/loaders/rehype/__tests__/exportStories.spec.ts b/src/loaders/rehype/__tests__/exportStories.spec.ts
index 965f8f708..45dfa1abf 100644
--- a/src/loaders/rehype/__tests__/exportStories.spec.ts
+++ b/src/loaders/rehype/__tests__/exportStories.spec.ts
@@ -153,6 +153,64 @@ export const basic = () => <Container><Buttons.Button /></Container>
 	`);
 	});
 
+	test('skips current component', async () => {
+		const result = await compile(
+			`Henlo`,
+			`
+import Pizza from './Pizza';
+import Container from './Container';
+export const basic = () => <Container><Pizza /></Container>
+`
+		);
+		expect(result).toMatchInlineSnapshot(`
+		"
+		import * as __story_import_0 from './Pizza'
+		import * as __story_import_1 from './Container'
+		export const __namedExamples = {
+		  'basic': 'import Container from \\\\'./Container\\\\';\\\\n\\\\n<Container><Pizza /></Container>'
+		};
+		export const __storiesScope = {
+		  './Pizza': __story_import_0,
+		  './Container': __story_import_1
+		};
+
+		const layoutProps = {
+		  __namedExamples,
+		__storiesScope
+		};
+		"
+	`);
+	});
+
+	test('includes the current component when it is not the only import', async () => {
+		const result = await compile(
+			`Henlo`,
+			`
+import Pizza, { cheese } from './Pizza';
+import Container from './Container';
+export const basic = () => <Container><Pizza toppings={[cheese]} /></Container>
+`
+		);
+		expect(result).toMatchInlineSnapshot(`
+		"
+		import * as __story_import_0 from './Pizza'
+		import * as __story_import_1 from './Container'
+		export const __namedExamples = {
+		  'basic': 'import Pizza, { cheese } from \\\\'./Pizza\\\\';\\\\nimport Container from \\\\'./Container\\\\';\\\\n\\\\n<Container><Pizza toppings={[cheese]} /></Container>'
+		};
+		export const __storiesScope = {
+		  './Pizza': __story_import_0,
+		  './Container': __story_import_1
+		};
+
+		const layoutProps = {
+		  __namedExamples,
+		__storiesScope
+		};
+		"
+	`);
+	});
+
 	test('unused imports', async () => {
 		const result = await compile(
 			`Henlo`,
@@ -182,7 +240,7 @@ export const basic = () => <Container><Button /></Container>
 	`);
 	});
 
-	test('add semicolon', async () => {
+	test('adds semicolon', async () => {
 		const result = await compile(
 			`Henlo`,
 			`
@@ -354,7 +412,7 @@ export const basic = () => <Container>{javascript}</Container>
 	`);
 	});
 
-	test('add semicolon', async () => {
+	test('adds semicolon', async () => {
 		const result = await compile(
 			`Henlo`,
 			`
diff --git a/src/loaders/rehype/exportStories.ts b/src/loaders/rehype/exportStories.ts
index 10855f346..fad94b166 100644
--- a/src/loaders/rehype/exportStories.ts
+++ b/src/loaders/rehype/exportStories.ts
@@ -206,9 +206,17 @@ const getExportCode = (node: Declaration, code: string) => {
 // because we only check whether the dependency local name is present in the
 // example code. However, it won't break the code by not including all the used
 // dependencies
-const prependExampleWithDependencies = (code: string, dependencies: Dependency[]) => {
-	const usedDependencies = dependencies.filter((dependency) =>
-		dependency.names.some((name) => code.match(new RegExp(`\\b${name}\\b`)))
+const prependExampleWithDependencies = (
+	code: string,
+	dependencies: Dependency[],
+	component: string
+) => {
+	const usedDependencies = dependencies.filter(
+		(dependency) =>
+			// Ignore the current component import it it's the only import
+			!(dependency.names.length === 1 && dependency.names[0] === component) &&
+			// Include imports when any of the names are present in the code
+			dependency.names.some((name) => code.match(new RegExp(`\\b${name}\\b`)))
 	);
 	return [
 		usedDependencies
@@ -221,7 +229,7 @@ const prependExampleWithDependencies = (code: string, dependencies: Dependency[]
 		.join('\n\n');
 };
 
-const getExports = (ast: Program, code: string) => {
+const getExports = (ast: Program, code: string, component: string) => {
 	const imports = getImportStatements(ast, code);
 	const variables = getVariableStatements(ast, code);
 
@@ -234,10 +242,11 @@ const getExports = (ast: Program, code: string) => {
 				if (exportNamedDeclaratioNode.declaration) {
 					const exportCode = getExportCode(exportNamedDeclaratioNode.declaration, code);
 					if (exportCode) {
-						exports[exportCode.name] = prependExampleWithDependencies(exportCode.code, [
-							...imports,
-							...variables,
-						]);
+						exports[exportCode.name] = prependExampleWithDependencies(
+							exportCode.code,
+							[...imports, ...variables],
+							component
+						);
 					}
 				}
 			}
@@ -284,7 +293,7 @@ export default ({ component, resourcePath }: { component: string; resourcePath:
 	}
 
 	// Generate export for named examples
-	const exports = getExports(storiesAst, storiesCode);
+	const exports = getExports(storiesAst, storiesCode, component);
 	const examplesExportCode = `export const __namedExamples = ${generate(toAst(exports))}`;
 	tree.children.push({
 		type: 'export',