Skip to content

Expose setIndexConfiguration #6496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/honest-waves-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@firebase/firestore': patch
---

Expose client side indexing feature with `setIndexConfiguration`.
30 changes: 30 additions & 0 deletions common/api-review/firestore.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,30 @@ export function getFirestore(app?: FirebaseApp): Firestore;
// @public
export function increment(n: number): FieldValue;

// @public
export interface Index {
// (undocumented)
[key: string]: unknown;
readonly collectionGroup: string;
readonly fields?: IndexField[];
}

// @public
export interface IndexConfiguration {
// (undocumented)
[key: string]: unknown;
readonly indexes?: Index[];
}

// @public
export interface IndexField {
// (undocumented)
[key: string]: unknown;
readonly arrayConfig?: 'CONTAINS';
readonly fieldPath: string;
readonly order?: 'ASCENDING' | 'DESCENDING';
}

// @public
export function initializeFirestore(app: FirebaseApp, settings: FirestoreSettings): Firestore;

Expand Down Expand Up @@ -396,6 +420,12 @@ export function setDoc<T>(reference: DocumentReference<T>, data: WithFieldValue<
// @public
export function setDoc<T>(reference: DocumentReference<T>, data: PartialWithFieldValue<T>, options: SetOptions): Promise<void>;

// @public
export function setIndexConfiguration(firestore: Firestore, configuration: IndexConfiguration): Promise<void>;

// @public
export function setIndexConfiguration(firestore: Firestore, json: string): Promise<void>;

// @public
export function setLogLevel(logLevel: LogLevel): void;

Expand Down
8 changes: 7 additions & 1 deletion packages/firestore/src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,13 @@ export {
UnionToIntersection
} from '../src/lite-api/types';

export {
setIndexConfiguration,
Index,
IndexConfiguration,
IndexField
} from './api/index_configuration';

/**
* Internal exports
*/
Expand All @@ -160,4 +167,3 @@ export type { ByteString as _ByteString } from './util/byte_string';
export { logWarn as _logWarn } from './util/log';
export { EmptyAuthCredentialsProvider as _EmptyAuthCredentialsProvider } from './api/credentials';
export { EmptyAppCheckTokenProvider as _EmptyAppCheckTokenProvider } from './api/credentials';
export { setIndexConfiguration as _setIndexConfiguration } from './api/index_configuration';
10 changes: 2 additions & 8 deletions packages/firestore/src/api/index_configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ export {

/**
* A single field element in an index configuration.
*
* @internal
*/
export interface IndexField {
/** The field path to index. */
Expand All @@ -65,8 +63,6 @@ export interface IndexField {

/**
* The SDK definition of a Firestore index.
*
* @internal
*/
export interface Index {
/** The ID of the collection to index. */
Expand All @@ -82,8 +78,6 @@ export interface Index {
*
* See {@link https://firebase.google.com/docs/reference/firestore/indexes/#json_format | JSON Format}
* for a description of the format of the index definition.
*
* @internal
*/
export interface IndexConfiguration {
/** A list of all Firestore indexes. */
Expand All @@ -107,7 +101,6 @@ export interface IndexConfiguration {
* before setting an index configuration. If IndexedDb is not enabled, any
* index configuration is ignored.
*
* @internal
* @param firestore - The {@link Firestore} instance to configure indexes for.
* @param configuration -The index definition.
* @throws FirestoreError if the JSON format is invalid.
Expand All @@ -118,6 +111,7 @@ export function setIndexConfiguration(
firestore: Firestore,
configuration: IndexConfiguration
): Promise<void>;

/**
* Configures indexing for local query execution. Any previous index
* configuration is overridden. The `Promise` resolves once the index
Expand All @@ -137,7 +131,6 @@ export function setIndexConfiguration(
* firestore:indexes`). If the JSON format is invalid, this method throws an
* error.
*
* @internal
* @param firestore - The {@link Firestore} instance to configure indexes for.
* @param json -The JSON format exported by the Firebase CLI.
* @throws FirestoreError if the JSON format is invalid.
Expand All @@ -148,6 +141,7 @@ export function setIndexConfiguration(
firestore: Firestore,
json: string
): Promise<void>;

export function setIndexConfiguration(
firestore: Firestore,
jsonOrConfiguration: string | IndexConfiguration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import { expect } from 'chai';

import { _setIndexConfiguration as setIndexConfiguration } from '../util/firebase_export';
import { setIndexConfiguration } from '../util/firebase_export';
import { apiDescribe, withTestDb } from '../util/helpers';

apiDescribe('Index Configuration:', (persistence: boolean) => {
Expand Down