make-mp-data 1.4.4 → 1.4.5

package/.vscode/settings.json

@@ -1,5 +1,6 @@
 {
 	"cSpell.words": [
+		"adspend",
 		"AVCHD",
 		"chartjs",
 		"chupacabra",

package/core/index.js

@@ -6,18 +6,23 @@ by AK
 ak@mixpanel.com
 */
 
-//todo: churn ... is churnFunnel, possible to return, etc
-//todo: fixedTimeFunnel? if set this funnel will occur for all users at the same time ['cards charged', 'charge complete']
-//todo: send SCD data to mixpanel
-//todo: send and map lookup tables to mixpanel
+
+//!feature: mirror strategies
+//!feature: fixedTimeFunnel? if set this funnel will occur for all users at the same time ['cards charged', 'charge complete']
+//!feature: churn ... is churnFunnel, possible to return, etc
+//!bug: not writing adspend CSV
+//!bug: using --mc flag reverts to --complex for some reason
+
+//todo: send SCD data to mixpanel (blocked on dev)
+//todo: send and map lookup tables to mixpanel (also blocked on dev)
 
 /** @typedef {import('../types').Config} Config */
 /** @typedef {import('../types').EventConfig} EventConfig */
 /** @typedef {import('../types').Funnel} Funnel */
 /** @typedef {import('../types').Person} Person */
-/** @typedef {import('../types').SCDTableRow} SCDTableRow */
+/** @typedef {import('../types').SCDSchema} SCDTableRow */
 /** @typedef {import('../types').UserProfile} UserProfile */
-/** @typedef {import('../types').EventSpec} EventSpec */
+/** @typedef {import('../types').EventSchema} EventSpec */
 
 const dayjs = require("dayjs");
 const utc = require("dayjs/plugin/utc");
@@ -177,16 +182,16 @@ async function main(config) {
 	log(`------------------SETUP------------------`, "\n");
 
 	//setup all the data structures we will push into
-	const eventData = u.enrichArray([], { hook, type: "event", config });
-	const userProfilesData = u.enrichArray([], { hook, type: "user", config });
-	const adSpendData = u.enrichArray([], { hook, type: "ad-spend", config });
+	const eventData = u.hookArray([], { hook, type: "event", config });
+	const userProfilesData = u.hookArray([], { hook, type: "user", config });
+	const adSpendData = u.hookArray([], { hook, type: "ad-spend", config });
 	const scdTableKeys = Object.keys(scdProps);
 	const scdTableData = [];
 	for (const [index, key] of scdTableKeys.entries()) {
-		scdTableData[index] = u.enrichArray([], { hook, type: "scd", config, scdKey: key });
+		scdTableData[index] = u.hookArray([], { hook, type: "scd", config, scdKey: key });
 	}
-	const groupProfilesData = u.enrichArray([], { hook, type: "group", config });
-	const lookupTableData = u.enrichArray([], { hook, type: "lookup", config });
+	const groupProfilesData = u.hookArray([], { hook, type: "group", config });
+	const lookupTableData = u.hookArray([], { hook, type: "lookup", config });
 	const avgEvPerUser = Math.ceil(numEvents / numUsers);
 
 	// if no funnels, make some out of events...
@@ -331,7 +336,7 @@ async function main(config) {
 			const newTime = dayjs(event.time).add(timeShift, "second");
 			event.time = newTime.toISOString();
 			if (epochStart && newTime.unix() < epochStart) event = {};
-			if (epochEnd && newTime.unix() > epochEnd) event = {};
+			if (epochEnd && newTime.unix() > (epochEnd - 60 * 60)) event = {};
 		}
 		catch (e) {
 			//noop
@@ -453,7 +458,7 @@ async function main(config) {
 			log(`\tsent ${comma(imported.success)} events\n`);
 			importResults.events = imported;
 		}
-		if (userProfilesData) {
+		if (userProfilesData && userProfilesData.length) {
 			log(`importing user profiles to mixpanel...\n`);
 			const imported = await mp(creds, clone(userProfilesData), {
 				recordType: "user",
@@ -462,7 +467,7 @@ async function main(config) {
 			log(`\tsent ${comma(imported.success)} user profiles\n`);
 			importResults.users = imported;
 		}
-		if (adSpendData) {
+		if (adSpendData && adSpendData.length) {
 			log(`importing ad spend data to mixpanel...\n`);
 			const imported = await mp(creds, clone(adSpendData), {
 				recordType: "event",
@@ -616,8 +621,8 @@ function makeEvent(distinct_id, anonymousIds, sessionIds, earliestTime, chosenEv
 		const groupEvents = groupPair[2] || [];
 
 		// empty array for group events means all events
-		if (!groupEvents.length) eventTemplate[groupKey] = u.pick(u.weightedRange(1, groupCardinality));
-		if (groupEvents.includes(eventTemplate.event)) eventTemplate[groupKey] = u.pick(u.weightedRange(1, groupCardinality));
+		if (!groupEvents.length) eventTemplate[groupKey] = u.pick(u.weighNumRange(1, groupCardinality));
+		if (groupEvents.includes(eventTemplate.event)) eventTemplate[groupKey] = u.pick(u.weighNumRange(1, groupCardinality));
 	}
 
 	//make $insert_id
@@ -668,7 +673,7 @@ function makeFunnel(funnel, user, profile, scd, firstEventTime, config) {
 		.map((eventName) => {
 			const foundEvent = config.events.find((e) => e.event === eventName);
 			/** @type {EventConfig} */
-			const eventSpec = foundEvent || { event: eventName, properties: {} };
+			const eventSpec = clone(foundEvent) || { event: eventName, properties: {} };
 			for (const key in eventSpec.properties) {
 				try {
 					eventSpec.properties[key] = u.choose(eventSpec.properties[key]);
@@ -877,7 +882,7 @@ function makeAdSpend(day) {
 			const utm_term = u.choose(u.pickAWinner(network.utm_term)());
 			//each of these is a campaign
 			const adSpendEvent = {
-				event: "Ad Data",
+				event: "$ad_spend",
 				time: day,
 				source: 'dm4',
 				utm_campaign: campaign,

package/core/utils.js

@@ -15,8 +15,8 @@ const { domainSuffix, domainPrefix } = require('./defaults');
 /** @typedef {import('../types').Config} Config */
 /** @typedef {import('../types').EventConfig} EventConfig */
 /** @typedef {import('../types').ValueValid} ValueValid */
-/** @typedef {import('../types').EnrichedArray} EnrichArray */
-/** @typedef {import('../types').EnrichArrayOptions} EnrichArrayOptions */
+/** @typedef {import('../types').EnrichedArray} hookArray */
+/** @typedef {import('../types').hookArrayOptions} hookArrayOptions */
 /** @typedef {import('../types').Person} Person */
 /** @typedef {import('../types').Funnel} Funnel */
 
@@ -34,6 +34,7 @@ RNG
 /**
  * the random number generator initialization function
  * @param  {string} seed
+ * @returns {Chance}
  */
 function initChance(seed) {
 	if (process.env.SEED) seed = process.env.SEED;  // Override seed with environment variable if available
@@ -42,6 +43,7 @@ function initChance(seed) {
 		if (global.MP_SIMULATION_CONFIG) global.MP_SIMULATION_CONFIG.chance = globalChance;
 		chanceInitialized = true;
 	}
+	return globalChance;
 }
 
 /**
@@ -54,8 +56,7 @@ function getChance() {
 		if (!seed) {
 			return new Chance();
 		}
-		initChance(seed);
-		return globalChance;
+		return initChance(seed);		
 	}
 	return globalChance;
 }
@@ -242,64 +243,6 @@ function integer(min = 1, max = 100) {
 };
 
 
-/**
- * Creates a function that generates a weighted list of items
- * with a higher likelihood of picking a specified index and clear second and third place indices.
- * 
- * @param {Array} items - The list of items to pick from.
- * @param {number} [mostChosenIndex] - The index of the item to be most favored.
- * @returns {function} - A function that returns a weighted list of items.
- */
-function pickAWinner(items, mostChosenIndex) {
-	const chance = getChance();
-
-	// Ensure mostChosenIndex is within the bounds of the items array
-	if (!items) return () => { return ""; };
-	if (!items.length) return () => { return ""; };
-	if (!mostChosenIndex) mostChosenIndex = chance.integer({ min: 0, max: items.length - 1 });
-	if (mostChosenIndex >= items.length) mostChosenIndex = items.length - 1;
-
-	// Calculate second and third most chosen indices
-	const secondMostChosenIndex = (mostChosenIndex + 1) % items.length;
-	const thirdMostChosenIndex = (mostChosenIndex + 2) % items.length;
-
-	// Return a function that generates a weighted list
-	return function () {
-		const weighted = [];
-		for (let i = 0; i < 10; i++) {
-			const rand = chance.d10(); // Random number between 1 and 10
-
-			// 35% chance to favor the most chosen index
-			if (chance.bool({ likelihood: 35 })) {
-				// 50% chance to slightly alter the index
-				if (chance.bool({ likelihood: 50 })) {
-					weighted.push(items[mostChosenIndex]);
-				} else {
-					const addOrSubtract = chance.bool({ likelihood: 50 }) ? -rand : rand;
-					let newIndex = mostChosenIndex + addOrSubtract;
-
-					// Ensure newIndex is within bounds
-					if (newIndex < 0) newIndex = 0;
-					if (newIndex >= items.length) newIndex = items.length - 1;
-					weighted.push(items[newIndex]);
-				}
-			}
-			// 25% chance to favor the second most chosen index
-			else if (chance.bool({ likelihood: 25 })) {
-				weighted.push(items[secondMostChosenIndex]);
-			}
-			// 15% chance to favor the third most chosen index
-			else if (chance.bool({ likelihood: 15 })) {
-				weighted.push(items[thirdMostChosenIndex]);
-			}
-			// Otherwise, pick a random item from the list
-			else {
-				weighted.push(chance.pickone(items));
-			}
-		}
-		return weighted;
-	};
-}
 
 
 
@@ -359,12 +302,13 @@ function mapToRange(value, mean, sd) {
  * @param  {number} step=1
  */
 function range(a, b, step = 1) {
+	const arr = [];
 	step = !step ? 1 : step;
 	b = b / step;
 	for (var i = a; i <= b; i++) {
-		this.push(i * step);
+		arr.push(i * step);
 	}
-	return this;
+	return arr;
 };
 
 
@@ -491,7 +435,7 @@ function weighFunnels(acc, funnel) {
  * @param  {number} skew=1
  * @param  {number} size=100
  */
-function weightedRange(min, max, skew = 1, size = 50) {
+function weighNumRange(min, max, skew = 1, size = 50) {
 	if (size > 2000) size = 2000;
 	const mean = (max + min) / 2;
 	const sd = (max - min) / 4;
@@ -508,13 +452,16 @@ function weightedRange(min, max, skew = 1, size = 50) {
 	return array;
 }
 
+/**
+ * arbitrarily weigh an array of values to create repeats
+ * @param  {Array<any>} arr
+ */
 function weighArray(arr) {
-
 	// Calculate the upper bound based on the size of the array with added noise
 	const maxCopies = arr.length + integer(1, arr.length);
 
 	// Create an empty array to store the weighted elements
-	let weightedArray = [];
+	const weightedArray = [];
 
 	// Iterate over the input array and copy each element a random number of times
 	arr.forEach(element => {
@@ -527,6 +474,106 @@ function weighArray(arr) {
 	return weightedArray;
 }
 
+/**
+ * Creates a function that generates a weighted array of values.
+ * 
+ * @overload
+ * @param {Array<{value: string, weight: number}>} items - An array of weighted objects or an array of strings.
+ * @returns {function(): Array<string>} A function that returns a weighted array of values when called.
+ * 
+ * @overload
+ * @param {Array<string>} items - An array of strings.
+ * @returns {function(): Array<string>} A function that returns a weighted array with automatically assigned random weights to each string.
+ */
+
+function weighChoices(items) {
+	let weightedItems;
+
+	// If items are strings, assign unique random weights
+	if (items.every(item => typeof item === 'string')) {
+		const weights = shuffleArray(range(1, items.length));
+		weightedItems = items.map((item, index) => ({
+			value: item,
+			weight: weights[index]
+		}));
+	} else {
+		weightedItems = items;
+	}
+
+	return function generateWeightedArray() {
+		const weightedArray = [];
+
+		// Add each value to the array the number of times specified by its weight
+		weightedItems.forEach(({ value, weight }) => {
+			if (!weight) weight = 1;
+			for (let i = 0; i < weight; i++) {
+				weightedArray.push(value);
+			}
+		});
+
+		return weightedArray;
+	};
+}
+
+/**
+ * Creates a function that generates a weighted list of items
+ * with a higher likelihood of picking a specified index and clear second and third place indices.
+ * 
+ * @param {Array} items - The list of items to pick from.
+ * @param {number} [mostChosenIndex] - The index of the item to be most favored.
+ * @returns {function} - A function that returns a weighted list of items.
+ */
+function pickAWinner(items, mostChosenIndex) {
+	const chance = getChance();
+
+	// Ensure mostChosenIndex is within the bounds of the items array
+	if (!items) return () => { return ""; };
+	if (!items.length) return () => { return ""; };
+	if (!mostChosenIndex) mostChosenIndex = chance.integer({ min: 0, max: items.length - 1 });
+	if (mostChosenIndex >= items.length) mostChosenIndex = items.length - 1;
+
+	// Calculate second and third most chosen indices
+	const secondMostChosenIndex = (mostChosenIndex + 1) % items.length;
+	const thirdMostChosenIndex = (mostChosenIndex + 2) % items.length;
+
+	// Return a function that generates a weighted list
+	return function () {
+		const weighted = [];
+		for (let i = 0; i < 10; i++) {
+			const rand = chance.d10(); // Random number between 1 and 10
+
+			// 35% chance to favor the most chosen index
+			if (chance.bool({ likelihood: 35 })) {
+				// 50% chance to slightly alter the index
+				if (chance.bool({ likelihood: 50 })) {
+					weighted.push(items[mostChosenIndex]);
+				} else {
+					const addOrSubtract = chance.bool({ likelihood: 50 }) ? -rand : rand;
+					let newIndex = mostChosenIndex + addOrSubtract;
+
+					// Ensure newIndex is within bounds
+					if (newIndex < 0) newIndex = 0;
+					if (newIndex >= items.length) newIndex = items.length - 1;
+					weighted.push(items[newIndex]);
+				}
+			}
+			// 25% chance to favor the second most chosen index
+			else if (chance.bool({ likelihood: 25 })) {
+				weighted.push(items[secondMostChosenIndex]);
+			}
+			// 15% chance to favor the third most chosen index
+			else if (chance.bool({ likelihood: 15 })) {
+				weighted.push(items[thirdMostChosenIndex]);
+			}
+			// Otherwise, pick a random item from the list
+			else {
+				weighted.push(chance.pickone(items));
+			}
+		}
+		return weighted;
+	};
+}
+
 /*
 ----
 SHUFFLERS
@@ -654,10 +701,10 @@ META
 /** 
  * our meta programming function which lets you mutate items as they are pushed into an array
  * @param  {any[]} arr
- * @param  {EnrichArrayOptions} opts
- * @returns {EnrichArray}}
+ * @param  {hookArrayOptions} opts
+ * @returns {hookArray}}
  */
-function enrichArray(arr = [], opts = {}) {
+function hookArray(arr = [], opts = {}) {
 	const { hook = a => a, type = "", ...rest } = opts;
 
 	function transformThenPush(item) {
@@ -703,7 +750,7 @@ function enrichArray(arr = [], opts = {}) {
 
 	}
 
-	/** @type {EnrichArray} */
+	/** @type {hookArray} */
 	// @ts-ignore
 	const enrichedArray = arr;
 
@@ -714,12 +761,15 @@ function enrichArray(arr = [], opts = {}) {
 	return enrichedArray;
 };
 
+/**
+ * @param  {Config} config
+ */
 function buildFileNames(config) {
 	const { format = "csv", groupKeys = [], lookupTables = [] } = config;
 	let extension = "";
 	extension = format === "csv" ? "csv" : "json";
 	// const current = dayjs.utc().format("MM-DD-HH");
-	const simName = config.simulationName;
+	let simName = config.simulationName;
 	let writeDir = "./";
 	if (config.writeToDisk) {
 		const dataFolder = path.resolve("./data");
@@ -732,13 +782,17 @@ function buildFileNames(config) {
 	const writePaths = {
 		eventFiles: [path.join(writeDir, `${simName}-EVENTS.${extension}`)],
 		userFiles: [path.join(writeDir, `${simName}-USERS.${extension}`)],
-		adSpendFiles: [path.join(writeDir, `${simName}-AD-SPEND.${extension}`)],
+		adSpendFiles: [],
 		scdFiles: [],
 		mirrorFiles: [],
 		groupFiles: [],
 		lookupFiles: [],
 		folder: writeDir,
 	};
+	//add ad spend files
+	if (config?.hasAdSpend) {
+		writePaths.adSpendFiles.push(path.join(writeDir, `${simName}-AD-SPEND.${extension}`));
+	}
 
 	//add SCD files
 	const scdKeys = Object.keys(config?.scdProps || {});
@@ -869,7 +923,9 @@ function TimeSoup(earliestTime, latestTime, peaks = 5, deviation = 2, mean = 0)
 		iterations++;
 		offset = chance.normal({ mean: mean, dev: chunkSize / deviation });
 		isValidTime = validateTime(chunkMid + offset, earliestTime, latestTime);
-		if (iterations > 10000) throw new Error("Too many iterations");
+		if (iterations > 25000) {
+			throw `${iterations} iterations... exceeded`;
+		}
 	} while (chunkMid + offset < chunkStart || chunkMid + offset > chunkEnd);
 
 	try {
@@ -1026,7 +1082,7 @@ module.exports = {
 	boxMullerRandom,
 	applySkew,
 	mapToRange,
-	weightedRange,
+	weighNumRange,
 	progress,
 	range,
 	openFinder,
@@ -1044,11 +1100,12 @@ module.exports = {
 	shuffleOutside,
 	interruptArray,
 	generateUser,
-	enrichArray,
+	hookArray,
 	optimizedBoxMuller,
 	buildFileNames,
 	streamJSON,
 	streamCSV,
 	inferFunnels,
-	datesBetween
+	datesBetween,
+	weighChoices
 };

package/package.json

@@ -1,18 +1,18 @@
 {
 	"name": "make-mp-data",
-	"version": "1.4.04",
+	"version": "1.4.05",
 	"description": "builds all mixpanel primitives for a given project",
 	"main": "index.js",
 	"types": "types.d.ts",
 	"scripts": {
 		"start": "node ./core/index.js",
-		"dev": "nodemon scratch.mjs --ignore /data",
-		"complex": "nodemon ./core/index.js --complex --e 10000 --u 100",
-		"simple": "nodemon ./core/index.js  --simple --e 10000 --u 100",
+		"dev": "nodemon scratch.mjs --ignore /data",		
 		"prune": "rm -f ./data/* && rm -f ./tmp/*",
 		"post": "npm publish",
 		"test": "NODE_ENV=test jest --runInBand",
-		"deps": "sh ./scripts/deps.sh"
+		"coverage": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --coverage && open ./tests/coverage/lcov-report/index.html",
+		"deps": "sh ./scripts/deps.sh",
+		"new": "sh ./scripts/new.sh"
 	},
 	"repository": {
 		"type": "git",

package/schemas/anon.js

@@ -14,7 +14,7 @@ const dayjs = require("dayjs");
 const utc = require("dayjs/plugin/utc");
 dayjs.extend(utc);
 const { uid, comma } = require('ak-tools');
-const { pickAWinner, weightedRange, date, integer } = require('../core/utils');
+const { pickAWinner, weighNumRange, date, integer } = require('../core/utils');
 
 
 
@@ -86,7 +86,7 @@ const config = {
 	superProps: {},
 	userProps: {
 		title: chance.profession.bind(chance),
-		luckyNumber: weightedRange(42, 420),
+		luckyNumber: weighNumRange(42, 420),
 		spiritAnimal: ["duck", "dog", "otter", "penguin", "cat", "elephant", "lion", "cheetah", "giraffe", "zebra", "rhino", "hippo", "whale", "dolphin", "shark", "octopus", "squid", "jellyfish", "starfish", "seahorse", "crab", "lobster", "shrimp", "clam", "snail", "slug", "butterfly", "moth", "bee", "wasp", "ant", "beetle", "ladybug", "caterpillar", "centipede", "millipede", "scorpion", "spider", "tarantula", "tick", "mite", "mosquito", "fly", "dragonfly", "damselfly", "grasshopper", "cricket", "locust", "mantis", "cockroach", "termite", "praying mantis", "walking stick", "stick bug", "leaf insect", "lacewing", "aphid", "cicada", "thrips", "psyllid", "scale insect", "whitefly", "mealybug", "planthopper", "leafhopper", "treehopper", "flea", "louse", "bedbug", "flea beetle", "weevil", "longhorn beetle", "leaf beetle", "tiger beetle", "ground beetle", "lady beetle", "firefly", "click beetle", "rove beetle", "scarab beetle", "dung beetle", "stag beetle", "rhinoceros beetle", "hercules beetle", "goliath beetle", "jewel beetle", "tortoise beetle"]
 	},
 	scdProps: {},

package/schemas/complex.js

@@ -8,7 +8,7 @@
 
 const Chance = require('chance');
 const chance = new Chance();
-const { weightedRange, date, integer } = require('../core/utils.js');
+const { weighNumRange, date, integer } = require('../core/utils.js');
 const u = require('ak-tools');
 
 /** @type {import('../types.js').Config} */
@@ -37,7 +37,7 @@ const config = {
 			"event": "checkout",
 			"weight": 2,
 			"properties": {
-				amount: weightedRange(5, 500, .25),
+				amount: weighNumRange(5, 500, .25),
 				currency: ["USD", "USD", "USD", "CAD", "EUR", "EUR", "BTC", "BTC", "ETH", "JPY"],
 				cart: makeProducts(12),
 			}
@@ -46,9 +46,9 @@ const config = {
 			"event": "add to cart",
 			"weight": 4,
 			"properties": {
-				amount: weightedRange(5, 500, .25),
+				amount: weighNumRange(5, 500, .25),
 				qty: integer(1, 5),
-				product_id: weightedRange(1, 1000, 1.4)
+				product_id: weighNumRange(1, 1000, 1.4)
 			}
 		},
 		{
@@ -65,10 +65,10 @@ const config = {
 			"properties": {
 				category: ["funny", "educational", "inspirational", "music", "news", "sports", "cooking", "DIY", "travel", "gaming"],
 				hashTags: makeHashTags,
-				watchTimeSec: weightedRange(10, 600, .25,),
+				watchTimeSec: weighNumRange(10, 600, .25,),
 				quality: ["2160p", "1440p", "1080p", "720p", "480p", "360p", "240p"],
 				format: ["mp4", "avi", "mov", "mpg"],
-				video_id: weightedRange(1, 50000, 1.4),
+				video_id: weighNumRange(1, 50000, 1.4),
 
 			}
 		},
@@ -76,8 +76,8 @@ const config = {
 			"event": "comment",
 			"weight": 2,
 			"properties": {
-				length: weightedRange(1, 500, .25),
-				video_id: weightedRange(1, 50000, 1.4),
+				length: weighNumRange(1, 500, .25),
+				video_id: weighNumRange(1, 50000, 1.4),
 				has_replies: [true, false, false, false, false],
 				has_photo: [true, false, false, false, false],
 
@@ -87,7 +87,7 @@ const config = {
 			"event": "save video",
 			"weight": 4,
 			"properties": {
-				video_id: weightedRange(1, 50000, 1.4),
+				video_id: weighNumRange(1, 50000, 1.4),
 				ui_control: ["toolbar", "menu", "keyboard"]
 
 
@@ -97,7 +97,7 @@ const config = {
 			"event": "view item",
 			"weight": 8,
 			"properties": {
-				product_id: weightedRange(1, 24, 3),
+				product_id: weighNumRange(1, 24, 3),
 				colors: ["light", "dark", "custom", "dark"]
 			}
 		},
@@ -105,7 +105,7 @@ const config = {
 			"event": "save item",
 			"weight": 5,
 			"properties": {
-				product_id: weightedRange(1, 1000, 12),
+				product_id: weighNumRange(1, 1000, 12),
 				colors: ["light", "dark", "custom", "dark"]
 			}
 		},
@@ -113,7 +113,7 @@ const config = {
 			"event": "support ticket",
 			"weight": 2,
 			"properties": {
-				product_id: weightedRange(1, 1000, .6),
+				product_id: weighNumRange(1, 1000, .6),
 				description: chance.sentence.bind(chance),
 				severity: ["low", "medium", "high"],
 				ticket_id: chance.guid.bind(chance)
@@ -141,7 +141,7 @@ const config = {
 	*/
 	userProps: {
 		title: chance.profession.bind(chance),
-		luckyNumber: weightedRange(42, 420),
+		luckyNumber: weighNumRange(42, 420),
 		experiment: designExperiment(),
 		spiritAnimal: ["unicorn", "dragon", "phoenix", "sasquatch", "yeti", "kraken", "jackalope", "thunderbird", "mothman", "nessie", "chupacabra", "jersey devil", "bigfoot", "weindgo", "bunyip", "mokele-mbembe", "tatzelwurm", "megalodon"],
 		timezone: chance.timezone.bind(chance), // ["America/New_York", "America/Los_Angeles", "America/Chicago", "America/Denver", "America/Phoenix", "America/Anchorage", "Pacific/Honolulu"]
@@ -153,8 +153,8 @@ const config = {
 	/** each generates it's own table */
 	scdProps: {
 		plan: ["free", "free", "free", "free", "basic", "basic", "basic", "premium", "premium", "enterprise"],
-		MRR: weightedRange(0, 10000, .15),
-		NPS: weightedRange(0, 10, 2, 150),
+		MRR: weighNumRange(0, 10000, .15),
+		NPS: weighNumRange(0, 10, 2, 150),
 		subscribed: [true, true, true, true, true, true, false, false, false, false, "it's complicated"],
 		renewalDate: date(100, false),
 	},
@@ -164,7 +164,7 @@ const config = {
 		profit: { events: ["checkout"], values: [4, 2, 42, 420] },
 		watchTimeSec: {
 			events: ["watch video"],
-			values: weightedRange(50, 1200, 6, 247)
+			values: weighNumRange(50, 1200, 6)
 		}
 	},
 
@@ -181,7 +181,7 @@ const config = {
 		company_id: {
 			name: () => { return chance.company(); },
 			email: () => { return `CSM: ${chance.pickone(["AK", "Jessica", "Michelle", "Dana", "Brian", "Dave"])}`; },
-			"# of employees": weightedRange(3, 10000),
+			"# of employees": weighNumRange(3, 10000),
 			"industry": ["tech", "finance", "healthcare", "education", "government", "non-profit"],
 			"segment": ["enterprise", "SMB", "mid-market"],
 			"products": [["core"], ["core"], ["core", "add-ons"], ["core", "pro-serve"], ["core", "add-ons", "pro-serve"], ["core", "BAA", "enterprise"], ["free"], ["free"], ["free", "addons"]],
@@ -190,7 +190,7 @@ const config = {
 			name: () => { return `#${chance.word({ length: integer(4, 24), capitalize: true })}`; },
 			email: ["public", "private"],
 			"room provider": ["partner", "core", "core", "core"],
-			"room capacity": weightedRange(3, 1000000),
+			"room capacity": weighNumRange(3, 1000000),
 			"isPublic": [true, false, false, false, false],
 			"country": chance.country.bind(chance),
 			"isVerified": [true, true, false, false, false],
@@ -208,9 +208,9 @@ const config = {
 				"demand": ["high", "medium", "medium", "low"],
 				"supply": ["high", "medium", "medium", "low"],
 				"manufacturer": chance.company.bind(chance),
-				"price": weightedRange(5, 500, 1000, .25),
-				"rating": weightedRange(1, 5),
-				"reviews": weightedRange(0, 35)
+				"price": weighNumRange(5, 500, 1000, .25),
+				"rating": weighNumRange(1, 5),
+				"reviews": weighNumRange(0, 35)
 			}
 
 		},
@@ -222,7 +222,7 @@ const config = {
 				copyright: ["all rights reserved", "creative commons", "creative commons", "public domain", "fair use"],
 				uploader_id: chance.guid.bind(chance),
 				"uploader influence": ["low", "low", "low", "medium", "medium", "high"],
-				thumbs: weightedRange(0, 35),
+				thumbs: weighNumRange(0, 35),
 				rating: ["G", "PG", "PG-13", "R", "NC-17", "PG-13", "R", "NC-17", "R", "PG", "PG"]
 			}