fix(react): Fixed issues after merge (#179)

maneesht · web-flow · commit 6767228b4111 · 2025-03-25T19:09:08.000Z
* Fixed issues after merge

* Fixed formatting
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -9,7 +9,10 @@ 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 +23,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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ export const connectorConfig = {`
`7`	`7`	`};`
`8`	`8`
`9`	`9`	`export function createMovieRef(dcOrVars, vars) {`
`10`		`- const { dc: dcInstance, vars: inputVars } = validateArgs(connectorConfig, dcOrVars, vars, true);`
	`10`	`+ const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);`
`11`	`11`	`dcInstance._useGeneratedSdk();`
`12`	`12`	`return mutationRef(dcInstance, 'CreateMovie', inputVars);`
`13`	`13`	`}`
`@@ -17,7 +17,7 @@ export function createMovie(dcOrVars, vars) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`export function upsertMovieRef(dcOrVars, vars) {`
`20`		`- const { dc: dcInstance, vars: inputVars } = validateArgs(connectorConfig, dcOrVars, vars, true);`
	`20`	`+ const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);`
`21`	`21`	`dcInstance._useGeneratedSdk();`
`22`	`22`	`return mutationRef(dcInstance, 'UpsertMovie', inputVars);`
`23`	`23`	`}`
`@@ -27,7 +27,7 @@ export function upsertMovie(dcOrVars, vars) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`export function deleteMovieRef(dcOrVars, vars) {`
`30`		`- const { dc: dcInstance, vars: inputVars } = validateArgs(connectorConfig, dcOrVars, vars, true);`
	`30`	`+ const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);`
`31`	`31`	`dcInstance._useGeneratedSdk();`
`32`	`32`	`return mutationRef(dcInstance, 'DeleteMovie', inputVars);`
`33`	`33`	`}`
`@@ -37,7 +37,7 @@ export function deleteMovie(dcOrVars, vars) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`export function addMetaRef(dc) {`
`40`		`- const { dc: dcInstance } = validateArgs(connectorConfig, dc, undefined);`
	`40`	`+ const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);`
`41`	`41`	`dcInstance._useGeneratedSdk();`
`42`	`42`	`return mutationRef(dcInstance, 'AddMeta');`
`43`	`43`	`}`
`@@ -47,7 +47,7 @@ export function addMeta(dc) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`export function deleteMetaRef(dcOrVars, vars) {`
`50`		`- const { dc: dcInstance, vars: inputVars } = validateArgs(connectorConfig, dcOrVars, vars, true);`
	`50`	`+ const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);`
`51`	`51`	`dcInstance._useGeneratedSdk();`
`52`	`52`	`return mutationRef(dcInstance, 'DeleteMeta', inputVars);`
`53`	`53`	`}`
`@@ -57,7 +57,7 @@ export function deleteMeta(dcOrVars, vars) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`export function listMoviesRef(dc) {`
`60`		`- const { dc: dcInstance } = validateArgs(connectorConfig, dc, undefined);`
	`60`	`+ const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);`
`61`	`61`	`dcInstance._useGeneratedSdk();`
`62`	`62`	`return queryRef(dcInstance, 'ListMovies');`
`63`	`63`	`}`
`@@ -67,7 +67,7 @@ export function listMovies(dc) {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`export function getMovieByIdRef(dcOrVars, vars) {`
`70`		`- const { dc: dcInstance, vars: inputVars } = validateArgs(connectorConfig, dcOrVars, vars, true);`
	`70`	`+ const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);`
`71`	`71`	`dcInstance._useGeneratedSdk();`
`72`	`72`	`return queryRef(dcInstance, 'GetMovieById', inputVars);`
`73`	`73`	`}`
`@@ -77,7 +77,7 @@ export function getMovieById(dcOrVars, vars) {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`export function getMetaRef(dc) {`
`80`		`- const { dc: dcInstance } = validateArgs(connectorConfig, dc, undefined);`
	`80`	`+ const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);`
`81`	`81`	`dcInstance._useGeneratedSdk();`
`82`	`82`	`return queryRef(dcInstance, 'GetMeta');`
`83`	`83`	`}`