ga4-export-fixer 0.1.2 → 0.1.3-dev.1

package/README.md

@@ -17,13 +17,15 @@ Include the package in the package.json file in your Dataform repository.
 **`package.json`**
 ```json
 {
-  "name": "my_dataform_repo",
   "dependencies": {
-    "@dataform/core": "3.0.39",
-    "ga4-export-fixer": "0.1.1"
+    "@dataform/core": "3.0.42",
+    "ga4-export-fixer": "0.1.2"
   }
 }
 ```
+
+**Note:** The best practice is to specify the package version explicitly (e.g. `"0.1.2"`) rather than using `"latest"` or `"*"`, to avoid unexpected breaking changes when the package is updated.
+
 In Google Cloud Dataform, click "Install Packages" to install it in your development workspace.
 
 If your Dataform repository does not have a package.json file, see this guide: https://docs.cloud.google.com/dataform/docs/manage-repository#move-to-package-json
@@ -95,7 +97,12 @@ const config = {
     'ga_session_number',
     'page_type',
     'user_agent'
-  ]
+  ],
+  // use day threshold for data_is_final
+  dataIsFinal: {
+    detectionMethod: 'DAY_THRESHOLD',
+    dayThreshold: 4
+  },
 };
 
 ga4EventsEnhanced.createTable(publish, config);

package/package.json

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

package/utils.js

@@ -105,6 +105,7 @@ const mergeSQLConfigurations = (defaultConfig, inputConfig = {}) => {
         return defaultConfig;
     }
 
+    // the merged configuration object
     const result = { ...defaultConfig };
 
     for (const key in inputConfig) {
@@ -170,6 +171,27 @@ const mergeSQLConfigurations = (defaultConfig, inputConfig = {}) => {
         }
     }
 
+    // support different formats for passing the sourceTable path
+    const fixSourceTable = (sourceTable) => {
+        if (isDataformTableReferenceObject(sourceTable)) {
+            return sourceTable;
+        }
+        if (typeof sourceTable === 'string') {
+            const tablePath = sourceTable.replace(/[`"']/g, '').trim();
+            if (/^[a-zA-Z0-9-]+\.[a-zA-Z0-9_]+(\.[^\.]+)?$/.test(tablePath)) {
+                const project = tablePath.split('.')[0];
+                const dataset = tablePath.split('.')[1];
+                return `\`${project}.${dataset}.events_*\``;
+            }
+        }
+        throw new Error(`sourceTable must be a Dataform table reference or a string. Supported string formats include: '\`project.dataset.events_*\`', 'project.dataset', 'project.dataset.events_*', for example. Received: ${JSON.stringify(sourceTable)}`);
+    };
+
+    // process the sourceTable to support different formats
+    if (result.sourceTable) {
+        result.sourceTable = fixSourceTable(result.sourceTable);
+    }
+
     return result;
 };
 
@@ -178,15 +200,14 @@ const mergeSQLConfigurations = (defaultConfig, inputConfig = {}) => {
  *
  * A Dataform table reference object is expected to have the properties: 'name', 'project', and 'dataset'.
  *
- * @param {Object} table - The object to check.
+ * @param {Object} obj - The object to check.
  * @returns {boolean} True if the object is a Dataform table reference, false otherwise.
  */
-const isDataformTableReferenceObject = (table) => {
-    return table &&
-        typeof table === 'object' &&
-        Object.hasOwn(table, 'name') &&
-        Object.hasOwn(table, 'project') &&
-        Object.hasOwn(table, 'dataset');
+const isDataformTableReferenceObject = (obj) => {
+    return obj &&
+        typeof obj === 'object' &&
+        Object.hasOwn(obj, 'name') &&
+        Object.hasOwn(obj, 'dataset');
 };