Review

Author: schmidt-sebastian

packages/firestore/src/local/local_serializer.ts

@@ -192,9 +192,9 @@ export class LocalSerializer {
 
     let target: Target;
     if (isDocumentQuery(dbTarget.query)) {
-      target = fromDocumentsTarget(this.remoteSerializer, dbTarget.query);
+      target = fromDocumentsTarget(dbTarget.query);
     } else {
-      target = fromQueryTarget(this.remoteSerializer, dbTarget.query);
+      target = fromQueryTarget(dbTarget.query);
     }
     return new TargetData(
       target,

packages/firestore/src/remote/serializer.ts

@@ -153,7 +153,6 @@ function toInt32Proto(
  * Returns a number (or null) from a google.protobuf.Int32Value proto.
  */
 function fromInt32Proto(
-  serializer: JsonProtoSerializer,
   val: number | { value: number } | undefined
 ): number | null {
   let result;
@@ -629,7 +628,7 @@ export function fromMutation(
   proto: api.Write
 ): Mutation {
   const precondition = proto.currentDocument
-    ? fromPrecondition(serializer, proto.currentDocument)
+    ? fromPrecondition(proto.currentDocument)
     : Precondition.none();
 
   if (proto.update) {
@@ -681,10 +680,7 @@ function toPrecondition(
   }
 }
 
-function fromPrecondition(
-  serializer: JsonProtoSerializer,
-  precondition: api.Precondition
-): Precondition {
+function fromPrecondition(precondition: api.Precondition): Precondition {
   if (precondition.updateTime !== undefined) {
     return Precondition.updateTime(fromVersion(precondition.updateTime));
   } else if (precondition.exists !== undefined) {
@@ -805,7 +801,6 @@ export function toDocumentsTarget(
 }
 
 export function fromDocumentsTarget(
-  serializer: JsonProtoSerializer,
   documentsTarget: api.DocumentsTarget
 ): Target {
   const count = documentsTarget.documents!.length;
@@ -870,10 +865,7 @@ export function toQueryTarget(
   return result;
 }
 
-export function fromQueryTarget(
-  serializer: JsonProtoSerializer,
-  target: api.QueryTarget
-): Target {
+export function fromQueryTarget(target: api.QueryTarget): Target {
   let path = fromQueryPath(target.parent!);
 
   const query = target.structuredQuery!;
@@ -904,7 +896,7 @@ export function fromQueryTarget(
 
   let limit: number | null = null;
   if (query.limit) {
-    limit = fromInt32Proto(serializer, query.limit);
+    limit = fromInt32Proto(query.limit);
   }
 
   let startAt: Bound | null = null;

packages/firestore/test/unit/remote/serializer.helper.ts

@@ -973,9 +973,7 @@ export function serializerTest(
           documents: { documents: ['projects/p/databases/d/documents/docs/1'] },
           targetId: 1
         });
-        expect(fromDocumentsTarget(s, toDocumentsTarget(s, q))).to.deep.equal(
-          q
-        );
+        expect(fromDocumentsTarget(toDocumentsTarget(s, q))).to.deep.equal(q);
       });
 
       it('converts first-level ancestor queries', () => {
@@ -996,7 +994,7 @@ export function serializerTest(
           },
           targetId: 1
         });
-        expect(fromQueryTarget(s, toQueryTarget(s, q))).to.deep.equal(q);
+        expect(fromQueryTarget(toQueryTarget(s, q))).to.deep.equal(q);
       });
 
       it('converts nested ancestor queries', () => {
@@ -1020,7 +1018,7 @@ export function serializerTest(
           targetId: 1
         };
         expect(result).to.deep.equal(expected);
-        expect(fromQueryTarget(s, toQueryTarget(s, q))).to.deep.equal(q);
+        expect(fromQueryTarget(toQueryTarget(s, q))).to.deep.equal(q);
       });
 
       it('converts single filters at first-level collections', () => {
@@ -1055,7 +1053,7 @@ export function serializerTest(
           targetId: 1
         };
         expect(result).to.deep.equal(expected);
-        expect(fromQueryTarget(s, toQueryTarget(s, q))).to.deep.equal(q);
+        expect(fromQueryTarget(toQueryTarget(s, q))).to.deep.equal(q);
       });
 
       it('converts multiple filters at first-level collections', () => {
@@ -1127,7 +1125,7 @@ export function serializerTest(
           targetId: 1
         };
         expect(result).to.deep.equal(expected);
-        expect(fromQueryTarget(s, toQueryTarget(s, q))).to.deep.equal(q);
+        expect(fromQueryTarget(toQueryTarget(s, q))).to.deep.equal(q);
       });
 
       it('converts single filters on deeper collections', () => {
@@ -1162,7 +1160,7 @@ export function serializerTest(
           targetId: 1
         };
         expect(result).to.deep.equal(expected);
-        expect(fromQueryTarget(s, toQueryTarget(s, q))).to.deep.equal(q);
+        expect(fromQueryTarget(toQueryTarget(s, q))).to.deep.equal(q);
       });
 
       it('converts order bys', () => {
@@ -1190,7 +1188,7 @@ export function serializerTest(
           targetId: 1
         };
         expect(result).to.deep.equal(expected);
-        expect(fromQueryTarget(s, toQueryTarget(s, q))).to.deep.equal(q);
+        expect(fromQueryTarget(toQueryTarget(s, q))).to.deep.equal(q);
       });
 
       it('converts limits', () => {
@@ -1215,7 +1213,7 @@ export function serializerTest(
           targetId: 1
         };
         expect(result).to.deep.equal(expected);
-        expect(fromQueryTarget(s, toQueryTarget(s, q))).to.deep.equal(q);
+        expect(fromQueryTarget(toQueryTarget(s, q))).to.deep.equal(q);
       });
 
       it('converts startAt/endAt', () => {
@@ -1268,7 +1266,7 @@ export function serializerTest(
           targetId: 1
         };
         expect(result).to.deep.equal(expected);
-        expect(fromQueryTarget(s, toQueryTarget(s, q))).to.deep.equal(q);
+        expect(fromQueryTarget(toQueryTarget(s, q))).to.deep.equal(q);
       });
 
       it('converts resume tokens', () => {