Skip to content

Refactor on the core observable engine #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesdaniels merged 15 commits into from
Feb 12, 2020
Merged

Refactor on the core observable engine #210

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
af22931
First.
jamesdaniels Feb 7, 2020
5cdd030
Cleanup and comments
jamesdaniels Feb 7, 2020
9a29caf
Better warm up on the subscription, fix test script, and useState/set…
jamesdaniels Feb 7, 2020
c423a30
Firestore is green
jamesdaniels Feb 10, 2020
2c4b25f
Green tests
jamesdaniels Feb 10, 2020
cf14caa
Catch the error in the observable, immediately clean up cache on unsu…
jamesdaniels Feb 11, 2020
c6e0f32
Removing unneeded changes
jamesdaniels Feb 11, 2020
59a0882
Rename to SuspenseSubject
jamesdaniels Feb 11, 2020
a82d9f1
Clean up observable caching ids more, also collection() doesnt take i…
jamesdaniels Feb 11, 2020
8ac5b1f
NPM pack for easier local testing and .npmignore test files
jamesdaniels Feb 11, 2020
778b297
Case sensitive FS on Travis
jamesdaniels Feb 11, 2020
81064d2
Cache remote config off of appName and getter
jamesdaniels Feb 12, 2020
7e78f0a
fail, if there isnt a throw
jamesdaniels Feb 12, 2020
71adcb1
Start typing FirebaseAppProvider props, allow more than one app, erro…
jamesdaniels Feb 12, 2020
a321083
Addressing my own nits
jamesdaniels Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Firestore is green
  • Loading branch information
@jamesdaniels
jamesdaniels committed Feb 10, 2020
commit c423a30d9871d3731784e8e3e1132763af252072
13 changes: 7 additions & 6 deletions reactfire/firestore/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function useFirestoreDoc<T = unknown>(
): T extends {} ? T : firestore.DocumentSnapshot {
return useObservable(
doc(ref),
'firestore doc: ' + ref.path,
`useFirestoreDoc:${ref.path}`,
options ? options.startWithValue : undefined
);
}
Expand All @@ -61,7 +61,7 @@ export function useFirestoreDocData<T = unknown>(
): T {
return useObservable(
docData(ref, checkIdField(options)),
'firestore docdata: ' + ref.path,
`useFirestoreDocData:${ref.path}`,
checkStartWithValue(options)
);
}
Expand All @@ -76,7 +76,7 @@ export function useFirestoreCollection<T = { [key: string]: unknown }>(
query: firestore.Query,
options?: ReactFireOptions<T[]>
): T extends {} ? T[] : firestore.QuerySnapshot {
const queryId = getHashFromFirestoreQuery(query);
const queryId = `useFirestoreCollection:${getHashFromFirestoreQuery(query)}`;

return useObservable(
fromCollectionRef(query, checkIdField(options)),
Expand All @@ -96,8 +96,7 @@ interface _QueryWithId extends firestore.Query {
}

function getHashFromFirestoreQuery(query: firestore.Query) {
const hash = (query as _QueryWithId)._query.canonicalId();
return `firestore: ${hash}`;
return (query as _QueryWithId)._query.canonicalId();
}

/**
Expand All @@ -110,7 +109,9 @@ export function useFirestoreCollectionData<T = { [key: string]: unknown }>(
query: firestore.Query,
options?: ReactFireOptions<T[]>
): T[] {
const queryId = getHashFromFirestoreQuery(query);
const queryId = `useFirestoreCollectionData:${getHashFromFirestoreQuery(
query
)}`;

return useObservable(
collectionData(query, checkIdField(options)),
Expand Down