diff --git a/config.ts b/config.ts index 89e079b..2d0416e 100644 --- a/config.ts +++ b/config.ts @@ -14,24 +14,9 @@ export const TRANSFORM_OPTIONS = [ value: 'v4-deprecated-signatures', version: '5.0.0', }, - { - description: 'Reverse param order for "redirect" method', - value: 'redirect', - version: '5.0.0', - }, { description: 'Change request.param() to dedicated methods', value: 'req-param', version: '5.0.0', }, - { - description: 'Convert method name "sendfile" to "sendFile"', - value: 'send-file', - version: '5.0.0', - }, - { - description: 'Convert method name "del" to "delete"', - value: 'full-name-delete', - version: '5.0.0', - }, ] diff --git a/transforms/__test__/full-name-delete.spec.ts b/transforms/__test__/full-name-delete.spec.ts deleted file mode 100644 index a200864..0000000 --- a/transforms/__test__/full-name-delete.spec.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { testSpecBuilder } from './util' - -testSpecBuilder('full-name-delete') diff --git a/transforms/__test__/redirect.spec.ts b/transforms/__test__/redirect.spec.ts deleted file mode 100644 index aaab3db..0000000 --- a/transforms/__test__/redirect.spec.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { testSpecBuilder } from './util' - -testSpecBuilder('redirect') diff --git a/transforms/__test__/send-file.spec.ts b/transforms/__test__/send-file.spec.ts deleted file mode 100644 index 1953788..0000000 --- a/transforms/__test__/send-file.spec.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { testSpecBuilder } from './util' - -testSpecBuilder('send-file') diff --git a/transforms/__testfixtures__/full-name-delete/delete.input.ts b/transforms/__testfixtures__/v4-deprecated-signatures/delete.input.ts similarity index 100% rename from transforms/__testfixtures__/full-name-delete/delete.input.ts rename to transforms/__testfixtures__/v4-deprecated-signatures/delete.input.ts diff --git a/transforms/__testfixtures__/full-name-delete/delete.output.ts b/transforms/__testfixtures__/v4-deprecated-signatures/delete.output.ts similarity index 100% rename from transforms/__testfixtures__/full-name-delete/delete.output.ts rename to transforms/__testfixtures__/v4-deprecated-signatures/delete.output.ts diff --git a/transforms/__testfixtures__/redirect/redirect.input.ts b/transforms/__testfixtures__/v4-deprecated-signatures/redirect.input.ts similarity index 100% rename from transforms/__testfixtures__/redirect/redirect.input.ts rename to transforms/__testfixtures__/v4-deprecated-signatures/redirect.input.ts diff --git a/transforms/__testfixtures__/redirect/redirect.output.ts b/transforms/__testfixtures__/v4-deprecated-signatures/redirect.output.ts similarity index 100% rename from transforms/__testfixtures__/redirect/redirect.output.ts rename to transforms/__testfixtures__/v4-deprecated-signatures/redirect.output.ts diff --git a/transforms/__testfixtures__/send-file/send-file.input.ts b/transforms/__testfixtures__/v4-deprecated-signatures/send-file.input.ts similarity index 100% rename from transforms/__testfixtures__/send-file/send-file.input.ts rename to transforms/__testfixtures__/v4-deprecated-signatures/send-file.input.ts diff --git a/transforms/__testfixtures__/send-file/send-file.output.ts b/transforms/__testfixtures__/v4-deprecated-signatures/send-file.output.ts similarity index 100% rename from transforms/__testfixtures__/send-file/send-file.output.ts rename to transforms/__testfixtures__/v4-deprecated-signatures/send-file.output.ts diff --git a/transforms/full-name-delete.ts b/transforms/full-name-delete.ts deleted file mode 100644 index 4422cff..0000000 --- a/transforms/full-name-delete.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { type API, type FileInfo, Identifier, identifier } from 'jscodeshift' -import { getParsedFile } from '../utils/parse' - -export default function transformer(file: FileInfo, _api: API) { - const parsedFile = getParsedFile(file) - - parsedFile - .find(Identifier, { - name: 'del', - }) - .replaceWith(() => identifier('delete')) - - return parsedFile.toSource() -} diff --git a/transforms/redirect.ts b/transforms/redirect.ts deleted file mode 100644 index 0853733..0000000 --- a/transforms/redirect.ts +++ /dev/null @@ -1,23 +0,0 @@ -import type { API, FileInfo } from 'jscodeshift' -import { CallExpression, withParser } from 'jscodeshift' - -export default function transformer(file: FileInfo, _api: API): string { - const parser = withParser('ts') - - return parser(file.source) - .find(CallExpression, { - callee: { - property: { - name: 'redirect', - }, - }, - }) - .map((path) => { - if (path.value.arguments.length === 2) { - path.value.arguments.reverse() - } - - return path - }) - .toSource() -} diff --git a/transforms/send-file.ts b/transforms/send-file.ts deleted file mode 100644 index 93b52a1..0000000 --- a/transforms/send-file.ts +++ /dev/null @@ -1,23 +0,0 @@ -import type { API, FileInfo } from 'jscodeshift' -import { CallExpression, withParser } from 'jscodeshift' - -export default function transformer(file: FileInfo, _api: API): string { - const parser = withParser('ts') - - return parser(file.source) - .find(CallExpression, { - callee: { - property: { - name: 'sendfile', - }, - }, - }) - .map((path) => { - if (path.node.callee.type === 'MemberExpression' && path.node.callee.property.type === 'Identifier') { - path.node.callee.property.name = 'sendFile' - } - - return path - }) - .toSource() -} diff --git a/transforms/v4-deprecated-signatures.ts b/transforms/v4-deprecated-signatures.ts index 56d96ed..d54fda2 100644 --- a/transforms/v4-deprecated-signatures.ts +++ b/transforms/v4-deprecated-signatures.ts @@ -1,5 +1,5 @@ import type { API, ASTPath, FileInfo } from 'jscodeshift' -import { CallExpression, callExpression, identifier, memberExpression, withParser } from 'jscodeshift' +import { CallExpression, Identifier, callExpression, identifier, memberExpression, withParser } from 'jscodeshift' import { recursiveParent } from '../utils/recursiveParent' const separateStatusAndBody = (path: ASTPath, calleePropertyName: string) => { @@ -93,5 +93,43 @@ export default function transformer(file: FileInfo, _api: API): string { return path }) + parsedFile + .find(Identifier, { + name: 'del', + }) + .replaceWith(() => identifier('delete')) + + parsedFile + .find(CallExpression, { + callee: { + property: { + name: 'sendfile', + }, + }, + }) + .map((path) => { + if (path.node.callee.type === 'MemberExpression' && path.node.callee.property.type === 'Identifier') { + path.node.callee.property.name = 'sendFile' + } + + return path + }) + + parsedFile + .find(CallExpression, { + callee: { + property: { + name: 'redirect', + }, + }, + }) + .map((path) => { + if (path.value.arguments.length === 2) { + path.value.arguments.reverse() + } + + return path + }) + return parsedFile.toSource() }