Merge branch 'main' of https://github.com/prettier/prettier-cli into stdin-filepath-test-fixes

Author: pralkarz

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/ci.yml

@@ -8,8 +8,15 @@ on:
 
 jobs:
   test:
-    name: Build & Test
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - "ubuntu-latest"
+          - "macos-latest"
+          - "windows-latest"
+    runs-on: ${{ matrix.os }}
+    name: Build & Test (${{ matrix.os }})
     steps:
       - uses: actions/checkout@v4
 

package-lock.json

@@ -3,7 +3,7 @@
   "repository": "github:prettier/prettier-cli",
   "description": "A faster CLI for Prettier.",
   "license": "MIT",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,7 +13,7 @@
   "exports": {
     ".": "./dist/index.js",
     "./bin": "./dist/bin.js",
-    "./package.json": "./package.json"
+    "./*": "./*"
   },
   "files": [
     "dist"
@@ -37,44 +37,43 @@
   "dependencies": {
     "atomically": "^2.0.3",
     "fast-ignore": "^1.1.3",
-    "find-up-json": "^2.0.4",
-    "function-once": "^3.0.0",
+    "find-up-json": "^2.0.5",
+    "function-once": "^3.0.1",
     "import-meta-resolve": "^4.1.0",
-    "is-binary-path": "^2.1.0",
+    "is-binary-path": "^3.0.0",
     "js-yaml": "^4.1.0",
-    "json-sorted-stringify": "^1.0.0",
+    "json-sorted-stringify": "^1.0.1",
     "json5": "^2.2.3",
-    "kasi": "^1.1.0",
-    "lomemo": "^1.0.0",
-    "pioppo": "^1.2.0",
-    "promise-resolve-timeout": "^2.0.0",
-    "smol-toml": "^1.3.1",
+    "kasi": "^1.1.1",
+    "lomemo": "^1.0.1",
+    "pioppo": "^1.2.1",
+    "promise-resolve-timeout": "^2.0.1",
+    "smol-toml": "^1.3.4",
     "specialist": "^1.4.5",
     "tiny-editorconfig": "^1.0.0",
-    "tiny-jsonc": "^1.0.1",
     "tiny-readdir": "^2.7.4",
-    "tiny-readdir-glob": "^1.23.1",
-    "tiny-spinner": "^2.0.4",
+    "tiny-readdir-glob": "^1.23.2",
+    "tiny-spinner": "^2.0.5",
     "worktank": "^2.7.3",
-    "zeptomatch": "^2.0.0",
-    "zeptomatch-escape": "^1.0.0",
-    "zeptomatch-is-static": "^1.0.0"
+    "zeptomatch": "^2.0.1",
+    "zeptomatch-escape": "^1.0.1",
+    "zeptomatch-is-static": "^1.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.12",
+    "@types/jest": "^29.5.14",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^20.12.7",
+    "@types/node": "^22.15.10",
     "cross-env": "^7.0.3",
     "dedent": "^1.5.3",
     "jest": "^29.7.0",
-    "jest-snapshot-serializer-ansi": "^2.1.0",
+    "jest-snapshot-serializer-ansi": "^2.2.1",
     "jest-snapshot-serializer-raw": "^2.0.0",
     "json-archive": "^2.1.0",
     "nanoexec": "^1.1.0",
-    "prettier": "3.3.3",
-    "radix64-encoding": "^2.0.1",
-    "tiny-dirname": "^1.0.1",
-    "typescript": "^5.4.5",
+    "prettier": "3.5.3",
+    "radix64-encoding": "^2.0.2",
+    "tiny-dirname": "^1.0.2",
+    "typescript": "^5.8.3",
     "zeptoid": "^1.0.2"
   }
 }

package.json

@@ -322,7 +322,8 @@ const makeWarnedPluggableBin = async (): Promise<Bin> => {
 
 const runBin = async (): Promise<void> => {
   const bin = await makeWarnedPluggableBin();
-  bin.run();
+  await bin.run();
 };
 
-runBin();
+// Exposed for test, we can also consider use TLA someday
+export const __promise = runBin();

src/bin.ts

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import JSONC from "tiny-jsonc";
+import url from "node:url";
 import zeptomatch from "zeptomatch";
 import Known from "./known.js";
 import { fastJoinedPath, fastRelativeChildPath, getModulePath } from "./utils.js";
@@ -15,19 +15,14 @@ const Loaders = {
     return loader(filePath);
   },
   js: async (filePath: string): Promise<unknown> => {
-    const module = await import(filePath);
+    const module = await import(url.pathToFileURL(filePath).href);
     return module.default || module.exports || module.prettier || module;
   },
   json: async (filePath: string): Promise<unknown> => {
     const fileContent = fs.readFileSync(filePath, "utf8");
     const config = JSON.parse(fileContent);
     return config;
   },
-  jsonc: async (filePath: string): Promise<unknown> => {
-    const fileContent = fs.readFileSync(filePath, "utf8");
-    const config = JSONC.parse(fileContent);
-    return config;
-  },
   json5: async (filePath: string): Promise<unknown> => {
     const fileContent = fs.readFileSync(filePath, "utf8");
     const JSON5 = (await import("json5")).default;
@@ -70,7 +65,6 @@ const File2Loader: Record<string, (filePath: string) => Promise<unknown>> = {
   ".prettierrc.yml": Loaders.yaml,
   ".prettierrc.yaml": Loaders.yaml,
   ".prettierrc.json": Loaders.json,
-  ".prettierrc.jsonc": Loaders.jsonc,
   ".prettierrc.json5": Loaders.json5,
   ".prettierrc.toml": Loaders.toml,
   ".prettierrc.js": Loaders.js,
@@ -86,7 +80,6 @@ const Ext2Loader: Record<string, (filePath: string) => Promise<unknown>> = {
   yml: Loaders.yaml,
   yaml: Loaders.yaml,
   json: Loaders.json,
-  jsonc: Loaders.jsonc,
   json5: Loaders.json5,
   toml: Loaders.toml,
   js: Loaders.js,

src/config_prettier.ts

@@ -21,6 +21,7 @@ const DEFAULT_PARSERS = [
   "scss",
   "json",
   "json5",
+  "jsonc",
   "json-stringify",
   "graphql",
   "markdown",

src/constants.ts

@@ -12,7 +12,7 @@ import Known from "./known.js";
 import Logger from "./logger.js";
 import { makePrettier } from "./prettier.js";
 import { castArray, getExpandedFoldersPaths, getFoldersChildrenPaths, getPluginsVersions, getProjectPath, getStdin, getTargetsPaths } from "./utils.js";
-import { fastRelativePath, isNull, isString, isUndefined, negate, pluralize, trimFinalNewline, uniq, without } from "./utils.js";
+import { fastRelativePath, isNull, isString, isUndefined, negate, pluralize, trimFinalNewline, uniq, without, normalizeToPosix } from "./utils.js";
 import type { FormatOptions, Options, PluginsOptions } from "./types.js";
 
 async function run(options: Options, pluginsDefaultOptions: PluginsOptions, pluginsCustomOptions: PluginsOptions): Promise<void> {
@@ -194,11 +194,11 @@ async function runGlobs(options: Options, pluginsDefaultOptions: PluginsOptions,
         } else {
           totalUnformatted += 1;
           const filePath = filesPathsTargets[i];
-          const fileRelativePath = fastRelativePath(rootPath, filePath);
+          const fileNameToDisplay = normalizeToPosix(fastRelativePath(rootPath, filePath));
           if (options.check) {
-            stderr.prefixed.warn(fileRelativePath);
+            stderr.prefixed.warn(fileNameToDisplay);
           } else if (options.list || options.write) {
-            stdout.warn(fileRelativePath);
+            stdout.warn(fileNameToDisplay);
           }
         }
       }
@@ -212,12 +212,12 @@ async function runGlobs(options: Options, pluginsDefaultOptions: PluginsOptions,
         totalErrored += 1;
         pathsErrored.push(filesPathsTargets[i]);
         const filePath = filesPathsTargets[i];
-        const fileRelativePath = fastRelativePath(rootPath, filePath);
+        const fileNameToDisplay = normalizeToPosix(fastRelativePath(rootPath, filePath));
         //TODO: Make sure the error is syntax-highlighted when possible
         if (options.check || options.write) {
-          stderr.prefixed.error(`${fileRelativePath}: ${error}`);
+          stderr.prefixed.error(`${fileNameToDisplay}: ${error}`);
         } else if (options.list) {
-          stderr.error(fileRelativePath);
+          stderr.error(fileNameToDisplay);
         }
       }
     }
@@ -229,9 +229,9 @@ async function runGlobs(options: Options, pluginsDefaultOptions: PluginsOptions,
   stdout.prefixed.debug(`Files formatted: ${totalFormatted}`);
   stdout.prefixed.debug(`Files unformatted: ${totalUnformatted}`);
   stdout.prefixed.debug(`Files unknown: ${totalUnknown}`);
-  stdout.prefixed.debug(() => pathsUnknown.map((filePath) => fastRelativePath(rootPath, filePath)).join("\n"));
+  stdout.prefixed.debug(() => pathsUnknown.map((filePath) => normalizeToPosix(fastRelativePath(rootPath, filePath))).join("\n"));
   stdout.prefixed.debug(`Files errored: ${totalErrored}`);
-  stdout.prefixed.debug(() => pathsErrored.map((filePath) => fastRelativePath(rootPath, filePath)).join("\n"));
+  stdout.prefixed.debug(() => pathsErrored.map((filePath) => normalizeToPosix(fastRelativePath(rootPath, filePath))).join("\n"));
 
   if (!totalMatched && !totalIgnored) {
     if (options.errorOnUnmatchedPattern) {

src/index.ts

@@ -1,6 +1,6 @@
 import { readFile, writeFile } from "atomically";
 import process from "node:process";
-import prettier from "prettier/standalone";
+import * as prettier from "prettier/standalone";
 import { getPluginsOrExit, getPluginsBuiltin, resolve } from "./utils.js";
 import type { ContextOptions, LazyFormatOptions, PluginsOptions } from "./types.js";
 

src/prettier_serial.ts

@@ -20,7 +20,7 @@ type FormatOptions = {
   insertPragma?: boolean;
   jsxSingleQuote?: boolean;
   objectWrap?: "preserve" | "collapse";
-  parser?: "flow" | "babel" | "babel-flow" | "babel-ts" | "typescript" | "acorn" | "espree" | "meriyah" | "css" | "less" | "scss" | "json" | "json5" | "json-stringify" | "graphql" | "markdown" | "mdx" | "vue" | "yaml" | "glimmer" | "html" | "angular" | "lwc"; // prettier-ignore
+  parser?: "flow" | "babel" | "babel-flow" | "babel-ts" | "typescript" | "acorn" | "espree" | "meriyah" | "css" | "less" | "scss" | "json" | "jsonc" | "json5" | "json-stringify" | "graphql" | "markdown" | "mdx" | "vue" | "yaml" | "glimmer" | "html" | "angular" | "lwc"; // prettier-ignore
   plugins?: string[];
   printWidth?: number;
   proseWrap?: "always" | "never" | "preserve";