feat: use Prettier to write config file, if possible (#356)

This commit is contained in:
Josh Goldberg ✨ 2023-05-29 01:30:15 +03:00 committed by GitHub
parent 45787a7636
commit e0a5312dc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 65 additions and 2 deletions

View file

@ -61,6 +61,9 @@
"nock": "^12.0.0",
"semantic-release": "^17.0.8"
},
"optionalDependencies": {
"prettier": "^2"
},
"eslintIgnore": [
"node_modules",
"coverage",

View file

@ -0,0 +1,3 @@
{
"useTabs": true
}

View file

@ -0,0 +1,35 @@
import path from 'path'
import formatting from '../formatting'
const content = {contributors: [{id: 'abc123'}]}
const absentFile = '/!@#*&^DefinitelyDoesNotExistAllContributorsCLI$!@#'
const absentConfigFileExpected = `{
"contributors": [
{
"id": "abc123"
}
]
}`
const presentFile = path.join(__dirname, '__stubs__', 'file.json')
const presentConfigFileExpected = `{
"contributors": [
{
"id": "abc123"
}
]
}
`
test('falls back to JSON.stringify when the configPath cannot resolve to a config', () => {
expect(formatting.formatConfig(absentFile, content)).toBe(
absentConfigFileExpected,
)
})
test('uses Prettier when the configPath can resolve to a config', () => {
expect(formatting.formatConfig(presentFile, content)).toBe(
presentConfigFileExpected,
)
})

View file

@ -2,6 +2,7 @@ const fs = require('fs')
const pify = require('pify')
const _ = require('lodash/fp')
const jf = require('json-fixer')
const {formatConfig} = require('./formatting')
function readConfig(configPath) {
try {
@ -14,7 +15,7 @@ function readConfig(configPath) {
}
if (changed) {
//Updates the file with fixes
fs.writeFileSync(configPath, JSON.stringify(config, null, 2))
fs.writeFileSync(configPath, formatConfig(config))
}
return config
} catch (error) {
@ -43,7 +44,7 @@ function writeConfig(configPath, content) {
`Error! Project files was overridden and is empty in ${configPath}`,
)
}
return pify(fs.writeFile)(configPath, `${JSON.stringify(content, null, 2)}\n`)
return pify(fs.writeFile)(configPath, `${formatConfig(content)}\n`)
}
function writeContributors(configPath, contributors) {

21
src/util/formatting.js Normal file
View file

@ -0,0 +1,21 @@
function formatConfig(configPath, content) {
const stringified = JSON.stringify(content, null, 2)
try {
const prettier = require('prettier')
const prettierConfig = prettier.resolveConfig.sync(configPath, {
useCache: false,
})
return prettierConfig
? prettier.format(stringified, {...prettierConfig, parser: 'json'})
: stringified
} catch (error) {
// If Prettier can't be required or throws in general,
// assume it's not usable and we should fall back to JSON.stringify
return stringified
}
}
module.exports = {
formatConfig,
}