make-mp-data 2.0.19 → 2.0.22

package/lib/utils/utils.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import Chance from 'chance';
 import readline from 'readline';
-import { comma, uid} from 'ak-tools';
+import { comma, uid } from 'ak-tools';
 import { spawn } from 'child_process';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc.js';
@@ -10,7 +10,8 @@ import { mkdir, parseGCSUri } from 'ak-tools';
 import { existsSync } from 'fs';
 dayjs.extend(utc);
 import 'dotenv/config';
-import { domainSuffix, domainPrefix } from '../data/defaults.js';
+import { domainSuffix, domainPrefix } from '../templates/defaults.js';
+const {NODE_ENV = "unknown"} = process.env;
 
 /** @typedef {import('../../types').Dungeon} Config */
 /** @typedef {import('../../types').EventConfig} EventConfig */
@@ -186,6 +187,27 @@ function day(start, end) {
 function choose(value) {
 	const chance = getChance();
 
+	// most of the time this will receive a list of strings; 
+	// when that is the case, we need to ensure some 'keywords' like 'variant' or 'test' aren't in the array
+	// next we want to see if the array is unweighted ... i.e. no dupe strings and each string only occurs once ['a', 'b', 'c', 'd']
+	// if all these are true we will pickAWinner(value)()
+	if (Array.isArray(value) && value.length > 2 && value.length < 20 && value.every(item => typeof item === 'string')) {
+		// ensure terms 'variant' 'group' 'experiment' or 'population' are NOT in any of the items
+		if (!value.some(item => item.includes('variant') || item.includes('group') || item.includes('experiment') || item.includes('population'))) {
+			// check to make sure that each element in the array only occurs once...
+			const uniqueItems = new Set(value);
+			if (uniqueItems.size === value.length) {
+				// Array has no duplicates, use pickAWinner
+				const quickList = pickAWinner(value, 0)();
+				const theChosenOne = chance.pickone(quickList);
+				return theChosenOne;
+			}
+
+		}
+
+	}
+
+
 	try {
 		// Keep resolving the value if it's a function (with caching)
 		while (typeof value === 'function') {
@@ -218,13 +240,12 @@ function choose(value) {
 			return chance.pickone(value);
 		}
 
-		// Now, if the resolved value is an array, use chance.pickone
-		if (Array.isArray(value) && value.every(item => typeof item === 'string')) {
-			return chance.pickone(value);
-		}
-
-		if (Array.isArray(value) && value.every(item => typeof item === 'number')) {
-			return chance.pickone(value);
+		// PERFORMANCE: Optimized array handling - check first item type instead of every()
+		if (Array.isArray(value) && value.length > 0) {
+			const firstType = typeof value[0];
+			if (firstType === 'string' || firstType === 'number') {
+				return chance.pickone(value);
+			}
 		}
 
 		if (Array.isArray(value) && value.every(item => typeof item === 'object')) {
@@ -331,7 +352,10 @@ function integer(min = 1, max = 100) {
 };
 
 
-
+function decimal(min = 0, max = 1, fixed = 2) {
+	const chance = getChance();
+	return chance.floating({ min, max, fixed });
+}
 
 
 /*
@@ -522,13 +546,7 @@ WEIGHERS
 ----
 */
 
-function weighFunnels(acc, funnel) {
-	const weight = funnel?.weight || 1;
-	for (let i = 0; i < weight; i++) {
-		acc.push(funnel);
-	}
-	return acc;
-}
+
 
 /**
  * a utility function to generate a range of numbers within a given skew
@@ -684,18 +702,18 @@ function pickAWinner(items, mostChosenIndex) {
 }
 
 function quickHash(str, seed = 0) {
-    let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
-    for (let i = 0, ch; i < str.length; i++) {
-        ch = str.charCodeAt(i);
-        h1 = Math.imul(h1 ^ ch, 2654435761);
-        h2 = Math.imul(h2 ^ ch, 1597334677);
-    }
-    h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507);
-    h1 ^= Math.imul(h2 ^ (h2 >>> 13), 3266489909);
-    h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507);
-    h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
-
-    return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString();
+	let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
+	for (let i = 0, ch; i < str.length; i++) {
+		ch = str.charCodeAt(i);
+		h1 = Math.imul(h1 ^ ch, 2654435761);
+		h2 = Math.imul(h2 ^ ch, 1597334677);
+	}
+	h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507);
+	h1 ^= Math.imul(h2 ^ (h2 >>> 13), 3266489909);
+	h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507);
+	h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
+
+	return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString();
 };
 
 /*
@@ -717,10 +735,10 @@ function shuffleArray(array) {
 }
 
 function pickRandom(array) {
-    const chance = getChance();
-    if (!array || array.length === 0) return undefined;
-    const randomIndex = chance.integer({ min: 0, max: array.length - 1 });
-    return array[randomIndex];
+	if (!array || array.length === 0) return undefined;
+	// PERFORMANCE: Use Math.random() instead of chance.integer() for simple cases
+	const randomIndex = Math.floor(Math.random() * array.length);
+	return array[randomIndex];
 }
 
 function shuffleExceptFirst(array) {
@@ -918,25 +936,25 @@ function buildFileNames(config) {
  * @param  {[string, number][]} arrayOfArrays
  */
 function progress(arrayOfArrays) {
-    const terminalWidth = process.stdout.columns || 120;
-    
-    // Clear the entire line
-    readline.cursorTo(process.stdout, 0);
-    readline.clearLine(process.stdout, 0);
-    
-    // Build message with better formatting
-    const items = arrayOfArrays.map(([thing, p]) => {
-        return `${thing}: ${comma(p)}`;
-    });
-    
-    const message = items.join(' │ ');
-    
-    // Ensure we don't exceed terminal width
-    const finalMessage = message.length > terminalWidth 
-        ? message.substring(0, terminalWidth - 3) + '...'
-        : message.padEnd(terminalWidth, ' ');
-    
-    process.stdout.write(finalMessage);
+	const terminalWidth = process.stdout.columns || 120;
+
+	// Clear the entire line
+	readline.cursorTo(process.stdout, 0);
+	readline.clearLine(process.stdout, 0);
+
+	// Build message with better formatting
+	const items = arrayOfArrays.map(([thing, p]) => {
+		return `${thing}: ${comma(p)}`;
+	});
+
+	const message = items.join(' │ ');
+
+	// Ensure we don't exceed terminal width
+	const finalMessage = message.length > terminalWidth
+		? message.substring(0, terminalWidth - 3) + '...'
+		: message.padEnd(terminalWidth, ' ');
+
+	process.stdout.write(finalMessage);
 }
 
 function openFinder(path, callback) {
@@ -997,6 +1015,46 @@ let soupHits = 0;
  * @param  {number} [peaks=5]
  */
 function TimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0) {
+	if (!earliestTime) earliestTime = global.FIXED_BEGIN ? global.FIXED_BEGIN : dayjs().subtract(30, 'd').unix(); // 30 days ago
+	if (!latestTime) latestTime = global.FIXED_NOW ? global.FIXED_NOW : dayjs().unix();
+	const chance = getChance();
+	const totalRange = latestTime - earliestTime;
+	const chunkSize = totalRange / peaks;
+
+	// Select a random chunk based on the number of peaks
+	const peakIndex = integer(0, peaks - 1);
+	const chunkStart = earliestTime + peakIndex * chunkSize;
+	const chunkEnd = chunkStart + chunkSize;
+	const chunkMid = (chunkStart + chunkEnd) / 2;
+
+	// Generate a single timestamp within this chunk using a normal distribution centered at chunkMid
+	let offset;
+	let iterations = 0;
+	let isValidTime = false;
+	do {
+		iterations++;
+		soupHits++;
+		offset = chance.normal({ mean: mean, dev: chunkSize / deviation });
+		isValidTime = validTime(chunkMid + offset, earliestTime, latestTime);
+		if (iterations > 25000) {
+			throw `${iterations} iterations... exceeded`;
+		}
+	} while (chunkMid + offset < chunkStart || chunkMid + offset > chunkEnd);
+
+	try {
+		return dayjs.unix(chunkMid + offset).toISOString();
+	}
+
+	catch (e) {
+		//escape hatch
+		// console.log('BAD TIME', e?.message);
+		if (NODE_ENV === 'dev') debugger;
+		return dayjs.unix(integer(earliestTime, latestTime)).toISOString();
+	}
+}
+
+
+function NewTimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0) {
 	if (!earliestTime) earliestTime = global.FIXED_BEGIN ? global.FIXED_BEGIN : dayjs().subtract(30, 'd').unix(); // 30 days ago
 	if (!latestTime) latestTime = global.FIXED_NOW ? global.FIXED_NOW : dayjs().unix();
 	const chance = getChance();
@@ -1176,7 +1234,10 @@ function wrapFunc(obj, func, recursion = 0, parentKey = null, grandParentKey = n
 
 // }
 
-
+const chance = getChance();
+function odds(num) {	
+	return chance.bool({ likelihood: num });
+}
 
 /**
  * makes a random-sized array of emojis
@@ -1271,7 +1332,8 @@ export {
 	deepClone,
 	initChance,
 	getChance,
-
+	decimal,
+	odds,
 	validTime,
 	validEvent,
 
@@ -1287,7 +1349,6 @@ export {
 	pickAWinner,
 	quickHash,
 	weighArray,
-	weighFunnels,
 	validateEventConfig,
 	shuffleArray,
 	shuffleExceptFirst,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "make-mp-data",
-	"version": "2.0.19",
+	"version": "2.0.22",
 	"description": "builds all mixpanel primitives for a given project",
 	"type": "module",
 	"main": "index.js",
@@ -16,6 +16,7 @@
 		"README.md"
 	],
 	"scripts": {
+		"new:dungeon": "node ./scripts/create-dungeon.mjs",
 		"start": "node ./index.js",
 		"dev": "nodemon scratch.mjs --ignore ./data/*",
 		"prune": "rm -f ./data/* && rm -f ./tmp/* && rm -f vscode-profile-*",
@@ -24,10 +25,9 @@
 		"test": "NODE_ENV=test vitest run",
 		"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 ./tests/benchmark/concurrency.mjs",
-		"benchmark:phase1": "node ./tests/benchmark/phase1-performance.mjs",
+		"typecheck:build": "tsc --noEmit --project tsconfig.build.json",
+		"typecheck:strict": "echo '⚠️  Running pedantic strict checks (many false positives expected)...' && tsc --noEmit --project tsconfig.build.json --strict",
+		"typecheck:summary": "echo '🔍 Type-checking all shipped files...' && npm run typecheck:build && echo '✅ All TypeScript checks passed!'",
 		"test:quick": "node ./tests/benchmark/quick-test.mjs",
 		"exp:soup": "node ./tests/testSoup.mjs",
 		"func:local": "functions-framework --target=entry",
@@ -61,17 +61,16 @@
 	"dependencies": {
 		"@google-cloud/functions-framework": "^3.4.2",
 		"@google-cloud/storage": "^7.14.0",
-		"@google/generative-ai": "^0.24.1",
-		"ak-fetch": "^2.0.1",
-		"ak-gemini": "^1.0.55",
-		"ak-tools": "^1.1.0",
+		"ak-fetch": "^2.0.12",
+		"ak-gemini": "^1.0.59",
+		"ak-tools": "^1.1.12",
 		"chance": "^1.1.11",
 		"chart.js": "^3.9.1",
 		"chartjs-node-canvas": "^4.1.6",
 		"dayjs": "^1.11.11",
 		"dotenv": "^16.4.5",
 		"google-auth-library": "^9.15.0",
-		"mixpanel-import": "^2.8.14",
+		"mixpanel-import": "^2.8.162",
 		"p-limit": "^3.1.0",
 		"yargs": "^17.7.2"
 	},