feat: support shorthand for CallExpression as tag

close #137

Author: JounQin

.changeset/dirty-ghosts-roll.md

@@ -0,0 +1,5 @@
+---
+"prettier-plugin-embed": minor
+---
+
+feat: support shorthand for CallExpression as tag

src/utils.ts

@@ -1,4 +1,4 @@
-import type { Expression, Node, TemplateLiteral } from "estree";
+import type { Expression, Node, Super, TemplateLiteral } from "estree";
 import memoize from "micro-memoize";
 import {
   type AstPath,
@@ -220,6 +220,15 @@ export async function resolveEmbeddedOverrideOptions(
   }
 }
 
+function* createExpressionGenerator(
+  expression: Expression | Super,
+): Generator<Expression | Super> {
+  yield expression;
+  if (expression.type === "CallExpression") {
+    yield* createExpressionGenerator(expression.callee);
+  }
+}
+
 export const compareTagExpressionToTagString = (() => {
   const ignoreSet = new Set([
     "start",
@@ -266,14 +275,16 @@ export const compareTagExpressionToTagString = (() => {
       return false;
     }
 
-    if (
-      compareObjects(
-        tagExpression as unknown as Record<string, unknown>,
-        tagStringNode.tag as unknown as Record<string, unknown>,
-        ignoreSet,
-      )
-    ) {
-      return true;
+    for (const tagExp of createExpressionGenerator(tagExpression)) {
+      if (
+        compareObjects(
+          tagExp as unknown as Record<string, unknown>,
+          tagStringNode.tag as unknown as Record<string, unknown>,
+          ignoreSet,
+        )
+      ) {
+        return true;
+      }
     }
 
     return false;

test/__snapshots__/fixtures.spec.ts.snap

@@ -0,0 +1,18 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`fixtures > should work 1`] = `
+"sql.type(SESSION)\`
+  INSERT INTO
+    sessions (account_id, expires_at)
+  VALUES
+    (
+      \${accountId},
+      \${expiresAt.toJSON()}
+    ) RETURNING id,
+    created_at AS "createdAt",
+    updated_at AS "updatedAt",
+    expires_at AS "expiresAt",
+    account_id AS "accountId"
+\`;
+"
+`;

test/fixtures.spec.ts

@@ -0,0 +1,23 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+
+import prettier from "prettier";
+import sql from "prettier-plugin-sql";
+import * as embed from "../src";
+
+import { describe, expect, it } from "vitest";
+
+describe("fixtures", () => {
+  it("should work", async () => {
+    for (const file of await fs.readdir("test/fixtures")) {
+      const filepath = path.resolve("test/fixtures", file);
+      const code = await fs.readFile(filepath, "utf-8");
+      const formatted = await prettier.format(code, {
+        filepath,
+        plugins: [embed, sql],
+        embeddedSqlTags: ["sql.type"],
+      });
+      expect(formatted).toMatchSnapshot();
+    }
+  });
+});

test/fixtures/137.js

@@ -0,0 +1,10 @@
+sql.type(SESSION)`
+  INSERT INTO sessions (account_id, expires_at)
+  VALUES (${accountId}, ${expiresAt.toJSON()})
+  RETURNING
+    id,
+    created_at AS "createdAt",
+    updated_at AS "updatedAt",
+    expires_at AS "expiresAt",
+    account_id AS "accountId"
+`;