Skip to content

Commit

Permalink
fmt: respect prettierrc and prettierignore (denoland#3346)
Browse files Browse the repository at this point in the history
  • Loading branch information
axetroy authored and bartlomieju committed Dec 28, 2019
1 parent cfb77ed commit 1f13e94
Show file tree
Hide file tree
Showing 15 changed files with 414 additions and 10 deletions.
57 changes: 54 additions & 3 deletions cli/flags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,32 @@ Automatically downloads Prettier dependencies on first run.
deno fmt myfile1.ts myfile2.ts",
)
.arg(
Arg::with_name("prettierrc")
.long("prettierrc")
.value_name("auto|disable|FILE")
.help("Specify the configuration file of the prettier.
auto: Auto detect prettier configuration file in current working dir.
disable: Disable load configuration file.
FILE: Load specified prettier configuration file. support .json/.toml/.js/.ts file
")
.takes_value(true)
.require_equals(true)
.default_value("auto")
)
.arg(
Arg::with_name("ignore-path")
.long("ignore-path")
.value_name("auto|disable|FILE")
.help("Path to a file containing patterns that describe files to ignore.
auto: Auto detect .pretierignore file in current working dir.
disable: Disable load .prettierignore file.
FILE: Load specified prettier ignore file.
")
.takes_value(true)
.require_equals(true)
.default_value("auto")
)
.arg(
Arg::with_name("stdout")
.long("stdout")
Expand Down Expand Up @@ -966,6 +992,8 @@ pub fn flags_from_vec(
}

let prettier_flags = [
["1", "prettierrc"],
["1", "ignore-path"],
["1", "print-width"],
["1", "tab-width"],
["0", "use-tabs"],
Expand All @@ -989,7 +1017,11 @@ pub fn flags_from_vec(
if t == "0" {
argv.push(format!("--{}", keyword));
} else {
argv.push(format!("--{}", keyword));
if keyword == "prettierrc" {
argv.push("--config".to_string());
} else {
argv.push(format!("--{}", keyword));
}
argv.push(fmt_match.value_of(keyword).unwrap().to_string());
}
}
Expand Down Expand Up @@ -1384,7 +1416,11 @@ mod tests {
PRETTIER_URL,
"script_1.ts",
"script_2.ts",
"--write"
"--write",
"--config",
"auto",
"--ignore-path",
"auto"
]
);
}
Expand Down Expand Up @@ -1602,7 +1638,16 @@ mod tests {
assert_eq!(subcommand, DenoSubcommand::Run);
assert_eq!(
argv,
svec!["deno", PRETTIER_URL, "script_1.ts", "script_2.ts"]
svec![
"deno",
PRETTIER_URL,
"script_1.ts",
"script_2.ts",
"--config",
"auto",
"--ignore-path",
"auto"
]
);
}

Expand Down Expand Up @@ -2043,6 +2088,7 @@ mod tests {
let (flags, subcommand, argv) = flags_from_vec(svec![
"deno",
"fmt",
"--prettierrc=auto",
"--print-width=100",
"--tab-width=4",
"--use-tabs",
Expand All @@ -2054,6 +2100,7 @@ mod tests {
"--quote-props=preserve",
"--jsx-single-quote",
"--jsx-bracket-same-line",
"--ignore-path=.prettier-ignore",
"script.ts"
]);
assert_eq!(
Expand All @@ -2072,6 +2119,10 @@ mod tests {
PRETTIER_URL,
"script.ts",
"--write",
"--config",
"auto",
"--ignore-path",
".prettier-ignore",
"--print-width",
"100",
"--tab-width",
Expand Down
179 changes: 172 additions & 7 deletions std/prettier/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
// This script formats the given source files. If the files are omitted, it
// formats the all files in the repository.
import { parse } from "../flags/mod.ts";
import * as path from "../path/mod.ts";
import * as toml from "../encoding/toml.ts";
import { ExpandGlobOptions, WalkInfo, expandGlob } from "../fs/mod.ts";
import { prettier, prettierPlugins } from "./prettier.ts";
const { args, cwd, exit, readAll, readFile, stdin, stdout, writeFile } = Deno;
Expand All @@ -40,6 +42,10 @@ Options:
it will output to stdout, Defaults to
false.
--ignore <path> Ignore the given path(s).
--ignore-path <auto|disable|path> Path to a file containing patterns that
describe files to ignore. Optional
value: auto/disable/filepath. Defaults
to null.
--stdin Specifies to read the code from stdin.
If run the command in a pipe, you do not
need to specify this flag.
Expand All @@ -49,6 +55,10 @@ Options:
parser for stdin. available parser:
typescript/babel/markdown/json. Defaults
to typescript.
--config <auto|disable|path> Specify the configuration file of the
prettier.
Optional value: auto/disable/filepath.
Defaults to null.
JS/TS Styling Options:
--print-width <int> The line length where Prettier will try
Expand Down Expand Up @@ -106,7 +116,7 @@ Example:
// Available parsers
type ParserLabel = "typescript" | "babel" | "markdown" | "json";

interface PrettierOptions {
interface PrettierBuildInOptions {
printWidth: number;
tabWidth: number;
useTabs: boolean;
Expand All @@ -120,6 +130,9 @@ interface PrettierOptions {
arrowParens: string;
proseWrap: string;
endOfLine: string;
}

interface PrettierOptions extends PrettierBuildInOptions {
write: boolean;
}

Expand Down Expand Up @@ -343,10 +356,134 @@ async function* getTargetFiles(
}
}

/**
* auto detect prettier configuration file and return config if file exist.
*/
async function autoResolveConfig(): Promise<PrettierBuildInOptions> {
const configFileNamesMap = {
".prettierrc.json": 1,
".prettierrc.yaml": 1,
".prettierrc.yml": 1,
".prettierrc.js": 1,
".prettierrc.ts": 1,
"prettier.config.js": 1,
"prettier.config.ts": 1,
".prettierrc.toml": 1
};

const files = await Deno.readDir(".");

for (const f of files) {
if (f.isFile() && configFileNamesMap[f.name]) {
const c = await resolveConfig(f.name);
if (c) {
return c;
}
}
}

return;
}

/**
* parse prettier configuration file.
* @param filepath the configuration file path.
* support extension name with .json/.toml/.js
*/
async function resolveConfig(
filepath: string
): Promise<PrettierBuildInOptions> {
let config: PrettierOptions = undefined;

function generateError(msg: string): Error {
return new Error(`Invalid prettier configuration file: ${msg}.`);
}

const raw = new TextDecoder().decode(await Deno.readFile(filepath));

switch (path.extname(filepath)) {
case ".json":
try {
config = JSON.parse(raw) as PrettierOptions;
} catch (err) {
throw generateError(err.message);
}
break;
case ".yml":
case ".yaml":
// TODO: Unimplemented loading yaml / yml configuration file yet.
break;
case ".toml":
try {
config = toml.parse(raw) as PrettierOptions;
} catch (err) {
throw generateError(err.message);
}
break;
case ".js":
case ".ts":
const absPath = path.isAbsolute(filepath)
? filepath
: path.join(cwd(), filepath);

try {
const output = await import(
// TODO: Remove platform condition
// after https://github.com/denoland/deno/issues/3355 fixed
Deno.build.os === "win" ? "file://" + absPath : absPath
);

if (output && output.default) {
config = output.default;
} else {
throw new Error(
"Prettier of JS version should have default exports."
);
}
} catch (err) {
throw generateError(err.message);
}

break;
default:
break;
}

return config;
}

/**
* auto detect .prettierignore and return pattern if file exist.
*/
async function autoResolveIgnoreFile(): Promise<string[]> {
const files = await Deno.readDir(".");

for (const f of files) {
if (f.isFile() && f.name === ".prettierignore") {
return await resolveIgnoreFile(f.name);
}
}

return [];
}

/**
* parse prettier ignore file.
* @param filepath the ignore file path.
*/
async function resolveIgnoreFile(filepath: string): Promise<string[]> {
const raw = new TextDecoder().decode(await Deno.readFile(filepath));

return raw
.split("\n")
.filter((v: string) => !!v.trim() && v.trim().indexOf("#") !== 0)
.map(v => v);
}

async function main(opts): Promise<void> {
const { help, ignore, check, _: args } = opts;
const { help, check, _: args } = opts;

const prettierOpts: PrettierOptions = {
let prettierOpts: PrettierOptions = {
printWidth: Number(opts["print-width"]),
tabWidth: Number(opts["tab-width"]),
useTabs: Boolean(opts["use-tabs"]),
Expand All @@ -368,10 +505,37 @@ async function main(opts): Promise<void> {
exit(0);
}

const files = getTargetFiles(
args.length ? args : ["."],
Array.isArray(ignore) ? ignore : [ignore]
);
const configFilepath = opts["config"];

if (configFilepath && configFilepath !== "disable") {
const config =
configFilepath === "auto"
? await autoResolveConfig()
: await resolveConfig(configFilepath);

if (config) {
prettierOpts = { ...prettierOpts, ...config };
}
}

let ignore = opts.ignore as string[];

if (!Array.isArray(ignore)) {
ignore = [ignore];
}

const ignoreFilepath = opts["ignore-path"];

if (ignoreFilepath && ignoreFilepath !== "disable") {
const ignorePatterns: string[] =
ignoreFilepath === "auto"
? await autoResolveIgnoreFile()
: await resolveIgnoreFile(ignoreFilepath);

ignore = ignore.concat(ignorePatterns);
}

const files = getTargetFiles(args.length ? args : ["."], ignore);

const tty = Deno.isTTY();

Expand All @@ -396,6 +560,7 @@ main(
parse(args.slice(1), {
string: [
"ignore",
"ignore-path",
"printWidth",
"tab-width",
"trailing-comma",
Expand Down
Loading

0 comments on commit 1f13e94

Please sign in to comment.