Merge pull request #12 from rivethealth/Nevada/add-file-ext-overrides…

…-option-to-prettier-config Support Prettier's `overrides` option; upgrade to Prettier 3.4.2
rivethealth · Dec 25, 2024 · 65f4339 · 65f4339
2 parents 0696c8d + dc3dbad
commit 65f4339
Show file tree

Hide file tree

Showing 9 changed files with 2,224 additions and 26 deletions.
diff --git a/nodejs/default/nodejs.bzl b/nodejs/default/nodejs.bzl
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "long": "~4.0.0",
     "node-fetch": "^2.0.0",
     "npm-registry-fetch": "~14.0.2",
-    "prettier": "^3",
+    "prettier": "^3.4.2",
     "prettier-plugin-organize-imports": "^3",
     "protobufjs": "~6.11.2",
     "reflect-metadata": "0.1.13",

diff --git a/prettier/format/src/index.ts b/prettier/format/src/index.ts
@@ -2,8 +2,9 @@ import { workerMain } from "@better-rules-javascript/bazel-worker";
 import { ArgumentParser } from "argparse";
 import { dirname } from "node:path";
 import { pathToFileURL } from "node:url";
-import { Options } from "prettier";
+import { Options, resolveConfig } from "prettier";
 import { load, resolve } from "./import";
+import { PrettierWorker } from "./worker";
 
 interface Args {
   config?: string;
@@ -14,9 +15,6 @@ workerMain(async (a) => {
   parser.add_argument("--config", { help: "Configuration path" });
   const args: Args = parser.parse_args(a);
 
-  const { resolveConfig } = await import("prettier");
-  const { PrettierWorker } = await import("./worker");
-
   const options: Options | undefined =
     args.config === undefined
       ? undefined
@@ -37,7 +35,7 @@ workerMain(async (a) => {
       }),
     );
   }
-  const worker = new PrettierWorker(options);
+  const worker = new PrettierWorker(args.config, options?.plugins);
 
   return async (a) => {
     try {

diff --git a/prettier/format/src/worker.ts b/prettier/format/src/worker.ts
@@ -1,18 +1,31 @@
 import { ArgumentParser } from "argparse";
 import { readFile, writeFile } from "node:fs/promises";
-import { Options, format } from "prettier";
+import { resolve } from "node:path";
+import { Options, format, resolveConfig } from "prettier";
 
 export class PrettierWorker {
-  constructor(private readonly options: Options | undefined) {}
+  constructor(
+    readonly configPath: string | undefined,
+    readonly plugins: any[] | undefined,
+  ) {}
 
   async run(a: string[]) {
     const parser = new ArgumentParser();
     parser.add_argument("input");
     parser.add_argument("output");
     const args = parser.parse_args(a);
+
+    const resolvedConfig = await resolveConfig(resolve(args.input), {
+      config: this.configPath,
+    });
+    const options: Options = {
+      ...resolvedConfig,
+      plugins: this.plugins,
+    };
+
     const input = await readFile(args.input, "utf8");
     const output = await format(input, {
-      ...this.options,
+      ...options,
       filepath: args.input,
     });
     await writeFile(args.output, output, "utf8");

diff --git a/rules/npm_data.bzl b/rules/npm_data.bzl
@@ -11153,14 +11153,14 @@ PACKAGES = {
         "name": "prelude-ls",
         "url": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
     },
-    "prettier@3.1.1": {
+    "prettier@3.4.2": {
         "deps": [
         ],
         "extra_deps": {
         },
-        "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==",
+        "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
         "name": "prettier",
-        "url": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz",
+        "url": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
     },
     "pretty-bytes@5.6.0": {
         "deps": [
@@ -14147,7 +14147,7 @@ ROOTS = [
         "name": "npm",
     },
     {
-        "id": "prettier@3.1.1",
+        "id": "prettier@3.4.2",
         "name": "prettier",
     },
     {

diff --git a/rules/package.json b/rules/package.json
@@ -21,7 +21,7 @@
     "long": "~4.0.0",
     "node-fetch": "^2.0.0",
     "npm": "^9",
-    "prettier": "^3",
+    "prettier": "^3.4.2",
     "protobufjs": "~7.1.0",
     "rollup": "~3.21.0",
     "rxjs": "~7.5.0",

diff --git a/rules/yarn.lock b/rules/yarn.lock
@@ -5790,12 +5790,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3":
-  version: 3.1.1
-  resolution: "prettier@npm:3.1.1"
+"prettier@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "prettier@npm:3.4.2"
   bin:
     prettier: bin/prettier.cjs
-  checksum: e386855e3a1af86a748e16953f168be555ce66d6233f4ba54eb6449b88eb0c6b2ca79441b11eae6d28a7f9a5c96440ce50864b9d5f6356d331d39d6bb66c648e
+  checksum: 061c84513db62d3944c8dc8df36584dad82883ce4e49efcdbedd8703dce5b173c33fd9d2a4e1725d642a3b713c932b55418342eaa347479bc4a9cca114a04cd0
   languageName: node
   linkType: hard
 
@@ -6282,7 +6282,7 @@ __metadata:
     long: ~4.0.0
     node-fetch: ^2.0.0
     npm: ^9
-    prettier: ^3
+    prettier: ^3.4.2
     protobufjs: ~7.1.0
     rollup: ~3.21.0
     rxjs: ~7.5.0

diff --git a/util/starlark/src/index.ts b/util/starlark/src/index.ts
@@ -37,7 +37,7 @@ export class StarlarkFile {
   constructor(readonly statements: StarlarkStatement[]) {}
 }
 
-function printArray(value: StarlarkArray, indent: string | undefined): string {
+function printArray(value: StarlarkArray, indent?: string | undefined): string {
   let output = "";
   output += "[";
   output += indent === undefined ? " " : "\n";
@@ -56,7 +56,7 @@ function printArray(value: StarlarkArray, indent: string | undefined): string {
   return output;
 }
 
-function printDict(value: StarlarkDict, indent: string | undefined): string {
+function printDict(value: StarlarkDict, indent?: string | undefined): string {
   let output = "";
   output += "{";
   output += indent === undefined ? " " : "\n";
@@ -85,7 +85,7 @@ function printString(value: StarlarkString): string {
   return JSON.stringify(value.value);
 }
 
-function printValue(value: StarlarkValue, indent: string | undefined): string {
+function printValue(value: StarlarkValue, indent?: string | undefined): string {
   if (value instanceof StarlarkArray) {
     return printArray(value, indent);
   }

diff --git a/yarn.lock b/yarn.lock
@@ -7846,9 +7846,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3":
-  version: 3.1.1
-  resolution: "prettier@npm:3.1.1"
+"prettier@npm:^3.4.2":
+  version: 3.4.2
+  resolution: "prettier@npm:3.4.2"
   bin:
     prettier: bin/prettier.cjs
   checksum: e386855e3a1af86a748e16953f168be555ce66d6233f4ba54eb6449b88eb0c6b2ca79441b11eae6d28a7f9a5c96440ce50864b9d5f6356d331d39d6bb66c648e
@@ -8375,7 +8375,7 @@ __metadata:
     long: ~4.0.0
     node-fetch: ^2.0.0
     npm-registry-fetch: ~14.0.2
-    prettier: ^3
+    prettier: ^3.4.2
     prettier-plugin-organize-imports: ^3
     protobufjs: ~6.11.2
     reflect-metadata: 0.1.13