liquidsoap-prettier 1.6.0 → 1.7.1

package/package.json

@@ -1,12 +1,18 @@
 {
   "name": "liquidsoap-prettier",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "description": "Liquidsoap language prettier CLI and plugin",
   "type": "module",
   "main": "src/index.js",
   "bin": {
     "liquidsoap-prettier": "src/cli.js"
   },
+  "scripts": {
+    "build:web": "webpack --config webpack.web.cjs",
+    "release": "dune build && npm run build:web && npm publish",
+    "dev:prepare": "node ./scripts/download-parser.js",
+    "liquidsoap-prettier": "node ./src/cli.js"
+  },
   "prettier": {
     "plugins": [
       "./src/index.js"
@@ -28,11 +34,5 @@
     "tar-fs": "^3.0.6",
     "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4"
-  },
-  "scripts": {
-    "build:web": "webpack --config webpack.web.cjs",
-    "release": "dune build && npm run build:web && npm publish",
-    "dev:prepare": "node ./scripts/download-parser.js",
-    "liquidsoap-prettier": "node ./src/cli.js"
   }
-}
+}

package/src/cli.js

@@ -15,8 +15,10 @@ const run = async () => {
       w,
       check,
       c,
+      "print-width": printWidth = 80,
     } = parseArgs(process.argv.slice(2), {
       boolean: ["w", "write", "c", "check"],
+      number: ["print-width"],
     });
 
     if (!filename) {
@@ -53,12 +55,14 @@ const run = async () => {
           const isFormatted = await prettier.check(code, {
             parser: "liquidsoap",
             plugins: [prettierPluginLiquidsoap],
+            printWidth,
           });
           exitCode = isFormatted ? 0 : 2;
         } else {
           const formattedCode = await prettier.format(code, {
             parser: "liquidsoap",
             plugins: [prettierPluginLiquidsoap],
+            printWidth,
           });
 
           if (write || w) {

package/src/index.js

@@ -44,9 +44,7 @@ const printString = (str) => {
     str
       .replace(/\\\n\s*/g, "")
       .split(/(\s)/)
-      .map((s) =>
-        s === " " ? ifBreak(group([" ", "\\", hardline, " "]), " ") : s,
-      ),
+      .map((s) => (s === " " ? ifBreak([" ", "\\", hardline, " "], " ") : s)),
   );
 };
 
@@ -202,8 +200,7 @@ const print = (path, options, print) => {
     group([...printLabel(), ...(node.default ? ["=", print("default")] : [])]);
 
   const printAppArg = () => {
-    if (node.label)
-      return group([node.label, "=", indent([softline, print("value")])]);
+    if (node.label) return group([node.label, "=", print("value")]);
     return print("value");
   };
 
@@ -223,6 +220,8 @@ const print = (path, options, print) => {
         ];
       case "list":
         return group(["[", indent([softline, print("value")]), softline, "]"]);
+      case "ref":
+        return group(["ref", "(", print("value"), ")"]);
       case "json_object":
         return [
           "[",
@@ -334,13 +333,9 @@ const print = (path, options, print) => {
       case "while":
         return group([
           "while",
-          line,
-          print("condition"),
-          line,
+          group([indent([line, print("condition")]), line]),
           "do",
-          line,
-          print("loop"),
-          line,
+          group([indent([line, print("loop")]), line]),
           "end",
         ]);
       case "for":
@@ -518,17 +513,23 @@ const print = (path, options, print) => {
       case "app_arg":
         return printAppArg();
       case "app":
-        return group([
-          print("op"),
-          "(",
-          ...(node.args.length === 0
-            ? []
-            : [
-                indent([softline, group([joinWithComments([","], "args")])]),
-                softline,
-              ]),
-          ")",
-        ]);
+        if (node.args.length === 0) {
+          return group([print("op"), "(", ")"]);
+        }
+
+        // Print all arguments
+        const printedArgs = path.map(print, "args");
+
+        // Try to format on a single line first
+        const singleLine = join(", ", printedArgs);
+
+        // Format with line breaks
+        const multiLine = [
+          indent([line, join([",", line], printedArgs)]),
+          line,
+        ];
+
+        return group([print("op"), "(", ifBreak(multiLine, singleLine), ")"]);
       case "eof":
         return "";
       case "seq":