From a7aab05004960714c473a4c8a2b204e151256aed Mon Sep 17 00:00:00 2001
From: Maneesh Tewani <mtewani@google.com>
Date: Tue, 25 Mar 2025 11:18:40 -0700
Subject: [PATCH 1/2] Fixed issues after merge

---
 .../js/default-connector/esm/index.esm.js        | 16 ++++++++--------
 .../js/default-connector/index.cjs.js            |  6 ------
 examples/react-example/package.json              |  4 ++--
 .../react-example/src/examples/data-connect.tsx  |  8 ++++----
 .../src/data-connect/useDataConnectQuery.ts      |  4 ++--
 packages/react/tsup.config.ts                    |  1 +
 pnpm-lock.yaml                                   | 12 ++++++------
 7 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/dataconnect-sdk/js/default-connector/esm/index.esm.js b/dataconnect-sdk/js/default-connector/esm/index.esm.js
index 6b2bec26..01524f0c 100644
--- a/dataconnect-sdk/js/default-connector/esm/index.esm.js
+++ b/dataconnect-sdk/js/default-connector/esm/index.esm.js
@@ -7,7 +7,7 @@ export const connectorConfig = {
 };
 
 export function createMovieRef(dcOrVars, vars) {
-  const { dc: dcInstance, vars: inputVars } = validateArgs(connectorConfig, dcOrVars, vars, true);
+  const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
   dcInstance._useGeneratedSdk();
   return mutationRef(dcInstance, 'CreateMovie', inputVars);
 }
@@ -17,7 +17,7 @@ export function createMovie(dcOrVars, vars) {
 }
 
 export function upsertMovieRef(dcOrVars, vars) {
-  const { dc: dcInstance, vars: inputVars } = validateArgs(connectorConfig, dcOrVars, vars, true);
+  const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
   dcInstance._useGeneratedSdk();
   return mutationRef(dcInstance, 'UpsertMovie', inputVars);
 }
@@ -27,7 +27,7 @@ export function upsertMovie(dcOrVars, vars) {
 }
 
 export function deleteMovieRef(dcOrVars, vars) {
-  const { dc: dcInstance, vars: inputVars } = validateArgs(connectorConfig, dcOrVars, vars, true);
+  const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
   dcInstance._useGeneratedSdk();
   return mutationRef(dcInstance, 'DeleteMovie', inputVars);
 }
@@ -37,7 +37,7 @@ export function deleteMovie(dcOrVars, vars) {
 }
 
 export function addMetaRef(dc) {
-  const { dc: dcInstance } = validateArgs(connectorConfig, dc, undefined);
+  const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
   dcInstance._useGeneratedSdk();
   return mutationRef(dcInstance, 'AddMeta');
 }
@@ -47,7 +47,7 @@ export function addMeta(dc) {
 }
 
 export function deleteMetaRef(dcOrVars, vars) {
-  const { dc: dcInstance, vars: inputVars } = validateArgs(connectorConfig, dcOrVars, vars, true);
+  const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
   dcInstance._useGeneratedSdk();
   return mutationRef(dcInstance, 'DeleteMeta', inputVars);
 }
@@ -57,7 +57,7 @@ export function deleteMeta(dcOrVars, vars) {
 }
 
 export function listMoviesRef(dc) {
-  const { dc: dcInstance } = validateArgs(connectorConfig, dc, undefined);
+  const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
   dcInstance._useGeneratedSdk();
   return queryRef(dcInstance, 'ListMovies');
 }
@@ -67,7 +67,7 @@ export function listMovies(dc) {
 }
 
 export function getMovieByIdRef(dcOrVars, vars) {
-  const { dc: dcInstance, vars: inputVars } = validateArgs(connectorConfig, dcOrVars, vars, true);
+  const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
   dcInstance._useGeneratedSdk();
   return queryRef(dcInstance, 'GetMovieById', inputVars);
 }
@@ -77,7 +77,7 @@ export function getMovieById(dcOrVars, vars) {
 }
 
 export function getMetaRef(dc) {
-  const { dc: dcInstance } = validateArgs(connectorConfig, dc, undefined);
+  const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
   dcInstance._useGeneratedSdk();
   return queryRef(dcInstance, 'GetMeta');
 }
diff --git a/dataconnect-sdk/js/default-connector/index.cjs.js b/dataconnect-sdk/js/default-connector/index.cjs.js
index 8fa0d2ad..6fa06288 100644
--- a/dataconnect-sdk/js/default-connector/index.cjs.js
+++ b/dataconnect-sdk/js/default-connector/index.cjs.js
@@ -15,7 +15,6 @@ exports.createMovieRef = function createMovieRef(dcOrVars, vars) {
 exports.createMovie = function createMovie(dcOrVars, vars) {
   return executeMutation(createMovieRef(dcOrVars, vars));
 };
-
 exports.upsertMovieRef = function upsertMovieRef(dcOrVars, vars) {
   const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
   dcInstance._useGeneratedSdk();
@@ -24,7 +23,6 @@ exports.upsertMovieRef = function upsertMovieRef(dcOrVars, vars) {
 exports.upsertMovie = function upsertMovie(dcOrVars, vars) {
   return executeMutation(upsertMovieRef(dcOrVars, vars));
 };
-
 exports.deleteMovieRef = function deleteMovieRef(dcOrVars, vars) {
   const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
   dcInstance._useGeneratedSdk();
@@ -33,7 +31,6 @@ exports.deleteMovieRef = function deleteMovieRef(dcOrVars, vars) {
 exports.deleteMovie = function deleteMovie(dcOrVars, vars) {
   return executeMutation(deleteMovieRef(dcOrVars, vars));
 };
-
 exports.addMetaRef = function addMetaRef(dc) {
   const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
   dcInstance._useGeneratedSdk();
@@ -42,7 +39,6 @@ exports.addMetaRef = function addMetaRef(dc) {
 exports.addMeta = function addMeta(dc) {
   return executeMutation(addMetaRef(dc));
 };
-
 exports.deleteMetaRef = function deleteMetaRef(dcOrVars, vars) {
   const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
   dcInstance._useGeneratedSdk();
@@ -51,7 +47,6 @@ exports.deleteMetaRef = function deleteMetaRef(dcOrVars, vars) {
 exports.deleteMeta = function deleteMeta(dcOrVars, vars) {
   return executeMutation(deleteMetaRef(dcOrVars, vars));
 };
-
 exports.listMoviesRef = function listMoviesRef(dc) {
   const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
   dcInstance._useGeneratedSdk();
@@ -60,7 +55,6 @@ exports.listMoviesRef = function listMoviesRef(dc) {
 exports.listMovies = function listMovies(dc) {
   return executeQuery(listMoviesRef(dc));
 };
-
 exports.getMovieByIdRef = function getMovieByIdRef(dcOrVars, vars) {
   const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
   dcInstance._useGeneratedSdk();
diff --git a/examples/react-example/package.json b/examples/react-example/package.json
index b9821325..9b1e8fdb 100644
--- a/examples/react-example/package.json
+++ b/examples/react-example/package.json
@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "@tanstack/react-query": "^5.55.4",
-    "@tanstack-query-firebase/react": "link:../../packages/react",
-    "@dataconnect/default-connector": "link:../../dataconnect-sdk",
+    "@tanstack-query-firebase/react": "link:../../packages/react/dist",
+    "@dataconnect/default-connector": "link:../../dataconnect-sdk/js/default-connector",
     "firebase": "^11.3.0",
     "next": "15.1.0",
     "react": "^19.0.0",
diff --git a/examples/react-example/src/examples/data-connect.tsx b/examples/react-example/src/examples/data-connect.tsx
index 215e9f63..41b0a3b6 100644
--- a/examples/react-example/src/examples/data-connect.tsx
+++ b/examples/react-example/src/examples/data-connect.tsx
@@ -12,7 +12,7 @@ export function Movies() {
 	const movies = useDataConnectQuery(listMoviesRef());
 
 	const addMovie = useDataConnectMutation(createMovieRef, {
-		invalidate: [listMoviesRef],
+		invalidate: [listMoviesRef()],
 	});
 
 	if (movies.isLoading) {
@@ -39,10 +39,10 @@ export function Movies() {
 				Add Movie
 			</button>
 			<ul>
-				<li>Fetch Time: {movies.data?.fetchTime}</li>
-				<li>Source: {movies.data?.source}</li>
+				<li>Fetch Time: {movies.dataConnectResult?.fetchTime}</li>
+				<li>Source: {movies.dataConnectResult?.source}</li>
 				<li>
-					Query Key: {movies.data?.ref.name} + {movies.data?.ref.variables}
+					Query Key: {movies.dataConnectResult?.ref.name} + {movies.dataConnectResult?.ref.variables}
 				</li>
 				{movies.data!.movies.map((movie) => (
 					<li key={movie.id}>{movie.title}</li>
diff --git a/packages/react/src/data-connect/useDataConnectQuery.ts b/packages/react/src/data-connect/useDataConnectQuery.ts
index c07fadce..38fc881c 100644
--- a/packages/react/src/data-connect/useDataConnectQuery.ts
+++ b/packages/react/src/data-connect/useDataConnectQuery.ts
@@ -9,7 +9,7 @@ import {
 } from "firebase/data-connect";
 import { useState } from "react";
 import type { PartialBy } from "../../utils";
-import type { QueryResultRequiredRef, UseDataConnectQuery } from "./types";
+import type { QueryResultRequiredRef, UseDataConnectQueryResult } from "./types";
 
 export type useDataConnectQueryOptions<
   TData = object,
@@ -20,7 +20,7 @@ export function useDataConnectQuery<Data = unknown, Variables = unknown>(
   refOrResult: QueryRef<Data, Variables> | QueryResult<Data, Variables>,
   options?: useDataConnectQueryOptions<Data, FirebaseError>,
   _callerSdkType: CallerSdkType = CallerSdkTypeEnum.TanstackReactCore,
-): UseDataConnectQuery<Data, Variables> {
+): UseDataConnectQueryResult<Data, Variables> {
   const [dataConnectResult, setDataConnectResult] = useState<
     QueryResultRequiredRef<Data, Variables>
   >("ref" in refOrResult ? refOrResult : { ref: refOrResult });
diff --git a/packages/react/tsup.config.ts b/packages/react/tsup.config.ts
index 8ff65485..bf07cf62 100644
--- a/packages/react/tsup.config.ts
+++ b/packages/react/tsup.config.ts
@@ -6,6 +6,7 @@ export default defineConfig({
 	format: ["esm"],
 	dts: true, // generates .d.ts files
 	outDir: "dist",
+	external: ['react'],
 	esbuildOptions(options, context) {
 		options.outbase = './src';
 	},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 471e2ea5..f74bb3a8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -61,11 +61,11 @@ importers:
   examples/react-example:
     dependencies:
       '@dataconnect/default-connector':
-        specifier: link:../../dataconnect-sdk
-        version: link:../../dataconnect-sdk
+        specifier: link:../../dataconnect-sdk/js/default-connector
+        version: link:../../dataconnect-sdk/js/default-connector
       '@tanstack-query-firebase/react':
-        specifier: link:../../packages/react
-        version: link:../../packages/react
+        specifier: link:../../packages/react/dist
+        version: link:../../packages/react/dist
       '@tanstack/react-query':
         specifier: ^5.55.4
         version: 5.66.9(react@19.0.0)
@@ -5174,7 +5174,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.25.0(eslint@9.21.0(jiti@1.21.7))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.8.3(eslint-plugin-import@2.31.0)(eslint@9.21.0(jiti@1.21.7)))(eslint@9.21.0(jiti@1.21.7)):
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.25.0(eslint@9.21.0(jiti@1.21.7))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.8.3)(eslint@9.21.0(jiti@1.21.7)):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
@@ -5196,7 +5196,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 9.21.0(jiti@1.21.7)
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.25.0(eslint@9.21.0(jiti@1.21.7))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.8.3(eslint-plugin-import@2.31.0)(eslint@9.21.0(jiti@1.21.7)))(eslint@9.21.0(jiti@1.21.7))
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.25.0(eslint@9.21.0(jiti@1.21.7))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.8.3)(eslint@9.21.0(jiti@1.21.7))
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3

From c0d13897027c257080939b929c3d7b1a54fb1c6c Mon Sep 17 00:00:00 2001
From: Maneesh Tewani <mtewani@google.com>
Date: Tue, 25 Mar 2025 11:21:16 -0700
Subject: [PATCH 2/2] Fixed formatting

---
 packages/react/src/data-connect/useDataConnectQuery.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/react/src/data-connect/useDataConnectQuery.ts b/packages/react/src/data-connect/useDataConnectQuery.ts
index 38fc881c..5f51903d 100644
--- a/packages/react/src/data-connect/useDataConnectQuery.ts
+++ b/packages/react/src/data-connect/useDataConnectQuery.ts
@@ -9,7 +9,10 @@ import {
 } from "firebase/data-connect";
 import { useState } from "react";
 import type { PartialBy } from "../../utils";
-import type { QueryResultRequiredRef, UseDataConnectQueryResult } from "./types";
+import type {
+  QueryResultRequiredRef,
+  UseDataConnectQueryResult,
+} from "./types";
 
 export type useDataConnectQueryOptions<
   TData = object,