ga4-export-fixer 0.4.5 → 0.4.6-dev.0

package/index.js

@@ -1,7 +1,7 @@
 const helpers = require('./helpers/index.js');
 const ga4EventsEnhanced = require('./tables/ga4EventsEnhanced.js');
-const preOperations = require('./preOperations.js');
-const { validateBaseConfig, validateEnhancedEventsConfig } = require('./inputValidation.js');
+const { setPreOperations } = require('./preOperations.js');
+const { validateBaseConfig } = require('./inputValidation.js');
 const { mergeSQLConfigurations } = require('./utils.js');
 const { baseConfig } = require('./defaultConfig.js');
 
@@ -13,13 +13,11 @@ const setPreOperations = (config) => {
   // do input validation on the merged config
   validateBaseConfig(mergedConfig);
 
-  return preOperations.setPreOperations(mergedConfig);
+  return setPreOperations(mergedConfig);
 };
 
 module.exports = {
   helpers,
   ga4EventsEnhanced,
   setPreOperations,
-  validateBaseConfig,
-  validateEnhancedEventsConfig
 };

package/package.json

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

package/tables/ga4EventsEnhanced.js

@@ -146,16 +146,7 @@ const getFinalColumnOrder = (eventDataStep, sessionDataStep) => {
  *   eventParamsToColumns: [{ name: 'foo', type: 'string' }]
  * });
  */
-const generateEnhancedEventsSQL = (config) => {
-    const mergedConfig = utils.mergeSQLConfigurations(defaultConfig, config);
-
-    // validate the config and throw an error if it's invalid
-    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.");
-    }
-
+const _generateEnhancedEventsSQL = (mergedConfig) => {
     // the most accurate available timestamp column
     const mainTimestampColumn = mergedConfig.customTimestampParam ? 'event_custom_timestamp' : 'event_timestamp';
 
@@ -297,6 +288,13 @@ ${excludedEventsSQL}`,
     return utils.queryBuilder(steps);
 };
 
+// Exported wrapper: merge config, validate, then delegate to the internal function
+const generateEnhancedEventsSQL = (config) => {
+    const mergedConfig = utils.mergeSQLConfigurations(defaultConfig, config);
+    inputValidation.validateEnhancedEventsConfig(mergedConfig);
+    return _generateEnhancedEventsSQL(mergedConfig);
+};
+
 /**
  * Creates an enhanced GA4 events table using Dataform's publish() API.
  *
@@ -320,6 +318,7 @@ ${excludedEventsSQL}`,
  */
 const createEnhancedEventsTable = (dataformPublish, config) => {
     const mergedConfig = utils.mergeSQLConfigurations(defaultConfig, config);
+    inputValidation.validateEnhancedEventsConfig(mergedConfig);
 
     // Compute dynamic fields from merged SQL config
     const getDatasetName = (sourceTable) => {
@@ -360,15 +359,15 @@ const createEnhancedEventsTable = (dataformPublish, config) => {
     return dataformPublish(dataformTableConfig.name, dataformTableConfig).preOps(ctx => {
         return preOperations.setPreOperations(utils.setDataformContext(ctx, mergedConfig));
     }).query(ctx => {
-        return generateEnhancedEventsSQL(utils.setDataformContext(ctx, mergedConfig));
+        return _generateEnhancedEventsSQL(utils.setDataformContext(ctx, mergedConfig));
     });
 
 };
 
-// provide a merged config for the pre operations
-// required for the .sqlx deployment
+// Exported wrapper: merge config, validate, then delegate to preOperations module
 const setPreOperations = (config) => {
     const mergedConfig = utils.mergeSQLConfigurations(defaultConfig, config);
+    inputValidation.validateEnhancedEventsConfig(mergedConfig);
     return preOperations.setPreOperations(mergedConfig);
 };