make-mp-data 1.5.0 → 1.5.1

package/scripts/{new.sh → new-dungeon.sh}

@@ -13,7 +13,7 @@ const dayjs = require("dayjs");
 const utc = require("dayjs/plugin/utc");
 dayjs.extend(utc);
 require("dotenv").config();
-const u = require("../src/utils");
+const u = require("../components/utils");
 const v = require("ak-tools");
 const chance = u.initChance(SEED);
 const num_users = 25_000
@@ -26,9 +26,10 @@ const config = {
     numDays: days, 
     numEvents: num_users * 100, 
     numUsers: num_users, 
-	hasAnonIds: true, 
-	hasSessionIds: true, 
-
+	hasAnonIds: false, 
+	hasSessionIds: false, 
+	format: "json",
+	alsoInferFunnels: true,
 	hasLocation: true,
 	hasAndroidDevices: true,
 	hasIOSDevices: true,
@@ -54,9 +55,31 @@ const config = {
     groupKeys: [],
     groupProps: {},
     lookupTables: [],
-    hook: function(record, type, meta) {
-        return record;
-    }
+	hook: function (record, type, meta) {
+		const NOW = dayjs.unix(global.NOW);
+
+		if (type === "event") {
+			const EVENT_TIME = dayjs(record.time);
+		}
+
+		if (type === "user") {
+
+		}
+
+		if (type === "funnel-post") {
+			
+		}
+
+		if (type === "funnel-pre") {
+
+		}
+
+		if (type === "scd") {
+
+		}
+
+		return record;
+	}
 };
 
 module.exports = config;'

package/scripts/new-project.mjs

@@ -0,0 +1,14 @@
+import project from "../components/project.js";
+import dotenv from "dotenv";
+
+dotenv.config();
+const OAUTH_TOKEN = process.env.OAUTH_TOKEN || "";
+
+if (!OAUTH_TOKEN) throw new Error('No OAUTH_TOKEN in .env');
+
+// @ts-ignore
+const createdProject = await project({
+	oauth: OAUTH_TOKEN	
+})
+
+console.log(createdProject);

package/scripts/update-deps.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+npm i mixpanel-import@latest --save
+npm i ak-tools@latest --save
+npm i ak-fetch@latest --save

package/tests/int.test.js

@@ -23,7 +23,7 @@ const { generators, orchestrators, meta } = MAIN;
 const { makeAdSpend, makeEvent, makeFunnel, makeProfile, makeSCD, makeMirror } = generators;
 const { sendToMixpanel, userLoop, validateDungeonConfig } = orchestrators;
 const { hookArray, inferFunnels } = meta;
-const { validEvent } = require('../src/utils.js');
+const { validEvent } = require('../components/utils.js');
 
 
 // Mock the global variables
@@ -31,7 +31,7 @@ let CAMPAIGNS;
 let DEFAULTS;
 let STORAGE;
 let CONFIG;
-const { campaigns, devices, locations } = require('../src/defaults.js');
+const { campaigns, devices, locations } = require('../components/defaults.js');
 
 beforeEach(async () => {
 	// Reset global variables before each test
@@ -72,7 +72,8 @@ beforeEach(async () => {
 	global.DEFAULTS = DEFAULTS;
 	global.STORAGE = STORAGE;
 	global.CONFIG = CONFIG;
-	global.NOW = dayjs().unix(); // Mock global NOW
+	const FIXED_NOW = dayjs('2024-02-02').unix();
+	global.FIXED_NOW = FIXED_NOW;
 
 });
 
@@ -137,7 +138,7 @@ describe('generators', () => {
 				prop3: ["value5"]
 			},
 		};
-		const result = await makeEvent("known_id", dayjs().subtract(1, 'd').unix(), eventConfig, ["anon_id"], ["session_id"]);
+		const result = await makeEvent("known_id", dayjs.unix(global.FIXED_NOW).subtract(30, 'd').unix(), eventConfig, ["anon_id"], ["session_id"]);
 		expect(result).toHaveProperty('event', 'test_event');
 		expect(result).toHaveProperty('device_id', 'anon_id');
 		// expect(result).toHaveProperty('user_id', 'known_id'); // Known ID not always on the event
@@ -154,7 +155,7 @@ describe('generators', () => {
 
 	test('makeEvent: opt params', async () => {
 		const eventConfig = { event: "test_event", properties: {} };
-		const result = await makeEvent("known_id", dayjs().subtract(1, 'd').unix(), eventConfig);
+		const result = await makeEvent("known_id",dayjs.unix(global.FIXED_NOW).subtract(30, 'd').unix(), eventConfig);
 		expect(result).toHaveProperty('event', 'test_event');
 		expect(result).toHaveProperty('user_id', 'known_id');
 		expect(result).toHaveProperty('source', 'dm4');
@@ -170,7 +171,7 @@ describe('generators', () => {
 				prop2: ["value3", "value4"]
 			},
 		};
-		const result = await makeEvent("known_id", dayjs().subtract(1, 'd').unix(), eventConfig, ["anon_id"], ["session_id"]);
+		const result = await makeEvent("known_id",dayjs.unix(global.FIXED_NOW).subtract(30, 'd').unix(), eventConfig, ["anon_id"], ["session_id"]);
 		expect(result.prop1 === "value1" || result.prop1 === "value2").toBeTruthy();
 		expect(result.prop2 === "value3" || result.prop2 === "value4").toBeTruthy();
 	});
@@ -189,7 +190,7 @@ describe('generators', () => {
 		/** @type {Record<string, SCDSchema[]>} */
 		const scd = { "scd_example": [{ distinct_id: "user1", insertTime: dayjs().toISOString(), startTime: dayjs().toISOString() }] };
 
-		const [result, converted] = await makeFunnel(funnelConfig, user, dayjs().unix(), profile, scd, {});
+		const [result, converted] = await makeFunnel(funnelConfig, user,dayjs.unix(global.FIXED_NOW).subtract(30, 'd').unix(), profile, scd, {});
 		expect(result.length).toBe(2);
 		expect(converted).toBe(true);
 		expect(result.every(e => validEvent(e))).toBeTruthy();
@@ -205,7 +206,7 @@ describe('generators', () => {
 		const profile = { created: dayjs().toISOString(), distinct_id: "user1" };
 		const scd = { "scd_example": [{ distinct_id: "user1", insertTime: dayjs().toISOString(), startTime: dayjs().toISOString() }] };
 
-		const [result, converted] = await makeFunnel(funnelConfig, user, dayjs().unix(), profile, scd, {});
+		const [result, converted] = await makeFunnel(funnelConfig, user, dayjs.unix(global.FIXED_NOW).subtract(30, 'd').unix(), profile, scd, {});
 		expect(result.length).toBeGreaterThanOrEqual(1);
 		expect(result.length).toBeLessThanOrEqual(3);
 		expect(result.every(e => validEvent(e))).toBeTruthy();
@@ -221,7 +222,7 @@ describe('generators', () => {
 		const profile = { created: dayjs().toISOString(), distinct_id: "user1" };
 		const scd = { "scd_example": [{ distinct_id: "user1", insertTime: dayjs().toISOString(), startTime: dayjs().toISOString() }] };
 
-		const [result, converted] = await makeFunnel(funnelConfig, user, dayjs().unix(), profile, scd, {});
+		const [result, converted] = await makeFunnel(funnelConfig, user, dayjs.unix(global.FIXED_NOW).subtract(30, 'd').unix(), profile, scd, {});
 		expect(result.length).toBe(3);
 		expect(converted).toBe(true);
 		expect(result.every(e => validEvent(e))).toBeTruthy();
@@ -490,7 +491,7 @@ describe('orchestrators', () => {
 		};
 		const result = await sendToMixpanel(CONFIG, STORAGE);
 		expect(result.events.success).toBe(0);
-		expect(result.users.success).toBe(0)
+		expect(result.users.success).toBe(0);
 		expect(result.groups).toHaveLength(0);
 	});
 

package/tests/testCases.mjs

@@ -226,4 +226,4 @@ const TEST_CASES = [
 
 ];
 
-module.exports = TEST_CASES;
+export default TEST_CASES;

package/tests/testSoup.mjs

@@ -1,8 +1,9 @@
-import { generateLineChart } from '../src/chart.js';
-import { TimeSoup } from '../src/utils.js';
+import { generateLineChart } from '../components/chart.js';
+import { TimeSoup } from '../components/utils.js';
 import dayjs from 'dayjs';
 import { progress } from 'ak-tools';
 import TEST_CASES from './testCases.mjs';
+
 import execSync from 'child_process';
 
 async function genViz(soup) {
@@ -12,7 +13,7 @@ async function genViz(soup) {
 	const end = dayjs().unix();
 	console.log(`\n\nTEST CASE: ${name}\n\n`);
 	for (let i = 0; i < 100_000; i++) {
-		progress('processing', i);
+		progress([['processing', i]]);
 		const time = TimeSoup(start, end, peaks, deviation, mean);
 		data.push({ time });
 	}

package/tests/unit.test.js

@@ -57,7 +57,7 @@ const {
 
 	datesBetween,
 	weighChoices
-} = require('../src/utils.js');
+} = require('../components/utils.js');
 
 const main = require('../index.js');
 //todo: test for funnel inference
@@ -283,7 +283,7 @@ describe('generation', () => {
 		const user = generateUser('uuid-123', { numDays });
 		const createdDate = dayjs(user.created, 'YYYY-MM-DD');
 		expect(createdDate.isValid()).toBeTruthy();
-		expect(createdDate.isBefore(dayjs.unix(global.NOW))).toBeTruthy();
+		expect(createdDate.isBefore(dayjs())).toBeTruthy();
 	});
 
 
@@ -393,7 +393,8 @@ describe('generation', () => {
 describe('validation', () => {
 
 	beforeAll(() => {
-		global.NOW = 1672531200; // fixed point in time for testing
+		global.FIXED_NOW = 1672531200; // fixed point in time for testing
+		global.FIXED_BEGIN = global.FIXED_NOW - (60 * 60 * 24 * 30); // 30 days ago
 	});
 
 	test('events: non arrays', () => {
@@ -438,33 +439,33 @@ describe('validation', () => {
 	});
 
 	test('time: between', () => {
-		const chosenTime = global.NOW - (60 * 60 * 24 * 15); // 15 days ago
-		const earliestTime = global.NOW - (60 * 60 * 24 * 30); // 30 days ago
-		const latestTime = global.NOW;
+		const chosenTime = global.FIXED_NOW - (60 * 60 * 24 * 15); // 15 days ago
+		const earliestTime = global.FIXED_NOW - (60 * 60 * 24 * 30); // 30 days ago
+		const latestTime = global.FIXED_NOW;
 		expect(validTime(chosenTime, earliestTime, latestTime)).toBe(true);
 	});
 
 	test('time: outside earliest', () => {
-		const chosenTime = global.NOW - (60 * 60 * 24 * 31); // 31 days ago
-		const earliestTime = global.NOW - (60 * 60 * 24 * 30); // 30 days ago
-		const latestTime = global.NOW;
+		const chosenTime = global.FIXED_NOW - (60 * 60 * 24 * 31); // 31 days ago
+		const earliestTime = global.FIXED_NOW - (60 * 60 * 24 * 30); // 30 days ago
+		const latestTime = global.FIXED_NOW;
 		expect(validTime(chosenTime, earliestTime, latestTime)).toBe(false);
 	});
 
 	test('time: outside latest', () => {
 		const chosenTime = -1;
-		const earliestTime = global.NOW - (60 * 60 * 24 * 30); // 30 days ago
-		const latestTime = global.NOW;
+		const earliestTime = global.FIXED_NOW - (60 * 60 * 24 * 30); // 30 days ago
+		const latestTime = global.FIXED_NOW;
 		expect(validTime(chosenTime, earliestTime, latestTime)).toBe(false);
 	});
 
 	test('time: inference in', () => {
-		const chosenTime = global.NOW - (60 * 60 * 24 * 15); // 15 days ago
+		const chosenTime = global.FIXED_NOW - (60 * 60 * 24 * 15); // 15 days ago
 		expect(validTime(chosenTime)).toBe(true);
 	});
 
 	test('time: inference out', () => {
-		const chosenTime = global.NOW - (60 * 60 * 24 * 31); // 31 days ago
+		const chosenTime = global.FIXED_NOW - (60 * 60 * 24 * 31); // 31 days ago
 		expect(validTime(chosenTime)).toBe(false);
 	});
 });
@@ -547,7 +548,7 @@ describe('utilities', () => {
 	test('date: future', () => {
 		const futureDate = date(10, false, 'YYYY-MM-DD')();
 		expect(dayjs(futureDate, 'YYYY-MM-DD').isValid()).toBeTruthy();
-		expect(dayjs(futureDate).isAfter(dayjs.unix(global.NOW))).toBeTruthy();
+		expect(dayjs(futureDate).isAfter(dayjs.unix(global.FIXED_NOW))).toBeTruthy();
 	});
 
 	test('dates: pairs', () => {

package/tsconfig.json

@@ -11,7 +11,7 @@
   },
   "include": [
     "**/*.js"
-, "soupTemplates.mjs", "tests/testSoup.mjs", "tests/testCases.mjs", "tests/benchmark/concurrency.mjs"  ],
+, "soupTemplates.mjs", "tests/testSoup.mjs", "tests/testCases.mjs", "tests/benchmark/concurrency.mjs", "dungeons/pos.mjs", "scripts/new-project.mjs"  ],
   "exclude": [
     "node_modules"
   ]

package/types.d.ts

@@ -44,6 +44,7 @@ declare namespace main {
     verbose?: boolean;
     hasAnonIds?: boolean;
     hasSessionIds?: boolean;
+	alsoInferFunnels?: boolean;
     makeChart?: boolean | string;
 
     //models

package/scripts/deps.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-npm i mixpanel-import@latest --save
-npm i ak-tools@latest --save