Skip to content

Commit 2e0d0ad

Browse files
authored
Update to v1 protos. (#1473)
1. Update src/protos/update.sh script to use v1. 2. Search/replace V1beta1 => V1 on firestore_proto_api.d.ts 3. Check in output of src/protos/update.sh script (and remove old v1beta1 directory.) 4. Search/replace all "v1beta1" instances to "v1". 5. Include '/documents' for root document paths (v1 endpoint requires this now).
1 parent 92e2baf commit 2e0d0ad

File tree

17 files changed

+406
-303
lines changed

17 files changed

+406
-303
lines changed

packages/firestore/src/platform_browser/webchannel_connection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ import { StringMap } from '../util/types';
4141

4242
const LOG_TAG = 'Connection';
4343

44-
const RPC_STREAM_SERVICE = 'google.firestore.v1beta1.Firestore';
45-
const RPC_URL_VERSION = 'v1beta1';
44+
const RPC_STREAM_SERVICE = 'google.firestore.v1.Firestore';
45+
const RPC_URL_VERSION = 'v1';
4646

4747
/** Maps RPC names to the corresponding REST endpoint name. */
4848
const RPC_NAME_REST_MAPPING = {

packages/firestore/src/platform_node/grpc_connection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export class GrpcConnection implements Connection {
9797
private cachedStub: CachedStub | null = null;
9898

9999
constructor(protos: grpc.GrpcObject, private databaseInfo: DatabaseInfo) {
100-
this.firestore = protos['google']['firestore']['v1beta1'];
100+
this.firestore = protos['google']['firestore']['v1'];
101101
}
102102

103103
private sameToken(tokenA: Token | null, tokenB: Token | null): boolean {

packages/firestore/src/platform_node/load_protos.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export function loadProtos(): grpc.GrpcObject {
3535
);
3636
const firestoreProtoFile = {
3737
root,
38-
file: 'google/firestore/v1beta1/firestore.proto'
38+
file: 'google/firestore/v1/firestore.proto'
3939
};
4040
return grpc.load(firestoreProtoFile, /*format=*/ 'proto', options);
4141
}

packages/firestore/src/protos/firestore_proto_api.d.ts

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export interface IValueNullValueEnum {
122122
values(): Array<ValueNullValue>;
123123
}
124124
export declare const ValueNullValueEnum: IValueNullValueEnum;
125-
export declare namespace firestoreV1beta1ApiClientInterfaces {
125+
export declare namespace firestoreV1ApiClientInterfaces {
126126
interface ArrayValue {
127127
values?: Array<Value>;
128128
}
@@ -383,60 +383,60 @@ export declare namespace firestoreV1beta1ApiClientInterfaces {
383383
transformResults?: Array<Value>;
384384
}
385385
}
386-
export declare type ArrayValue = firestoreV1beta1ApiClientInterfaces.ArrayValue;
387-
export declare type BatchGetDocumentsRequest = firestoreV1beta1ApiClientInterfaces.BatchGetDocumentsRequest;
388-
export declare type BatchGetDocumentsResponse = firestoreV1beta1ApiClientInterfaces.BatchGetDocumentsResponse;
389-
export declare type BeginTransactionRequest = firestoreV1beta1ApiClientInterfaces.BeginTransactionRequest;
390-
export declare type BeginTransactionResponse = firestoreV1beta1ApiClientInterfaces.BeginTransactionResponse;
391-
export declare type CollectionSelector = firestoreV1beta1ApiClientInterfaces.CollectionSelector;
392-
export declare type CommitRequest = firestoreV1beta1ApiClientInterfaces.CommitRequest;
393-
export declare type CommitResponse = firestoreV1beta1ApiClientInterfaces.CommitResponse;
394-
export declare type CompositeFilter = firestoreV1beta1ApiClientInterfaces.CompositeFilter;
395-
export declare type Cursor = firestoreV1beta1ApiClientInterfaces.Cursor;
396-
export declare type Document = firestoreV1beta1ApiClientInterfaces.Document;
397-
export declare type DocumentChange = firestoreV1beta1ApiClientInterfaces.DocumentChange;
398-
export declare type DocumentDelete = firestoreV1beta1ApiClientInterfaces.DocumentDelete;
399-
export declare type DocumentMask = firestoreV1beta1ApiClientInterfaces.DocumentMask;
400-
export declare type DocumentRemove = firestoreV1beta1ApiClientInterfaces.DocumentRemove;
401-
export declare type DocumentTransform = firestoreV1beta1ApiClientInterfaces.DocumentTransform;
402-
export declare type DocumentsTarget = firestoreV1beta1ApiClientInterfaces.DocumentsTarget;
403-
export declare type Empty = firestoreV1beta1ApiClientInterfaces.Empty;
404-
export declare type ExistenceFilter = firestoreV1beta1ApiClientInterfaces.ExistenceFilter;
405-
export declare type FieldFilter = firestoreV1beta1ApiClientInterfaces.FieldFilter;
406-
export declare type FieldReference = firestoreV1beta1ApiClientInterfaces.FieldReference;
407-
export declare type FieldTransform = firestoreV1beta1ApiClientInterfaces.FieldTransform;
408-
export declare type Filter = firestoreV1beta1ApiClientInterfaces.Filter;
409-
export declare type Index = firestoreV1beta1ApiClientInterfaces.Index;
410-
export declare type IndexField = firestoreV1beta1ApiClientInterfaces.IndexField;
411-
export declare type LatLng = firestoreV1beta1ApiClientInterfaces.LatLng;
412-
export declare type ListCollectionIdsRequest = firestoreV1beta1ApiClientInterfaces.ListCollectionIdsRequest;
413-
export declare type ListCollectionIdsResponse = firestoreV1beta1ApiClientInterfaces.ListCollectionIdsResponse;
414-
export declare type ListDocumentsResponse = firestoreV1beta1ApiClientInterfaces.ListDocumentsResponse;
415-
export declare type ListIndexesResponse = firestoreV1beta1ApiClientInterfaces.ListIndexesResponse;
416-
export declare type ListenRequest = firestoreV1beta1ApiClientInterfaces.ListenRequest;
417-
export declare type ListenResponse = firestoreV1beta1ApiClientInterfaces.ListenResponse;
418-
export declare type MapValue = firestoreV1beta1ApiClientInterfaces.MapValue;
419-
export declare type Operation = firestoreV1beta1ApiClientInterfaces.Operation;
420-
export declare type Order = firestoreV1beta1ApiClientInterfaces.Order;
421-
export declare type Precondition = firestoreV1beta1ApiClientInterfaces.Precondition;
422-
export declare type Projection = firestoreV1beta1ApiClientInterfaces.Projection;
423-
export declare type QueryTarget = firestoreV1beta1ApiClientInterfaces.QueryTarget;
424-
export declare type ReadOnly = firestoreV1beta1ApiClientInterfaces.ReadOnly;
425-
export declare type ReadWrite = firestoreV1beta1ApiClientInterfaces.ReadWrite;
426-
export declare type RollbackRequest = firestoreV1beta1ApiClientInterfaces.RollbackRequest;
427-
export declare type RunQueryRequest = firestoreV1beta1ApiClientInterfaces.RunQueryRequest;
428-
export declare type RunQueryResponse = firestoreV1beta1ApiClientInterfaces.RunQueryResponse;
429-
export declare type Status = firestoreV1beta1ApiClientInterfaces.Status;
430-
export declare type StructuredQuery = firestoreV1beta1ApiClientInterfaces.StructuredQuery;
431-
export declare type Target = firestoreV1beta1ApiClientInterfaces.Target;
432-
export declare type TargetChange = firestoreV1beta1ApiClientInterfaces.TargetChange;
433-
export declare type TransactionOptions = firestoreV1beta1ApiClientInterfaces.TransactionOptions;
434-
export declare type UnaryFilter = firestoreV1beta1ApiClientInterfaces.UnaryFilter;
435-
export declare type Value = firestoreV1beta1ApiClientInterfaces.Value;
436-
export declare type Write = firestoreV1beta1ApiClientInterfaces.Write;
437-
export declare type WriteRequest = firestoreV1beta1ApiClientInterfaces.WriteRequest;
438-
export declare type WriteResponse = firestoreV1beta1ApiClientInterfaces.WriteResponse;
439-
export declare type WriteResult = firestoreV1beta1ApiClientInterfaces.WriteResult;
386+
export declare type ArrayValue = firestoreV1ApiClientInterfaces.ArrayValue;
387+
export declare type BatchGetDocumentsRequest = firestoreV1ApiClientInterfaces.BatchGetDocumentsRequest;
388+
export declare type BatchGetDocumentsResponse = firestoreV1ApiClientInterfaces.BatchGetDocumentsResponse;
389+
export declare type BeginTransactionRequest = firestoreV1ApiClientInterfaces.BeginTransactionRequest;
390+
export declare type BeginTransactionResponse = firestoreV1ApiClientInterfaces.BeginTransactionResponse;
391+
export declare type CollectionSelector = firestoreV1ApiClientInterfaces.CollectionSelector;
392+
export declare type CommitRequest = firestoreV1ApiClientInterfaces.CommitRequest;
393+
export declare type CommitResponse = firestoreV1ApiClientInterfaces.CommitResponse;
394+
export declare type CompositeFilter = firestoreV1ApiClientInterfaces.CompositeFilter;
395+
export declare type Cursor = firestoreV1ApiClientInterfaces.Cursor;
396+
export declare type Document = firestoreV1ApiClientInterfaces.Document;
397+
export declare type DocumentChange = firestoreV1ApiClientInterfaces.DocumentChange;
398+
export declare type DocumentDelete = firestoreV1ApiClientInterfaces.DocumentDelete;
399+
export declare type DocumentMask = firestoreV1ApiClientInterfaces.DocumentMask;
400+
export declare type DocumentRemove = firestoreV1ApiClientInterfaces.DocumentRemove;
401+
export declare type DocumentTransform = firestoreV1ApiClientInterfaces.DocumentTransform;
402+
export declare type DocumentsTarget = firestoreV1ApiClientInterfaces.DocumentsTarget;
403+
export declare type Empty = firestoreV1ApiClientInterfaces.Empty;
404+
export declare type ExistenceFilter = firestoreV1ApiClientInterfaces.ExistenceFilter;
405+
export declare type FieldFilter = firestoreV1ApiClientInterfaces.FieldFilter;
406+
export declare type FieldReference = firestoreV1ApiClientInterfaces.FieldReference;
407+
export declare type FieldTransform = firestoreV1ApiClientInterfaces.FieldTransform;
408+
export declare type Filter = firestoreV1ApiClientInterfaces.Filter;
409+
export declare type Index = firestoreV1ApiClientInterfaces.Index;
410+
export declare type IndexField = firestoreV1ApiClientInterfaces.IndexField;
411+
export declare type LatLng = firestoreV1ApiClientInterfaces.LatLng;
412+
export declare type ListCollectionIdsRequest = firestoreV1ApiClientInterfaces.ListCollectionIdsRequest;
413+
export declare type ListCollectionIdsResponse = firestoreV1ApiClientInterfaces.ListCollectionIdsResponse;
414+
export declare type ListDocumentsResponse = firestoreV1ApiClientInterfaces.ListDocumentsResponse;
415+
export declare type ListIndexesResponse = firestoreV1ApiClientInterfaces.ListIndexesResponse;
416+
export declare type ListenRequest = firestoreV1ApiClientInterfaces.ListenRequest;
417+
export declare type ListenResponse = firestoreV1ApiClientInterfaces.ListenResponse;
418+
export declare type MapValue = firestoreV1ApiClientInterfaces.MapValue;
419+
export declare type Operation = firestoreV1ApiClientInterfaces.Operation;
420+
export declare type Order = firestoreV1ApiClientInterfaces.Order;
421+
export declare type Precondition = firestoreV1ApiClientInterfaces.Precondition;
422+
export declare type Projection = firestoreV1ApiClientInterfaces.Projection;
423+
export declare type QueryTarget = firestoreV1ApiClientInterfaces.QueryTarget;
424+
export declare type ReadOnly = firestoreV1ApiClientInterfaces.ReadOnly;
425+
export declare type ReadWrite = firestoreV1ApiClientInterfaces.ReadWrite;
426+
export declare type RollbackRequest = firestoreV1ApiClientInterfaces.RollbackRequest;
427+
export declare type RunQueryRequest = firestoreV1ApiClientInterfaces.RunQueryRequest;
428+
export declare type RunQueryResponse = firestoreV1ApiClientInterfaces.RunQueryResponse;
429+
export declare type Status = firestoreV1ApiClientInterfaces.Status;
430+
export declare type StructuredQuery = firestoreV1ApiClientInterfaces.StructuredQuery;
431+
export declare type Target = firestoreV1ApiClientInterfaces.Target;
432+
export declare type TargetChange = firestoreV1ApiClientInterfaces.TargetChange;
433+
export declare type TransactionOptions = firestoreV1ApiClientInterfaces.TransactionOptions;
434+
export declare type UnaryFilter = firestoreV1ApiClientInterfaces.UnaryFilter;
435+
export declare type Value = firestoreV1ApiClientInterfaces.Value;
436+
export declare type Write = firestoreV1ApiClientInterfaces.Write;
437+
export declare type WriteRequest = firestoreV1ApiClientInterfaces.WriteRequest;
438+
export declare type WriteResponse = firestoreV1ApiClientInterfaces.WriteResponse;
439+
export declare type WriteResult = firestoreV1ApiClientInterfaces.WriteResult;
440440
export declare type ProjectsDatabasesDocumentsApiClient$Xgafv = '1' | '2';
441441
export interface IProjectsDatabasesDocumentsApiClient$XgafvEnum {
442442
1: ProjectsDatabasesDocumentsApiClient$Xgafv;

0 commit comments

Comments
 (0)