Skip to content
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

Jump to bottom

[RFC] project options using package.json #1086

Closed
wants to merge 10 commits into from
Closed

[RFC] project options using package.json #1086

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0c6d2e5
Read project defaults through package.json
eXon Mar 24, 2017
d6aa98d
Fix project options in CLI
eXon Mar 24, 2017
951589f
Refactor to be reusable + take CLI over project options
eXon Mar 24, 2017
8596993
Stop looking at package.json when we found one with prettier block
eXon Mar 24, 2017
d122953
Remove redundant fallback on prettier config in package.json
eXon Mar 24, 2017
1d8a639
Fix project configs when default is not undefined
eXon Apr 1, 2017
a1de24c
Remove deadcode
eXon Apr 1, 2017
b334a2e
Merge branch 'master' into feature/projectDefault
eXon Apr 5, 2017
af32f34
Merge branch 'master' into feature/projectDefault
eXon Apr 20, 2017
8f15041
Merge branch 'master' into feature/projectDefault
eXon May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 26 additions & 10 deletions bin/prettier.js
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ const chalk = require("chalk");
const minimist = require("minimist");
const readline = require("readline");
const prettier = require("../index");
const { getProjectOptions } = require("../src/util");

const argv = minimist(process.argv.slice(2), {
boolean: [
Expand Down Expand Up @@ -118,15 +119,10 @@ function getTrailingComma() {
}
}

const options = {
printWidth: getIntOption("print-width"),
tabWidth: getIntOption("tab-width"),
bracketSpacing: argv["bracket-spacing"],
singleQuote: argv["single-quote"],
jsxBracketSameLine: argv["jsx-bracket-same-line"],
trailingComma: getTrailingComma(),
parser: getParserOption()
};
const options = Object.assign(
getProjectOptions(process.cwd()),
getCliOptions()
);

function format(input) {
if (argv["debug-print-doc"]) {
Expand Down Expand Up @@ -218,7 +214,7 @@ if (stdin) {
let input;
try {
input = fs.readFileSync(filename, "utf8");
} catch(e) {
} catch (e) {
// Add newline to split errors from filename line.
process.stdout.write("\n");

Expand Down Expand Up @@ -295,3 +291,23 @@ function eachFilename(patterns, callback) {
});
});
}

function getCliOptions() {
const cliOptions = {
printWidth: getIntOption("print-width"),
tabWidth: getIntOption("tab-width"),
bracketSpacing: argv["bracket-spacing"],
singleQuote: argv["single-quote"],
jsxBracketSameLine: argv["jsx-bracket-same-line"],
trailingComma: getTrailingComma(),
parser: getParserOption()
};

Object.keys(cliOptions).forEach(function clearUndefinedValues(optionName) {
if (cliOptions[optionName] === undefined) {
delete cliOptions[optionName];
}
});

return cliOptions;
}
42 changes: 42 additions & 0 deletions src/util.js
View file
Open in desktop
@@ -1,6 +1,8 @@
"use strict";

var types = require("ast-types");
var path = require("path");
var fs = require("fs");
var n = types.namedTypes;

function comparePos(pos1, pos2) {
Expand Down Expand Up @@ -305,9 +307,49 @@ function getPrecedence(op) {
return PRECEDENCE[op];
}

function getProjectOptions(searchDirectory) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This whole thing can be replaced by https://www.npmjs.com/package/read-pkg-up except for the part to keep searching if no prettier-entry

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hah, or just https://www.npmjs.com/package/pkg-conf which is then even easier

while (searchDirectory !== path.sep) {
const packagePath = path.join(searchDirectory, "package.json");
const packageJson = readPackageJson(packagePath);

if (packageJson && packageJson.prettier) {
return packageJson.prettier;
}

// continue searching
searchDirectory = path.resolve(searchDirectory, "..");
}

return {};
}

function readPackageJson(packagePath) {
let content;

try {
content = fs.readFileSync(packagePath);
} catch (e) {
return null;
}

content = content.toString("utf-8");

// Remove BOM
if (content.charCodeAt(0) === 0xfeff) {
content = content.slice(1);
}

try {
return JSON.parse(content);
} catch (e) {
return null;
}
}

module.exports = {
comparePos,
getPrecedence,
getProjectOptions,
fixFaultyLocations,
isExportDeclaration,
getParentExportDeclaration,
Expand Down