Skip to content

Add updateDoc() #3148

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.

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
merged 75 commits into from
Jun 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
da82b5d
Add Firestore, initializeFirestore, getFirestore to Firestore lite
schmidt-sebastian May 26, 2020
30bfc3f
Review
schmidt-sebastian May 27, 2020
f49096f
add one more tests
schmidt-sebastian May 27, 2020
da3403f
Fix lint
schmidt-sebastian May 27, 2020
bd3596e
Add lite to build
schmidt-sebastian May 27, 2020
3aac6f4
Add private
schmidt-sebastian May 27, 2020
6f05e2f
Fix Path
schmidt-sebastian May 27, 2020
634145a
Remove unused import
schmidt-sebastian May 27, 2020
8187cb7
Update package.json
schmidt-sebastian May 27, 2020
5760b02
Simplify
schmidt-sebastian May 27, 2020
4ba0f4e
Merge branch 'mrschmidt/initializefirestore' of github.com:firebase/f…
schmidt-sebastian May 27, 2020
e40faf4
Merge branch 'master' into mrschmidt/initializefirestore
schmidt-sebastian May 27, 2020
f243a6c
Add DocumentReference
schmidt-sebastian May 27, 2020
d48405b
Feedback
schmidt-sebastian May 28, 2020
804fe94
Typo
schmidt-sebastian May 28, 2020
d244bcd
Lint fix
schmidt-sebastian May 28, 2020
bc342a3
Update integration.test.ts
schmidt-sebastian May 28, 2020
5297d47
Update rollup.config.lite.js
schmidt-sebastian May 28, 2020
867d9c0
One more test
schmidt-sebastian May 28, 2020
084fdcf
Update reference.ts
schmidt-sebastian May 28, 2020
ca44064
Add CollectionReference
schmidt-sebastian May 28, 2020
920c0e2
Merge branch 'master' into mrschmidt/initializefirestore
schmidt-sebastian May 28, 2020
d5745f0
Merge
schmidt-sebastian May 28, 2020
b636d27
Merge
schmidt-sebastian May 28, 2020
31ba3ba
Add DocumentSnapshot
schmidt-sebastian May 28, 2020
505792f
Add exports
schmidt-sebastian May 28, 2020
3750a00
Add getDoc()
schmidt-sebastian May 28, 2020
5d3e2aa
Fix build
schmidt-sebastian May 28, 2020
58a84d1
More integration test fixes
schmidt-sebastian May 29, 2020
6f91171
Fix Integration tests
schmidt-sebastian May 29, 2020
c63977f
Add DocumentReference
schmidt-sebastian May 29, 2020
6352026
Add deleteDoc()
schmidt-sebastian May 29, 2020
be02305
Cleanup
schmidt-sebastian May 29, 2020
518631d
Merge
schmidt-sebastian May 29, 2020
6318fa4
Update datastore.ts
schmidt-sebastian May 29, 2020
a4ff5fd
Add setDoc()
schmidt-sebastian May 29, 2020
72b0b8b
Add setDoc()
schmidt-sebastian May 29, 2020
f3a4316
Add addDoc()
schmidt-sebastian May 30, 2020
efa58c4
Add converter
schmidt-sebastian May 30, 2020
7649b67
Throw when user data parsing fails
schmidt-sebastian May 30, 2020
3aa5d2f
Merge
schmidt-sebastian May 30, 2020
66d72d0
Throw when user data parsing fails
schmidt-sebastian May 30, 2020
e5b5d8f
Add test
schmidt-sebastian May 30, 2020
ca9ab39
Update test names
schmidt-sebastian May 30, 2020
97cf094
Merge branch 'mrschmidt/setdoc' into mrschmidt/adddoc
schmidt-sebastian May 30, 2020
1a81864
Simplify
schmidt-sebastian May 30, 2020
068d5a5
Simplify
schmidt-sebastian May 30, 2020
94e22df
Merge branch 'mrschmidt/newgetdocument' into mrschmidt/deletedoc
schmidt-sebastian May 30, 2020
555a16c
Merge branch 'mrschmidt/deletedoc' of github.com:firebase/firebase-js…
schmidt-sebastian May 30, 2020
61b7c4c
Merge branch 'mrschmidt/deletedoc' into mrschmidt/setdoc
schmidt-sebastian May 30, 2020
d8abac1
Simplify
schmidt-sebastian May 30, 2020
ad1a038
Merge branch 'mrschmidt/setdoc' into mrschmidt/adddoc
schmidt-sebastian May 30, 2020
b2fd485
Simplify
schmidt-sebastian May 30, 2020
df8186b
addDoc
schmidt-sebastian May 30, 2020
8a7fc93
Add documentID() (#3137)
schmidt-sebastian Jun 1, 2020
8bb9829
Add updateDoc()
schmidt-sebastian Jun 2, 2020
c3e3375
Merge
schmidt-sebastian Jun 3, 2020
835ad93
Merge
schmidt-sebastian Jun 3, 2020
bd5a998
Merge
schmidt-sebastian Jun 3, 2020
f6553cb
Merge branch 'mrschmidt/snapshot' of github.com:firebase/firebase-js-…
schmidt-sebastian Jun 3, 2020
25f01e8
Merge
schmidt-sebastian Jun 3, 2020
2685912
Simplify
schmidt-sebastian Jun 4, 2020
6a34bbb
Merge
schmidt-sebastian Jun 4, 2020
3361a63
Feedback
schmidt-sebastian Jun 4, 2020
27bed90
Merge
schmidt-sebastian Jun 4, 2020
6f8521a
Merge branch 'master' into mrschmidt/newgetdocument
schmidt-sebastian Jun 4, 2020
4142278
Merge
schmidt-sebastian Jun 4, 2020
a005ed5
Merge
schmidt-sebastian Jun 4, 2020
d7200bd
Merge
schmidt-sebastian Jun 5, 2020
6af39e9
Merge
schmidt-sebastian Jun 5, 2020
b327858
Merge
schmidt-sebastian Jun 5, 2020
403fe89
Merge
schmidt-sebastian Jun 5, 2020
93d89cd
Lint
schmidt-sebastian Jun 5, 2020
7b6e899
Merge
schmidt-sebastian Jun 5, 2020
03f8223
Merge
schmidt-sebastian Jun 5, 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
5 changes: 3 additions & 2 deletions packages/firestore/lite/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -280,15 +280,16 @@ export function setDoc<T>(
options: SetOptions
): Promise<void>;
export function updateDoc(
reference: DocumentReference,
reference: DocumentReference<unknown>,
data: UpdateData
): Promise<void>;
export function updateDoc(
reference: DocumentReference<unknown>,
field: string | FieldPath,
value: any,
...moreFieldsAndValues: any[]
): Promise<void>;
export function deleteDoc(reference: DocumentReference): Promise<void>;
export function deleteDoc(reference: DocumentReference<unknown>): Promise<void>;

export class FieldValue {
private constructor();
Expand Down
1 change: 1 addition & 0 deletions packages/firestore/lite/index.node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export {
getDoc,
deleteDoc,
setDoc,
updateDoc,
addDoc
} from './src/api/reference';

Expand Down
79 changes: 73 additions & 6 deletions packages/firestore/lite/src/api/reference.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import { DocumentKey } from '../../../src/model/document_key';
import { Firestore } from './database';
import {
DocumentKeyReference,
ParsedUpdateData,
UserDataReader
} from '../../../src/api/user_data_reader';
import { Query as InternalQuery } from '../../../src/core/query';
import { FirebaseFirestore, FirestoreDataConverter } from '../../index';
import { ResourcePath } from '../../../src/model/path';
import { AutoId } from '../../../src/util/misc';
import { DocumentSnapshot } from './snapshot';
Expand All @@ -38,6 +38,7 @@ import { DeleteMutation, Precondition } from '../../../src/model/mutation';
import { PlatformSupport } from '../../../src/platform/platform';
import { applyFirestoreDataConverter } from '../../../src/api/database';
import { DatabaseId } from '../../../src/core/database_info';
import { FieldPath } from './field_path';
import { cast } from './util';
import {
validateArgType,
Expand Down Expand Up @@ -78,7 +79,7 @@ export class Query<T = firestore.DocumentData> implements firestore.Query<T> {
constructor(
readonly firestore: Firestore,
readonly _query: InternalQuery,
readonly _converter?: FirestoreDataConverter<T>
readonly _converter?: firestore.FirestoreDataConverter<T>
) {}

where(
Expand Down Expand Up @@ -173,11 +174,11 @@ export class CollectionReference<T = firestore.DocumentData> extends Query<T>
}

export function collection(
firestore: FirebaseFirestore,
firestore: firestore.FirebaseFirestore,
collectionPath: string
): CollectionReference<firestore.DocumentData>;
export function collection(
reference: DocumentReference,
reference: firestore.DocumentReference,
collectionPath: string
): CollectionReference<firestore.DocumentData>;
export function collection(
Expand All @@ -198,11 +199,11 @@ export function collection(
}

export function doc(
firestore: FirebaseFirestore,
firestore: firestore.FirebaseFirestore,
documentPath: string
): DocumentReference<firestore.DocumentData>;
export function doc<T>(
reference: CollectionReference<T>,
reference: firestore.CollectionReference<T>,
documentPath?: string
): DocumentReference<T>;
export function doc<T>(
Expand Down Expand Up @@ -277,6 +278,15 @@ export function getDoc<T>(
});
}

export function setDoc<T>(
reference: firestore.DocumentReference<T>,
data: T
): Promise<void>;
export function setDoc<T>(
reference: firestore.DocumentReference<T>,
data: Partial<T>,
options: firestore.SetOptions
): Promise<void>;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding these overloads allows us to simulator more realtime usage in the integration tests as it removes the availability of the "catch all" API.

export function setDoc<T>(
reference: firestore.DocumentReference<T>,
data: T,
Expand Down Expand Up @@ -307,6 +317,63 @@ export function setDoc<T>(
);
}

export function updateDoc(
reference: firestore.DocumentReference,
data: firestore.UpdateData
): Promise<void>;
export function updateDoc(
reference: firestore.DocumentReference,
field: string | firestore.FieldPath,
value: unknown,
...moreFieldsAndValues: unknown[]
): Promise<void>;
export function updateDoc(
reference: firestore.DocumentReference,
fieldOrUpdateData: string | firestore.FieldPath | firestore.UpdateData,
value?: unknown,
...moreFieldsAndValues: unknown[]
): Promise<void> {
const ref = cast(reference, DocumentReference);

// Kick off configuring the client, which freezes the settings.
const configureClient = ref.firestore._ensureClientConfigured();
const dataReader = newUserDataReader(
ref.firestore._databaseId,
ref.firestore._settings!
);

let parsed: ParsedUpdateData;
if (
typeof fieldOrUpdateData === 'string' ||
fieldOrUpdateData instanceof FieldPath
) {
parsed = dataReader.parseUpdateVarargs(
'updateDoc',
fieldOrUpdateData,
value,
moreFieldsAndValues
);
} else {
parsed = dataReader.parseUpdateData('updateDoc', fieldOrUpdateData);
}

return configureClient.then(datastore =>
invokeCommitRpc(
datastore,
parsed.toMutations(ref._key, Precondition.none())
)
);

return ref.firestore
._ensureClientConfigured()
.then(datastore =>
invokeCommitRpc(
datastore,
parsed.toMutations(ref._key, Precondition.exists(true))
)
);
}

export function deleteDoc(
reference: firestore.DocumentReference
): Promise<void> {
Expand Down
29 changes: 28 additions & 1 deletion packages/firestore/lite/test/integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ import {
getDoc,
deleteDoc,
setDoc,
addDoc
addDoc,
updateDoc
} from '../src/api/reference';
import { FieldPath } from '../src/api/field_path';
import {
Expand Down Expand Up @@ -260,6 +261,32 @@ describe('setDoc()', () => {
});
});

describe('update()', () => {
it('can update a document', () => {
return withTestDocAndInitialData({ foo: 1, bar: 1 }, async docRef => {
await updateDoc(docRef, { foo: 2, baz: 2 });
const docSnap = await getDoc(docRef);
expect(docSnap.data()).to.deep.equal({ foo: 2, bar: 1, baz: 2 });
});
});

it('can update a document (using varargs)', () => {
return withTestDocAndInitialData({ foo: 1, bar: 1 }, async docRef => {
await updateDoc(docRef, 'foo', 2, new FieldPath('baz'), 2);
const docSnap = await getDoc(docRef);
expect(docSnap.data()).to.deep.equal({ foo: 2, bar: 1, baz: 2 });
});
});

it('throws when user input fails validation', () => {
return withTestDoc(async docRef => {
expect(() => updateDoc(docRef, { val: undefined })).to.throw(
'Function updateDoc() called with invalid data. Unsupported field value: undefined (found in field val)'
);
});
});
});

describe('addDoc()', () => {
it('can add a document', () => {
return withTestCollection(async collRef => {
Expand Down