fix rebase error

Author: wu-hui

packages/firestore/src/core/target.ts

@@ -52,7 +52,7 @@ import {
   orderByEquals,
   stringifyOrderBy
 } from './order_by';
-import { Pipeline } from '../pipelines/api/pipeline';
+import { Pipeline } from '../api/pipeline';
 
 /**
  * A Target represents the WatchTarget representation of a Query, which is used

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

@@ -812,13 +812,20 @@ export class Pipeline<AppModelType = DocumentData> implements ProtoSerializable<
    * @private
    */
   _toProto(jsonProtoSerializer: JsonProtoSerializer): ExecutePipelineRequest {
-    const stages: ProtoStage[] = this.stages.map(stage =>
-      stage._toProto(jsonProtoSerializer)
-    );
-    const structuredPipeline: StructuredPipeline = { pipeline: { stages } };
     return {
       database: getEncodedDatabaseId(jsonProtoSerializer),
-      structuredPipeline
+      structuredPipeline: this._toStructuredPipeline(jsonProtoSerializer)
     };
   }
+
+  /**
+   * @internal
+   * @private
+   */
+  _toStructuredPipeline(jsonProtoSerializer: JsonProtoSerializer): StructuredPipeline {
+    const stages: ProtoStage[] = this.stages.map(stage =>
+      stage._toProto(jsonProtoSerializer)
+    );
+    return { pipeline: { stages } };
+  }
 }

packages/firestore/src/local/local_serializer.ts

@@ -81,7 +81,7 @@ import {
 } from './indexeddb_schema';
 import { DbDocumentOverlayKey, DbTimestampKey } from './indexeddb_sentinels';
 import { TargetData, TargetPurpose } from './target_data';
-import { Pipeline } from '../pipelines/api/pipeline';
+import { Pipeline } from '../api/pipeline';
 
 /** Serializer for values stored in the LocalStore. */
 export class LocalSerializer {

packages/firestore/src/local/target_data.ts

@@ -19,7 +19,7 @@ import { SnapshotVersion } from '../core/snapshot_version';
 import { Target } from '../core/target';
 import { ListenSequenceNumber, TargetId } from '../core/types';
 import { ByteString } from '../util/byte_string';
-import { Pipeline } from '../pipelines/api/pipeline';
+import { Pipeline } from '../api/pipeline';
 
 /** An enumeration of the different purposes we have for targets. */
 export const enum TargetPurpose {

packages/firestore/src/remote/serializer.ts

@@ -116,7 +116,7 @@ import {
   WatchTargetChange,
   WatchTargetChangeState
 } from './watch_change';
-import { Pipeline } from '../api';
+import { Pipeline } from '../api/pipeline';
 
 const DIRECTIONS = (() => {
   const dirs: { [dir: string]: ProtoOrderDirection } = {};
@@ -1102,7 +1102,7 @@ export function toPipelineTarget(
   target: Pipeline
 ): ProtoPipelineQueryTarget {
   return {
-    pipeline: {}
+    pipeline: target._toStructuredPipeline(serializer)
   };
 }