make-mp-data 1.1.14 → 1.1.16

package/index.js

@@ -473,41 +473,56 @@ function buildFileNames(config) {
  * @returns {number} - The generated event timestamp in Unix format.
  */
 function AKsTimeSoup(earliestTime, latestTime = NOW, peakDays = PEAK_DAYS) {
-	// Define business hours
-	const peakStartHour = 4; // 4 AM
-	const peakEndHour = 23; // 11 PM
-	const likelihoodOfPeakDay = chance.integer({ min: integer(5, 42), max: integer(43, 69) }); // Randomize likelihood with CHAOS!~~
-
-	// Select a day, with a preference for peak days
-	let selectedDay;
-	if (chance.bool({ likelihood: likelihoodOfPeakDay })) { // Randomized likelihood to pick a peak day
-		selectedDay = peakDays.length > 0 ? chance.pickone(peakDays) : integer(earliestTime, latestTime);
-	} else {
-		// Introduce minor peaks by allowing some events to still occur during business hours
-		selectedDay = chance.bool({ likelihood: integer(1, 42) })
-			? chance.pickone(peakDays)
-			: integer(earliestTime, latestTime);
-	}
-
-	// Normalize selectedDay to the start of the day
-	selectedDay = dayjs.unix(selectedDay).startOf('day').unix();
-
-	// Generate a random time within business hours with a higher concentration in the middle of the period
-	const businessStart = dayjs.unix(selectedDay).hour(peakStartHour).minute(0).second(0).unix();
-	const businessEnd = dayjs.unix(selectedDay).hour(peakEndHour).minute(0).second(0).unix();
+	let chosenTime;
 	let eventTime;
-	if (selectedDay === peakDays[0]) {
-		// Use a skewed distribution for peak days
-		eventTime = chance.normal({ mean: (businessEnd + businessStart) / integer(1, 4), dev: (businessEnd - businessStart) / integer(2, 8) });
-	} else {
-		// For non-peak days, use a uniform distribution to add noise
-		eventTime = integer(integer(businessStart, businessEnd), integer(businessStart, businessEnd));
-	}
+	let validTime = false;
+
+	if (typeof earliestTime !== "number") {
+		if (parseInt(earliestTime) > 0) earliestTime = parseInt(earliestTime);
+		if (dayjs(earliestTime).isValid()) earliestTime = dayjs(earliestTime).unix();		
+	} 
+
+	while (!validTime) {
+
+		// Define business hours
+		const peakStartHour = 4; // 4 AM
+		const peakEndHour = 23; // 11 PM
+		const likelihoodOfPeakDay = chance.integer({ min: integer(5, 42), max: integer(43, 69) }); // Randomize likelihood with CHAOS!~~
+
+		// Select a day, with a preference for peak days
+		let selectedDay;
+		if (chance.bool({ likelihood: likelihoodOfPeakDay })) { // Randomized likelihood to pick a peak day
+			selectedDay = peakDays.length > 0 ? chance.pickone(peakDays) : integer(earliestTime, latestTime);
+		} else {
+			// Introduce minor peaks by allowing some events to still occur during business hours
+			selectedDay = chance.bool({ likelihood: integer(1, 42) })
+				? chance.pickone(peakDays)
+				: integer(earliestTime, latestTime);
+		}
 
-	// usually, ensure the event time is within business hours
-	if (chance.bool({ likelihood: 42 })) eventTime = Math.min(Math.max(eventTime, businessStart), businessEnd);
+		// Normalize selectedDay to the start of the day
+		selectedDay = dayjs.unix(selectedDay).startOf('day').unix();
+
+		// Generate a random time within business hours with a higher concentration in the middle of the period
+		const businessStart = dayjs.unix(selectedDay).hour(peakStartHour).minute(0).second(0).unix();
+		const businessEnd = dayjs.unix(selectedDay).hour(peakEndHour).minute(0).second(0).unix();
+		
+		if (selectedDay === peakDays[0]) {
+			// Use a skewed distribution for peak days
+			eventTime = chance.normal({ mean: (businessEnd + businessStart) / integer(1, 4), dev: (businessEnd - businessStart) / integer(2, 8) });
+		} else {
+			// For non-peak days, use a uniform distribution to add noise
+			eventTime = integer(integer(businessStart, businessEnd), integer(businessStart, businessEnd));
+		}
 
-	return dayjs.unix(eventTime).toISOString();
+		// usually, ensure the event time is within business hours
+		if (chance.bool({ likelihood: 42 })) eventTime = Math.min(Math.max(eventTime, businessStart), businessEnd);
+
+		const compareTime = dayjs.unix(eventTime).toISOString();
+		if (dayjs(chosenTime).isAfter(dayjs.unix(0))) validTime = true;
+	}
+	chosenTime = dayjs.unix(eventTime).toISOString();
+	return chosenTime;
 }
 
 
@@ -575,6 +590,7 @@ if (require.main === module) {
 			openFinder(path.resolve("./data"));
 		});
 } else {
+	main.timeSoup = AKsTimeSoup;
 	module.exports = main;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "make-mp-data",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "description": "builds all mixpanel primitives for a given project",
   "main": "index.js",
   "types": "types.d.ts",
@@ -38,10 +38,11 @@
   },
   "homepage": "https://github.com/ak--47/make-mp-data#readme",
   "dependencies": {
-    "ak-tools": "^1.0.53",
-    "chance": "^1.1.7",
-    "dayjs": "^1.11.10",
-    "mixpanel-import": "^2.5.5",
+    "ak-tools": "^1.0.55",
+    "chance": "^1.1.11",
+    "dayjs": "^1.11.11",
+    "mixpanel-import": "^2.5.51",
+    "papaparse": "^5.4.1",
     "yargs": "^17.7.2"
   }
 }

package/{e2e.test.js → tests/e2e.test.js}

@@ -3,7 +3,7 @@
 /* eslint-disable no-undef */
 /* eslint-disable no-debugger */
 /* eslint-disable no-unused-vars */
-const generate = require('./index.js');
+const generate = require('../index.js');
 require('dotenv').config();
 const { execSync } = require("child_process");
 const u = require('ak-tools');

package/tests/unit.test.js

@@ -0,0 +1,23 @@
+const generate = require('../index.js');
+const dayjs = require("dayjs");
+const utc = require("dayjs/plugin/utc");
+const u = require('ak-tools');
+dayjs.extend(utc);
+const { timeSoup } = generate;
+require('dotenv').config();
+
+
+describe('timeSoup', () => {
+	test('always positive dates', () => {
+		const dates = [];
+		for (let i = 0; i < 10000; i++) {
+			const earliest = dayjs().subtract(u.rand(2, 360), 'D');
+			dates.push(timeSoup());
+		}
+		const tooOld = dates.filter(d => dayjs(d).isBefore(dayjs.unix(0)));
+		const badYear = dates.filter(d => !d.startsWith('202'));
+		expect(dates.every(d => dayjs(d).isAfter(dayjs.unix(0)))).toBe(true);
+		expect(dates.every(d => d.startsWith('202'))).toBe(true);
+
+	});
+});