Skip to content

fix(to-arrow): add missing modifiers/computed #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antfu merged 1 commit into from
May 3, 2024
Merged

fix(to-arrow): add missing modifiers/computed #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/commands/to-arrow.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ run(
code: d`
const bar = {
/// to-arrow
async bar(a: number, b: number): number {
async [bar]?(a: number, b: number): number {
return a + b
},
foo() {
Expand All @@ -54,7 +54,7 @@ run(
}`,
output: d`
const bar = {
bar: async (a: number, b: number): number => {
[bar]: async (a: number, b: number): number => {
return a + b
},
foo() {
Expand All @@ -63,12 +63,22 @@ run(
}`,
errors: ['command-removal', 'command-fix'],
},
// Getter/setter
{
code: d`
const bar = {
/// to-arrow
get id() {}
}`,
output: null,
errors: 'command-error',
},
// Class method
{
code: d`
class Bar {
/// to-arrow
async bar(a: number, b: number): number {
private static override async [bar]?(a: number, b: number): number {
return a + b
}
foo() {
Expand All @@ -77,7 +87,7 @@ run(
}`,
output: d`
class Bar {
bar = async (a: number, b: number): number => {
private static override [bar] ? = async (a: number, b: number): number => {
return a + b
}
foo() {
Expand Down
32 changes: 19 additions & 13 deletions src/commands/to-arrow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ export const toArrow: Command = {
let rangeStart = fn.range[0]
const rangeEnd = fn.range[1]

const parent = fn.parent

if (parent.type === 'Property' && parent.kind !== 'init')
return ctx.reportError(`Cannot convert ${parent.kind}ter property to arrow function`)

ctx.removeComment()
ctx.report({
node: fn,
Expand Down Expand Up @@ -42,24 +47,25 @@ export const toArrow: Command = {
}

// For object methods
else if (fn.parent.type === 'Property') {
rangeStart = fn.parent.range[0]
textName = ctx.getTextOf(fn.parent.key)
final = `${textName}: ${final}`
else if (parent.type === 'Property') {
rangeStart = parent.range[0]
textName = ctx.getTextOf(parent.key)
final = `${parent.computed ? `[${textName}]` : textName}: ${final}`
}

// For class methods
else if (fn.parent.type === 'MethodDefinition') {
rangeStart = fn.parent.range[0]
textName = ctx.getTextOf(fn.parent.key)
final = `${textName} = ${final}`
else if (parent.type === 'MethodDefinition') {
rangeStart = parent.range[0]
textName = ctx.getTextOf(parent.key)
final = `${[
parent.accessibility,
parent.static && 'static',
parent.override && 'override',
parent.computed ? `[${textName}]` : textName,
parent.optional && '?',
].filter(Boolean).join(' ')} = ${final}`
}

// console.log({
// final,
// original: code.slice(rangeStart, rangeEnd),
// p: fn.parent.type,
// })
return fixer.replaceTextRange([rangeStart, rangeEnd], final)
},
})
Expand Down