Made ProtoSerializable generic and used by Pipeline and Stage

Author: MarkDuckworth

packages/firestore/src/lite-api/expressions.ts

@@ -122,7 +122,7 @@ export type ExprType =
  * The `Expr` class provides a fluent API for building expressions. You can chain together
  * method calls to create complex expressions.
  */
-export abstract class Expr implements ProtoSerializable, UserData {
+export abstract class Expr implements ProtoSerializable<ProtoValue>, UserData {
  /**
  * Creates an expression that adds this expression to another expression.
  *

packages/firestore/src/lite-api/pipeline.ts

@@ -24,7 +24,7 @@ import {
 import { invokeExecutePipeline } from '../remote/datastore';
 import {
  getEncodedDatabaseId,
- JsonProtoSerializer
+ JsonProtoSerializer, ProtoSerializable
 } from '../remote/serializer';
 
 import { getDatastore } from './components';
@@ -117,7 +117,7 @@ function isReadableUserData(value: any): value is ReadableUserData {
 /**
  * Base-class implementation
  */
-export class Pipeline<AppModelType = DocumentData> {
+export class Pipeline<AppModelType = DocumentData> implements ProtoSerializable<ExecutePipelineRequest>{
  /**
  * @internal
  * @private

packages/firestore/src/lite-api/stage.ts

@@ -19,7 +19,7 @@ import {
 } from '../protos/firestore_proto_api';
 import { toNumber } from '../remote/number_serializer';
 import {
- JsonProtoSerializer,
+ JsonProtoSerializer, ProtoSerializable,
  toMapValue,
  toStringValue
 } from '../remote/serializer';
@@ -37,14 +37,8 @@ import { VectorValue } from './vector_value';
 /**
  * @beta
  */
-export interface Stage {
+export interface Stage extends ProtoSerializable<ProtoStage>{
  name: string;
-
- /**
- * @internal
- * @private
- */
- _toProto(jsonProtoSerializer: JsonProtoSerializer): ProtoStage;
 }
 
 /**

packages/firestore/src/remote/serializer.ts

@@ -1429,8 +1429,8 @@ export function isValidResourceName(path: ResourcePath): boolean {
  );
 }
 
-export interface ProtoSerializable {
- _toProto(serializer: JsonProtoSerializer): ProtoValue;
+export interface ProtoSerializable<ProtoType> {
+ _toProto(serializer: JsonProtoSerializer): ProtoType;
 }
 
 export interface UserData {
@@ -1439,10 +1439,10 @@ export interface UserData {
 
 export function toMapValue(
  serializer: JsonProtoSerializer,
- input: Map<string, ProtoSerializable>
+ input: Map<string, ProtoSerializable<ProtoValue>>
 ): ProtoValue {
  const map: ProtoMapValue = { fields: {} };
- input.forEach((exp: ProtoSerializable, key: string) => {
+ input.forEach((exp: ProtoSerializable<ProtoValue>, key: string) => {
  if (typeof key !== 'string') {
  throw new Error(`Cannot encode map with non-string key: ${key}`);
  }