Skip to content

Commit 6767228

Browse files
maneeshtmaneesht
authored
fix(react): Fixed issues after merge (#179)
* Fixed issues after merge * Fixed formatting
1 parent a17debe commit 6767228

File tree

7 files changed

+26
-28
lines changed

7 files changed

+26
-28
lines changed

‎dataconnect-sdk/js/default-connector/esm/index.esm.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const connectorConfig = {
77
};
88

99
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);
1111
dcInstance._useGeneratedSdk();
1212
return mutationRef(dcInstance, 'CreateMovie', inputVars);
1313
}
@@ -17,7 +17,7 @@ export function createMovie(dcOrVars, vars) {
1717
}
1818

1919
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);
2121
dcInstance._useGeneratedSdk();
2222
return mutationRef(dcInstance, 'UpsertMovie', inputVars);
2323
}
@@ -27,7 +27,7 @@ export function upsertMovie(dcOrVars, vars) {
2727
}
2828

2929
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);
3131
dcInstance._useGeneratedSdk();
3232
return mutationRef(dcInstance, 'DeleteMovie', inputVars);
3333
}
@@ -37,7 +37,7 @@ export function deleteMovie(dcOrVars, vars) {
3737
}
3838

3939
export function addMetaRef(dc) {
40-
const { dc: dcInstance } = validateArgs(connectorConfig, dc, undefined);
40+
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
4141
dcInstance._useGeneratedSdk();
4242
return mutationRef(dcInstance, 'AddMeta');
4343
}
@@ -47,7 +47,7 @@ export function addMeta(dc) {
4747
}
4848

4949
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);
5151
dcInstance._useGeneratedSdk();
5252
return mutationRef(dcInstance, 'DeleteMeta', inputVars);
5353
}
@@ -57,7 +57,7 @@ export function deleteMeta(dcOrVars, vars) {
5757
}
5858

5959
export function listMoviesRef(dc) {
60-
const { dc: dcInstance } = validateArgs(connectorConfig, dc, undefined);
60+
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
6161
dcInstance._useGeneratedSdk();
6262
return queryRef(dcInstance, 'ListMovies');
6363
}
@@ -67,7 +67,7 @@ export function listMovies(dc) {
6767
}
6868

6969
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);
7171
dcInstance._useGeneratedSdk();
7272
return queryRef(dcInstance, 'GetMovieById', inputVars);
7373
}
@@ -77,7 +77,7 @@ export function getMovieById(dcOrVars, vars) {
7777
}
7878

7979
export function getMetaRef(dc) {
80-
const { dc: dcInstance } = validateArgs(connectorConfig, dc, undefined);
80+
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
8181
dcInstance._useGeneratedSdk();
8282
return queryRef(dcInstance, 'GetMeta');
8383
}

‎dataconnect-sdk/js/default-connector/index.cjs.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ exports.createMovieRef = function createMovieRef(dcOrVars, vars) {
1515
exports.createMovie = function createMovie(dcOrVars, vars) {
1616
return executeMutation(createMovieRef(dcOrVars, vars));
1717
};
18-
1918
exports.upsertMovieRef = function upsertMovieRef(dcOrVars, vars) {
2019
const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
2120
dcInstance._useGeneratedSdk();
@@ -24,7 +23,6 @@ exports.upsertMovieRef = function upsertMovieRef(dcOrVars, vars) {
2423
exports.upsertMovie = function upsertMovie(dcOrVars, vars) {
2524
return executeMutation(upsertMovieRef(dcOrVars, vars));
2625
};
27-
2826
exports.deleteMovieRef = function deleteMovieRef(dcOrVars, vars) {
2927
const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
3028
dcInstance._useGeneratedSdk();
@@ -33,7 +31,6 @@ exports.deleteMovieRef = function deleteMovieRef(dcOrVars, vars) {
3331
exports.deleteMovie = function deleteMovie(dcOrVars, vars) {
3432
return executeMutation(deleteMovieRef(dcOrVars, vars));
3533
};
36-
3734
exports.addMetaRef = function addMetaRef(dc) {
3835
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
3936
dcInstance._useGeneratedSdk();
@@ -42,7 +39,6 @@ exports.addMetaRef = function addMetaRef(dc) {
4239
exports.addMeta = function addMeta(dc) {
4340
return executeMutation(addMetaRef(dc));
4441
};
45-
4642
exports.deleteMetaRef = function deleteMetaRef(dcOrVars, vars) {
4743
const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
4844
dcInstance._useGeneratedSdk();
@@ -51,7 +47,6 @@ exports.deleteMetaRef = function deleteMetaRef(dcOrVars, vars) {
5147
exports.deleteMeta = function deleteMeta(dcOrVars, vars) {
5248
return executeMutation(deleteMetaRef(dcOrVars, vars));
5349
};
54-
5550
exports.listMoviesRef = function listMoviesRef(dc) {
5651
const { dc: dcInstance} = validateArgs(connectorConfig, dc, undefined);
5752
dcInstance._useGeneratedSdk();
@@ -60,7 +55,6 @@ exports.listMoviesRef = function listMoviesRef(dc) {
6055
exports.listMovies = function listMovies(dc) {
6156
return executeQuery(listMoviesRef(dc));
6257
};
63-
6458
exports.getMovieByIdRef = function getMovieByIdRef(dcOrVars, vars) {
6559
const { dc: dcInstance, vars: inputVars} = validateArgs(connectorConfig, dcOrVars, vars, true);
6660
dcInstance._useGeneratedSdk();

‎examples/react-example/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
},
1111
"dependencies": {
1212
"@tanstack/react-query": "^5.55.4",
13-
"@tanstack-query-firebase/react": "link:../../packages/react",
14-
"@dataconnect/default-connector": "link:../../dataconnect-sdk",
13+
"@tanstack-query-firebase/react": "link:../../packages/react/dist",
14+
"@dataconnect/default-connector": "link:../../dataconnect-sdk/js/default-connector",
1515
"firebase": "^11.3.0",
1616
"next": "15.1.0",
1717
"react": "^19.0.0",

‎examples/react-example/src/examples/data-connect.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export function Movies() {
1212
const movies = useDataConnectQuery(listMoviesRef());
1313

1414
const addMovie = useDataConnectMutation(createMovieRef, {
15-
invalidate: [listMoviesRef],
15+
invalidate: [listMoviesRef()],
1616
});
1717

1818
if (movies.isLoading) {
@@ -39,10 +39,10 @@ export function Movies() {
3939
Add Movie
4040
</button>
4141
<ul>
42-
<li>Fetch Time: {movies.data?.fetchTime}</li>
43-
<li>Source: {movies.data?.source}</li>
42+
<li>Fetch Time: {movies.dataConnectResult?.fetchTime}</li>
43+
<li>Source: {movies.dataConnectResult?.source}</li>
4444
<li>
45-
Query Key: {movies.data?.ref.name} + {movies.data?.ref.variables}
45+
Query Key: {movies.dataConnectResult?.ref.name} + {movies.dataConnectResult?.ref.variables}
4646
</li>
4747
{movies.data!.movies.map((movie) => (
4848
<li key={movie.id}>{movie.title}</li>

‎packages/react/src/data-connect/useDataConnectQuery.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ import {
99
} from "firebase/data-connect";
1010
import { useState } from "react";
1111
import type { PartialBy } from "../../utils";
12-
import type { QueryResultRequiredRef, UseDataConnectQuery } from "./types";
12+
import type {
13+
QueryResultRequiredRef,
14+
UseDataConnectQueryResult,
15+
} from "./types";
1316

1417
export type useDataConnectQueryOptions<
1518
TData = object,
@@ -20,7 +23,7 @@ export function useDataConnectQuery<Data = unknown, Variables = unknown>(
2023
refOrResult: QueryRef<Data, Variables> | QueryResult<Data, Variables>,
2124
options?: useDataConnectQueryOptions<Data, FirebaseError>,
2225
_callerSdkType: CallerSdkType = CallerSdkTypeEnum.TanstackReactCore,
23-
): UseDataConnectQuery<Data, Variables> {
26+
): UseDataConnectQueryResult<Data, Variables> {
2427
const [dataConnectResult, setDataConnectResult] = useState<
2528
QueryResultRequiredRef<Data, Variables>
2629
>("ref" in refOrResult ? refOrResult : { ref: refOrResult });

‎packages/react/tsup.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default defineConfig({
66
format: ["esm"],
77
dts: true, // generates .d.ts files
88
outDir: "dist",
9+
external: ['react'],
910
esbuildOptions(options, context) {
1011
options.outbase = './src';
1112
},

‎pnpm-lock.yaml‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)