fix: changed to use j.ObjectProperty instead of j.Property

wheresrhys · Sep 19, 2024 · 78c2e35 · 78c2e35
1 parent 376d5c3
commit 78c2e35
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 31 deletions.
diff --git a/packages/codemods/src/__test__/option-codemods.test.js b/packages/codemods/src/__test__/option-codemods.test.js
@@ -210,7 +210,8 @@ describe('codemods operating on options', () => {
 				`Object.assign(fetchMock.config, {fallbackToNetwork: true, other: 'value'})`,
 				`Object.assign(fetchMock.config, {
   other: 'value'
-})${errorString}`,
+});
+${errorString}`,
 			);
 		});
 	});

diff --git a/packages/codemods/src/codemods/methods.js b/packages/codemods/src/codemods/methods.js
@@ -1,4 +1,4 @@
-const j = require('jscodeshift');
+const j = require('jscodeshift').withParser('tsx');
 
 function getAllChainedMethodCalls(fetchMockVariableName, root) {
 	return root
@@ -31,7 +31,6 @@ module.exports.simpleMethods = function(fetchMockVariableName, root) {
 	const fetchMockMethodCalls = getAllChainedMethodCalls(
 		fetchMockVariableName,
 		root,
-		j,
 	);
 
 	fetchMockMethodCalls.forEach((path) => {
@@ -43,6 +42,7 @@ module.exports.simpleMethods = function(fetchMockVariableName, root) {
 		if (method === 'resetHistory') {
 			path.value.callee.property.name = 'clearHistory';
 		}
+
 		['get', 'post', 'put', 'delete', 'head', 'patch'].some((httpMethod) => {
 			let prependStar = false;
 			if (method === `${httpMethod}Any`) {

diff --git a/packages/codemods/src/codemods/options.js b/packages/codemods/src/codemods/options.js
@@ -1,4 +1,4 @@
-const j = require('jscodeshift');
+const j = require('jscodeshift').withParser('tsx');
 const { getAllChainedMethodCalls } = require('./methods.js');
 const simpleOptionNames = ['overwriteRoutes', 'warnOnFallback', 'sendAsJson'];
 
@@ -46,7 +46,7 @@ module.exports.simpleOptions = function(fetchMockVariableName, root) {
 				},
 			},
 		});
-		const objectAssignments = configSets.find(j.Property, { key: { name } });
+		const objectAssignments = configSets.find(j.ObjectProperty, { key: { name } });
 
 		if (name === 'fallbackToNetwork') {
 			const errorMessage =
@@ -72,23 +72,23 @@ module.exports.simpleOptions = function(fetchMockVariableName, root) {
 	);
 
 	[
-		'once',
-		'route',
-		'sticky',
-		'any',
-		'anyOnce',
+		// 'once',
+		// 'route',
+		// 'sticky',
+		// 'any',
+		// 'anyOnce',
 		'get',
-		'getOnce',
-		'post',
-		'postOnce',
-		'put',
-		'putOnce',
-		'delete',
-		'deleteOnce',
-		'head',
-		'headOnce',
-		'patch',
-		'patchOnce',
+		// 'getOnce',
+		// 'post',
+		// 'postOnce',
+		// 'put',
+		// 'putOnce',
+		// 'delete',
+		// 'deleteOnce',
+		// 'head',
+		// 'headOnce',
+		// 'patch',
+		// 'patchOnce',
 	].some((methodName) => {
 		const optionsObjects = fetchMockMethodCalls
 			.filter((path) => path.value.callee.property.name === methodName)
@@ -102,13 +102,12 @@ module.exports.simpleOptions = function(fetchMockVariableName, root) {
 					})
 					.paths();
 			});
-
 		if (!optionsObjects.length) {
 			return;
 		}
 		simpleOptionNames.forEach((optionName) => {
 			optionsObjects
-				.find(j.Property, {
+				.find(j.ObjectProperty, {
 					key: { name: optionName },
 				})
 				.remove();

diff --git a/packages/codemods/try.js b/packages/codemods/try.js
@@ -1,12 +1,8 @@
-import { codemod } from './src/index.js';
-import jscodeshift from 'jscodeshift';
+const { codemod } = require( './src/index.js');
 
 console.log(
 	codemod(
-		`
-const fetchMock = require('fetch-mock');
-jest.mock('node-fetch', () => fetchMock.fetchHandler)
-`,
-		jscodeshift,
-	),
+		`const fetchMock = require('fetch-mock');
+fetchMock.get('*', 200, {name: 'rio', sendAsJson: true});
+`),
 );