test: fix regression tests and bring back execution cursor

Author: skoshx

src/index.ts

@@ -11,7 +11,7 @@ import { log } from './core/logging'
 import { saveCapture } from './core/newStorage'
 
 let _executingFunctions: CapturedFunction[] = []
-const _executionCursor = 1
+let _executionCursor = 1
 let _functionCalls: CapturedCall[] = []
 let _userId: string | undefined = undefined
 
@@ -85,12 +85,14 @@ export function uff<T extends AnyFunction>(func: T, id: string | null = null): T
 				timestamp: Date.now()
 			})
 		}
+		_executionCursor--
 		try {
 			const context = null
 			const functionOutput = func.apply(context ?? this, args)
 			if (id) {
 				saveOutputForFunction(id, functionOutput)
 			}
+			_executionCursor++
 			return functionOutput
 		} catch (error) {
 			/**

test/regression.test.ts

@@ -1,21 +1,22 @@
 import { describe, expect, it } from 'vitest'
 import { initTRPC } from '@trpc/server'
+import { removeCircularsAndNonPojos } from '../src/core/stringify'
 // import { removeCircularDependencies } from '../src/core/stringify'
 
 describe('Regression', () => {
-	/* it('regression #2 > can remove circulars from non-POJOs', () => {
+	it('regression #2 > can remove circulars from non-POJOs', () => {
 		const trpcInstance = initTRPC.create({})
-		const withoutCirculars = removeCircularDependencies(trpcInstance)
+		const withoutCirculars = removeCircularsAndNonPojos(trpcInstance)
 		expect(typeof withoutCirculars).toEqual('object')
 	})
 
-	it.skip("regression #3 > doesn't give false positives to circular", () => {
+	it("regression #3 > doesn't give false positives to circular", () => {
 		const items = ['abc', 'def']
 		const calls = [items, items]
-		const callsWithoutCirculars = removeCircularDependencies(calls)
+		const callsWithoutCirculars = removeCircularsAndNonPojos(calls)
 		expect(callsWithoutCirculars).toEqual([
 			['abc', 'def'],
 			['abc', 'def']
 		])
-	}) */
+	})
 })

test/transform-uff.test.ts

@@ -116,7 +116,7 @@ describe('functions', () => {
 	}
 })
 
-it('callee and accessorKey are correct', () => {
+it.only('callee and accessorKey are correct', () => {
 	const accessorKeyFixtures = [
 		/* {
 			fixture: 'parseFloat',
@@ -171,8 +171,9 @@ it('callee and accessorKey are correct', () => {
 
 	for (let i = 0; i < accessorKeyFixtures.length; i++) {
 		const fixture = accessorKeyFixtures[i].fixture
+
 		// @ts-expect-error
-		const node = parseCode(fixture).unwrap().data?.program?.body?.[0]?.expression
+		const node = parseCode(fixture).unwrap().program?.body?.[0]?.expression
 		if (node === undefined) {
 			throw new Error(`Could not parse fixture "${fixture}"`)
 		}