prettier 2.7.0 → 2.8.0

package/LICENSE

@@ -56,7 +56,7 @@ Repository: <https://github.com/babel/babel.git>
 
 ----------------------------------------
 
-### @babel/helper-validator-identifier@v7.16.7
+### @babel/helper-validator-identifier@v7.18.6
 
 License: MIT
 By: The Babel Team
@@ -118,7 +118,7 @@ Repository: <https://github.com/babel/babel.git>
 
 ----------------------------------------
 
-### @babel/parser@v7.18.0
+### @babel/parser@v7.20.1
 
 License: MIT
 By: The Babel Team
@@ -337,7 +337,7 @@ License: MIT
 
 ----------------------------------------
 
-### @typescript-eslint/types@v5.27.0
+### @typescript-eslint/types@v5.44.0
 
 License: MIT
 Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
@@ -366,7 +366,7 @@ Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 ----------------------------------------
 
-### @typescript-eslint/typescript-estree@v5.27.0
+### @typescript-eslint/typescript-estree@v5.44.0
 
 License: BSD-2-Clause
 Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
@@ -400,7 +400,7 @@ Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 ----------------------------------------
 
-### @typescript-eslint/visitor-keys@v5.27.0
+### @typescript-eslint/visitor-keys@v5.44.0
 
 License: MIT
 Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
@@ -429,14 +429,14 @@ Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 ----------------------------------------
 
-### acorn@v8.7.0
+### acorn@v8.8.0
 
 License: MIT
 Repository: <https://github.com/acornjs/acorn.git>
 
 > MIT License
 >
-> Copyright (C) 2012-2020 by various contributors (see AUTHORS)
+> Copyright (C) 2012-2022 by various contributors (see AUTHORS)
 >
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal
@@ -1243,34 +1243,6 @@ By: Jon Schlinkert
 
 ----------------------------------------
 
-### debug@v4.3.4
-
-License: MIT
-By: Josh Junon
-Repository: <git://github.com/debug-js/debug.git>
-
-> (The MIT License)
->
-> Copyright (c) 2014-2017 TJ Holowaychuk <tj@vision-media.ca>
-> Copyright (c) 2018-2021 Josh Junon
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-> and associated documentation files (the 'Software'), to deal in the Software without restriction,
-> including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-> and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-> subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in all copies or substantial
-> portions of the Software.
->
-> THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-> LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-> IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-> WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-> SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
 ### defaults@v1.0.3
 
 License: MIT
@@ -1739,7 +1711,7 @@ By: Toru Nagashima
 
 ----------------------------------------
 
-### espree@v9.3.1
+### espree@v9.4.0
 
 License: BSD-2-Clause
 By: Nicholas C. Zakas
@@ -3330,7 +3302,7 @@ Repository: <git+https://github.com/isaacs/isexe.git>
 
 ----------------------------------------
 
-### jest-docblock@v27.5.1
+### jest-docblock@v28.1.1
 
 License: MIT
 Repository: <https://github.com/facebook/jest.git>
@@ -3903,34 +3875,6 @@ Repository: <git://github.com/substack/minimist.git>
 
 ----------------------------------------
 
-### ms@v2.1.2
-
-License: MIT
-
-> The MIT License (MIT)
->
-> Copyright (c) 2016 Zeit, Inc.
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in all
-> copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-> SOFTWARE.
-
-----------------------------------------
-
 ### n-readlines@v1.0.1
 
 License: MIT
@@ -5353,7 +5297,7 @@ Repository: <https://github.com/ajafff/tsutils>
 
 ----------------------------------------
 
-### typescript@v4.7.2
+### typescript@v4.9.3
 
 License: Apache-2.0
 By: Microsoft Corp.

package/cli.js

@@ -2399,7 +2399,8 @@ var require_logger = __commonJS2({
       default: stripAnsi2
     } = (init_strip_ansi(), __toCommonJS(strip_ansi_exports));
     var {
-      default: chalk2
+      default: chalk2,
+      chalkStderr: chalkStderr2
     } = (init_source(), __toCommonJS(source_exports));
     var countLines = (stream, text) => {
       const columns = stream.columns || 80;
@@ -2435,8 +2436,9 @@ var require_logger = __commonJS2({
         if (!shouldLog(loggerName)) {
           return () => emptyLogResult;
         }
-        const prefix = color ? `[${chalk2[color](loggerName)}] ` : "";
         const stream = process[loggerName === "log" ? "stdout" : "stderr"];
+        const chalkInstance = loggerName === "log" ? chalk2 : chalkStderr2;
+        const prefix = color ? `[${chalkInstance[color](loggerName)}] ` : "";
         return (message, options) => {
           options = Object.assign({
             newline: true,
@@ -2641,6 +2643,10 @@ var require_constant = __commonJS2({
         description: "Only format changed files. Cannot use with --stdin-filepath.",
         type: "boolean"
       },
+      "cache-location": {
+        description: "Path to the cache file.",
+        type: "path"
+      },
       "cache-strategy": {
         choices: [{
           description: "Use the file metadata such as timestamps as cache keys",
@@ -3047,12 +3053,21 @@ var require_utils = __commonJS2({
         }
       }
     }
+    function isJson(value) {
+      try {
+        JSON.parse(value);
+        return true;
+      } catch {
+        return false;
+      }
+    }
     module2.exports = {
       printToScreen: printToScreen2,
       groupBy,
       pick,
       createHash,
-      statSafe
+      statSafe,
+      isJson
     };
   }
 });
@@ -9408,7 +9423,7 @@ var require_commondir = __commonJS2({
   }
 });
 var require_p_try = __commonJS2({
-  "node_modules/p-try/index.js"(exports2, module2) {
+  "node_modules/pkg-dir/node_modules/p-try/index.js"(exports2, module2) {
     "use strict";
     var pTry = (fn, ...arguments_) => new Promise((resolve) => {
       resolve(fn(...arguments_));
@@ -9418,7 +9433,7 @@ var require_p_try = __commonJS2({
   }
 });
 var require_p_limit = __commonJS2({
-  "node_modules/p-limit/index.js"(exports2, module2) {
+  "node_modules/pkg-dir/node_modules/p-limit/index.js"(exports2, module2) {
     "use strict";
     var pTry = require_p_try();
     var pLimit = (concurrency) => {
@@ -9467,7 +9482,7 @@ var require_p_limit = __commonJS2({
   }
 });
 var require_p_locate = __commonJS2({
-  "node_modules/p-locate/index.js"(exports2, module2) {
+  "node_modules/pkg-dir/node_modules/p-locate/index.js"(exports2, module2) {
     "use strict";
     var pLimit = require_p_limit();
     var EndError = class extends Error {
@@ -9506,7 +9521,7 @@ var require_p_locate = __commonJS2({
   }
 });
 var require_locate_path = __commonJS2({
-  "node_modules/locate-path/index.js"(exports2, module2) {
+  "node_modules/pkg-dir/node_modules/locate-path/index.js"(exports2, module2) {
     "use strict";
     var path = require("path");
     var fs = require("fs");
@@ -9593,7 +9608,7 @@ var require_path_exists = __commonJS2({
   }
 });
 var require_find_up = __commonJS2({
-  "node_modules/find-up/index.js"(exports2, module2) {
+  "node_modules/pkg-dir/node_modules/find-up/index.js"(exports2, module2) {
     "use strict";
     var path = require("path");
     var locatePath = require_locate_path();
@@ -10998,10 +11013,15 @@ var require_find_cache_dir = __commonJS2({
 var require_find_cache_file = __commonJS2({
   "src/cli/find-cache-file.js"(exports2, module2) {
     "use strict";
+    var fs = require("fs").promises;
     var os2 = require("os");
     var path = require("path");
     var findCacheDir = require_find_cache_dir();
-    function findCacheFile() {
+    var {
+      statSafe,
+      isJson
+    } = require_utils();
+    function findDefaultCacheFile() {
       const cacheDir = findCacheDir({
         name: "prettier",
         create: true
@@ -11009,6 +11029,27 @@ var require_find_cache_file = __commonJS2({
       const cacheFilePath = path.join(cacheDir, ".prettier-cache");
       return cacheFilePath;
     }
+    async function findCacheFileFromOption(cacheLocation) {
+      const cacheFile = path.resolve(cacheLocation);
+      const stat = await statSafe(cacheFile);
+      if (stat) {
+        if (stat.isDirectory()) {
+          throw new Error(`Resolved --cache-location '${cacheFile}' is a directory`);
+        }
+        const data = await fs.readFile(cacheFile, "utf8");
+        if (!isJson(data)) {
+          throw new Error(`'${cacheFile}' isn't a valid JSON file`);
+        }
+      }
+      return cacheFile;
+    }
+    async function findCacheFile(cacheLocation) {
+      if (!cacheLocation) {
+        return findDefaultCacheFile();
+      }
+      const cacheFile = await findCacheFileFromOption(cacheLocation);
+      return cacheFile;
+    }
     module2.exports = findCacheFile;
   }
 });
@@ -14113,16 +14154,13 @@ var require_format_results_cache = __commonJS2({
       }
       existsAvailableFormatResultsCache(filePath, options) {
         const fileDescriptor = this.fileEntryCache.getFileDescriptor(filePath);
-        const hashOfOptions = getHashOfOptions(options);
-        const meta = getMetadataFromFileDescriptor(fileDescriptor);
-        const changed = fileDescriptor.changed || meta.hashOfOptions !== hashOfOptions;
         if (fileDescriptor.notFound) {
           return false;
         }
-        if (changed) {
-          return false;
-        }
-        return true;
+        const hashOfOptions = getHashOfOptions(options);
+        const meta = getMetadataFromFileDescriptor(fileDescriptor);
+        const changed = fileDescriptor.changed || meta.hashOfOptions !== hashOfOptions;
+        return !changed;
       }
       setFormatResultsCache(filePath, options) {
         const fileDescriptor = this.fileEntryCache.getFileDescriptor(filePath);
@@ -14131,6 +14169,9 @@ var require_format_results_cache = __commonJS2({
           meta.hashOfOptions = getHashOfOptions(options);
         }
       }
+      removeFormatResultsCache(filePath) {
+        this.fileEntryCache.removeEntry(filePath);
+      }
       reconcile() {
         this.fileEntryCache.reconcile();
       }
@@ -14785,7 +14826,7 @@ var require_format = __commonJS2({
       }
     }
     async function formatFiles2(context) {
-      var _formatResultsCache3;
+      var _formatResultsCache4;
       const ignorer = await createIgnorerFromContextOrDie(context);
       let numberOfUnformattedFilesFound = 0;
       const {
@@ -14795,7 +14836,7 @@ var require_format = __commonJS2({
         context.logger.log("Checking formatting...");
       }
       let formatResultsCache;
-      const cacheFilePath = findCacheFile();
+      const cacheFilePath = await findCacheFile(context.argv.cacheLocation);
       if (context.argv.cache) {
         formatResultsCache = new FormatResultsCache(cacheFilePath, context.argv.cacheStrategy || "content");
       } else {
@@ -14803,13 +14844,15 @@ var require_format = __commonJS2({
           context.logger.error("`--cache-strategy` cannot be used without `--cache`.");
           process.exit(2);
         }
-        const stat = await statSafe(cacheFilePath);
-        if (stat) {
-          await fs.unlink(cacheFilePath);
+        if (!context.argv.cacheLocation) {
+          const stat = await statSafe(cacheFilePath);
+          if (stat) {
+            await fs.unlink(cacheFilePath);
+          }
         }
       }
       for await (const pathOrError of expandPatterns(context)) {
-        var _formatResultsCache, _formatResultsCache2;
+        var _formatResultsCache;
         if (typeof pathOrError === "object") {
           context.logger.error(pathOrError.error);
           process.exitCode = 2;
@@ -14864,8 +14907,8 @@ ${error.message}`);
           handleError(context, filename, error, printedFilename);
           continue;
         }
-        (_formatResultsCache2 = formatResultsCache) === null || _formatResultsCache2 === void 0 ? void 0 : _formatResultsCache2.setFormatResultsCache(filename, options);
         const isDifferent = output !== input;
+        let shouldSetCache = !isDifferent;
         if (printedFilename) {
           printedFilename.clear();
         }
@@ -14880,6 +14923,7 @@ ${error.message}`);
             }
             try {
               await fs.writeFile(filename, output, "utf8");
+              shouldSetCache = true;
             } catch (error) {
               context.logger.error(`Unable to write file: ${filename}
 ${error.message}`);
@@ -14902,6 +14946,13 @@ ${error.message}`);
         } else if (!context.argv.check && !context.argv.listDifferent) {
           writeOutput(context, result, options);
         }
+        if (shouldSetCache) {
+          var _formatResultsCache2;
+          (_formatResultsCache2 = formatResultsCache) === null || _formatResultsCache2 === void 0 ? void 0 : _formatResultsCache2.setFormatResultsCache(filename, options);
+        } else {
+          var _formatResultsCache3;
+          (_formatResultsCache3 = formatResultsCache) === null || _formatResultsCache3 === void 0 ? void 0 : _formatResultsCache3.removeFormatResultsCache(filename);
+        }
         if (isDifferent) {
           if (context.argv.check) {
             context.logger.warn(filename);
@@ -14911,7 +14962,7 @@ ${error.message}`);
           numberOfUnformattedFilesFound += 1;
         }
       }
-      (_formatResultsCache3 = formatResultsCache) === null || _formatResultsCache3 === void 0 ? void 0 : _formatResultsCache3.reconcile();
+      (_formatResultsCache4 = formatResultsCache) === null || _formatResultsCache4 === void 0 ? void 0 : _formatResultsCache4.reconcile();
       if (context.argv.check) {
         if (numberOfUnformattedFilesFound === 0) {
           context.logger.log("All matched files use Prettier code style!");