Fix regression in _internalPipelineToExecutePipelineRequestProto

Author: MarkDuckworth

packages/firestore/src/remote/internal_serializer.ts

@@ -18,14 +18,23 @@
 import { ensureFirestoreConfigured, Firestore } from '../api/database';
 import { AggregateImpl } from '../core/aggregate';
 import { queryToAggregateTarget, queryToTarget } from '../core/query';
+import {
+  StructuredPipeline,
+  StructuredPipelineOptions
+} from '../core/structured_pipeline';
 import { AggregateSpec } from '../lite-api/aggregate_types';
 import { getDatastore } from '../lite-api/components';
 import { Pipeline } from '../lite-api/pipeline';
 import { Query } from '../lite-api/reference';
+import { ExecutePipelineRequest as ProtoExecutePipelineRequest } from '../protos/firestore_proto_api';
 import { cast } from '../util/input_validation';
 import { mapToArray } from '../util/obj';
 
-import { toQueryTarget, toRunAggregationQueryRequest } from './serializer';
+import {
+  getEncodedDatabaseId,
+  toQueryTarget,
+  toRunAggregationQueryRequest
+} from './serializer';
 
 /**
  * @internal
@@ -112,5 +121,15 @@ export function _internalPipelineToExecutePipelineRequestProto(
   if (serializer === undefined) {
     return null;
   }
-  return pipeline._toProto(serializer);
+
+  const structuredPipeline = new StructuredPipeline(
+    pipeline,
+    new StructuredPipelineOptions()
+  );
+  const executePipelineRequest: ProtoExecutePipelineRequest = {
+    database: getEncodedDatabaseId(serializer),
+    structuredPipeline: structuredPipeline._toProto(serializer)
+  };
+
+  return executePipelineRequest;
 }

packages/firestore/test/integration/api/pipeline.test.ts

@@ -346,18 +346,19 @@ const timestampDeltaMS = 1000;
 
   describe('console support', () => {
     it('supports internal serialization to proto', async () => {
+      // Perform the same test as the console
       const pipeline = firestore
         .pipeline()
-        .collection('books')
-        .where(equal('awards.hugo', true))
-        .select(
-          'title',
-          field('nestedField.level.1'),
-          mapGet('nestedField', 'level.1').mapGet('level.2').as('nested')
-        );
+        .collection('customers')
+        .where(field('country').equal('United Kingdom'));
 
       const proto = _internalPipelineToExecutePipelineRequestProto(pipeline);
-      expect(proto).not.to.be.null;
+
+      const expectedStructuredPipelineProto =
+        '{"pipeline":{"stages":[{"name":"collection","options":{},"args":[{"referenceValue":"/customers"}]},{"name":"where","options":{},"args":[{"functionValue":{"name":"equal","args":[{"fieldReferenceValue":"country"},{"stringValue":"United Kingdom"}]}}]}]}}';
+      expect(JSON.stringify(proto.structuredPipeline)).to.equal(
+        expectedStructuredPipelineProto
+      );
     });
   });