fix: reverse func calls so that the latest ones are captured

Author: skoshx

src/core/captureLimits.ts

@@ -11,16 +11,18 @@ export function getSizeLimitedCaptures<T extends CapturedCall | CapturedFunction
 	callsOrFunctions: T[],
 	sizeLimitBytes: number
 ) {
+	const callsOrFunctionsReversed = callsOrFunctions.slice().reverse()
+
 	let currentSize = 0
 	let result: T[] = []
 
-	const callsOrFunctionsClone = callsOrFunctions.map((callOrFunc) => ({
+	const callsOrFunctionsClone = callsOrFunctionsReversed.map((callOrFunc) => ({
 		id: callOrFunc.id,
 		invocations: [...callOrFunc.invocations]
 	}))
 
-	for (let i = 0; i < callsOrFunctions.length; i++) {
-		result.push({ id: callsOrFunctions[i].id, invocations: [] as T['invocations'] } as T)
+	for (let i = 0; i < callsOrFunctionsReversed.length; i++) {
+		result.push({ id: callsOrFunctionsReversed[i].id, invocations: [] as T['invocations'] } as T)
 	}
 
 	let addedThisRound = false

src/index.ts

@@ -41,9 +41,9 @@ export const clearCapturedCalls = () => {
 export type UfcReturnType<T, O extends FlytrapCallOptions> = T extends AnyFunction
 	? ReturnType<T>
 	: T extends object
-		? // @ts-expect-error
-			ReturnType<T[O['name']]>
-		: never
+	  ? // @ts-expect-error
+	    ReturnType<T[O['name']]>
+	  : never
 
 export function ufc<T, O extends FlytrapCallOptions>(
 	functionOrNamespace: T,
@@ -287,22 +287,13 @@ function saveFunctionCall(opts: FlytrapCallOptions) {
 }
 
 function saveOutputForFunctionCall<T>(functionCallId: string, output: T) {
-	// @ts-ignore for some reason this isn't included
-	// const functionCallIndex = _functionCalls.findLastIndex((call) => call.id === functionCallId)
 	const functionCall = getFunctionCallById(functionCallId)
 
-	// console.log("function calls invocations length", _functionCalls.reduce((acc, curr) => acc + curr.invocations.length, 0))
-
 	if (functionCall === undefined) {
 		log.error('error', `Saving output for nonexistent function call with ID "${functionCallId}"`)
 		return
 	}
 
-	/* if (functionCallIndex === -1) {
-		log.error('error', `Saving output for nonexistent function call with ID "${functionCallId}"`)
-		return
-	} */
-
 	const lastInvocation = functionCall.invocations.at(-1)
 	if (lastInvocation) lastInvocation.output = output
 }
@@ -317,14 +308,6 @@ function saveOutputForFunction<T>(functionId: string, output: T) {
 		return
 	}
 
-	/* if (functionIndex === -1) {
-		log.error('error', `Saving output for nonexistent function with ID "${functionId}"`)
-		return
-	} */
-
-	// console.log("functions invocations length", _executingFunctions.reduce((acc, curr) => acc + curr.invocations.length, 0))
-
-	// const lastInvocation = _executingFunctions[functionIndex].invocations.at(-1)
 	const lastInvocation = functionDef.invocations.at(-1)
 	if (lastInvocation) lastInvocation.output = output
 }
@@ -336,7 +319,6 @@ function getFunctionCallById(functionCallId: string) {
 		}
 	}
 	return undefined
-	// return _functionCalls.find((call) => call.id === functionCallId)
 }
 
 function getFunctionById(functionId: string) {
@@ -347,7 +329,6 @@ function getFunctionById(functionId: string) {
 	}
 
 	return undefined
-	// return _executingFunctions.find((func) => func.id === functionId)
 }
 
 // TODO: let's make overloaded calls like this for `capture`

test/captureLimits.test.ts

@@ -80,7 +80,7 @@ describe('capture limits', () => {
 	it('saves everything when capture limit is more than data', () => {
 		const limitedResult = getSizeLimitedCaptures(callsFixture, 6_000).unwrap()
 		const { calls: newCalls } = limitedResult
-		expect(newCalls).toStrictEqual(callsFixture)
+		expect(newCalls).toStrictEqual(callsFixture.slice().reverse())
 	})
 
 	it('does capture limiting depth (functions & calls) first, instead of bredth first (invocations)', () => {
@@ -91,8 +91,8 @@ describe('capture limits', () => {
 		expect(newCalls.length).toBe(3)
 		expect(newCalls).toStrictEqual([
 			{
-				id: '/a.js-call-_a',
-				invocations: [2].map((timestamp) => ({
+				id: '/c.js-call-_c',
+				invocations: [9].map((timestamp) => ({
 					args: [],
 					output: createData(2),
 					timestamp
@@ -107,8 +107,8 @@ describe('capture limits', () => {
 				}))
 			},
 			{
-				id: '/c.js-call-_c',
-				invocations: [9].map((timestamp) => ({
+				id: '/a.js-call-_a',
+				invocations: [2].map((timestamp) => ({
 					args: [],
 					output: createData(2),
 					timestamp
@@ -126,8 +126,8 @@ describe('capture limits', () => {
 		expect(secondTestCaseCalls.length).toBe(3)
 		expect(secondTestCaseCalls).toStrictEqual([
 			{
-				id: '/a.js-call-_a',
-				invocations: [1, 2].map((timestamp) => ({
+				id: '/c.js-call-_c',
+				invocations: [8, 9].map((timestamp) => ({
 					args: [],
 					output: createData(2),
 					timestamp
@@ -142,8 +142,8 @@ describe('capture limits', () => {
 				}))
 			},
 			{
-				id: '/c.js-call-_c',
-				invocations: [8, 9].map((timestamp) => ({
+				id: '/a.js-call-_a',
+				invocations: [1, 2].map((timestamp) => ({
 					args: [],
 					output: createData(2),
 					timestamp