@firebaseextensions/firestore-bigquery-change-tracker 1.1.30 → 1.1.32

package/lib/bigquery/handleFailedTransactions.js

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

package/lib/bigquery/partitioning.js

@@ -63,10 +63,14 @@ class Partitioning {
         /* No custom config has been set, use partition value option only */
         if (hasNoCustomOptions)
             return true;
-        /* check if all options have been provided to be  */
-        return (!!timePartitioningField &&
-            !!timePartitioningFieldType &&
-            !!timePartitioningFirestoreField);
+        /* check if all valid combinations have been provided*/
+        const hasOnlyTimestamp = timePartitioningField === "timestamp" &&
+            !timePartitioningFieldType &&
+            !timePartitioningFirestoreField;
+        return (hasOnlyTimestamp ||
+            (!!timePartitioningField &&
+                !!timePartitioningFieldType &&
+                !!timePartitioningFirestoreField));
     }
     hasValidTimePartitionOption() {
         const { timePartitioning } = this.config;
@@ -83,44 +87,36 @@ class Partitioning {
         return !!metadata.schema;
     }
     hasValidTableReference() {
-        logs.invalidTableReference();
+        if (!this.table) {
+            logs.invalidTableReference();
+        }
         return !!this.table;
     }
     async isTablePartitioned() {
-        if (!this.table)
-            return Promise.resolve(false);
-        // No table provided, cannot evaluate
-        if (this.table.exists()) {
-            logs.cannotPartitionExistingTable(this.table);
-            return Promise.resolve(false);
-        }
-        /*** No table exists, return */
-        const [tableExists] = await this.table.exists();
-        if (!tableExists)
-            return Promise.resolve(false);
-        /* Check if partition metadata already exists */
+        /* Return true if partition metadata already exists */
         const [metadata] = await this.table.getMetadata();
-        if (!!metadata.timePartitioning)
+        if (!!metadata.timePartitioning) {
+            logs.cannotPartitionExistingTable(this.table);
             return Promise.resolve(true);
+        }
         /** Find schema fields **/
         const schemaFields = await this.metaDataSchemaFields();
-        /** No Schema exists, return */
+        /** Return false if no schema exists */
         if (!schemaFields)
             return Promise.resolve(false);
         /* Return false if time partition field not found */
         return schemaFields.some((column) => column.name === this.config.timePartitioningField);
     }
     async isValidPartitionForExistingTable() {
+        /** Return false if partition type option has not been set */
+        if (!this.isPartitioningEnabled())
+            return Promise.resolve(false);
+        /* Return false if table is already partitioned */
         const isPartitioned = await this.isTablePartitioned();
         if (isPartitioned)
             return Promise.resolve(false);
         return this.hasValidCustomPartitionConfig();
     }
-    isValidPartitionForNewTable() {
-        if (!this.isPartitioningEnabled())
-            return false;
-        return this.hasValidCustomPartitionConfig();
-    }
     convertDateValue(fieldValue) {
         const { timePartitioningFieldType } = this.config;
         /* Return as Datetime value */
@@ -178,56 +174,61 @@ class Partitioning {
         return fields.map(($) => $.name).includes(timePartitioningField);
     }
     async addPartitioningToSchema(fields = []) {
-        /** check if class has valid table reference */
+        /** Return if partition type option has not been set */
+        if (!this.isPartitioningEnabled())
+            return;
+        /** Return if class has invalid table reference */
         if (!this.hasValidTableReference())
-            return Promise.resolve();
-        /** return if table is already partitioned **/
+            return;
+        /** Return if table is already partitioned **/
         if (await this.isTablePartitioned())
-            return Promise.resolve();
-        /** return if an invalid partition type has been requested**/
+            return;
+        /** Return if partition config is invalid */
+        if (!this.hasValidCustomPartitionConfig())
+            return;
+        /** Return if an invalid partition type has been requested */
         if (!this.hasValidTimePartitionType())
-            return Promise.resolve();
+            return;
+        /** Return if an invalid partition option has been requested */
+        if (!this.hasValidTimePartitionOption())
+            return;
         /** Return if invalid partitioning and field type combination */
         if (this.hasHourAndDatePartitionConfig())
-            return Promise.resolve();
-        /** return if an invalid partition type has been requested**/
-        if (!this.hasValidCustomPartitionConfig())
-            return Promise.resolve();
-        /** return if an invalid partition type has been requested**/
-        if (!this.hasValidCustomPartitionConfig())
-            return Promise.resolve();
-        /** update fields with new schema option ** */
-        if (!this.hasValidTimePartitionOption())
-            return Promise.resolve();
-        /* Check if partition field has been provided */
+            return;
+        /** Return if partition field has not been provided */
         if (!this.config.timePartitioningField)
-            return Promise.resolve();
-        // if (await !this.hasExistingSchema) return Promise.resolve();
-        // Field already exists on schema, skip
+            return;
+        /** Return if field already exists on schema */
         if (this.customFieldExists(fields))
-            return Promise.resolve();
+            return;
+        /** Add new partitioning field **/
         fields.push((0, schema_1.getNewPartitionField)(this.config));
-        /** log successful addition of partition column */
+        /** Log successful addition of partition column */
         logs.addPartitionFieldColumn(this.table.id, this.config.timePartitioningField);
-        return Promise.resolve();
+        return;
     }
     async updateTableMetadata(options) {
-        /** return if table is already partitioned **/
+        /** Return if partition type option has not been set */
+        if (!this.isPartitioningEnabled())
+            return;
+        /** Return if class has invalid table reference */
+        if (!this.hasValidTableReference())
+            return;
+        /** Return if table is already partitioned **/
         if (await this.isTablePartitioned())
-            return Promise.resolve();
-        /** return if an invalid partition type has been requested**/
+            return;
+        /** Return if an invalid partition type has been requested**/
+        if (!this.hasValidCustomPartitionConfig())
+            return;
+        /** Return if an invalid partition type has been requested**/
         if (!this.hasValidTimePartitionType())
-            return Promise.resolve();
-        /** update fields with new schema option ** */
+            return;
+        /** Update fields with new schema option ** */
         if (!this.hasValidTimePartitionOption())
-            return Promise.resolve();
+            return;
         /** Return if invalid partitioning and field type combination */
         if (this.hasHourAndDatePartitionConfig())
-            return Promise.resolve();
-        /** return if an invalid partition type has been requested**/
-        if (!this.hasValidCustomPartitionConfig())
-            return Promise.resolve();
-        // if (await !this.hasExistingSchema) return Promise.resolve();
+            return;
         if (this.config.timePartitioning) {
             options.timePartitioning = { type: this.config.timePartitioning };
         }

package/package.json

@@ -5,7 +5,7 @@
     "url": "github.com/firebase/extensions.git",
     "directory": "firestore-bigquery-export/firestore-bigquery-change-tracker"
   },
-  "version": "1.1.30",
+  "version": "1.1.32",
   "description": "Core change-tracker library for Cloud Firestore Collection BigQuery Exports",
   "main": "./lib/index.js",
   "scripts": {
@@ -25,8 +25,8 @@
   "dependencies": {
     "@google-cloud/bigquery": "^4.7.0",
     "@google-cloud/resource-manager": "^3.0.0",
-    "firebase-admin": "^11.4.1",
-    "firebase-functions": "^3.13.2",
+    "firebase-admin": "^11.11.1",
+    "firebase-functions": "^4.6.0",
     "generate-schema": "^2.6.0",
     "inquirer": "^6.4.0",
     "lodash": "^4.17.14",