fix: handle all props getting ignored by shouldInclude

merceyz · Mar 28, 2020 · b69112e · b69112e
1 parent bfbe85a
commit b69112e
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 10 deletions.
diff --git a/src/generator.ts b/src/generator.ts
@@ -70,6 +70,10 @@ export function generate(node: t.Node | t.PropTypeNode[], options: GenerateOptio
 			filteredNodes = filteredNodes.filter((x) => shouldInclude(x));
 		}
 
+		if (filteredNodes.length === 0) {
+			return '';
+		}
+
 		return filteredNodes
 			.map((prop) => generate(prop, options))
 			.reduce((prev, curr) => `${prev}\n${curr}`);
@@ -82,14 +86,16 @@ export function generate(node: t.Node | t.PropTypeNode[], options: GenerateOptio
 	}
 
 	if (t.isComponentNode(node)) {
+		const generated = generate(node.types, options);
+		if (generated.length === 0) {
+			return '';
+		}
+
 		const comment =
 			options.comment &&
 			`// ${options.comment.split(/\r?\n/gm).reduce((prev, curr) => `${prev}\n// ${curr}`)}\n`;
 
-		return `${node.name}.propTypes = {\n${comment ? comment : ''}${generate(
-			node.types,
-			options
-		)}\n}`;
+		return `${node.name}.propTypes = {\n${comment ? comment : ''}${generated}\n}`;
 	}
 
 	if (t.isPropTypeNode(node)) {

diff --git a/src/injector.ts b/src/injector.ts
@@ -165,8 +165,6 @@ function plugin(
 
 				if (usedProps.length === 0 && !includeUnusedProps) return;
 
-				needImport = true;
-
 				// Prevent visiting again
 				(node as any).hasBeenVisited = true;
 				path.skip();
@@ -216,8 +214,6 @@ function plugin(
 
 					if (usedProps.length === 0 && !includeUnusedProps) return;
 
-					needImport = true;
-
 					// Prevent visiting again
 					(node as any).hasBeenVisited = true;
 					path.skip();
@@ -244,8 +240,6 @@ function plugin(
 
 				if (usedProps.length === 0 && !includeUnusedProps) return;
 
-				needImport = true;
-
 				// Prevent visiting again
 				(node as any).hasBeenVisited = true;
 				path.skip();
@@ -274,6 +268,12 @@ function plugin(
 			shouldInclude: (prop) => shouldInclude!({ prop, usedProps }),
 		});
 
+		if (source.length === 0) {
+			return;
+		}
+
+		needImport = true;
+
 		const placeholder = `const a${uuid().replace(/\-/g, '_')} = null;`;
 
 		mapOfPropTypes.set(placeholder, source);

diff --git a/test/injector/all-props-ignored/input.tsx b/test/injector/all-props-ignored/input.tsx
@@ -0,0 +1,3 @@
+export function Foo(props: { className: string }) {
+	return <div className={props.className}></div>;
+}
diff --git a/test/injector/all-props-ignored/options.ts b/test/injector/all-props-ignored/options.ts
@@ -0,0 +1,11 @@
+import { TestOptions } from '../../types';
+
+const options: TestOptions = {
+	injector: {
+		shouldInclude() {
+			return false;
+		},
+	},
+};
+
+export default options;
diff --git a/test/injector/all-props-ignored/output.js b/test/injector/all-props-ignored/output.js
@@ -0,0 +1,3 @@
+export function Foo(props) {
+	return <div className={props.className}></div>;
+}
diff --git a/test/injector/all-props-ignored/output.json b/test/injector/all-props-ignored/output.json
@@ -0,0 +1,12 @@
+{
+	"type": "ProgramNode",
+	"body": [
+		{
+			"type": "ComponentNode",
+			"name": "Foo",
+			"types": [
+				{ "type": "PropTypeNode", "name": "className", "propType": { "type": "StringNode" } }
+			]
+		}
+	]
+}