-
Notifications
You must be signed in to change notification settings - Fork 34
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.
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
Add support for template codemods #81
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b293927
Add template test support
simonihmig c809c5d
Add bin-support for templates, updated test-support for full plugin r…
simonihmig 7995cbf
Add generator for template transforms and tests
simonihmig 9dba17c
Address PR feedback
simonihmig 6bf475a
Remove extra globby call in bin-support/runTemplateTransform
simonihmig 1902c28
Refactor transform type detection
simonihmig a21d5ca
Cleanup after PR feedback
simonihmig File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,14 @@ | ||
'use strict'; | ||
|
||
const DEFAULT_EXTENSIONS = 'js,ts'; | ||
const DEFAULT_JS_EXTENSIONS = 'js,ts'; | ||
|
||
async function runTransform(binRoot, transformName, args, extensions = DEFAULT_EXTENSIONS) { | ||
function getTransformPath(binRoot, transformName) { | ||
const path = require('path'); | ||
|
||
return path.join(binRoot, '..', 'transforms', transformName, 'index.js'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we do There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
} | ||
|
||
async function runJsTransform(binRoot, transformName, args, extensions = DEFAULT_JS_EXTENSIONS) { | ||
const globby = require('globby'); | ||
const execa = require('execa'); | ||
const chalk = require('chalk'); | ||
|
@@ -15,7 +21,7 @@ async function runTransform(binRoot, transformName, args, extensions = DEFAULT_E | |
let foundPaths = await globby(paths, { | ||
expandDirectories: { extensions: extensions.split(',') }, | ||
}); | ||
let transformPath = path.join(binRoot, '..', 'transforms', transformName, 'index.js'); | ||
let transformPath = getTransformPath(binRoot, transformName); | ||
|
||
let jscodeshiftPkg = require('jscodeshift/package'); | ||
let jscodeshiftPath = path.dirname(require.resolve('jscodeshift/package')); | ||
|
@@ -37,6 +43,48 @@ async function runTransform(binRoot, transformName, args, extensions = DEFAULT_E | |
} | ||
} | ||
|
||
async function runTemplateTransform(binRoot, transformName, args) { | ||
const execa = require('execa'); | ||
const chalk = require('chalk'); | ||
const { parseTransformArgs } = require('./options-support'); | ||
|
||
let { paths, options } = parseTransformArgs(args); | ||
|
||
try { | ||
let transformPath = getTransformPath(binRoot, transformName); | ||
let binOptions = ['-t', transformPath, ...paths]; | ||
|
||
return execa('ember-template-recast', binOptions, { | ||
stdio: 'inherit', | ||
preferLocal: true, | ||
env: { | ||
CODEMOD_CLI_ARGS: JSON.stringify(options), | ||
}, | ||
}); | ||
} catch (error) { | ||
console.error(chalk.red(error.stack)); // eslint-disable-line no-console | ||
process.exitCode = 1; | ||
|
||
throw error; | ||
} | ||
} | ||
|
||
async function runTransform(binRoot, transformName, args, extensions) { | ||
const { getTransformType } = require('./transform-support'); | ||
|
||
let transformPath = getTransformPath(binRoot, transformName); | ||
let type = getTransformType(transformPath); | ||
|
||
switch (type) { | ||
case 'js': | ||
return runJsTransform(binRoot, transformName, args, extensions); | ||
case 'hbs': | ||
return runTemplateTransform(binRoot, transformName, args); | ||
default: | ||
throw new Error(`Unknown type passed to runTransform: "${type}"`); | ||
} | ||
} | ||
|
||
module.exports = { | ||
runTransform, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
'use strict'; | ||
|
||
/* global it, describe, beforeEach, afterEach */ | ||
|
||
const { runInlineTest } = require('jscodeshift/dist/testUtils'); | ||
const fs = require('fs-extra'); | ||
const path = require('path'); | ||
const globby = require('globby'); | ||
const { transformDetails } = require('./utils'); | ||
|
||
module.exports = function jscodeshiftTest(options) { | ||
let details = transformDetails(options); | ||
|
||
let transform = require(details.transformPath); | ||
|
||
describe(details.name, function() { | ||
globby | ||
.sync('**/*.input.*', { | ||
cwd: details.fixtureDir, | ||
absolute: true, | ||
}) | ||
.map(entry => entry.slice(entry.indexOf('__testfixtures__') + '__testfixtures__'.length + 1)) | ||
.forEach(filename => { | ||
let extension = path.extname(filename); | ||
let testName = filename.replace(`.input${extension}`, ''); | ||
let testInputPath = path.join(details.fixtureDir, `${testName}${extension}`); | ||
let inputPath = path.join(details.fixtureDir, `${testName}.input${extension}`); | ||
let outputPath = path.join(details.fixtureDir, `${testName}.output${extension}`); | ||
let optionsPath = path.join(details.fixtureDir, `${testName}.options.json`); | ||
let options = fs.pathExistsSync(optionsPath) ? fs.readFileSync(optionsPath) : '{}'; | ||
|
||
describe(testName, function() { | ||
beforeEach(function() { | ||
process.env.CODEMOD_CLI_ARGS = options; | ||
}); | ||
|
||
afterEach(function() { | ||
process.env.CODEMOD_CLI_ARGS = ''; | ||
}); | ||
|
||
it('transforms correctly', function() { | ||
runInlineTest( | ||
transform, | ||
{}, | ||
{ path: testInputPath, source: fs.readFileSync(inputPath, 'utf8') }, | ||
fs.readFileSync(outputPath, 'utf8') | ||
); | ||
}); | ||
|
||
it('is idempotent', function() { | ||
runInlineTest( | ||
transform, | ||
{}, | ||
{ path: testInputPath, source: fs.readFileSync(outputPath, 'utf8') }, | ||
fs.readFileSync(outputPath, 'utf8') | ||
); | ||
}); | ||
}); | ||
}); | ||
}); | ||
}; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to add
index.js
here? I wonder if we can basically just let it fall through via therequire
that is done down ingetTransformType
(sincerequire(codemodDir)
andrequire(codemodDir + '/index.js')
are effectively the same thing)? That would allow folks to use other extensions (for example.ts
)...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done