fix: replace existing propTypes when removeExistingPropTypes

Author: eps1lon

src/injector.ts

@@ -119,6 +119,7 @@ function plugin(
 	let needImport = false;
 	let alreadyImported = false;
 	let previousPropTypesSource = new Map<string, string>();
+	let originalPropTypesPath: null | babel.NodePath = null;
 
 	return {
 		visitor: {
@@ -159,9 +160,7 @@ function plugin(
 								});
 							}
 
-							if (removeExistingPropTypes) {
-								nodePath.remove();
-							}
+							originalPropTypesPath = nodePath;
 						}
 					});
 				},
@@ -312,8 +311,9 @@ function plugin(
 
 		mapOfPropTypes.set(placeholder, source);
 
-		// Insert prop types
-		if (babelTypes.isExportNamedDeclaration(path.parent)) {
+		if (removeExistingPropTypes && originalPropTypesPath !== null) {
+			originalPropTypesPath.replaceWith(babel.template.ast(placeholder) as babelTypes.Statement);
+		} else if (babelTypes.isExportNamedDeclaration(path.parent)) {
 			path.insertAfter(babel.template.ast(`export { ${nodeName} };`));
 			path.insertAfter(babel.template.ast(placeholder));
 			path.parentPath.replaceWith(path.node);

test/code-order/input.d.ts

@@ -0,0 +1,7 @@
+import * as React from 'react';
+
+export interface Props {
+	value: unknown;
+}
+
+export default function Component(props: Props): JSX.Element;

test/code-order/input.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+function Component(props) {
+	const { value } = props;
+	return <div>{value}</div>;
+}
+
+const someValidator = () => new Error();
+
+Component.propTypes = {
+	value: PropTypes.any,
+};
+
+export default Component;

test/code-order/options.ts

@@ -0,0 +1,9 @@
+import { TestOptions } from '../types';
+
+const options: TestOptions = {
+	injector: {
+		removeExistingPropTypes: true,
+	},
+};
+
+export default options;

test/code-order/output.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+function Component(props) {
+	const { value } = props;
+	return <div>{value}</div>;
+}
+
+const someValidator = () => new Error();
+
+Component.propTypes = {
+	value: PropTypes.any.isRequired,
+};
+
+export default Component;

test/code-order/output.json

@@ -0,0 +1,10 @@
+{
+	"type": "ProgramNode",
+	"body": [
+		{
+			"type": "ComponentNode",
+			"name": "Component",
+			"types": [{ "type": "PropTypeNode", "name": "value", "propType": { "type": "AnyNode" } }]
+		}
+	]
+}

test/index.test.ts

@@ -58,9 +58,9 @@ for (const testCase of testCases) {
 		}
 
 		let result = '';
-		// For d.ts-only files we just generate the AST
+		// For d.ts files we just generate the AST
 		if (!inputSource) {
-			result = ttp.generate(ast);
+			result = ttp.generate(ast, options.generator);
 		}
 		// For .tsx? files we transpile them and inject the proptypes
 		else {