ga4-export-fixer 0.5.1-dev.0 → 0.5.1-dev.2

package/README.md

@@ -204,7 +204,7 @@ const config = {
       dateRangeStart: 'current_date()-1',
       dateRangeEnd: 'current_date()',
   },
-  schemaLock: '20260101', // prevent possible issues from updates to the export schema
+  schemaLock: '20260101', // lock to daily export; also supports 'intraday_20260101' or 'fresh_20260101'
   customTimestampParam: 'custom_event_timestamp', // custom timestamp collected as an event param
   timezone: 'Europe/Helsinki',
   // not needed data
@@ -291,7 +291,7 @@ All fields are optional except `sourceTable`. Default values are applied automat
 | `self`                 | Dataform self()         | **required for .SQLX deployment**  | Reference to the table itself. Use `self()` in Dataform                                                                                                                                                                                                                                                                      |
 | `incremental`          | Dataform incremental()  | **required for .SQLX deployment**  | Switch between incremental and full refresh logic. Use `incremental()` in Dataform                                                                                                                                                                                                                                           |
 | `dataformTableConfig`  | object                  | **In JS deployment only.** [See default](#default-dataformtableconfig) | Override the default Dataform table configuration for JS deployment. See: [ITableConfig reference](https://docs.cloud.google.com/dataform/docs/reference/dataform-core-reference#itableconfig) |
-| `schemaLock`           | string (YYYYMMDD)       | `undefined`                        | Lock the table schema to a specific date. Must be a valid date >= `"20241009"`                                                                                                                                                                                                                                               |
+| `schemaLock`           | string                  | `undefined`                        | Lock the table schema to a specific GA4 export table suffix. Accepts `"YYYYMMDD"` (daily), `"intraday_YYYYMMDD"`, or `"fresh_YYYYMMDD"`. Date must be >= `"20241009"`                                                                                                                                                        |
 | `timezone`             | string                  | `'Etc/UTC'`                        | IANA timezone for event datetime (e.g. `'Europe/Helsinki'`)                                                                                                                                                                                                                                                                  |
 | `customTimestampParam` | string                  | `undefined`                        | Name of a custom event parameter containing a JS timestamp in milliseconds (e.g. collected via `Date.now()`)                                                                                                                                                                                                                 |
 | `bufferDays`           | integer                 | `1`                                | Extra days to include for sessions that span midnight                                                                                                                                                                                                                                                                        |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ga4-export-fixer",
-  "version": "0.5.1-dev.0",
+  "version": "0.5.1-dev.2",
   "description": "",
   "main": "index.js",
   "files": [

package/preOperations.js

@@ -45,11 +45,10 @@ const getDateRangeStart = (config) => {
     ${constants.DATE_COLUMN}
 )
 select
-  max(${constants.DATE_COLUMN})+1 as ${constants.DATE_RANGE_START_VARIABLE}
-from
-  days
-where
-  data_is_final = true`;
+  coalesce(
+    (select max(${constants.DATE_COLUMN})+1 from days where data_is_final = true),
+    (select min(${constants.DATE_COLUMN}) from days where data_is_final = false)
+  ) as ${constants.DATE_RANGE_START_VARIABLE}`;
   } else {
     const dateRangeStartFullRefresh = config.test ? config.testConfig.dateRangeStart : config.preOperations.dateRangeStartFullRefresh;
     return `select ${dateRangeStartFullRefresh}`;

package/tables/ga4EventsEnhanced/validation.js

@@ -40,22 +40,23 @@ const validateEnhancedEventsConfig = (config, options = {}) => {
         throw new Error(`config.sourceTable must be a Dataform table reference object or a string in format '\`project.dataset.table\`'. Received: ${JSON.stringify(config.sourceTable)}`);
     }
 
-    // schemaLock - optional; must be undefined or a string in "YYYYMMDD" format (e.g., "20260101")
+    // schemaLock - optional; must be undefined or a GA4 export table suffix: "YYYYMMDD", "intraday_YYYYMMDD", or "fresh_YYYYMMDD"
     if (typeof config.schemaLock !== 'undefined') {
-        if (typeof config.schemaLock !== 'string' || !/^\d{8}$/.test(config.schemaLock)) {
-            throw new Error(`config.schemaLock must be a string in "YYYYMMDD" format (e.g., "20260101"). Received: ${JSON.stringify(config.schemaLock)}`);
+        if (typeof config.schemaLock !== 'string' || !/^(?:(?:intraday|fresh)_)?\d{8}$/.test(config.schemaLock)) {
+            throw new Error(`config.schemaLock must be a string in "YYYYMMDD", "intraday_YYYYMMDD", or "fresh_YYYYMMDD" format (e.g., "20260101", "intraday_20260101"). Received: ${JSON.stringify(config.schemaLock)}`);
         }
-        // Must be a valid date
-        const year = parseInt(config.schemaLock.slice(0, 4), 10);
-        const month = parseInt(config.schemaLock.slice(4, 6), 10);
-        const day = parseInt(config.schemaLock.slice(6, 8), 10);
+        // Must be a valid date (extract date portion from the end)
+        const datePart = config.schemaLock.slice(-8);
+        const year = parseInt(datePart.slice(0, 4), 10);
+        const month = parseInt(datePart.slice(4, 6), 10);
+        const day = parseInt(datePart.slice(6, 8), 10);
         const date = new Date(year, month - 1, day);
         if (date.getFullYear() !== year || date.getMonth() !== month - 1 || date.getDate() !== day) {
-            throw new Error(`config.schemaLock must be a valid date. Received: ${JSON.stringify(config.schemaLock)}`);
+            throw new Error(`config.schemaLock must contain a valid date. Received: ${JSON.stringify(config.schemaLock)}`);
         }
         // Must be at least 20241009
-        if (config.schemaLock < "20241009") {
-            throw new Error(`config.schemaLock must be a date string equal to or greater than "20241009". Received: ${JSON.stringify(config.schemaLock)}`);
+        if (datePart < "20241009") {
+            throw new Error(`config.schemaLock date must be equal to or greater than "20241009". Received: ${JSON.stringify(config.schemaLock)}`);
         }
     }