fix: printing attr method shorthands (#56)

package.json

@@ -5,30 +5,30 @@
   "author": "Dylan Piercey <[email protected]>",
   "bugs": "https://github.com/marko-js/prettier/issues",
   "devDependencies": {
-    "@babel/generator": "^7.23.0",
+    "@babel/generator": "^7.25.5",
     "@commitlint/cli": "^17.7.2",
     "@commitlint/config-conventional": "^17.7.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@types/babel__generator": "^7.6.5",
-    "@types/mocha": "^10.0.2",
-    "@types/node": "^20.8.4",
+    "@types/babel__generator": "^7.6.8",
+    "@types/mocha": "^10.0.7",
+    "@types/node": "^22.5.1",
     "@typescript-eslint/eslint-plugin": "^6.7.5",
     "@typescript-eslint/parser": "^6.7.5",
     "esbuild": "^0.19.4",
     "esbuild-register": "^3.5.0",
     "eslint": "^8.51.0",
     "eslint-config-prettier": "^9.0.0",
-    "fast-glob": "^3.3.1",
+    "fast-glob": "^3.3.2",
     "fixpack": "^4.0.0",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.1",
-    "marko": "^5.32.0",
-    "mocha": "^10.2.0",
+    "marko": "^5.35.11",
+    "mocha": "^10.7.3",
     "mocha-snap": "^5.0.0",
     "nyc": "^15.1.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.3.3",
     "semantic-release": "^22.0.5",
-    "typescript": "^5.2.2"
+    "typescript": "^5.5.4"
   },
   "exports": {
     ".": {

src/__tests__/__snapshots__/attr-default-method.expected/auto.marko

@@ -1,3 +1,7 @@
-<custom-tag() { console.log("hi"); }/>
+<custom-tag() {
+  console.log("hi");
+}/>
 
-<custom-tag() { console.log("hi"); }/>
+<custom-tag() {
+  console.log("hi");
+}/>

src/__tests__/__snapshots__/attr-default-method.expected/concise.marko

@@ -1,3 +1,7 @@
-custom-tag() { console.log("hi"); }
+custom-tag() {
+  console.log("hi");
+}
 
-custom-tag() { console.log("hi"); }
+custom-tag() {
+  console.log("hi");
+}

src/__tests__/__snapshots__/attr-default-method.expected/html.marko

@@ -1,3 +1,7 @@
-<custom-tag() { console.log("hi"); }/>
+<custom-tag() {
+  console.log("hi");
+}/>
 
-<custom-tag() { console.log("hi"); }/>
+<custom-tag() {
+  console.log("hi");
+}/>

src/__tests__/__snapshots__/attr-default-method.expected/with-parens.marko

@@ -1,3 +1,7 @@
-<custom-tag() { console.log("hi"); }/>
+<custom-tag() {
+  console.log("hi");
+}/>
 
-<custom-tag() { console.log("hi"); }/>
+<custom-tag() {
+  console.log("hi");
+}/>

src/__tests__/__snapshots__/tag-effect-single-line.expected/auto.marko

@@ -1 +1,3 @@
-<effect() { console.log("Hello again"); }/>
+<effect() {
+  console.log("Hello again");
+}/>

src/__tests__/__snapshots__/tag-effect-single-line.expected/concise.marko

@@ -1 +1,3 @@
-effect() { console.log("Hello again"); }
+effect() {
+  console.log("Hello again");
+}

src/__tests__/__snapshots__/tag-effect-single-line.expected/html.marko

@@ -1 +1,3 @@
-<effect() { console.log("Hello again"); }/>
+<effect() {
+  console.log("Hello again");
+}/>

src/__tests__/__snapshots__/tag-effect-single-line.expected/with-parens.marko

@@ -1 +1,3 @@
-<effect() { console.log("Hello again"); }/>
+<effect() {
+  console.log("Hello again");
+}/>

src/index.ts

@@ -533,40 +533,7 @@ export const printers: Record<string, Printer<types.Node>> = {
               t.isFunctionExpression(value) &&
               !(value.id || value.async || value.generator)
             ) {
-              const methodBodyDocs: Doc[] = [];
-              (attrPath as any).each(
-                (childPath: AstPath<types.Statement>) => {
-                  if (childPath.getNode()?.type !== "EmptyStatement") {
-                    methodBodyDocs.push(print(childPath));
-                  }
-                },
-                "value",
-                "body",
-                "body",
-              );
-              doc.push(
-                b.group([
-                  "(",
-                  b.indent([
-                    b.softline,
-                    b.join(
-                      [",", b.line],
-                      attrPath.map((it) => print(it), "value", "params"),
-                    ),
-                    opts.trailingComma === "all" ? b.ifBreak(",") : "",
-                  ]),
-                  b.softline,
-                  ")",
-                ]),
-                methodBodyDocs.length
-                  ? b.group([
-                      " {",
-                      b.indent([b.line, b.join(b.hardline, methodBodyDocs)]),
-                      b.line,
-                      "}",
-                    ])
-                  : " {}",
-              );
+              doc.push(attrPath.call(print, "value"));
             } else {
               doc.push(
                 node.bound ? ":=" : "=",
@@ -1033,6 +1000,20 @@ export const printers: Record<string, Printer<types.Node>> = {
               },
               code,
             );
+          } else if (
+            parentType === "MarkoAttribute" &&
+            path.key === "value" &&
+            node.type === "FunctionExpression" &&
+            !(node.async || node.generator || node.id)
+          ) {
+            return tryPrintEmbed(
+              `({_${code.replace(/^\s*function\s*/, "")}})`,
+              scriptParser,
+              (doc: any) => {
+                return doc[1].contents[1].contents[1].contents.slice(1);
+              },
+              code,
+            );
           }
 
           return tryPrintEmbed(code, expressionParser);

src/utils/get-original-code.ts

@@ -8,6 +8,21 @@ export function getOriginalCodeForNode(
   opts: ParserOptions<t.Node>,
   node: t.Node,
 ) {
+  const hasLeadingComments = node.leadingComments?.length;
+  const hasTrailingComments = node.trailingComments?.length;
+
+  if (!hasLeadingComments && !hasTrailingComments) {
+    switch (node.type) {
+      case "StringLiteral":
+        return JSON.stringify(node.value);
+      case "BooleanLiteral":
+      case "NumericLiteral":
+        return "" + node.value;
+      case "NullLiteral":
+        return "null";
+    }
+  }
+
   const loc = node.loc;
   if (!loc) {
     return generate(node as any, {
@@ -19,8 +34,8 @@ export function getOriginalCodeForNode(
   }
 
   let start = loc.start;
-  if (node.leadingComments?.length) {
-    const commentStart = node.leadingComments[0].loc.start;
+  if (hasLeadingComments) {
+    const commentStart = node.leadingComments![0].loc.start;
     if (
       commentStart.line < start.line ||
       (commentStart.line === start.line && commentStart.column < start.column)
@@ -30,9 +45,9 @@ export function getOriginalCodeForNode(
   }
 
   let end = loc.end;
-  if (node.trailingComments?.length) {
+  if (hasTrailingComments) {
     const commentEnd =
-      node.trailingComments[node.trailingComments.length - 1].loc.end;
+      node.trailingComments![node.trailingComments!.length - 1].loc.end;
     if (
       commentEnd.line > end.line ||
       (commentEnd.line === end.line && commentEnd.column > end.column)