Skip to content

refactor: tidy up #112

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

Closed
wants to merge 1 commit into from
Closed

refactor: tidy up #112

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
33 changes: 14 additions & 19 deletions src/transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,12 @@ export const MagicRegExpTransformPlugin = createUnplugin(() => {
const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href))
const { type } = parseQuery(search)

// vue files
if (pathname.endsWith('.vue') && (type === 'script' || !search)) {
return true
}

// js files
if (pathname.match(/\.((c|m)?j|t)sx?$/g)) {
return true
}

return false
return !!(
(
(pathname.endsWith('.vue') && (type === 'script' || !search)) || // vue files
pathname.match(/\.((c|m)?j|t)sx?$/g)
) // js files
)
},
transform(code, id) {
if (!code.includes('magic-regexp')) return
Expand Down Expand Up @@ -62,17 +57,17 @@ export const MagicRegExpTransformPlugin = createUnplugin(() => {

walk(this.parse(code), {
enter(_node) {
if (_node.type !== 'CallExpression') return
const node = _node as SimpleCallExpression
if (
_node.type !== 'CallExpression' ||
// Normal call
!wrapperNames.includes((node.callee as any).name) &&
// Namespaced call
(node.callee.type !== 'MemberExpression' ||
node.callee.object.type !== 'Identifier' ||
node.callee.object.name !== namespace ||
node.callee.property.type !== 'Identifier' ||
node.callee.property.name !== 'createRegExp')
(!wrapperNames.includes((node.callee as any).name) &&
// Namespaced call
(node.callee.type !== 'MemberExpression' ||
node.callee.object.type !== 'Identifier' ||
node.callee.object.name !== namespace ||
node.callee.property.type !== 'Identifier' ||
node.callee.property.name !== 'createRegExp'))
) {
return
}
Expand Down