@firebaseextensions/firestore-bigquery-change-tracker 1.1.40 → 1.1.42

package/lib/bigquery/handleFailedTransactions.js

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const firebase = require("firebase-admin");
+const admin = require("firebase-admin");
+const app_1 = require("firebase-admin/app");
 const firestore_1 = require("firebase-admin/firestore");
-if (!firebase.apps.length) {
-    firebase.initializeApp();
-    firebase.firestore().settings({ ignoreUndefinedProperties: true });
+if (!admin.apps.length) {
+    (0, app_1.initializeApp)();
 }
 exports.default = async (rows, config, e) => {
-    const db = (0, firestore_1.getFirestore)();
+    const db = (0, firestore_1.getFirestore)(config.firestoreInstanceId);
+    db.settings({
+        ignoreUndefinedProperties: true,
+    });
     const batchArray = [db.batch()];
     let operationCounter = 0;
     let batchIndex = 0;

package/lib/bigquery/index.d.ts

@@ -5,6 +5,7 @@ export { RawChangelogSchema, RawChangelogViewSchema } from "./schema";
 export interface FirestoreBigQueryEventHistoryTrackerConfig {
     datasetId: string;
     tableId: string;
+    firestoreInstanceId?: string;
     datasetLocation?: string | undefined;
     transformFunction?: string | undefined;
     timePartitioning?: string | undefined;

package/lib/bigquery/index.js

@@ -1,6 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirestoreBigQueryEventHistoryTracker = exports.RawChangelogViewSchema = exports.RawChangelogSchema = void 0;
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 const bigquery = require("@google-cloud/bigquery");
 const firestore_1 = require("firebase-admin/firestore");
 const traverse = require("traverse");
@@ -36,6 +51,8 @@ class FirestoreBigQueryEventHistoryTracker {
         if (!this.config.datasetLocation) {
             this.config.datasetLocation = "us";
         }
+        this.config.firestoreInstanceId =
+            this.config.firestoreInstanceId || "(default)";
         logger_1.logger.setLogLevel(this.config.logLevel || logger_1.LogLevel.INFO);
     }
     async record(events) {

package/lib/bigquery/partitioning.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Partitioning = void 0;
+const __1 = require("..");
 const firebase = require("firebase-admin");
 const logs = require("../logs");
 const functions = require("firebase-functions");
@@ -143,11 +144,15 @@ class Partitioning {
       Delete changes events have no data, return early as cannot partition on empty data.
     **/
     getPartitionValue(event) {
-        if (!event.data)
+        // When old data is disabled and the operation is delete
+        // the data and old data will be null
+        if (event.data == null && event.oldData == null)
             return {};
         const firestoreFieldName = this.config.timePartitioningFirestoreField;
         const fieldName = this.config.timePartitioningField;
-        const fieldValue = event.data[firestoreFieldName];
+        const fieldValue = event.operation === __1.ChangeType.DELETE
+            ? event.oldData[firestoreFieldName]
+            : event.data[firestoreFieldName];
         if (!fieldName || !fieldValue) {
             return {};
         }

package/package.json

@@ -5,7 +5,7 @@
     "url": "github.com/firebase/extensions.git",
     "directory": "firestore-bigquery-export/firestore-bigquery-change-tracker"
   },
-  "version": "1.1.40",
+  "version": "1.1.42",
   "description": "Core change-tracker library for Cloud Firestore Collection BigQuery Exports",
   "main": "./lib/index.js",
   "scripts": {
@@ -27,8 +27,8 @@
   "dependencies": {
     "@google-cloud/bigquery": "^7.6.0",
     "@google-cloud/resource-manager": "^5.1.0",
-    "firebase-admin": "^12.0.0",
-    "firebase-functions": "^4.9.0",
+    "firebase-admin": "^13.2.0",
+    "firebase-functions": "^6.3.2",
     "generate-schema": "^2.6.0",
     "inquirer": "^6.4.0",
     "lodash": "^4.17.14",