prettier 3.0.1 → 3.0.2

package/LICENSE

@@ -17,7 +17,7 @@ MIT, ISC, BSD-2-Clause, BSD-3-Clause, Apache-2.0
 
 ## Bundled dependencies
 
-### @angular/compiler@v16.1.7
+### @angular/compiler@v16.2.0
 
 > Angular - the compiler library
 
@@ -27,7 +27,7 @@ Author: angular
 
 ----------------------------------------
 
-### @babel/code-frame@v7.22.5
+### @babel/code-frame@v7.22.10
 
 > Generate errors that contain a code frame that point to source locations.
 
@@ -94,7 +94,7 @@ Author: The Babel Team (https://babel.dev/team)
 
 ----------------------------------------
 
-### @babel/highlight@v7.22.5
+### @babel/highlight@v7.22.10
 
 > Syntax highlight JavaScript strings for output in terminals.
 
@@ -128,7 +128,7 @@ Author: The Babel Team (https://babel.dev/team)
 
 ----------------------------------------
 
-### @babel/parser@v7.22.7
+### @babel/parser@v7.22.10
 
 > A JavaScript parser
 
@@ -397,7 +397,7 @@ Author: fisker Cheung <lionkay@gmail.com>
 
 ----------------------------------------
 
-### @prettier/parse-srcset@v3.0.0
+### @prettier/parse-srcset@v3.1.0
 
 > A spec-conformant JavaScript parser for the HTML5 srcset attribute
 
@@ -408,6 +408,7 @@ Author: Alex Bell <alex@bellandwhistle.net>
 > The MIT License (MIT)
 >
 > Copyright (c) 2014 Alex Bell
+> Copyright (c) fisker Cheung
 >
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal
@@ -429,7 +430,7 @@ Author: Alex Bell <alex@bellandwhistle.net>
 
 ----------------------------------------
 
-### @typescript-eslint/types@v6.2.0
+### @typescript-eslint/types@v6.4.0
 
 > Types for the TypeScript-ESTree AST spec
 
@@ -460,7 +461,7 @@ Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 ----------------------------------------
 
-### @typescript-eslint/typescript-estree@v6.2.0
+### @typescript-eslint/typescript-estree@v6.4.0
 
 > A parser that converts TypeScript source code into an ESTree compatible form
 
@@ -798,7 +799,7 @@ Contributors:
 
 ----------------------------------------
 
-### camelcase@v7.0.1
+### camelcase@v8.0.0
 
 > Convert a dash/dot/underscore/space separated string to camelCase or PascalCase: `foo-bar` → `fooBar`
 
@@ -1915,7 +1916,7 @@ Contributors:
 
 ----------------------------------------
 
-### flow-parser@v0.213.1
+### flow-parser@v0.214.0
 
 > JavaScript parser written in OCaml. Produces ESTree AST
 

package/index.cjs

@@ -592,7 +592,7 @@ var init_public = __esm({
 // src/main/version.evaluate.cjs
 var require_version_evaluate = __commonJS({
   "src/main/version.evaluate.cjs"(exports2, module2) {
-    module2.exports = "3.0.1";
+    module2.exports = "3.0.2";
   }
 });
 

package/index.mjs

@@ -6068,9 +6068,9 @@ var require_lib = __commonJS({
   }
 });
 
-// node_modules/@babel/highlight/node_modules/escape-string-regexp/index.js
+// node_modules/@babel/code-frame/node_modules/escape-string-regexp/index.js
 var require_escape_string_regexp = __commonJS({
-  "node_modules/@babel/highlight/node_modules/escape-string-regexp/index.js"(exports, module) {
+  "node_modules/@babel/code-frame/node_modules/escape-string-regexp/index.js"(exports, module) {
     "use strict";
     var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
     module.exports = function(str) {
@@ -7224,9 +7224,9 @@ var require_ansi_styles = __commonJS({
   }
 });
 
-// node_modules/@babel/highlight/node_modules/has-flag/index.js
+// node_modules/@babel/code-frame/node_modules/has-flag/index.js
 var require_has_flag = __commonJS({
-  "node_modules/@babel/highlight/node_modules/has-flag/index.js"(exports, module) {
+  "node_modules/@babel/code-frame/node_modules/has-flag/index.js"(exports, module) {
     "use strict";
     module.exports = (flag, argv) => {
       argv = argv || process.argv;
@@ -7238,9 +7238,9 @@ var require_has_flag = __commonJS({
   }
 });
 
-// node_modules/@babel/highlight/node_modules/supports-color/index.js
+// node_modules/@babel/code-frame/node_modules/supports-color/index.js
 var require_supports_color = __commonJS({
-  "node_modules/@babel/highlight/node_modules/supports-color/index.js"(exports, module) {
+  "node_modules/@babel/code-frame/node_modules/supports-color/index.js"(exports, module) {
     "use strict";
     var os2 = __require("os");
     var hasFlag2 = require_has_flag();
@@ -7333,9 +7333,9 @@ var require_supports_color = __commonJS({
   }
 });
 
-// node_modules/@babel/highlight/node_modules/chalk/templates.js
+// node_modules/@babel/code-frame/node_modules/chalk/templates.js
 var require_templates = __commonJS({
-  "node_modules/@babel/highlight/node_modules/chalk/templates.js"(exports, module) {
+  "node_modules/@babel/code-frame/node_modules/chalk/templates.js"(exports, module) {
     "use strict";
     var TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
     var STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
@@ -7444,9 +7444,9 @@ var require_templates = __commonJS({
   }
 });
 
-// node_modules/@babel/highlight/node_modules/chalk/index.js
+// node_modules/@babel/code-frame/node_modules/chalk/index.js
 var require_chalk = __commonJS({
-  "node_modules/@babel/highlight/node_modules/chalk/index.js"(exports, module) {
+  "node_modules/@babel/code-frame/node_modules/chalk/index.js"(exports, module) {
     "use strict";
     var escapeStringRegexp2 = require_escape_string_regexp();
     var ansiStyles2 = require_ansi_styles();
@@ -7619,23 +7619,23 @@ var require_lib2 = __commonJS({
       value: true
     });
     exports.default = highlight;
-    exports.getChalk = getChalk;
     exports.shouldHighlight = shouldHighlight;
     var _jsTokens = require_js_tokens();
     var _helperValidatorIdentifier = require_lib();
-    var _chalk = require_chalk();
+    var _chalk2 = require_chalk();
+    var chalk2 = _chalk2;
     var sometimesKeywords = /* @__PURE__ */ new Set(["as", "async", "from", "get", "of", "set"]);
-    function getDefs(chalk2) {
+    function getDefs(chalk3) {
       return {
-        keyword: chalk2.cyan,
-        capitalized: chalk2.yellow,
-        jsxIdentifier: chalk2.yellow,
-        punctuator: chalk2.yellow,
-        number: chalk2.magenta,
-        string: chalk2.green,
-        regex: chalk2.magenta,
-        comment: chalk2.grey,
-        invalid: chalk2.white.bgRed.bold
+        keyword: chalk3.cyan,
+        capitalized: chalk3.yellow,
+        jsxIdentifier: chalk3.yellow,
+        punctuator: chalk3.yellow,
+        number: chalk3.magenta,
+        string: chalk3.green,
+        regex: chalk3.magenta,
+        comment: chalk3.grey,
+        invalid: chalk3.white.bgRed.bold
       };
     }
     var NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
@@ -7690,18 +7690,28 @@ var require_lib2 = __commonJS({
       return highlighted;
     }
     function shouldHighlight(options8) {
-      return !!_chalk.supportsColor || options8.forceColor;
+      return !!chalk2.supportsColor || options8.forceColor;
+    }
+    var chalkWithForcedColor = void 0;
+    function getChalk(forceColor) {
+      if (forceColor) {
+        var _chalkWithForcedColor;
+        (_chalkWithForcedColor = chalkWithForcedColor) != null ? _chalkWithForcedColor : chalkWithForcedColor = new chalk2.constructor({
+          enabled: true,
+          level: 1
+        });
+        return chalkWithForcedColor;
+      }
+      return chalk2;
     }
-    function getChalk(options8) {
-      return options8.forceColor ? new _chalk.constructor({
-        enabled: true,
-        level: 1
-      }) : _chalk;
+    {
+      {
+        exports.getChalk = (options8) => getChalk(options8.forceColor);
+      }
     }
     function highlight(code, options8 = {}) {
       if (code !== "" && shouldHighlight(options8)) {
-        const chalk2 = getChalk(options8);
-        const defs = getDefs(chalk2);
+        const defs = getDefs(getChalk(options8.forceColor));
         return highlightTokens(defs, code);
       } else {
         return code;
@@ -7720,12 +7730,26 @@ var require_lib3 = __commonJS({
     exports.codeFrameColumns = codeFrameColumns2;
     exports.default = _default;
     var _highlight = require_lib2();
+    var _chalk2 = require_chalk();
+    var chalk2 = _chalk2;
+    var chalkWithForcedColor = void 0;
+    function getChalk(forceColor) {
+      if (forceColor) {
+        var _chalkWithForcedColor;
+        (_chalkWithForcedColor = chalkWithForcedColor) != null ? _chalkWithForcedColor : chalkWithForcedColor = new chalk2.constructor({
+          enabled: true,
+          level: 1
+        });
+        return chalkWithForcedColor;
+      }
+      return chalk2;
+    }
     var deprecationWarningShown = false;
-    function getDefs(chalk2) {
+    function getDefs(chalk3) {
       return {
-        gutter: chalk2.grey,
-        marker: chalk2.red.bold,
-        message: chalk2.red.bold
+        gutter: chalk3.grey,
+        marker: chalk3.red.bold,
+        message: chalk3.red.bold
       };
     }
     var NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
@@ -7787,8 +7811,8 @@ var require_lib3 = __commonJS({
     }
     function codeFrameColumns2(rawLines, loc, opts = {}) {
       const highlighted = (opts.highlightCode || opts.forceColor) && (0, _highlight.shouldHighlight)(opts);
-      const chalk2 = (0, _highlight.getChalk)(opts);
-      const defs = getDefs(chalk2);
+      const chalk3 = getChalk(opts.forceColor);
+      const defs = getDefs(chalk3);
       const maybeHighlight = (chalkFn, string) => {
         return highlighted ? chalkFn(string) : string;
       };
@@ -7827,7 +7851,7 @@ var require_lib3 = __commonJS({
 ${frame}`;
       }
       if (highlighted) {
-        return chalk2.reset(frame);
+        return chalk3.reset(frame);
       } else {
         return frame;
       }
@@ -21402,7 +21426,7 @@ function isNextLineEmpty2(text, startIndex) {
 import * as doc from "./doc.mjs";
 
 // src/main/version.evaluate.cjs
-var version_evaluate_default = "3.0.1";
+var version_evaluate_default = "3.0.2";
 
 // src/index.js
 function withPlugins(fn, optionsArgumentIndex = 1) {

package/internal/cli.mjs

@@ -5404,12 +5404,30 @@ var preserveCamelCase = (string, toLowerCase, toUpperCase, preserveConsecutiveUp
 };
 var preserveConsecutiveUppercase = (input, toLowerCase) => {
   LEADING_CAPITAL.lastIndex = 0;
-  return input.replace(LEADING_CAPITAL, (m1) => toLowerCase(m1));
+  return string_replace_all_default(
+    /* isOptionalObject*/
+    false,
+    input,
+    LEADING_CAPITAL,
+    (match) => toLowerCase(match)
+  );
 };
 var postProcess = (input, toUpperCase) => {
   SEPARATORS_AND_IDENTIFIER.lastIndex = 0;
   NUMBERS_AND_IDENTIFIER.lastIndex = 0;
-  return input.replace(SEPARATORS_AND_IDENTIFIER, (_, identifier) => toUpperCase(identifier)).replace(NUMBERS_AND_IDENTIFIER, (m) => toUpperCase(m));
+  return string_replace_all_default(
+    /* isOptionalObject*/
+    false,
+    string_replace_all_default(
+      /* isOptionalObject*/
+      false,
+      input,
+      NUMBERS_AND_IDENTIFIER,
+      (match, pattern, offset) => ["_", "-"].includes(input.charAt(offset + match.length)) ? match : toUpperCase(match)
+    ),
+    SEPARATORS_AND_IDENTIFIER,
+    (_, identifier) => toUpperCase(identifier)
+  );
 };
 function camelCase(input, options) {
   if (!(typeof input === "string" || Array.isArray(input))) {

package/internal/internal.mjs

@@ -673,9 +673,9 @@ var require_lib = __commonJS({
   }
 });
 
-// node_modules/@babel/highlight/node_modules/escape-string-regexp/index.js
+// node_modules/@babel/code-frame/node_modules/escape-string-regexp/index.js
 var require_escape_string_regexp = __commonJS({
-  "node_modules/@babel/highlight/node_modules/escape-string-regexp/index.js"(exports, module) {
+  "node_modules/@babel/code-frame/node_modules/escape-string-regexp/index.js"(exports, module) {
     "use strict";
     var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
     module.exports = function(str) {
@@ -1829,9 +1829,9 @@ var require_ansi_styles = __commonJS({
   }
 });
 
-// node_modules/@babel/highlight/node_modules/has-flag/index.js
+// node_modules/@babel/code-frame/node_modules/has-flag/index.js
 var require_has_flag = __commonJS({
-  "node_modules/@babel/highlight/node_modules/has-flag/index.js"(exports, module) {
+  "node_modules/@babel/code-frame/node_modules/has-flag/index.js"(exports, module) {
     "use strict";
     module.exports = (flag, argv) => {
       argv = argv || process.argv;
@@ -1843,9 +1843,9 @@ var require_has_flag = __commonJS({
   }
 });
 
-// node_modules/@babel/highlight/node_modules/supports-color/index.js
+// node_modules/@babel/code-frame/node_modules/supports-color/index.js
 var require_supports_color = __commonJS({
-  "node_modules/@babel/highlight/node_modules/supports-color/index.js"(exports, module) {
+  "node_modules/@babel/code-frame/node_modules/supports-color/index.js"(exports, module) {
     "use strict";
     var os = __require("os");
     var hasFlag = require_has_flag();
@@ -1938,9 +1938,9 @@ var require_supports_color = __commonJS({
   }
 });
 
-// node_modules/@babel/highlight/node_modules/chalk/templates.js
+// node_modules/@babel/code-frame/node_modules/chalk/templates.js
 var require_templates = __commonJS({
-  "node_modules/@babel/highlight/node_modules/chalk/templates.js"(exports, module) {
+  "node_modules/@babel/code-frame/node_modules/chalk/templates.js"(exports, module) {
     "use strict";
     var TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
     var STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
@@ -2049,9 +2049,9 @@ var require_templates = __commonJS({
   }
 });
 
-// node_modules/@babel/highlight/node_modules/chalk/index.js
+// node_modules/@babel/code-frame/node_modules/chalk/index.js
 var require_chalk = __commonJS({
-  "node_modules/@babel/highlight/node_modules/chalk/index.js"(exports, module) {
+  "node_modules/@babel/code-frame/node_modules/chalk/index.js"(exports, module) {
     "use strict";
     var escapeStringRegexp = require_escape_string_regexp();
     var ansiStyles = require_ansi_styles();
@@ -2224,23 +2224,23 @@ var require_lib2 = __commonJS({
       value: true
     });
     exports.default = highlight;
-    exports.getChalk = getChalk;
     exports.shouldHighlight = shouldHighlight;
     var _jsTokens = require_js_tokens();
     var _helperValidatorIdentifier = require_lib();
-    var _chalk = require_chalk();
+    var _chalk2 = require_chalk();
+    var chalk = _chalk2;
     var sometimesKeywords = /* @__PURE__ */ new Set(["as", "async", "from", "get", "of", "set"]);
-    function getDefs(chalk) {
+    function getDefs(chalk2) {
       return {
-        keyword: chalk.cyan,
-        capitalized: chalk.yellow,
-        jsxIdentifier: chalk.yellow,
-        punctuator: chalk.yellow,
-        number: chalk.magenta,
-        string: chalk.green,
-        regex: chalk.magenta,
-        comment: chalk.grey,
-        invalid: chalk.white.bgRed.bold
+        keyword: chalk2.cyan,
+        capitalized: chalk2.yellow,
+        jsxIdentifier: chalk2.yellow,
+        punctuator: chalk2.yellow,
+        number: chalk2.magenta,
+        string: chalk2.green,
+        regex: chalk2.magenta,
+        comment: chalk2.grey,
+        invalid: chalk2.white.bgRed.bold
       };
     }
     var NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
@@ -2295,18 +2295,28 @@ var require_lib2 = __commonJS({
       return highlighted;
     }
     function shouldHighlight(options) {
-      return !!_chalk.supportsColor || options.forceColor;
+      return !!chalk.supportsColor || options.forceColor;
+    }
+    var chalkWithForcedColor = void 0;
+    function getChalk(forceColor) {
+      if (forceColor) {
+        var _chalkWithForcedColor;
+        (_chalkWithForcedColor = chalkWithForcedColor) != null ? _chalkWithForcedColor : chalkWithForcedColor = new chalk.constructor({
+          enabled: true,
+          level: 1
+        });
+        return chalkWithForcedColor;
+      }
+      return chalk;
     }
-    function getChalk(options) {
-      return options.forceColor ? new _chalk.constructor({
-        enabled: true,
-        level: 1
-      }) : _chalk;
+    {
+      {
+        exports.getChalk = (options) => getChalk(options.forceColor);
+      }
     }
     function highlight(code, options = {}) {
       if (code !== "" && shouldHighlight(options)) {
-        const chalk = getChalk(options);
-        const defs = getDefs(chalk);
+        const defs = getDefs(getChalk(options.forceColor));
         return highlightTokens(defs, code);
       } else {
         return code;
@@ -2325,12 +2335,26 @@ var require_lib3 = __commonJS({
     exports.codeFrameColumns = codeFrameColumns;
     exports.default = _default;
     var _highlight = require_lib2();
+    var _chalk2 = require_chalk();
+    var chalk = _chalk2;
+    var chalkWithForcedColor = void 0;
+    function getChalk(forceColor) {
+      if (forceColor) {
+        var _chalkWithForcedColor;
+        (_chalkWithForcedColor = chalkWithForcedColor) != null ? _chalkWithForcedColor : chalkWithForcedColor = new chalk.constructor({
+          enabled: true,
+          level: 1
+        });
+        return chalkWithForcedColor;
+      }
+      return chalk;
+    }
     var deprecationWarningShown = false;
-    function getDefs(chalk) {
+    function getDefs(chalk2) {
       return {
-        gutter: chalk.grey,
-        marker: chalk.red.bold,
-        message: chalk.red.bold
+        gutter: chalk2.grey,
+        marker: chalk2.red.bold,
+        message: chalk2.red.bold
       };
     }
     var NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
@@ -2392,8 +2416,8 @@ var require_lib3 = __commonJS({
     }
     function codeFrameColumns(rawLines, loc, opts = {}) {
       const highlighted = (opts.highlightCode || opts.forceColor) && (0, _highlight.shouldHighlight)(opts);
-      const chalk = (0, _highlight.getChalk)(opts);
-      const defs = getDefs(chalk);
+      const chalk2 = getChalk(opts.forceColor);
+      const defs = getDefs(chalk2);
       const maybeHighlight = (chalkFn, string) => {
         return highlighted ? chalkFn(string) : string;
       };
@@ -2432,7 +2456,7 @@ var require_lib3 = __commonJS({
 ${frame}`;
       }
       if (highlighted) {
-        return chalk.reset(frame);
+        return chalk2.reset(frame);
       } else {
         return frame;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin/prettier.cjs",
   "repository": "prettier/prettier",