1 files changed, 19 insertions, 8 deletions
diff --git a/packages/bun-macro-relay/bun-macro-relay.tsx b/packages/bun-macro-relay/bun-macro-relay.tsx
index eaeca062a..018f8f7f5 100644
--- a/packages/bun-macro-relay/bun-macro-relay.tsx
+++ b/packages/bun-macro-relay/bun-macro-relay.tsx
@@ -18,9 +18,14 @@ artifactDirectory = artifactDirectory.startsWith("/")
   : Bun.cwd + artifactDirectory;
 
 export function graphql(node) {
-  const [templateLiteral] = node.arguments;
+  let query;
+
+  if (node instanceof <call />) {
+    query = node.arguments[0].toString();
+  } else if (node instanceof <template />) {
+    query = node.toString();
+  }
 
-  const query = templateLiteral?.toString();
   if (typeof query !== "string" || query.length === 0) {
     throw new Error("BunMacroRelay: Unexpected empty graphql string.");
   }
@@ -56,10 +61,16 @@ export function graphql(node) {
     />
   );
 
-  return (
-    <>
-      <inject>{importStmt}</inject>,
-      <id to={importStmt.symbols.default} pure />,
-    </>
-  );
+  try {
+    const ret = (
+      <>
+        <inject>{importStmt}</inject>
+        <id to={importStmt.namespace[definitionName]} pure />
+      </>
+    );
+    return ret;
+  } catch (exception) {
+    console.error(exception);
+  }
+  return null;
 }