Skip to content

test: migrate infer-plugins-ext-dir test cases #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.

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

Merged
fabiospampinato merged 3 commits into from
Jun 14, 2025
Merged

test: migrate infer-plugins-ext-dir test cases #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f66fd45
test: migrate `infer-plugins-ext-dir` test cases
43081j Feb 3, 2025
ce99ba5
Various fixes
fabiospampinato Jun 14, 2025
6b9e8a6
Normalized diff file names for tests
fabiospampinato Jun 14, 2025
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ Thumbs.db

/dist
/node_modules
/test/__fixtures__/.temp-*
145 changes: 78 additions & 67 deletions package-lock.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"find-up-json": "^2.0.5",
"function-once": "^3.0.1",
"import-meta-resolve": "^4.1.0",
"is-binary-path": "^3.0.0",
"is-binary-path": "^2.0.0",
"js-yaml": "^4.1.0",
"json-sorted-stringify": "^1.0.1",
"json5": "^2.2.3",
Expand All @@ -54,7 +54,7 @@
"tiny-readdir": "^2.7.4",
"tiny-readdir-glob": "^1.23.2",
"tiny-spinner": "^2.0.5",
"worktank": "^2.7.3",
"worktank": "^3.0.2",
"zeptomatch": "^2.0.1",
"zeptomatch-escape": "^1.0.1",
"zeptomatch-is-static": "^1.0.1"
Expand Down
14 changes: 10 additions & 4 deletions src/prettier_parallel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
import os from "node:os";
import process from "node:process";
import WorkTank from "worktank";
import { resolve } from "./utils.js";
import type { Options, Prettier } from "./types.js";

function makeParallel(options: Options): Prettier {
const pool = new WorkTank<Prettier>({
name: "prettier",
size: options.parallelWorkers || Math.max(1, os.cpus().length - 1),
methods: new URL("./prettier_serial.js", import.meta.url),
warmup: true,
pool: {
name: "prettier",
size: options.parallelWorkers || Math.max(1, os.cpus().length - 1),
},
worker: {
autoInstantiate: true,
env: process.env,
methods: new URL("./prettier_serial.js", import.meta.url),
},
});

return {
Expand Down
11 changes: 9 additions & 2 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,15 @@ async function getTargetsPaths(
}

const filesExplicitPaths = targetFiles;
const filesFoundPaths = globResult.filesFound;
const foldersFoundPaths = [rootPath, ...globResult.directoriesFound];

const globFilesFoundPaths = globResult.filesFound;
const directoryFilesFoundPaths = directoriesResultsFiles.flat();
const filesFoundPaths = [...globFilesFoundPaths, ...directoryFilesFoundPaths];

const globFoldersFoundPaths = globResult.directoriesFound;
const directoryFoldersFoundPaths = directoriesResults.flatMap((result) => result.directories);
const foldersFoundPaths = [rootPath, ...globFoldersFoundPaths, ...directoryFoldersFoundPaths];

return [filesPaths, filesNames, filesNamesToPaths, filesExplicitPaths, filesFoundPaths, foldersFoundPaths];
}

Expand Down
10 changes: 10 additions & 0 deletions test/__fixtures__/infer-plugins-ext-dir-with-complex-overrides/.prettierrc.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export default {
overrides: [
{
files: ["dir/*.foo"],
options: {
plugins: ["../plugin-extensions/plugin.cjs"]
}
},
]
};
1 change: 1 addition & 0 deletions test/__fixtures__/infer-plugins-ext-dir-with-complex-overrides/1.foo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.foo
1 change: 1 addition & 0 deletions test/__fixtures__/infer-plugins-ext-dir-with-complex-overrides/dir/2.foo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.foo
3 changes: 3 additions & 0 deletions test/__fixtures__/infer-plugins-ext-dir-with-config/foo.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
plugins: ["../plugin-extensions/plugin.cjs"],
};
1 change: 1 addition & 0 deletions test/__fixtures__/infer-plugins-ext-dir-with-config/src/file.foo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
contents
3 changes: 3 additions & 0 deletions test/__fixtures__/infer-plugins-ext-dir-with-default-options/.prettierrc.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
plugins: ["../plugin-default-options/plugin.cjs"]
};
1 change: 1 addition & 0 deletions test/__fixtures__/infer-plugins-ext-dir-with-default-options/src/file.foo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
contents
3 changes: 3 additions & 0 deletions test/__fixtures__/infer-plugins-ext-dir-with-default-options/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
function main() {
console.log("Hello, World!");
}
12 changes: 12 additions & 0 deletions test/__fixtures__/infer-plugins-ext-dir-with-overrides-and-default-options/.prettierrc.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export default {
overrides: [
{
// TODO (43081j): in prettier, this was `*.foo` and would successfully
// match `src/*.foo`. In prettier CLI, this is not the case
files: ["**/*.foo"],
Copy link
Collaborator Author

@43081j 43081j Feb 3, 2025

Choose a reason for hiding this comment

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

@fabiospampinato this one seems like something we should discuss/decide before we merge these tests

it seems prettier treats *.foo as if it was **/*.foo, whereas we treat it as ./*.foo

i think we're correct, but this means a whole bunch of prettier configs may fail with our CLI. maybe we should do a special case that transforms "*.ext" into "**/*.ext"?

Copy link
Collaborator

@fabiospampinato fabiospampinato Feb 9, 2025

Choose a reason for hiding this comment

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

Yeah I think so, no need to break the world here. The problem is that this is a bit tricky, what is the actual logic that we want? Worth checking what v3 is actually doing, because there are many potential ways to implement something like this.

I imagine we should try to explode the glob and do something with that in some cases 🤔

I think we can skip this test for now and fix it later if it's the only blocker for this test suite.

Is everything else basically just copy/pasted?

Copy link
Collaborator Author

@43081j 43081j Feb 10, 2025

Choose a reason for hiding this comment

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

Pretty much, just the paths changed to the mock/fixture extensions. The rest should be the same

options: {
plugins: ["../plugin-default-options/plugin.cjs"]
}
}
]
};
1 change: 1 addition & 0 deletions test/__fixtures__/infer-plugins-ext-dir-with-overrides-and-default-options/src/file.foo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
contents
Loading