Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"@types/js-yaml": "^4.0.9",
"@types/node": "^22.15.10",
"cross-env": "^7.0.3",
"dedent": "^1.5.3",
"jest": "^29.7.0",
"jest-snapshot-serializer-ansi": "^2.2.1",
"jest-snapshot-serializer-raw": "^2.0.0",
Expand Down
36 changes: 34 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { fastRelativePath, isNull, isString, isUndefined, negate, pluralize, tri
import type { FormatOptions, Options, PluginsOptions } from "./types.js";

async function run(options: Options, pluginsDefaultOptions: PluginsOptions, pluginsCustomOptions: PluginsOptions): Promise<void> {
if (options.globs.length || !isString(await getStdin())) {
if (options.globs.length || (!isString(await getStdin()) && !("stdinFilepath" in options))) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

can you explain this one?

if there is stdin and there is a stdinFilepath, we now runGlobs?

and if there's no stdin but there is a stdinFilepath, we'd also runGlobs?

unless im reading wrong, thats what its doing now

Copy link
Contributor Author

@pralkarz pralkarz May 7, 2025

Choose a reason for hiding this comment

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

I based this branch on yours, you seem to have added this condition in 585f1be. Not really sure what the rationale was, but it seems to make sense, right? We runGlobs either when options.globs is not empty or there's no stdinFilepath in options AND there's no stdin data.

Copy link
Collaborator

@43081j 43081j May 7, 2025

Choose a reason for hiding this comment

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

if there's no stdinFilePath but there is stdin, we'll now call runStdin i think?

so i probably got this condition wrong. i don't remember why i did it that way

if there's no stdin or there's globs, we should runGlobs. otherwise, we can runStdin

return runGlobs(options, pluginsDefaultOptions, pluginsCustomOptions);
} else {
return runStdin(options, pluginsDefaultOptions, pluginsCustomOptions);
Expand All @@ -28,11 +28,43 @@ async function runStdin(options: Options, pluginsDefaultOptions: PluginsOptions,
const stdout = new Logger(options.logLevel, "stdout");
const prettier = await import("./prettier_serial.js");

const rootPath = process.cwd();
const projectPath = getProjectPath(rootPath);

const fileName = options.stdinFilepath || "stdin";
const fileContent = (await getStdin()) || "";

const [_filesPaths, filesNames, filesNamesToPaths, _filesExplicitPaths, filesFoundPaths, foldersFoundPaths] = await getTargetsPaths(rootPath, [fileName], false); // prettier-ignore
const [_foldersPathsTargets, foldersExtraPaths] = getExpandedFoldersPaths(foldersFoundPaths, projectPath);
const filesExtraPaths = await getFoldersChildrenPaths([rootPath, ...foldersExtraPaths]);
const filesExtraNames = filesExtraPaths.map((filePath) => path.basename(filePath));

Known.addFilesPaths(filesFoundPaths);
Known.addFilesPaths(filesExtraPaths);

Known.addFilesNames(filesNames);
Known.addFilesNames(filesExtraNames);

const ignoreNames = options.ignore ? [".gitignore", ".prettierignore"] : [];
const isIgnored = await getIgnoreResolved(path.join(rootPath, fileName), ignoreNames);
if (isIgnored) {
stdout.always(trimFinalNewline(fileContent));
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This matches the v3 behavior based on the related test case, where the ignored file gets output as is.

process.exitCode = 0;
return;
}

const editorConfigNames = options.editorConfig ? [".editorconfig"].filter(Known.hasFileName) : [];
const editorConfig = options.editorConfig
? getEditorConfigFormatOptions(await getEditorConfigResolved(path.join(rootPath, fileName), editorConfigNames))
: {};

const prettierConfigNames = options.config ? without(Object.keys(File2Loader), ["default"]).filter(Known.hasFileName) : [];
const prettierConfig = options.config ? await getPrettierConfigResolved(path.join(rootPath, fileName), prettierConfigNames) : {};

const formatOptions = { ...editorConfig, ...prettierConfig, ...options.formatOptions };

try {
const formatted = await prettier.format(fileName, fileContent, options.formatOptions, options.contextOptions, pluginsDefaultOptions, pluginsCustomOptions);
const formatted = await prettier.format(fileName, fileContent, formatOptions, options.contextOptions, pluginsDefaultOptions, pluginsCustomOptions);
if (options.check || options.list) {
if (formatted !== fileContent) {
stdout.warn("(stdin)");
Expand Down
8 changes: 7 additions & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ function fastRelativeChildPath(fromPath: string, toPath: string): string | undef
return toPath.slice(fromPath.length + 1);
}
}

if (fromPath === ".") {
return toPath;
}
}

function findLastIndex<T>(array: T[], predicate: (value: T, index: number, array: T[]) => unknown): number {
Expand Down Expand Up @@ -343,7 +347,9 @@ async function normalizeOptions(options: unknown, targets: unknown[]): Promise<O

const stdin = await getStdin();

if (!isString(stdin) && !globs.length) exit("Expected at least one target file/dir/glob");
if (!isString(stdin) && !globs.length && !("stdinFilepath" in options)) {
exit("Expected at least one target file/dir/glob");
}

const check = "check" in options && !!options.check;
const list = "listDifferent" in options && !!options.listDifferent;
Expand Down
18 changes: 18 additions & 0 deletions test/__fixtures__/editorconfig/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
root = true

[*.js]
indent_style = tab
tab_width = 8
indent_size = 2 # overridden by tab_width since indent_style = tab
max_line_length = 100

# Indentation override for all JS under lib directory
[lib/**.js]
indent_style = space
indent_size = 2

[lib/indent_size=tab.js]
indent_size = tab

[tab_width=unset.js]
tab_width = unset
8 changes: 8 additions & 0 deletions test/__fixtures__/editorconfig/.prettierrc
Copy link
Contributor Author

Choose a reason for hiding this comment

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

In Prettier v3, this file lives in a bigger overarching fixture directory (config), but it's needed for the snapshots to match what we expect. We could consider removing it, but then we need to update the snapshots to include semicolons.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
endOfLine: 'auto'
overrides:
- files: "**/*.js"
Copy link
Contributor Author

@pralkarz pralkarz Apr 23, 2025

Choose a reason for hiding this comment

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

In Prettier v3, this is just "*.js", but a/a/a/a/a/a/three.js matches that there somehow (maybe they do some exploding to include the leading **?). Since we usually provide nested paths in --stdin-path, the overrides wouldn't apply without **/.

Copy link
Collaborator

Choose a reason for hiding this comment

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

prettier treats *.ext as **/*.ext. not through any exploding/splitting, it just prepends it iirc

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is this something that we should do in v4 too or rather require the users to handle it explicitly?

Copy link
Collaborator

Choose a reason for hiding this comment

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

there was a conversation a while back around it. im not sure if it was in discord or on here
but iirc, fisker's opinion was that it makes patterns easier to write (*.ts to format all ts files is easier than **/*.ts). even though it isn't the right glob

we should probably discuss it again and make a decision

options:
semi: false
- files: "**/*.ts"
options:
semi: true
3 changes: 3 additions & 0 deletions test/__fixtures__/editorconfig/file.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
function f() {
console.log("should have tab width 8");
}
3 changes: 3 additions & 0 deletions test/__fixtures__/editorconfig/lib/file.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
function f() {
console.log("should have space width 2");
}
3 changes: 3 additions & 0 deletions test/__fixtures__/editorconfig/lib/indent_size=tab.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
function f() {
console.log("should have space width 8");
}
2 changes: 2 additions & 0 deletions test/__fixtures__/editorconfig/repo-root/.hg/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This isn't really a Mercurial repo, but we want to pretend it is for testing purposes.
See https://github.com/prettier/prettier/pull/3559#issuecomment-353857109
3 changes: 3 additions & 0 deletions test/__fixtures__/editorconfig/repo-root/file.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
function f() {
console.log("should have space width 2 despite ../.editorconfig specifying 8, because ./.hg is present");
}
1 change: 1 addition & 0 deletions test/__fixtures__/stdin-ignore/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ignore/
85 changes: 85 additions & 0 deletions test/__tests__/__snapshots__/stdin-filepath.js.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`apply editorconfig for stdin-filepath with a deep path (stderr) 1`] = `""`;

exports[`apply editorconfig for stdin-filepath with a deep path (stderr) 2`] = `""`;

exports[`apply editorconfig for stdin-filepath with a deep path (stdout) 1`] = `
"function f() {
console.log("should be indented with a tab")
}"
`;

exports[`apply editorconfig for stdin-filepath with a deep path (stdout) 2`] = `
"function f() {
console.log("should be indented with a tab")
}"
`;

exports[`apply editorconfig for stdin-filepath with a deep path (write) 1`] = `[]`;

exports[`apply editorconfig for stdin-filepath with a deep path (write) 2`] = `[]`;

exports[`apply editorconfig for stdin-filepath with nonexistent directory (stderr) 1`] = `""`;

exports[`apply editorconfig for stdin-filepath with nonexistent directory (stdout) 1`] = `
"function f() {
console.log("should be indented with a tab")
}"
`;

exports[`apply editorconfig for stdin-filepath with nonexistent directory (write) 1`] = `[]`;

exports[`apply editorconfig for stdin-filepath with nonexistent file (stderr) 1`] = `""`;

exports[`apply editorconfig for stdin-filepath with nonexistent file (stdout) 1`] = `
"function f() {
console.log("should be indented with a tab")
}"
`;

exports[`apply editorconfig for stdin-filepath with nonexistent file (write) 1`] = `[]`;

exports[`don't apply editorconfig outside project for stdin-filepath with nonexistent directory (stderr) 1`] = `""`;

exports[`don't apply editorconfig outside project for stdin-filepath with nonexistent directory (stdout) 1`] = `
"function f() {
console.log("should be indented with 2 spaces");
}"
`;

exports[`don't apply editorconfig outside project for stdin-filepath with nonexistent directory (write) 1`] = `[]`;

exports[`format correctly if stdin content compatible with stdin-filepath (stderr) 1`] = `""`;

exports[`format correctly if stdin content compatible with stdin-filepath (stdout) 1`] = `
".name {
display: none;
}"
`;

exports[`format correctly if stdin content compatible with stdin-filepath (write) 1`] = `[]`;

exports[`gracefully handle stdin-filepath with nonexistent directory (stderr) 1`] = `""`;

exports[`gracefully handle stdin-filepath with nonexistent directory (stdout) 1`] = `
".name {
display: none;
}"
`;

exports[`gracefully handle stdin-filepath with nonexistent directory (write) 1`] = `[]`;

exports[`output file as-is if stdin-filepath matched patterns in ignore-path (stderr) 1`] = `""`;

exports[`output file as-is if stdin-filepath matched patterns in ignore-path (write) 1`] = `[]`;

exports[`throw error if stdin content incompatible with stdin-filepath (stderr) 1`] = `
"[error] SyntaxError: Unexpected token (1:1)
[error] > 1 | .name { display: none; }
[error] | ^"
`;

exports[`throw error if stdin content incompatible with stdin-filepath (stdout) 1`] = `""`;

exports[`throw error if stdin content incompatible with stdin-filepath (write) 1`] = `[]`;
151 changes: 151 additions & 0 deletions test/__tests__/stdin-filepath.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
import { runCli } from "../utils";
import dedent from "dedent";

describe("format correctly if stdin content compatible with stdin-filepath", () => {
runCli(
"",
["--stdin-filepath", "abc.css"],
{ input: ".name { display: none; }" }, // css
).test({
status: 0,
});
});

describe("throw error if stdin content incompatible with stdin-filepath", () => {
runCli(
"",
["--stdin-filepath", "abc.js"],
{ input: ".name { display: none; }" }, // css
).test({
status: "non-zero",
});
});

describe("gracefully handle stdin-filepath with nonexistent directory", () => {
runCli(
"",
["--stdin-filepath", "definitely/nonexistent/path.css"],
{ input: ".name { display: none; }" }, // css
).test({
status: 0,
});
});

describe("apply editorconfig for stdin-filepath with nonexistent file", () => {
runCli("editorconfig", ["--stdin-filepath", "nonexistent.js"], {
input: dedent`
function f() {
console.log("should be indented with a tab");
}
`, // js
}).test({
status: 0,
});
});

describe("apply editorconfig for stdin-filepath with nonexistent directory", () => {
runCli(
"editorconfig",
["--stdin-filepath", "nonexistent/one/two/three.js"],
{
input: dedent`
function f() {
console.log("should be indented with a tab");
}
`, // js
},
).test({
status: 0,
});
});

describe("apply editorconfig for stdin-filepath with a deep path", () => {
runCli(
"editorconfig",
["--stdin-filepath", "a/".repeat(30) + "three.js"],
{
input: dedent`
function f() {
console.log("should be indented with a tab");
}
`, // js
},
).test({
status: 0,
});
});

// TODO: This is currently a false positive as no config actually gets resolved, but Prettier
// somehow formats the input correctly anyway.
describe("apply editorconfig for stdin-filepath in root", () => {
const code = dedent`
function f() {
console.log("should be indented with a tab");
}
`;
runCli("", ["--stdin-filepath", "/foo.js"], {
input: code, // js
}).test({
status: 0,
stdout: code,
stderr: "",
write: [],
});
});
Comment on lines +78 to +94
Copy link
Contributor Author

@pralkarz pralkarz Apr 23, 2025

Choose a reason for hiding this comment

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

I'm not sure what we expect here. The test case's name implies that we should search for any .editorconfig (either starting from root or from CWD) and apply it (especially since this test is only ran in CI in v3), but it seems like an odd choice.


describe("apply editorconfig for stdin-filepath with a deep path", () => {
runCli(
"editorconfig",
["--stdin-filepath", "a/".repeat(30) + "three.js"],
{
input: dedent`
function f() {
console.log("should be indented with a tab");
}
`, // js
},
).test({
status: 0,
});
});

// TODO: This is currently a false positive. Gotta investigate how it's handled in Prettier v3 to
// gauge the expected behavior.
describe("don't apply editorconfig outside project for stdin-filepath with nonexistent directory", () => {
runCli(
"",
[
"--stdin-filepath",
"editorconfig/repo-root/nonexistent/one/two/three.js",
],
{
input: dedent`
function f() {
console.log("should be indented with 2 spaces");
}
`, // js
},
).test({
status: 0,
});
});
Comment on lines +112 to +131
Copy link
Contributor Author

@pralkarz pralkarz Apr 23, 2025

Choose a reason for hiding this comment

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

It's currently a false positive, but when we change the first argument in runCli to editorconfig and update the path accordingly, stdin does get formatted based on __fixtures__/editorconfig/.editorconfig. Not sure why it wouldn't based on the other test cases. Maybe it's because repo-root counts as a separate project due to .hg there? Such an edge case could be quite tricky to support.


describe("output file as-is if stdin-filepath matched patterns in ignore-path", () => {
runCli("stdin-ignore", ["--stdin-filepath", "ignore/example.js"], {
input: "hello_world( );",
}).test({
stdout: "hello_world( );",
status: 0,
});
});

describe("Should format stdin even if it's empty", () => {
runCli("", ["--stdin-filepath", "example.js"], {
isTTY: true,
}).test({
stdout: "",
status: 0,
stderr: "",
write: [],
});
});
Loading