@firebaseextensions/firestore-bigquery-change-tracker 1.1.29 → 1.1.31

package/lib/bigquery/partitioning.js

@@ -35,7 +35,8 @@ class Partitioning {
     }
     isValidPartitionTypeDate(value) {
         /* Check if valid timestamp value from sdk */
-        if (value instanceof firebase.firestore.Timestamp)
+        // if (value instanceof firebase.firestore.Timestamp) return true;
+        if (isTimestampLike(value))
             return true;
         /* Check if valid date/timstemap, expedted result from production  */
         if (value && value.toDate && value.toDate())
@@ -62,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;
@@ -137,7 +142,7 @@ class Partitioning {
       Extracts a valid Partition field from the Document Change Event.
       Matches result based on a pre-defined Firestore field matching the event data object.
       Return an empty object if no field name or value provided.
-      Returns empty object if not a string or timestamp
+      Returns empty object if not a string or timestamp (or result of serializing a timestamp)
       Logs warning if not a valid datatype
       Delete changes events have no data, return early as cannot partition on empty data.
     **/
@@ -155,6 +160,12 @@ class Partitioning {
         }
         if (this.isValidPartitionTypeDate(fieldValue)) {
             /* Return converted console value */
+            if (isTimestampLike(fieldValue)) {
+                const convertedTimestampFieldValue = convertToTimestamp(fieldValue);
+                return {
+                    [fieldName]: this.convertDateValue(convertedTimestampFieldValue.toDate()),
+                };
+            }
             if (fieldValue.toDate) {
                 return { [fieldName]: this.convertDateValue(fieldValue.toDate()) };
             }
@@ -173,53 +184,53 @@ class Partitioning {
     async addPartitioningToSchema(fields = []) {
         /** check if class has valid table reference */
         if (!this.hasValidTableReference())
-            return Promise.resolve();
+            return;
         /** return if table is already partitioned **/
         if (await this.isTablePartitioned())
-            return Promise.resolve();
+            return;
         /** return if an invalid partition type has been requested**/
         if (!this.hasValidTimePartitionType())
-            return Promise.resolve();
+            return;
         /** Return if invalid partitioning and field type combination */
         if (this.hasHourAndDatePartitionConfig())
-            return Promise.resolve();
+            return;
         /** return if an invalid partition type has been requested**/
         if (!this.hasValidCustomPartitionConfig())
-            return Promise.resolve();
+            return;
         /** return if an invalid partition type has been requested**/
         if (!this.hasValidCustomPartitionConfig())
-            return Promise.resolve();
+            return;
         /** update fields with new schema option ** */
         if (!this.hasValidTimePartitionOption())
-            return Promise.resolve();
+            return;
         /* Check if partition field has been provided */
         if (!this.config.timePartitioningField)
-            return Promise.resolve();
+            return;
         // if (await !this.hasExistingSchema) return Promise.resolve();
         // Field already exists on schema, skip
         if (this.customFieldExists(fields))
-            return Promise.resolve();
+            return;
         fields.push((0, schema_1.getNewPartitionField)(this.config));
         /** 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 **/
         if (await this.isTablePartitioned())
-            return Promise.resolve();
+            return;
         /** return if an invalid partition type has been requested**/
         if (!this.hasValidTimePartitionType())
-            return Promise.resolve();
+            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;
         /** return if an invalid partition type has been requested**/
         if (!this.hasValidCustomPartitionConfig())
-            return Promise.resolve();
+            return;
         // if (await !this.hasExistingSchema) return Promise.resolve();
         if (this.config.timePartitioning) {
             options.timePartitioning = { type: this.config.timePartitioning };
@@ -234,3 +245,18 @@ class Partitioning {
     }
 }
 exports.Partitioning = Partitioning;
+const isTimestampLike = (value) => {
+    if (value instanceof firebase.firestore.Timestamp)
+        return true;
+    return (typeof value === "object" &&
+        value !== null &&
+        "_seconds" in value &&
+        typeof value["_seconds"] === "number" &&
+        "_nanoseconds" in value &&
+        typeof value["_nanoseconds"] === "number");
+};
+const convertToTimestamp = (value) => {
+    if (value instanceof firebase.firestore.Timestamp)
+        return value;
+    return new firebase.firestore.Timestamp(value._seconds, value._nanoseconds);
+};

package/package.json

@@ -5,14 +5,14 @@
     "url": "github.com/firebase/extensions.git",
     "directory": "firestore-bigquery-export/firestore-bigquery-change-tracker"
   },
-  "version": "1.1.29",
+  "version": "1.1.31",
   "description": "Core change-tracker library for Cloud Firestore Collection BigQuery Exports",
   "main": "./lib/index.js",
   "scripts": {
     "build": "npm run clean && npm run compile",
     "clean": "rimraf lib",
     "compile": "tsc",
-    "test:local": "firebase ext:dev:emulators:exec ./node_modules/.bin/jest --test-params=./src/__tests__/emulator-params.env --project=extensions-testing --config=./src/__tests__/firebase.json",
+    "test:local": "jest",
     "prepare": "npm run build",
     "generate-stresstest-table": "bq query --project_id=extensions-testing  --use_legacy_sql=false < ./src/__tests__/fixtures/sql/generateSnapshotStresstestTable.sql"
   },
@@ -35,16 +35,16 @@
     "traverse": "^0.6.6"
   },
   "devDependencies": {
+    "@types/chai": "^4.1.6",
+    "@types/jest": "^24.0.18",
     "@types/node": "14.18.34",
     "@types/traverse": "^0.6.32",
-    "typescript": "^4.9.4",
-    "rimraf": "^2.6.3",
-    "nyc": "^14.0.0",
-    "jest": "^24.9.0",
     "chai": "^4.2.0",
-    "ts-node": "^7.0.1",
+    "jest": "^24.9.0",
+    "nyc": "^14.0.0",
+    "rimraf": "^2.6.3",
     "ts-jest": "^24.1.0",
-    "@types/jest": "^24.0.18",
-    "@types/chai": "^4.1.6"
+    "ts-node": "^7.0.1",
+    "typescript": "^4.9.4"
   }
 }