Skip to content

Commit

Permalink
Try to resolve issue with invalid ESM import for firestore AGAIN
Browse files Browse the repository at this point in the history
  • Loading branch information
mbyrne00 committed Dec 15, 2023
1 parent 3f0a874 commit 9ca9bba
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .changeset/friendly-spiders-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@mondokit/gcp-firestore": patch
---

Try to resolve issue with invalid ESM import for firestore AGAIN
10 changes: 5 additions & 5 deletions packages/gcp-firestore/src/firestore/connect.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Firestore, Settings } from "@google-cloud/firestore";
import { FirestoreAdminClient } from "@google-cloud/firestore/types/v1/firestore_admin_client.js";
import firestore, { Firestore, Settings } from "@google-cloud/firestore";
import { configurationProvider, createLogger, runningOnGcp } from "@mondokit/gcp-core";
import { GcpFirestoreConfiguration } from "../configuration/schema.js";

const { v1: firestoreV1 } = firestore;
export interface FirestoreConnectOptions {
configuration?: GcpFirestoreConfiguration;
firestoreSettings?: Settings;
Expand Down Expand Up @@ -47,7 +47,7 @@ export const connectFirestore = (options?: FirestoreConnectOptions): Firestore =

// The proper typings from google-gax can be flaky depending on which version gets resolved
// It's safer to extract the types from client sdk
type AdminClientOptions = ConstructorParameters<typeof FirestoreAdminClient>[0];
type AdminClientOptions = ConstructorParameters<typeof firestoreV1.FirestoreAdminClient>[0];

export interface FirestoreAdminConnectOptions {
configuration?: GcpFirestoreConfiguration;
Expand All @@ -58,7 +58,7 @@ export interface FirestoreAdminConnectOptions {
* Creates a Firestore Admin Client. e.g. for admin operations like imports/exports.
* NOTE: This currently only works for real Firestore - i.e. not the emulator
*/
export const connectFirestoreAdmin = (options?: FirestoreAdminConnectOptions): FirestoreAdminClient => {
export const connectFirestoreAdmin = (options?: FirestoreAdminConnectOptions) => {
const logger = createLogger("connectFirestoreAdmin");
const config = options?.configuration || configurationProvider.get<GcpFirestoreConfiguration>();

Expand All @@ -67,5 +67,5 @@ export const connectFirestoreAdmin = (options?: FirestoreAdminConnectOptions): F
...options?.clientOptions,
};
logger.info(`Connecting Firestore Admin Client for project ${clientOptions.projectId || "(default)"}`);
return new FirestoreAdminClient(clientOptions);
return new firestoreV1.FirestoreAdminClient(clientOptions);
};

0 comments on commit 9ca9bba

Please sign in to comment.