Added support for the "objectWrap" and "experimentalOperatorPosition" options

Author: fisker

src/bin.ts

@@ -53,6 +53,10 @@ const makeBin = (): Bin => {
         section: "Format",
         enum: ["lf", "crlf", "cr", "auto"],
       })
+      .option("--experimental-operator-position <start|end>", 'Where to print operators when binary expressions wrap lines\nDefaults to "end"', {
+        section: "Format",
+        enum: ["start", "end"],
+      })
       .option("--experimental-ternaries", 'Use curious ternaries, with the question mark after the condition\nDefaults to "false"', {
         section: "Format",
       })
@@ -63,6 +67,10 @@ const makeBin = (): Bin => {
       .option("--jsx-single-quote", 'Use single quotes in JSX\nDefaults to "false"', {
         section: "Format",
       })
+      .option("--object-wrap <preserve|collapse>", 'How to wrap object literals\nDefaults to "preserve"', {
+        section: "Format",
+        enum: ["preserve", "collapse"],
+      })
       .option(`--parser <${DEFAULT_PARSERS.join('|')}>`, "Which parser to use", {
         section: "Format",
         enum: DEFAULT_PARSERS,

src/prettier_plugins_builtin.ts

@@ -106,6 +106,22 @@ const options = {
     description: "Print semicolons.",
     oppositeDescription: "Do not print semicolons, except at the beginning of lines which may need them.",
   },
+  experimentalOperatorPosition: {
+    category: "JavaScript",
+    type: "choice",
+    default: "end",
+    description: "Where to print operators when binary expressions wrap lines.",
+    choices: [
+      {
+        value: "start",
+        description: "Print operators at the start of new lines.",
+      },
+      {
+        value: "end",
+        description: "Print operators at the end of previous lines.",
+      },
+    ],
+  },
   experimentalTernaries: {
     category: "JavaScript",
     type: "boolean",
@@ -170,6 +186,22 @@ const options = {
       { value: "preserve", description: "Wrap prose as-is." },
     ],
   },
+  objectWrap: {
+    category: "Common",
+    type: "choice",
+    default: "preserve",
+    description: "How to wrap object literals.",
+    choices: [
+      {
+        value: "preserve",
+        description: "Keep as multi-line, if there is a newline between the opening brace and first property.",
+      },
+      {
+        value: "collapse",
+        description: "Fit to a single line when possible.",
+      },
+    ],
+  },
 };
 
 const languages = [

src/types.ts

@@ -9,6 +9,7 @@ type ContextOptions = {
 
 type FormatOptions = {
   [pluginOption: string]: unknown;
+  experimentalOperatorPosition?: "start" | "end";
   experimentalTernaries?: boolean;
   arrowParens?: "avoid" | "always";
   bracketSameLine?: boolean;
@@ -18,6 +19,7 @@ type FormatOptions = {
   htmlWhitespaceSensitivity?: "css" | "strict" | "ignore";
   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
   plugins?: string[];
   printWidth?: number;

src/utils.ts

@@ -429,6 +429,13 @@ function normalizeFormatOptions(options: unknown): FormatOptions {
 
   const formatOptions: FormatOptions = {};
 
+  if ("experimentalOperatorPosition" in options) {
+    const value = options.experimentalOperatorPosition;
+    if (value === "start" || value === "end") {
+      formatOptions.experimentalOperatorPosition = value;
+    }
+  }
+
   if ("experimentalTernaries" in options) {
     const value = options.experimentalTernaries;
     if (isBoolean(value)) {
@@ -492,6 +499,13 @@ function normalizeFormatOptions(options: unknown): FormatOptions {
     }
   }
 
+  if ("objectWrap" in options) {
+    const value = options.objectWrap;
+    if (value === "preserve" || value === "collapse") {
+      formatOptions.objectWrap = value;
+    }
+  }
+
   if ("parser" in options) {
     const value = options.parser;
     // prettier-ignore

test/__tests__/__snapshots__/early-exit.js.snap

@@ -39,6 +39,9 @@ exports[`show usage with --help (stdout) 1`] = `
     --end-of-line <lf|crlf|cr|auto>
                               Which end of line characters to apply
                               Defaults to "lf"
+    --experimental-operator-position <start|end>
+                              Where to print operators when binary expressions wrap lines
+                              Defaults to "end"
     --experimental-ternaries 
                               Use curious ternaries, with the question mark after the condition
                               Defaults to "false"
@@ -47,6 +50,9 @@ exports[`show usage with --help (stdout) 1`] = `
                               Defaults to "css"
     --jsx-single-quote        Use single quotes in JSX
                               Defaults to "false"
+    --object-wrap <preserve|collapse>
+                              How to wrap object literals
+                              Defaults to "preserve"
     --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>
                               Which parser to use
     --print-width <int>       The line length where Prettier will try wrap