make-mp-data 2.0.12 → 2.0.14

package/index.js

@@ -56,7 +56,6 @@ const { version } = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
 
 // Environment
 const { NODE_ENV = "unknown" } = process.env;
-const isCLI = process.argv[1].endsWith('index.js') || process.argv[1].endsWith('cli.js');
 
 /**
  * Main data generation function
@@ -68,6 +67,7 @@ async function main(config) {
 	jobTimer.start();
 
 	//cli mode check for positional dungeon config
+	const isCLI = import.meta.url === `file://${process.argv[1]}`;
 	if (isCLI) {
 		const firstArg = config._.slice().pop()
 		if (firstArg?.endsWith('.js') && existsSync(firstArg)) {
@@ -86,12 +86,13 @@ async function main(config) {
 	}
 
 	let validatedConfig;
+	let context;
 	try {
 		// Step 1: Validate and enrich configuration
 		validatedConfig = validateDungeonConfig(config);
 
 		// Step 2: Create context with validated config
-		const context = createContext(validatedConfig);
+		const context = createContext(validatedConfig, null, isCLI);
 
 		// Step 3: Initialize storage containers
 		const storageManager = new StorageManager(context);
@@ -159,7 +160,9 @@ async function main(config) {
 		};
 
 	} catch (error) {
-		if (isCLI || validatedConfig.verbose) {
+		
+		// @ts-ignore
+		if (context.isCLI() || validatedConfig.verbose) {
 			console.error(`\n❌ Error: ${error.message}\n`);
 			if (validatedConfig.verbose) {
 				console.error(error.stack);
@@ -199,7 +202,7 @@ async function generateGroupProfiles(context) {
 	const { config, storage } = context;
 	const { groupKeys, groupProps = {} } = config;
 
-	if (isCLI || config.verbose) {
+	if (context.isCLI() || config.verbose) {
 		console.log('\n👥 Generating group profiles...');
 	}
 
@@ -212,7 +215,7 @@ async function generateGroupProfiles(context) {
 			continue;
 		}
 
-		if (isCLI || config.verbose) {
+		if (context.isCLI() || config.verbose) {
 			console.log(`   Creating ${groupCount.toLocaleString()} ${groupKey} profiles...`);
 		}
 
@@ -228,7 +231,7 @@ async function generateGroupProfiles(context) {
 		}
 	}
 
-	if (isCLI || config.verbose) {
+	if (context.isCLI() || config.verbose) {
 		console.log('✅ Group profiles generated successfully');
 	}
 }
@@ -241,7 +244,7 @@ async function generateLookupTables(context) {
 	const { config, storage } = context;
 	const { lookupTables } = config;
 
-	if (isCLI || config.verbose) {
+	if (context.isCLI() || config.verbose) {
 		console.log('\n🔍 Generating lookup tables...');
 	}
 
@@ -255,7 +258,7 @@ async function generateLookupTables(context) {
 			continue;
 		}
 
-		if (isCLI || config.verbose) {
+		if (context.isCLI() || config.verbose) {
 			console.log(`   Creating ${entries.toLocaleString()} ${key} lookup entries...`);
 		}
 
@@ -268,7 +271,7 @@ async function generateLookupTables(context) {
 		}
 	}
 
-	if (isCLI || config.verbose) {
+	if (context.isCLI() || config.verbose) {
 		console.log('✅ Lookup tables generated successfully');
 	}
 }
@@ -281,7 +284,7 @@ async function generateGroupSCDs(context) {
 	const { config, storage } = context;
 	const { scdProps, groupKeys } = config;
 
-	if (isCLI || config.verbose) {
+	if (context.isCLI() || config.verbose) {
 		console.log('\n📊 Generating group SCDs...');
 	}
 
@@ -304,7 +307,7 @@ async function generateGroupSCDs(context) {
 			continue; // No SCDs for this group type
 		}
 
-		if (isCLI || config.verbose) {
+		if (context.isCLI() || config.verbose) {
 			console.log(`   Generating SCDs for ${groupCount.toLocaleString()} ${groupKey} entities...`);
 		}
 
@@ -346,7 +349,7 @@ async function generateGroupSCDs(context) {
 		}
 	}
 
-	if (isCLI || config.verbose) {
+	if (context.isCLI() || config.verbose) {
 		console.log('✅ Group SCDs generated successfully');
 	}
 }
@@ -365,7 +368,7 @@ async function generateCharts(context) {
 
 		await generateLineChart(storage.eventData, undefined, chartPath);
 
-		if (isCLI || config.verbose) {
+		if (context.isCLI() || config.verbose) {
 			console.log(`📊 Chart generated: ${chartPath}`);
 		} else {
 			sLog("Chart generated", { path: chartPath });
@@ -379,7 +382,7 @@ async function generateCharts(context) {
  * @param {import('./types').Dungeon} config - Configuration object
  */
 async function flushStorageToDisk(storage, config) {
-	if (isCLI || config.verbose) {
+	if (config.verbose) {
 		console.log('\n💾 Writing data to disk...');
 	}
 
@@ -403,7 +406,7 @@ async function flushStorageToDisk(storage, config) {
 
 	await Promise.all(flushPromises);
 
-	if (isCLI || config.verbose) {
+	if (config.verbose) {
 		console.log('✅ Data flushed to disk successfully');
 	}
 }
@@ -449,17 +452,31 @@ function extractStorageData(storage) {
 	};
 }
 
-// CLI execution
-if (isCLI) {
+// Cloud Functions setup
+functions.http('entry', async (req, res) => {
+	await handleCloudFunctionEntry(req, res, main);
+});
+
+// ES Module export
+export default main;
+
+// CommonJS compatibility
+if (typeof module !== 'undefined' && module.exports) {
+	module.exports = main;
+}
+
+// CLI execution - check if this file is being run directly
+if (import.meta.url === `file://${process.argv[1]}`) {
 	(async () => {
 		const cliConfig = getCliParams();
 
-		// Load dungeon config if --complex or --simple flags are used
+		// Load dungeon config - default to simple mode if no mode specified
 		let finalConfig = cliConfig;
 		if (cliConfig.complex) {
 			const complexConfig = await import('./dungeons/complex.js');
 			finalConfig = { ...complexConfig.default, ...cliConfig };
-		} else if (cliConfig.simple) {
+		} else if (cliConfig.simple || (!cliConfig.complex && !cliConfig.simple)) {
+			// Default to simple mode when no flags or when --simple is explicitly set
 			const simpleConfig = await import('./dungeons/simple.js');
 			finalConfig = { ...simpleConfig.default, ...cliConfig };
 		}
@@ -485,17 +502,4 @@ if (isCLI) {
 				process.exit(1);
 			});
 	})();
-}
-
-// Cloud Functions setup
-functions.http('entry', async (req, res) => {
-	await handleCloudFunctionEntry(req, res, main);
-});
-
-// ES Module export
-export default main;
-
-// CommonJS compatibility
-if (typeof module !== 'undefined' && module.exports) {
-	module.exports = main;
 }

package/lib/cli/cli.js

@@ -28,9 +28,10 @@ function cliParams() {
 		.usage(`\nusage:\nnpx $0 [dataModel.js] [options]
 
 		examples:
-npx $0
-npx $0 --token 1234 --u 100 --e 1000 --d 7 --w false
-npx $0 myDataConfig.js
+npx $0                                    (uses simple data model by default)
+npx $0 --complex                          (full enterprise data model)
+npx $0 --token 1234 --u 100 --e 1000     (send data to mixpanel)
+npx $0 myDataConfig.js                    (use custom config)
 
 DOCS: https://github.com/ak--47/make-mp-data
 DATA MODEL: https://github.com/ak--47/make-mp-data/blob/main/default.js

package/lib/core/context.js

@@ -61,9 +61,10 @@ function createRuntimeState() {
  * Context factory that creates a complete context object for data generation
  * @param {Dungeon} config - Validated configuration object
  * @param {Storage|null} storage - Storage containers (optional, can be set later)
+ * @param {boolean} [isCliMode] - Whether running in CLI mode (optional, will detect if not provided)
  * @returns {Context} Context object containing all state and dependencies
  */
-export function createContext(config, storage = null) {
+export function createContext(config, storage = null, isCliMode = null) {
     // Import campaign data (could be made configurable)
     const campaignData = campaigns;
     
@@ -76,7 +77,7 @@ export function createContext(config, storage = null) {
     // Set runtime flags from config
     runtime.verbose = config.verbose || false;
     runtime.isBatchMode = config.batchSize && config.batchSize < config.numEvents;
-    runtime.isCLI = process.argv[1].endsWith('index.js') || process.argv[1].endsWith('cli.js');
+    runtime.isCLI = isCliMode !== null ? isCliMode : (process.argv[1].endsWith('index.js') || process.argv[1].endsWith('cli.js'));
     
     const context = {
         config,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "make-mp-data",
-	"version": "2.0.12",
+	"version": "2.0.14",
 	"description": "builds all mixpanel primitives for a given project",
 	"type": "module",
 	"main": "index.js",
@@ -24,6 +24,7 @@
 		"test:watch": "NODE_ENV=test vitest",
 		"test:ui": "NODE_ENV=test vitest --ui",
 		"coverage": "vitest run --coverage && open ./coverage/index.html",
+		"typecheck": "tsc --noEmit",
 		"new:dungeon": "./scripts/new-dungeon.sh",
 		"new:project": "node ./scripts/new-project.mjs",
 		"exp:benchmark": "node --no-warnings --experimental-vm-modules ./tests/benchmark/concurrency.mjs",
@@ -76,6 +77,7 @@
 	"devDependencies": {
 		"@vitest/ui": "^2.1.9",
 		"nodemon": "^3.1.3",
+		"typescript": "^5.6.0",
 		"vitest": "^2.1.9"
 	},
 	"nodemonConfig": {