make-mp-data 1.5.2 → 1.5.3

package/components/cli.js

@@ -48,7 +48,7 @@ DATA MODEL: https://github.com/ak--47/make-mp-data/blob/main/default.js
 		})
 		.option("format", {
 			demandOption: false,
-			default: 'csv',
+			default: 'json',
 			alias: 'f',
 			describe: 'csv or json',
 			type: 'string'

package/components/utils.js

@@ -179,14 +179,14 @@ function day(start, end) {
  * @param  {ValueValid} value
  */
 function choose(value) {
-	let wasFunctionCalled = false;
+	// let wasFunctionCalled = false;
 	const chance = getChance();
 
 	try {
 		// Keep resolving the value if it's a function
 		while (typeof value === 'function') {
 			value = value();
-			wasFunctionCalled = true;
+			// wasFunctionCalled = true;
 		}
 
 		// allow functions which create arrays of objects to pass through
@@ -195,12 +195,12 @@ function choose(value) {
 		// }
 
 		// Now, if the resolved value is an array, use chance.pickone
-		if (Array.isArray(value) && !wasFunctionCalled) {
-			return chance.pickone(value);
+		if (Array.isArray(value) && hasSameKeys(value)) {
+			return value;
 		}
 
-		if (Array.isArray(value) && wasFunctionCalled) {
-			return value;
+		if (Array.isArray(value)) {
+			return chance.pickone(value);
 		}
 
 		if (typeof value === 'string') {
@@ -221,6 +221,31 @@ function choose(value) {
 	}
 }
 
+
+function hasSameKeys(arr) {
+	if (arr.length <= 1) {
+	  return true; // An empty array or an array with one object always has the same keys
+	}
+  
+	const firstKeys = Object.keys(arr[0]);
+  
+	for (let i = 1; i < arr.length; i++) {
+	  const currentKeys = Object.keys(arr[i]);
+  
+	  if (currentKeys.length !== firstKeys.length) {
+		return false; // Different number of keys
+	  }
+  
+	  for (const key of firstKeys) {
+		if (!currentKeys.includes(key)) {
+		  return false; // Key missing in current object
+		}
+	  }
+	}
+  
+	return true; // All objects have the same keys
+  }
+
 /**
  * keeps picking from an array until the array is exhausted
  * @param  {Array} arr
@@ -1086,7 +1111,7 @@ module.exports = {
 	TimeSoup,
 	companyName,
 	generateEmoji,
-
+	haveSameKeys: hasSameKeys,
 
 	initChance,
 	getChance,

package/index.js

@@ -28,7 +28,7 @@ const timeShift = actualNow.diff(dayjs.unix(FIXED_NOW), "seconds");
 const daysShift = actualNow.diff(dayjs.unix(FIXED_NOW), "days");
 
 // UTILS
-const { existsSync } = require("fs");
+const { existsSync, writeFileSync } = require("fs");
 const pLimit = require('p-limit');
 const os = require("os");
 const path = require("path");
@@ -275,7 +275,7 @@ async function main(config) {
 	log(`---------------SIMULATION----------------`, "\n");
 
 	// draw charts
-	const { makeChart } = config;
+	const { makeChart = false } = config;
 	if (makeChart) {
 		const bornEvents = config.events?.filter((e) => e?.isFirstEvent)?.map(e => e.event) || [];
 		const bornFunnels = config.funnels?.filter((f) => f.isFirstFunnel)?.map(f => f.sequence[0]) || [];
@@ -988,7 +988,7 @@ async function userLoop(config, storage, concurrency = 1) {
 			const adjustedCreated = userIsBornInDataset ? dayjs(created).subtract(daysShift, 'd') : dayjs.unix(global.FIXED_BEGIN);
 
 			if (hasLocation) {
-				const location = u.choose(DEFAULTS.locationsUsers);
+				const location = u.shuffleArray(u.choose(DEFAULTS.locationsUsers)).pop();
 				for (const key in location) {
 					user[key] = location[key];
 				}
@@ -1236,7 +1236,7 @@ async function sendToMixpanel(config, storage) {
 					scdLabel: `${scdKey}-scd`,
 					...commonOpts,
 				};
-				if (scdEntity.entityType !== "user") options.groupKey = scdEntity.entityType
+				if (scdEntity.entityType !== "user") options.groupKey = scdEntity.entityType;
 				const imported = await mp(
 					{
 						token,
@@ -1661,8 +1661,9 @@ if (NODE_ENV !== "prod") {
 					bytes: bytesHuman(bytes || 0),
 				};
 				if (bytes > 0) console.table(stats);
-				log(`\nfiles written to ${folder || "no where; we didn't write anything"} ...`);
-				log("  " + files?.flat().join("\n  "));
+				log(`\nlog written to ${folder} ...`);
+				writeFileSync(path.join(folder, "log.txt"), JSON.stringify(data?.importResults, null, 2));
+				// log("  " + files?.flat().join("\n  "));
 				log(`\n----------------SUMMARY-----------------\n\n\n`);
 			})
 			.catch((e) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "make-mp-data",
-	"version": "1.5.02",
+	"version": "1.5.03",
 	"description": "builds all mixpanel primitives for a given project",
 	"main": "index.js",
 	"types": "types.d.ts",