ga4-export-fixer 0.1.6-dev.4 → 0.1.6-dev.5

package/helpers.js

@@ -256,8 +256,8 @@ const incrementalDateFilter = (config) => {
 
   // test mode
   if (config.test) {
-    const testStart = config.testConfig.dateRangeStart || baseConfig.testConfig.dateRangeStart;
-    const testEnd = config.testConfig.dateRangeEnd || baseConfig.testConfig.dateRangeEnd;
+    const testStart = config?.testConfig?.dateRangeStart || baseConfig.testConfig.dateRangeStart;
+    const testEnd = config?.testConfig?.dateRangeEnd || baseConfig.testConfig.dateRangeEnd;
 
     return setDateRange(testStart, testEnd);
   }
@@ -268,8 +268,8 @@ const incrementalDateFilter = (config) => {
   }
 
   // full refresh mode
-  const fullRefreshStart = config.preOperations.dateRangeStartFullRefresh || baseConfig.preOperations.dateRangeStartFullRefresh;
-  const fullRefreshEnd = config.preOperations.dateRangeEnd || baseConfig.preOperations.dateRangeEnd;
+  const fullRefreshStart = config?.preOperations?.dateRangeStartFullRefresh || baseConfig.preOperations.dateRangeStartFullRefresh;
+  const fullRefreshEnd = config?.preOperations?.dateRangeEnd || baseConfig.preOperations.dateRangeEnd;
 
   return setDateRange(fullRefreshStart, fullRefreshEnd);
 };

package/index.js

@@ -3,36 +3,25 @@ const ga4EventsEnhanced = require('./tables/ga4EventsEnhanced.js');
 const preOperations = require('./preOperations.js');
 const { validateConfig } = require('./inputValidation.js');
 const { mergeSQLConfigurations } = require('./utils.js');
+const { baseConfig } = require('./defaultConfig.js');
 
 // export setPreOperations with default configuration for usage with downstream tables
 const setPreOperations = (config) => {
   if (!config || !config.self) {
     throw new Error('setPreOperations: config.self is required. Pass the table\'s "self()" reference in the config object.');
   }
-  if (config.incremental === undefined || config.incremental === null) {
+  if (typeof config.incremental !== 'boolean') {
     throw new Error('setPreOperations: config.incremental is required. Pass a boolean indicating whether the table uses incremental mode.');
   }
 
   /*
-  Todo: consider improving the validateConfig function to cover this use case as well
+  Todo:
+  - validation for baseConfig -> include in this function
+  - separate config merge into another function
+      - don't create a full ga4EnhancedEvents config for this case
   */
 
-  const defaultConfig = {
-    self: undefined,
-    incremental: undefined,
-    test: false,
-    testConfig: {
-        dateRangeStart: 'current_date()-1',
-        dateRangeEnd: 'current_date()',
-    },
-    preOperations: {
-      dateRangeStartFullRefresh: 'date(2000, 1, 1)',
-      dateRangeEnd: 'current_date()',
-      numberOfPreviousDaysToScan: 10,
-    },
-  };
-
-  const mergedConfig = mergeSQLConfigurations(defaultConfig, config);
+  const mergedConfig = mergeSQLConfigurations(baseConfig, config);
 
   return preOperations.setPreOperations(mergedConfig);
 };

package/package.json

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