Skip to content

Commit 40f9582

Browse files
Hide converter from Public API (#3794)
1 parent 01e9f58 commit 40f9582

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

packages/firestore/exp/src/api/reference.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,15 +317,18 @@ export function addDoc<T>(
317317
firestore._verifyNotTerminated();
318318

319319
const docRef = doc(reference);
320-
const convertedValue = applyFirestoreDataConverter(reference.converter, data);
320+
const convertedValue = applyFirestoreDataConverter(
321+
reference._converter,
322+
data
323+
);
321324

322325
const dataReader = newUserDataReader(reference.firestore);
323326
const parsed = parseSetData(
324327
dataReader,
325328
'addDoc',
326329
docRef._key,
327330
convertedValue,
328-
reference.converter !== null,
331+
reference._converter !== null,
329332
{}
330333
);
331334

packages/firestore/exp/src/api/snapshot.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ export class QuerySnapshot<T = DocumentData> {
232232
doc.key,
233233
doc,
234234
new SnapshotMetadata(hasPendingWrites, fromCache),
235-
this.query.converter
235+
this.query._converter
236236
);
237237
}
238238
}

packages/firestore/lite/src/api/reference.ts

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ export class DocumentReference<T = DocumentData> extends _DocumentKeyReference<
108108

109109
constructor(
110110
readonly firestore: FirebaseFirestore,
111-
readonly converter: FirestoreDataConverter<T> | null,
111+
_converter: FirestoreDataConverter<T> | null,
112112
readonly _path: ResourcePath
113113
) {
114-
super(firestore._databaseId, new DocumentKey(_path), converter);
114+
super(firestore._databaseId, new DocumentKey(_path), _converter);
115115
}
116116

117117
get id(): string {
@@ -154,7 +154,7 @@ export class Query<T = DocumentData> {
154154
// This is the lite version of the Query class in the main SDK.
155155
constructor(
156156
readonly firestore: FirebaseFirestore,
157-
readonly converter: FirestoreDataConverter<T> | null,
157+
readonly _converter: FirestoreDataConverter<T> | null,
158158
readonly _query: InternalQuery
159159
) {}
160160

@@ -217,7 +217,7 @@ class QueryFilterConstraint extends QueryConstraint {
217217
);
218218
return new Query(
219219
query.firestore,
220-
query.converter,
220+
query._converter,
221221
queryWithAddedFilter(query._query, filter)
222222
);
223223
}
@@ -261,7 +261,7 @@ class QueryOrderByConstraint extends QueryConstraint {
261261
const orderBy = newQueryOrderBy(query._query, this._field, this._direction);
262262
return new Query(
263263
query.firestore,
264-
query.converter,
264+
query._converter,
265265
queryWithAddedOrderBy(query._query, orderBy)
266266
);
267267
}
@@ -292,7 +292,7 @@ class QueryLimitConstraint extends QueryConstraint {
292292
_apply<T>(query: Query<T>): Query<T> {
293293
return new Query(
294294
query.firestore,
295-
query.converter,
295+
query._converter,
296296
queryWithLimit(query._query, this._limit, this._limitType)
297297
);
298298
}
@@ -326,7 +326,7 @@ class QueryStartAtConstraint extends QueryConstraint {
326326
);
327327
return new Query(
328328
query.firestore,
329-
query.converter,
329+
query._converter,
330330
queryWithStartAt(query._query, bound)
331331
);
332332
}
@@ -366,7 +366,7 @@ class QueryEndAtConstraint extends QueryConstraint {
366366
);
367367
return new Query(
368368
query.firestore,
369-
query.converter,
369+
query._converter,
370370
queryWithEndAt(query._query, bound)
371371
);
372372
}
@@ -454,7 +454,7 @@ export class CollectionReference<T = DocumentData> extends Query<T> {
454454
validateNonEmptyArgument('CollectionReference.doc', 'path', path);
455455
const absolutePath = this._path.child(ResourcePath.fromString(path!));
456456
validateDocumentPath(absolutePath);
457-
return new DocumentReference(this.firestore, this.converter, absolutePath);
457+
return new DocumentReference(this.firestore, this._converter, absolutePath);
458458
}
459459

460460
withConverter<U>(
@@ -580,7 +580,7 @@ export function doc<T>(
580580
validateDocumentPath(absolutePath);
581581
return new DocumentReference(
582582
parent.firestore,
583-
parent instanceof CollectionReference ? parent.converter : null,
583+
parent instanceof CollectionReference ? parent._converter : null,
584584
absolutePath
585585
);
586586
}
@@ -615,7 +615,7 @@ export function getDocs<T>(query: Query<T>): Promise<QuerySnapshot<T>> {
615615
query.firestore,
616616
doc.key,
617617
doc,
618-
query.converter
618+
query._converter
619619
)
620620
);
621621

@@ -726,7 +726,10 @@ export function addDoc<T>(
726726
): Promise<DocumentReference<T>> {
727727
const docRef = doc(reference);
728728

729-
const convertedValue = applyFirestoreDataConverter(reference.converter, data);
729+
const convertedValue = applyFirestoreDataConverter(
730+
reference._converter,
731+
data
732+
);
730733

731734
const dataReader = newUserDataReader(reference.firestore);
732735
const parsed = parseSetData(
@@ -757,7 +760,7 @@ export function refEqual<T>(
757760
return (
758761
left.firestore === right.firestore &&
759762
left.path === right.path &&
760-
left.converter === right.converter
763+
left._converter === right._converter
761764
);
762765
}
763766
return false;
@@ -768,7 +771,7 @@ export function queryEqual<T>(left: Query<T>, right: Query<T>): boolean {
768771
return (
769772
left.firestore === right.firestore &&
770773
queryEquals(left._query, right._query) &&
771-
left.converter === right.converter
774+
left._converter === right._converter
772775
);
773776
}
774777
return false;

0 commit comments

Comments
 (0)