prettier 4.0.0-alpha.7 → 4.0.0-alpha.9

package/index.cjs

@@ -33,6 +33,42 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// src/utils/skip.js
+function skip(characters) {
+  return (text, startIndex, options) => {
+    const backwards = Boolean(options == null ? void 0 : options.backwards);
+    if (startIndex === false) {
+      return false;
+    }
+    const { length } = text;
+    let cursor = startIndex;
+    while (cursor >= 0 && cursor < length) {
+      const character = text.charAt(cursor);
+      if (characters instanceof RegExp) {
+        if (!characters.test(character)) {
+          return cursor;
+        }
+      } else if (!characters.includes(character)) {
+        return cursor;
+      }
+      backwards ? cursor-- : cursor++;
+    }
+    if (cursor === -1 || cursor === length) {
+      return cursor;
+    }
+    return false;
+  };
+}
+var skipWhitespace, skipSpaces, skipToLineEnd, skipEverythingButNewLine;
+var init_skip = __esm({
+  "src/utils/skip.js"() {
+    skipWhitespace = skip(/\s/);
+    skipSpaces = skip(" 	");
+    skipToLineEnd = skip(",; 	");
+    skipEverythingButNewLine = skip(/[^\n\r]/);
+  }
+});
+
 // src/utils/skip-inline-comment.js
 function skipInlineComment(text, startIndex) {
   if (startIndex === false) {
@@ -85,42 +121,6 @@ var init_skip_newline = __esm({
   }
 });
 
-// src/utils/skip.js
-function skip(characters) {
-  return (text, startIndex, options) => {
-    const backwards = Boolean(options == null ? void 0 : options.backwards);
-    if (startIndex === false) {
-      return false;
-    }
-    const { length } = text;
-    let cursor = startIndex;
-    while (cursor >= 0 && cursor < length) {
-      const character = text.charAt(cursor);
-      if (characters instanceof RegExp) {
-        if (!characters.test(character)) {
-          return cursor;
-        }
-      } else if (!characters.includes(character)) {
-        return cursor;
-      }
-      backwards ? cursor-- : cursor++;
-    }
-    if (cursor === -1 || cursor === length) {
-      return cursor;
-    }
-    return false;
-  };
-}
-var skipWhitespace, skipSpaces, skipToLineEnd, skipEverythingButNewLine;
-var init_skip = __esm({
-  "src/utils/skip.js"() {
-    skipWhitespace = skip(/\s/);
-    skipSpaces = skip(" 	");
-    skipToLineEnd = skip(",; 	");
-    skipEverythingButNewLine = skip(/[^\n\r]/);
-  }
-});
-
 // src/utils/skip-trailing-comment.js
 function skipTrailingComment(text, startIndex) {
   if (startIndex === false) {
@@ -155,32 +155,14 @@ function getNextNonSpaceNonCommentCharacterIndex(text, startIndex) {
 var get_next_non_space_non_comment_character_index_default;
 var init_get_next_non_space_non_comment_character_index = __esm({
   "src/utils/get-next-non-space-non-comment-character-index.js"() {
+    init_skip();
     init_skip_inline_comment();
     init_skip_newline();
     init_skip_trailing_comment();
-    init_skip();
     get_next_non_space_non_comment_character_index_default = getNextNonSpaceNonCommentCharacterIndex;
   }
 });
 
-// src/utils/is-previous-line-empty.js
-function isPreviousLineEmpty(text, startIndex) {
-  let idx = startIndex - 1;
-  idx = skipSpaces(text, idx, { backwards: true });
-  idx = skip_newline_default(text, idx, { backwards: true });
-  idx = skipSpaces(text, idx, { backwards: true });
-  const idx2 = skip_newline_default(text, idx, { backwards: true });
-  return idx !== idx2;
-}
-var is_previous_line_empty_default;
-var init_is_previous_line_empty = __esm({
-  "src/utils/is-previous-line-empty.js"() {
-    init_skip_newline();
-    init_skip();
-    is_previous_line_empty_default = isPreviousLineEmpty;
-  }
-});
-
 // src/utils/has-newline.js
 function hasNewline(text, startIndex, options = {}) {
   const idx = skipSpaces(
@@ -217,15 +199,112 @@ function isNextLineEmpty(text, startIndex) {
 var is_next_line_empty_default;
 var init_is_next_line_empty = __esm({
   "src/utils/is-next-line-empty.js"() {
-    init_skip_newline();
+    init_has_newline();
     init_skip();
     init_skip_inline_comment();
+    init_skip_newline();
     init_skip_trailing_comment();
-    init_has_newline();
     is_next_line_empty_default = isNextLineEmpty;
   }
 });
 
+// src/utils/is-previous-line-empty.js
+function isPreviousLineEmpty(text, startIndex) {
+  let idx = startIndex - 1;
+  idx = skipSpaces(text, idx, { backwards: true });
+  idx = skip_newline_default(text, idx, { backwards: true });
+  idx = skipSpaces(text, idx, { backwards: true });
+  const idx2 = skip_newline_default(text, idx, { backwards: true });
+  return idx !== idx2;
+}
+var is_previous_line_empty_default;
+var init_is_previous_line_empty = __esm({
+  "src/utils/is-previous-line-empty.js"() {
+    init_skip();
+    init_skip_newline();
+    is_previous_line_empty_default = isPreviousLineEmpty;
+  }
+});
+
+// src/main/comments/utils.js
+function describeNodeForDebugging(node) {
+  const nodeType = node.type || node.kind || "(unknown type)";
+  let nodeName = String(
+    node.name || node.id && (typeof node.id === "object" ? node.id.name : node.id) || node.key && (typeof node.key === "object" ? node.key.name : node.key) || node.value && (typeof node.value === "object" ? "" : String(node.value)) || node.operator || ""
+  );
+  if (nodeName.length > 20) {
+    nodeName = nodeName.slice(0, 19) + "\u2026";
+  }
+  return nodeType + (nodeName ? " " + nodeName : "");
+}
+function addCommentHelper(node, comment) {
+  const comments = node.comments ?? (node.comments = []);
+  comments.push(comment);
+  comment.printed = false;
+  comment.nodeDescription = describeNodeForDebugging(node);
+}
+function addLeadingComment(node, comment) {
+  comment.leading = true;
+  comment.trailing = false;
+  addCommentHelper(node, comment);
+}
+function addDanglingComment(node, comment, marker) {
+  comment.leading = false;
+  comment.trailing = false;
+  if (marker) {
+    comment.marker = marker;
+  }
+  addCommentHelper(node, comment);
+}
+function addTrailingComment(node, comment) {
+  comment.leading = false;
+  comment.trailing = true;
+  addCommentHelper(node, comment);
+}
+var init_utils = __esm({
+  "src/main/comments/utils.js"() {
+  }
+});
+
+// src/utils/get-alignment-size.js
+function getAlignmentSize(text, tabWidth, startIndex = 0) {
+  let size = 0;
+  for (let i = startIndex; i < text.length; ++i) {
+    if (text[i] === "	") {
+      size = size + tabWidth - size % tabWidth;
+    } else {
+      size++;
+    }
+  }
+  return size;
+}
+var get_alignment_size_default;
+var init_get_alignment_size = __esm({
+  "src/utils/get-alignment-size.js"() {
+    get_alignment_size_default = getAlignmentSize;
+  }
+});
+
+// src/utils/get-indent-size.js
+function getIndentSize(value, tabWidth) {
+  const lastNewlineIndex = value.lastIndexOf("\n");
+  if (lastNewlineIndex === -1) {
+    return 0;
+  }
+  return get_alignment_size_default(
+    // All the leading whitespaces
+    value.slice(lastNewlineIndex + 1).match(/^[\t ]*/)[0],
+    tabWidth
+  );
+}
+var get_indent_size_default;
+var init_get_indent_size = __esm({
+  "src/utils/get-indent-size.js"() {
+    init_get_alignment_size();
+    get_indent_size_default = getIndentSize;
+  }
+});
+
 // node_modules/escape-string-regexp/index.js
 function escapeStringRegexp(string) {
   if (typeof string !== "string") {
@@ -259,6 +338,19 @@ var init_get_max_continuous_count = __esm({
   }
 });
 
+// src/utils/get-next-non-space-non-comment-character.js
+function getNextNonSpaceNonCommentCharacter(text, startIndex) {
+  const index = get_next_non_space_non_comment_character_index_default(text, startIndex);
+  return index === false ? "" : text.charAt(index);
+}
+var get_next_non_space_non_comment_character_default;
+var init_get_next_non_space_non_comment_character = __esm({
+  "src/utils/get-next-non-space-non-comment-character.js"() {
+    init_get_next_non_space_non_comment_character_index();
+    get_next_non_space_non_comment_character_default = getNextNonSpaceNonCommentCharacter;
+  }
+});
+
 // node_modules/emoji-regex/index.mjs
 var emoji_regex_default;
 var init_emoji_regex = __esm({
@@ -322,45 +414,6 @@ var init_get_string_width = __esm({
   }
 });
 
-// src/utils/get-alignment-size.js
-function getAlignmentSize(text, tabWidth, startIndex = 0) {
-  let size = 0;
-  for (let i = startIndex; i < text.length; ++i) {
-    if (text[i] === "	") {
-      size = size + tabWidth - size % tabWidth;
-    } else {
-      size++;
-    }
-  }
-  return size;
-}
-var get_alignment_size_default;
-var init_get_alignment_size = __esm({
-  "src/utils/get-alignment-size.js"() {
-    get_alignment_size_default = getAlignmentSize;
-  }
-});
-
-// src/utils/get-indent-size.js
-function getIndentSize(value, tabWidth) {
-  const lastNewlineIndex = value.lastIndexOf("\n");
-  if (lastNewlineIndex === -1) {
-    return 0;
-  }
-  return get_alignment_size_default(
-    // All the leading whitespaces
-    value.slice(lastNewlineIndex + 1).match(/^[\t ]*/)[0],
-    tabWidth
-  );
-}
-var get_indent_size_default;
-var init_get_indent_size = __esm({
-  "src/utils/get-indent-size.js"() {
-    init_get_alignment_size();
-    get_indent_size_default = getIndentSize;
-  }
-});
-
 // src/utils/has-newline-in-range.js
 function hasNewlineInRange(text, startIndex, endIndex) {
   for (let i = startIndex; i < endIndex; ++i) {
@@ -394,19 +447,6 @@ var init_has_spaces = __esm({
   }
 });
 
-// src/utils/get-next-non-space-non-comment-character.js
-function getNextNonSpaceNonCommentCharacter(text, startIndex) {
-  const index = get_next_non_space_non_comment_character_index_default(text, startIndex);
-  return index === false ? "" : text.charAt(index);
-}
-var get_next_non_space_non_comment_character_default;
-var init_get_next_non_space_non_comment_character = __esm({
-  "src/utils/get-next-non-space-non-comment-character.js"() {
-    init_get_next_non_space_non_comment_character_index();
-    get_next_non_space_non_comment_character_default = getNextNonSpaceNonCommentCharacter;
-  }
-});
-
 // scripts/build/shims/string-replace-all.js
 var stringReplaceAll, string_replace_all_default;
 var init_string_replace_all = __esm({
@@ -432,7 +472,7 @@ function makeString(rawText, enclosingQuote, unescapeUnnecessaryEscapes) {
   const otherQuote = enclosingQuote === '"' ? "'" : '"';
   const regex = /\\(.)|(["'])/gs;
   const raw = string_replace_all_default(
-    /* isOptionalObject*/
+    /* isOptionalObject */
     false,
     rawText,
     regex,
@@ -459,46 +499,6 @@ var init_make_string = __esm({
   }
 });
 
-// src/main/comments/utils.js
-function describeNodeForDebugging(node) {
-  const nodeType = node.type || node.kind || "(unknown type)";
-  let nodeName = String(
-    node.name || node.id && (typeof node.id === "object" ? node.id.name : node.id) || node.key && (typeof node.key === "object" ? node.key.name : node.key) || node.value && (typeof node.value === "object" ? "" : String(node.value)) || node.operator || ""
-  );
-  if (nodeName.length > 20) {
-    nodeName = nodeName.slice(0, 19) + "\u2026";
-  }
-  return nodeType + (nodeName ? " " + nodeName : "");
-}
-function addCommentHelper(node, comment) {
-  const comments = node.comments ?? (node.comments = []);
-  comments.push(comment);
-  comment.printed = false;
-  comment.nodeDescription = describeNodeForDebugging(node);
-}
-function addLeadingComment(node, comment) {
-  comment.leading = true;
-  comment.trailing = false;
-  addCommentHelper(node, comment);
-}
-function addDanglingComment(node, comment, marker) {
-  comment.leading = false;
-  comment.trailing = false;
-  if (marker) {
-    comment.marker = marker;
-  }
-  addCommentHelper(node, comment);
-}
-function addTrailingComment(node, comment) {
-  comment.leading = false;
-  comment.trailing = true;
-  addCommentHelper(node, comment);
-}
-var init_utils = __esm({
-  "src/main/comments/utils.js"() {
-  }
-});
-
 // src/utils/public.js
 var public_exports = {};
 __export(public_exports, {
@@ -563,29 +563,29 @@ function isNextLineEmpty2(text, startIndex) {
 var init_public = __esm({
   "src/utils/public.js"() {
     init_get_next_non_space_non_comment_character_index();
-    init_is_previous_line_empty();
     init_is_next_line_empty();
-    init_get_max_continuous_count();
-    init_get_string_width();
+    init_is_previous_line_empty();
+    init_utils();
     init_get_alignment_size();
     init_get_indent_size();
-    init_skip_newline();
-    init_skip_inline_comment();
-    init_skip_trailing_comment();
+    init_get_max_continuous_count();
+    init_get_next_non_space_non_comment_character();
+    init_get_string_width();
     init_has_newline();
     init_has_newline_in_range();
     init_has_spaces();
-    init_get_next_non_space_non_comment_character();
     init_make_string();
     init_skip();
-    init_utils();
+    init_skip_inline_comment();
+    init_skip_newline();
+    init_skip_trailing_comment();
   }
 });
 
 // src/main/version.evaluate.cjs
 var require_version_evaluate = __commonJS({
   "src/main/version.evaluate.cjs"(exports2, module2) {
-    module2.exports = "4.0.0-alpha.7";
+    module2.exports = "4.0.0-alpha.9";
   }
 });
 

package/index.d.ts

@@ -39,9 +39,8 @@ type ArrayProperties<T> = {
 // A union of the properties of the given array T that can be used to index it.
 // If the array is a tuple, then that's going to be the explicit indices of the
 // array, otherwise it's going to just be number.
-type IndexProperties<T extends { length: number }> = IsTuple<T> extends true
-  ? Exclude<Partial<T>["length"], T["length"]>
-  : number;
+type IndexProperties<T extends { length: number }> =
+  IsTuple<T> extends true ? Exclude<Partial<T>["length"], T["length"]> : number;
 
 // Effectively performing T[P], except that it's telling TypeScript that it's
 // safe to do this for tuples, arrays, or objects.
@@ -291,6 +290,7 @@ export type BuiltInParserName =
   | "json-stringify"
   | "json"
   | "json5"
+  | "jsonc"
   | "less"
   | "lwc"
   | "markdown"
@@ -347,12 +347,6 @@ export interface RequiredOptions extends doc.printer.Options {
    * @default false
    */
   bracketSameLine: boolean;
-  /**
-   * Put the `>` of a multi-line JSX element at the end of the last line instead of being alone on the next line.
-   * @default false
-   * @deprecated use bracketSameLine instead
-   */
-  jsxBracketSameLine: boolean;
   /**
    * Format only a segment of a file.
    * @default 0
@@ -430,6 +424,22 @@ export interface RequiredOptions extends doc.printer.Options {
    * @default false
    */
   singleAttributePerLine: boolean;
+  /**
+   * Use curious ternaries, with the question mark after the condition, instead
+   * of on the same line as the consequent.
+   * @default false
+   */
+  experimentalTernaries: boolean;
+  /**
+   * Put the `>` of a multi-line JSX element at the end of the last line instead of being alone on the next line.
+   * @default false
+   * @deprecated use bracketSameLine instead
+   */
+  jsxBracketSameLine?: boolean;
+  /**
+   * Arbitrary additional values on an options object are always allowed.
+   */
+  [_: string]: unknown;
 }
 
 export interface ParserOptions<T = any> extends RequiredOptions {
@@ -486,10 +496,12 @@ export interface Printer<T = any> {
   insertPragma?: (text: string) => string;
   /**
    * @returns `null` if you want to remove this node
-   * @returns `void` if you want to use modified newNode
+   * @returns `void` if you want to use modified `cloned`
    * @returns anything if you want to replace the node with it
    */
-  massageAstNode?: ((node: any, newNode: any, parent: any) => any) | undefined;
+  massageAstNode?:
+    | ((original: any, cloned: any, parent: any) => any)
+    | undefined;
   hasPrettierIgnore?: ((path: AstPath<T>) => boolean) | undefined;
   canAttachComment?: ((node: T) => boolean) | undefined;
   isBlockComment?: ((node: T) => boolean) | undefined;
@@ -780,7 +792,7 @@ export interface SupportInfo {
 export interface FileInfoOptions {
   ignorePath?: string | URL | (string | URL)[] | undefined;
   withNodeModules?: boolean | undefined;
-  plugins?: string[] | undefined;
+  plugins?: Array<string | Plugin> | undefined;
   resolveConfig?: boolean | undefined;
 }
 
@@ -794,10 +806,17 @@ export function getFileInfo(
   options?: FileInfoOptions,
 ): Promise<FileInfoResult>;
 
+export interface SupportInfoOptions {
+  plugins?: Array<string | Plugin> | undefined;
+  showDeprecated?: boolean | undefined;
+}
+
 /**
  * Returns an object representing the parsers, languages and file types Prettier supports for the current version.
  */
-export function getSupportInfo(): Promise<SupportInfo>;
+export function getSupportInfo(
+  options?: SupportInfoOptions,
+): Promise<SupportInfo>;
 
 /**
  * `version` field in `package.json`