Update to non-compat

Author: schmidt-sebastian

packages/firestore/src/api.ts

@@ -158,3 +158,4 @@ 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';

packages/firestore/src/api/index_configuration.ts

@@ -27,7 +27,13 @@ export {
   EmulatorMockTokenOptions
 } from '../lite-api/database';
 
-/** A single field element in an index configuration. */
+// TODO(indexing): Remove "@internal" from the API.
+
+/**
+ * A single field element in an index configuration.
+ *
+ * @internal
+ */
 export interface IndexField {
   /** The field path to index. */
   readonly fieldPath: string;
@@ -49,7 +55,11 @@ export interface IndexField {
   [key: string]: unknown;
 }
 
-/** The SDK definition of a Firestore index. */
+/**
+ * The SDK definition of a Firestore index.
+ *
+ * @internal
+ */
 export interface Index {
   /** The ID of the collection to index. */
   readonly collectionGroup: string;
@@ -64,6 +74,8 @@ 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. */
@@ -87,6 +99,7 @@ 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.
@@ -116,6 +129,7 @@ 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.

packages/firestore/test/integration/api_internal/index_configuration.test.ts renamed to packages/firestore/test/integration/api/index_configuration.test.ts

@@ -15,18 +15,16 @@
  * limitations under the License.
  */
 
-import { Compat } from '@firebase/util';
 import { expect } from 'chai';
 
-import { Firestore } from '../../../src';
-import { setIndexConfiguration } from '../../../src/api/index_configuration';
+import { _setIndexConfiguration as setIndexConfiguration } from '../util/firebase_export';
 import { apiDescribe, withTestDb } from '../util/helpers';
 
 apiDescribe('Index Configuration:', (persistence: boolean) => {
   it('supports JSON', () => {
     return withTestDb(persistence, db => {
       return setIndexConfiguration(
-        unwrap(db),
+        db,
         '{\n' +
           '  "indexes": [\n' +
           '    {\n' +
@@ -62,7 +60,7 @@ apiDescribe('Index Configuration:', (persistence: boolean) => {
 
   it('supports schema', () => {
     return withTestDb(persistence, db => {
-      return setIndexConfiguration(unwrap(db), {
+      return setIndexConfiguration(db, {
         indexes: [
           {
             collectionGroup: 'restaurants',
@@ -81,7 +79,7 @@ apiDescribe('Index Configuration:', (persistence: boolean) => {
 
   it('bad JSON does not crash client', () => {
     return withTestDb(persistence, async db => {
-      expect(() => setIndexConfiguration(unwrap(db), '{,}')).to.throw(
+      expect(() => setIndexConfiguration(db, '{,}')).to.throw(
         'Failed to parse JSON'
       );
     });
@@ -90,7 +88,7 @@ apiDescribe('Index Configuration:', (persistence: boolean) => {
   it('bad index does not crash client', () => {
     return withTestDb(persistence, db => {
       return setIndexConfiguration(
-        unwrap(db),
+        db,
         '{\n' +
           '  "indexes": [\n' +
           '    {\n' +
@@ -110,7 +108,3 @@ apiDescribe('Index Configuration:', (persistence: boolean) => {
     });
   });
 });
-
-function unwrap(db: unknown): Firestore {
-  return (db as Compat<Firestore>)._delegate;
-}