Skip to content

Commit

Permalink
fix: better coverage for un-if-statement
Browse files Browse the repository at this point in the history
  • Loading branch information
@pionxzh
pionxzh committed Aug 12, 2023
1 parent ed24762 commit 7cbdacf
Show file tree
Hide file tree
Showing 2 changed files with 171 additions and 45 deletions.
116 changes: 116 additions & 0 deletions packages/unminify/src/transformations/__tests__/un-if-statement.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
import transform from '../un-if-statement'
import { defineInlineTest } from './test-utils'

const inlineTest = defineInlineTest(transform)

inlineTest('nested ternary expression',
`
a ? b() : c ? d() : e()
`,
`
if (a) {
b();
}
if (c) {
d();
}
e()
`,
)

inlineTest('nested logical expression',
`
x == 'a' || x == 'b' || x == 'c' && x == 'd'
`,
`
x == 'a' || x == 'b' || x == 'c' && x == 'd'
`,
)

// inlineTest('return simple logical expression',
// `
// return x == 'a' || x == 'b' || x == 'c' && x == 'd'
// `,
// `
// if (!)
// `,
// )

inlineTest('simple ternary expression',
`
x ? a() : b()
`,
`
if (x) {
a();
} else {
b();
}
`,
)

inlineTest('simple logical expression',
`
x && a();
x || b();
x ?? c();
`,
`
if (x) {
a();
};
if (!x) {
b();
};
if (x == null) {
c();
};
`,
)

inlineTest('should not transform if statement',
`
var foo = x && a();
bar = x || a();
if (x && a()) {
b();
}
arr.push(x && a());
arr.push({ prop: x && a() });
function fn() {
return x ? a() : b()
}
function fn2(p = x && a()) {
return p && b();
}
`,
`
var foo = x && a();
bar = x || a();
if (x && a()) {
b();
}
arr.push(x && a());
arr.push({ prop: x && a() });
function fn() {
return x ? a() : b()
}
function fn2(p = x && a()) {
return p && b();
}
`,
)
100 changes: 55 additions & 45 deletions packages/unminify/src/transformations/un-if-statement.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,53 +77,53 @@ export const transformAST: ASTTransformation = (context) => {
* x == 'a' || x == 'b' || x == 'c' && x == 'd'
*/

/**
* Return simple ternary expression
*
* `return x ? a() : b()` -> `if (x) { return a() } else { return b() }`
*/
root
.find(j.ReturnStatement, {
argument: {
type: 'ConditionalExpression',
},
})
.forEach((path) => {
const { test, consequent, alternate } = path.node.argument as ConditionalExpression
const consequentReturn = j.blockStatement([j.returnStatement(consequent)])
const alternateReturn = j.blockStatement([j.returnStatement(alternate)])
const replacement = j.ifStatement(test, consequentReturn, alternateReturn)
j(path).replaceWith(replacement)
})
// /**
// * Return simple ternary expression
// *
// * `return x ? a() : b()` -> `if (x) { return a() } else { return b() }`
// */
// root
// .find(j.ReturnStatement, {
// argument: {
// type: 'ConditionalExpression',
// },
// })
// .forEach((path) => {
// const { test, consequent, alternate } = path.node.argument as ConditionalExpression
// const consequentReturn = j.blockStatement([j.returnStatement(consequent)])
// const alternateReturn = j.blockStatement([j.returnStatement(alternate)])
// const replacement = j.ifStatement(test, consequentReturn, alternateReturn)
// j(path).replaceWith(replacement)
// })

/**
* Return simple logical expression
* `return x && a()` -> `if (x) { return a() }`
* `return x || a()` -> `if (!x) { return a() }`
* `return x ?? a()` -> `if (x == null) { return a() }`
*/
root
.find(j.ReturnStatement, {
argument: {
type: 'LogicalExpression',
operator: (operator: string) => ['&&', '||', '??'].includes(operator),
},
})
.forEach((path) => {
const { node } = path
if (!j.LogicalExpression.check(node.argument)) return
// /**
// * Return simple logical expression
// * `return x && a()` -> `if (x) { return a() }`
// * `return x || a()` -> `if (!x) { return a() }`
// * `return x ?? a()` -> `if (x == null) { return a() }`
// */
// root
// .find(j.ReturnStatement, {
// argument: {
// type: 'LogicalExpression',
// operator: (operator: string) => ['&&', '||', '??'].includes(operator),
// },
// })
// .forEach((path) => {
// const { node } = path
// if (!j.LogicalExpression.check(node.argument)) return

const { operator, left, right } = node.argument
const test = operator === '&&'
? left
: operator === '||'
? j.unaryExpression('!', left)
: j.binaryExpression('==', left, NullIdentifier)
const consequent = j.blockStatement([j.returnStatement(right)])
const alternate = null
const replacement = j.ifStatement(test, consequent, alternate)
j(path).replaceWith(replacement)
})
// const { operator, left, right } = node.argument
// const test = operator === '&&'
// ? left
// : operator === '||'
// ? j.unaryExpression('!', left)
// : j.binaryExpression('==', left, NullIdentifier)
// const consequent = j.blockStatement([j.returnStatement(right)])
// const alternate = null
// const replacement = j.ifStatement(test, consequent, alternate)
// j(path).replaceWith(replacement)
// })

/**
* Simple ternary expression
Expand All @@ -142,6 +142,7 @@ export const transformAST: ASTTransformation = (context) => {
if (j.SequenceExpression.check(path.parentPath.node)) return
if (j.VariableDeclarator.check(path.parentPath.node)) return
if (j.AssignmentExpression.check(path.parentPath.node)) return
if (j.ReturnStatement.check(path.parentPath.node)) return
if (j.ArrowFunctionExpression.check(path.parentPath.node)) return

const { node } = path
Expand All @@ -166,14 +167,23 @@ export const transformAST: ASTTransformation = (context) => {
operator: (operator: string) => ['&&', '||', '??'].includes(operator),
})
.forEach((path) => {
if (j.Property.check(path.parentPath.node)) return
if (j.MemberExpression.check(path.parentPath.node)) return
if (j.IfStatement.check(path.parentPath.node)) return
if (j.LogicalExpression.check(path.parentPath.node)) return
if (j.ForStatement.check(path.parentPath.node)) return
if (j.ReturnStatement.check(path.parentPath.node)) return
// TODO: need to come up with a better way to handle LogicalExpression in SequenceExpression
if (j.SequenceExpression.check(path.parentPath.node)) return
if (j.VariableDeclarator.check(path.parentPath.node)) return
if (j.AssignmentExpression.check(path.parentPath.node)) return
if (j.AssignmentPattern.check(path.parentPath.node)) return
if (j.CallExpression.check(path.parentPath.node)) return
if (j.ConditionalExpression.check(path.parentPath.node)) return
if (j.ArrowFunctionExpression.check(path.parentPath.node)) return
if (j.ExportDeclaration.check(path.parentPath.node)) return
if (j.ExportDefaultDeclaration.check(path.parentPath.node)) return
if (j.UnaryExpression.check(path.parentPath.node)) return

const { node } = path
const { operator, left, right } = node
Expand Down

0 comments on commit 7cbdacf

Please sign in to comment.