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

package/helpers.js

@@ -563,8 +563,14 @@ Aggregation
  *   // => SQL expression for the last user_id by event_timestamp.
  */
 const aggregateValue = (column, aggregateType, timestampColumn) => {
-  if (typeof column === 'undefined' || typeof timestampColumn === 'undefined') {
-    throw new Error("aggregateValue: 'column' and 'timestampColumn' are required parameters and must be defined.");
+  if (typeof column === 'undefined') {
+    throw new Error("aggregateValue: 'column' is a required parameter and must be defined.");
+  }
+  if (typeof aggregateType === 'undefined') {
+    throw new Error("aggregateValue: 'aggregateType' is a required parameter and must be defined.");
+  }
+  if ((aggregateType === 'first' || aggregateType === 'last') && typeof timestampColumn === 'undefined') {
+    throw new Error(`aggregateValue: 'timestampColumn' is required when aggregateType is '${aggregateType}'.`);
   }
   
   if (aggregateType === 'max') {

package/index.js

@@ -1,28 +1,18 @@
 const helpers = require('./helpers.js');
 const ga4EventsEnhanced = require('./tables/ga4EventsEnhanced.js');
 const preOperations = require('./preOperations.js');
-const { validateConfig } = require('./inputValidation.js');
+const { validateBaseConfig, validateEnhancedEventsConfig } = 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 (typeof config.incremental !== 'boolean') {
-    throw new Error('setPreOperations: config.incremental is required. Pass a boolean indicating whether the table uses incremental mode.');
-  }
-
-  /*
-  Todo:
-  - validation for baseConfig -> include in this function
-  - separate config merge into another function
-      - don't create a full ga4EnhancedEvents config for this case
-  */
-
+  // merge the input config with the defaults
   const mergedConfig = mergeSQLConfigurations(baseConfig, config);
 
+  // do input validation on the merged config
+  validateBaseConfig(mergedConfig);
+
   return preOperations.setPreOperations(mergedConfig);
 };
 
@@ -30,5 +20,6 @@ module.exports = {
   helpers,
   ga4EventsEnhanced,
   setPreOperations,
-  validateConfig
+  validateBaseConfig,
+  validateEnhancedEventsConfig
 };

package/inputValidation.js

@@ -1,5 +1,86 @@
 const { isDataformTableReferenceObject } = require('./utils.js');
 
+/**
+ * Validates the base configuration fields shared across all table types.
+ * These correspond to the fields defined in baseConfig (defaultConfig.js):
+ * self, incremental, test, testConfig, and preOperations.
+ *
+ * @param {Object} config - The merged configuration object to validate.
+ * @throws {Error} If any base configuration value is invalid or missing.
+ */
+const validateBaseConfig = (config) => {
+    if (!config || typeof config !== 'object' || Array.isArray(config)) {
+        throw new Error(`config must be a non-null object. Received: ${JSON.stringify(config)}`);
+    }
+
+    // self - required, must be valid format
+    if (config.test !== true) {
+        if (typeof config.self !== 'string' || !config.self.trim() || !/^`[^`]+`$/.test(config.self.trim())) {
+            throw new Error(`config.self is required when config.test !== true and must be a non-empty string in format '\`project.dataset.table\`' (using the ref() function). Received: ${JSON.stringify(config.self)}`);
+        }
+    }
+
+    // incremental - required, must be boolean
+    if (typeof config.incremental !== 'boolean') {
+        throw new Error(`config.incremental must be a boolean. Received: ${JSON.stringify(config.incremental)}`);
+    }
+
+    // test - optional; when defined, must be a boolean
+    if (typeof config.test !== 'undefined' && typeof config.test !== 'boolean') {
+        throw new Error(`config.test must be a boolean when defined. Received: ${JSON.stringify(config.test)}`);
+    }
+
+    // testConfig - optional; when included, must be an object with optional dateRangeStart and dateRangeEnd
+    if (typeof config.testConfig !== 'undefined') {
+        if (!config.testConfig || typeof config.testConfig !== 'object' || Array.isArray(config.testConfig)) {
+            throw new Error(`config.testConfig must be an object when included. Received: ${JSON.stringify(config.testConfig)}`);
+        }
+        if (config.testConfig.dateRangeStart !== undefined && (typeof config.testConfig.dateRangeStart !== 'string' || !config.testConfig.dateRangeStart.trim())) {
+            throw new Error(`config.testConfig.dateRangeStart must be a non-empty string (SQL date expression) when provided. Received: ${JSON.stringify(config.testConfig.dateRangeStart)}`);
+        }
+        if (config.testConfig.dateRangeEnd !== undefined && (typeof config.testConfig.dateRangeEnd !== 'string' || !config.testConfig.dateRangeEnd.trim())) {
+            throw new Error(`config.testConfig.dateRangeEnd must be a non-empty string (SQL date expression) when provided. Received: ${JSON.stringify(config.testConfig.dateRangeEnd)}`);
+        }
+    }
+
+    // preOperations - required
+    if (config.preOperations === undefined) {
+        throw new Error("config.preOperations is required.");
+    }
+    if (!config.preOperations || typeof config.preOperations !== 'object' || Array.isArray(config.preOperations)) {
+        throw new Error(`config.preOperations must be an object. Received: ${JSON.stringify(config.preOperations)}`);
+    }
+    if (config.preOperations.numberOfPreviousDaysToScan === undefined) {
+        throw new Error("config.preOperations.numberOfPreviousDaysToScan is required.");
+    }
+    const v = config.preOperations.numberOfPreviousDaysToScan;
+    if (typeof v !== 'number' || isNaN(v) || !Number.isInteger(v) || v < 0) {
+        throw new Error(`config.preOperations.numberOfPreviousDaysToScan must be a non-negative integer. Received: ${JSON.stringify(v)}`);
+    }
+    if (config.preOperations.dateRangeStartFullRefresh === undefined || config.preOperations.dateRangeStartFullRefresh === null) {
+        throw new Error("config.preOperations.dateRangeStartFullRefresh is required.");
+    }
+    if (typeof config.preOperations.dateRangeStartFullRefresh !== 'string' || !config.preOperations.dateRangeStartFullRefresh.trim()) {
+        throw new Error(`config.preOperations.dateRangeStartFullRefresh must be a non-empty string (SQL date expression). Received: ${JSON.stringify(config.preOperations.dateRangeStartFullRefresh)}`);
+    }
+    if (config.preOperations.dateRangeEnd === undefined || config.preOperations.dateRangeEnd === null) {
+        throw new Error("config.preOperations.dateRangeEnd is required.");
+    }
+    if (typeof config.preOperations.dateRangeEnd !== 'string' || !config.preOperations.dateRangeEnd.trim()) {
+        throw new Error(`config.preOperations.dateRangeEnd must be a non-empty string (SQL date expression). Received: ${JSON.stringify(config.preOperations.dateRangeEnd)}`);
+    }
+    if (config.preOperations.incrementalStartOverride !== undefined && config.preOperations.incrementalStartOverride !== null && config.preOperations.incrementalStartOverride !== '') {
+        if (typeof config.preOperations.incrementalStartOverride !== 'string' || !config.preOperations.incrementalStartOverride.trim()) {
+            throw new Error(`config.preOperations.incrementalStartOverride must be a non-empty string when provided. Received: ${JSON.stringify(config.preOperations.incrementalStartOverride)}`);
+        }
+    }
+    if (config.preOperations.incrementalEndOverride !== undefined && config.preOperations.incrementalEndOverride !== null && config.preOperations.incrementalEndOverride !== '') {
+        if (typeof config.preOperations.incrementalEndOverride !== 'string' || !config.preOperations.incrementalEndOverride.trim()) {
+            throw new Error(`config.preOperations.incrementalEndOverride must be a non-empty string when provided. Received: ${JSON.stringify(config.preOperations.incrementalEndOverride)}`);
+        }
+    }
+};
+
 /**
  * Validates a GA4 export fixer configuration object.
  * Validation is performed on mergedConfig (default values merged with user input).
@@ -9,12 +90,19 @@ const { isDataformTableReferenceObject } = require('./utils.js');
  * @param {Object} config - The merged configuration object to validate.
  * @throws {Error} If any configuration value is invalid or missing.
  */
-const validateConfig = (config) => {
+const validateEnhancedEventsConfig = (config) => {
   try {
     if (!config || typeof config !== 'object' || Array.isArray(config)) {
         throw new Error(`config must be a non-null object. Received: ${JSON.stringify(config)}`);
     }
 
+    // base config fields (self, incremental, test, testConfig, preOperations)
+    validateBaseConfig(config);
+
+    /*
+    Rest of the validations are related to ga4_events_enhanced table specific fields
+    */
+
     // sourceTable - required; string or Dataform table reference
     if (config.sourceTable === undefined || config.sourceTable === null) {
         throw new Error("config.sourceTable is required. Provide a Dataform table reference (using the ref() function) or a string in format '`project.dataset.table`'.");
@@ -32,19 +120,6 @@ const validateConfig = (config) => {
         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)}`);
     }
 
-    // self - required when using Dataform; must be valid format
-    // config.self is required when config.test === true and must be a non-empty string in format '\`project.dataset.table\`' (using the ref() function)
-    if (config.test !== true) {
-        if (typeof config.self !== 'string' || !config.self.trim() || !/^`[^`]+`$/.test(config.self.trim())) {
-            throw new Error(`config.self is required when config.test === true and must be a non-empty string in format '\`project.dataset.table\`' (using the ref() function). Received: ${JSON.stringify(config.self)}`);
-        }
-    }
-
-    // incremental - required when using Dataform; must be boolean
-    if (typeof config.incremental !== 'boolean') {
-        throw new Error(`config.incremental must be a boolean. Received: ${JSON.stringify(config.incremental)}`);
-    }
-
     // schemaLock - optional; must be undefined or a string in "YYYYMMDD" format (e.g., "20260101")
     if (typeof config.schemaLock !== 'undefined') {
         if (typeof config.schemaLock !== 'string' || !/^\d{8}$/.test(config.schemaLock)) {
@@ -132,66 +207,11 @@ const validateConfig = (config) => {
         throw new Error(`config.dataIsFinal.detectionMethod must be 'DAY_THRESHOLD' when only intraday export is enabled (config.includedExportTypes.daily is false). A dayThreshold of 1 is recommended for intraday-only configurations. Received: ${JSON.stringify(config.dataIsFinal.detectionMethod)}`);
     }
 
-    // test - optional; when defined, must be a boolean
-    if (typeof config.test !== 'undefined' && typeof config.test !== 'boolean') {
-        throw new Error(`config.test must be a boolean when defined. Received: ${JSON.stringify(config.test)}`);
-    }
-
-    // testConfig - optional; when included, must be an object with optional dateRangeStart and dateRangeEnd
-    if (typeof config.testConfig !== 'undefined') {
-        if (!config.testConfig || typeof config.testConfig !== 'object' || Array.isArray(config.testConfig)) {
-            throw new Error(`config.testConfig must be an object when included. Received: ${JSON.stringify(config.testConfig)}`);
-        }
-        if (config.testConfig.dateRangeStart !== undefined && (typeof config.testConfig.dateRangeStart !== 'string' || !config.testConfig.dateRangeStart.trim())) {
-            throw new Error(`config.testConfig.dateRangeStart must be a non-empty string (SQL date expression) when provided. Received: ${JSON.stringify(config.testConfig.dateRangeStart)}`);
-        }
-        if (config.testConfig.dateRangeEnd !== undefined && (typeof config.testConfig.dateRangeEnd !== 'string' || !config.testConfig.dateRangeEnd.trim())) {
-            throw new Error(`config.testConfig.dateRangeEnd must be a non-empty string (SQL date expression) when provided. Received: ${JSON.stringify(config.testConfig.dateRangeEnd)}`);
-        }
-    }
-
     // bufferDays - required
     if (typeof config.bufferDays !== 'number' || !Number.isInteger(config.bufferDays) || config.bufferDays < 0) {
         throw new Error(`config.bufferDays must be a non-negative integer. Received: ${JSON.stringify(config.bufferDays)}`);
     }
 
-    // preOperations - required
-    if (config.preOperations === undefined) {
-        throw new Error("config.preOperations is required.");
-    }
-    if (!config.preOperations || typeof config.preOperations !== 'object' || Array.isArray(config.preOperations)) {
-        throw new Error(`config.preOperations must be an object. Received: ${JSON.stringify(config.preOperations)}`);
-    }
-    if (config.preOperations.numberOfPreviousDaysToScan === undefined) {
-        throw new Error("config.preOperations.numberOfPreviousDaysToScan is required.");
-    }
-    const v = config.preOperations.numberOfPreviousDaysToScan;
-    if (typeof v !== 'number' || isNaN(v) || !Number.isInteger(v) || v < 0) {
-        throw new Error(`config.preOperations.numberOfPreviousDaysToScan must be a non-negative integer. Received: ${JSON.stringify(v)}`);
-    }
-    if (config.preOperations.dateRangeStartFullRefresh === undefined || config.preOperations.dateRangeStartFullRefresh === null) {
-        throw new Error("config.preOperations.dateRangeStartFullRefresh is required.");
-    }
-    if (typeof config.preOperations.dateRangeStartFullRefresh !== 'string' || !config.preOperations.dateRangeStartFullRefresh.trim()) {
-        throw new Error(`config.preOperations.dateRangeStartFullRefresh must be a non-empty string (SQL date expression). Received: ${JSON.stringify(config.preOperations.dateRangeStartFullRefresh)}`);
-    }
-    if (config.preOperations.dateRangeEnd === undefined || config.preOperations.dateRangeEnd === null) {
-        throw new Error("config.preOperations.dateRangeEnd is required.");
-    }
-    if (typeof config.preOperations.dateRangeEnd !== 'string' || !config.preOperations.dateRangeEnd.trim()) {
-        throw new Error(`config.preOperations.dateRangeEnd must be a non-empty string (SQL date expression). Received: ${JSON.stringify(config.preOperations.dateRangeEnd)}`);
-    }
-    if (config.preOperations.incrementalStartOverride !== undefined && config.preOperations.incrementalStartOverride !== null && config.preOperations.incrementalStartOverride !== '') {
-        if (typeof config.preOperations.incrementalStartOverride !== 'string' || !config.preOperations.incrementalStartOverride.trim()) {
-            throw new Error(`config.preOperations.incrementalStartOverride must be a non-empty string when provided. Received: ${JSON.stringify(config.preOperations.incrementalStartOverride)}`);
-        }
-    }
-    if (config.preOperations.incrementalEndOverride !== undefined && config.preOperations.incrementalEndOverride !== null && config.preOperations.incrementalEndOverride !== '') {
-        if (typeof config.preOperations.incrementalEndOverride !== 'string' || !config.preOperations.incrementalEndOverride.trim()) {
-            throw new Error(`config.preOperations.incrementalEndOverride must be a non-empty string when provided. Received: ${JSON.stringify(config.preOperations.incrementalEndOverride)}`);
-        }
-    }
-
     // Array fields - all required
     const stringArrayKeys = ['defaultExcludedEventParams', 'excludedEventParams', 'sessionParams', 'defaultExcludedEvents', 'excludedEvents', 'excludedColumns'];
     for (const key of stringArrayKeys) {
@@ -242,5 +262,6 @@ const validateConfig = (config) => {
 };
 
 module.exports = {
-    validateConfig
+    validateBaseConfig,
+    validateEnhancedEventsConfig
 };

package/package.json

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

package/tables/ga4EventsEnhanced.js

@@ -148,7 +148,7 @@ const generateEnhancedEventsSQL = (config) => {
     const mergedConfig = utils.mergeSQLConfigurations(defaultConfig, config);
 
     // validate the config and throw an error if it's invalid
-    inputValidation.validateConfig(mergedConfig);
+    inputValidation.validateEnhancedEventsConfig(mergedConfig);
 
     if (!mergedConfig.sourceTable || typeof mergedConfig.sourceTable !== 'string' || mergedConfig.sourceTable.trim() === '') {
         throw new Error("generateEnhancedEventsSQL: 'sourceTable' is a required parameter in config and must be a non-empty string.");