Skip to content

Use proper types in cli tests instead of custom inline types #6038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
canova merged 2 commits into from
May 22, 2026
Merged

Use proper types in cli tests instead of custom inline types #6038

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7ebff0
Use proper types in cli tests instead of custom inline types
canova May 15, 2026
075ca65
Merge branch 'main' into pq-test-types
canova May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 20 additions & 47 deletions profiler-cli/src/test/integration/basic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ import {
type CliTestContext,
} from './utils';

import type { FilterStackResult } from '../../protocol';
import type {
FilterStackResult,
SessionMetadata,
StatusResult,
ThreadSamplesResult,
WithContext,
} from '../../protocol';

describe('profiler-cli basic functionality', () => {
let ctx: CliTestContext;
Expand Down Expand Up @@ -156,15 +162,7 @@ describe('profiler-cli basic functionality', () => {
await cli(ctx, ['filter', 'push', '--merge', 'f-1,f-2']);

const filterListResult = await cli(ctx, ['filter', 'list', '--json']);
const filterList = JSON.parse(filterListResult.stdout) as {
type: string;
threadHandle: string;
filters: Array<{
index: number;
transforms: Array<{ type: string; funcIndex?: number }>;
description: string;
}>;
};
const filterList = JSON.parse(filterListResult.stdout) as FilterStackResult;

expect(filterList.type).toBe('filter-stack');
expect(filterList.threadHandle).toBe('t-0');
Expand All @@ -177,15 +175,7 @@ describe('profiler-cli basic functionality', () => {
expect(filterList.filters[0].description).toBe('merge: f-1, f-2');

const statusResult = await cli(ctx, ['status', '--json']);
const status = JSON.parse(statusResult.stdout) as {
type: string;
filterStacks: Array<{
threadHandle: string;
filters: Array<{
transforms: Array<{ type: string; funcIndex?: number }>;
}>;
}>;
};
const status = JSON.parse(statusResult.stdout) as StatusResult;

expect(status.type).toBe('status');
expect(status.filterStacks).toHaveLength(1);
Expand All @@ -212,10 +202,7 @@ describe('profiler-cli basic functionality', () => {
]);
const otherThreadFilterList = JSON.parse(
otherThreadFilterListResult.stdout
) as {
threadHandle: string;
filters: unknown[];
};
) as FilterStackResult;

expect(otherThreadFilterList.threadHandle).toBe('t-1');
expect(otherThreadFilterList.filters).toHaveLength(0);
Expand All @@ -229,12 +216,7 @@ describe('profiler-cli basic functionality', () => {
]);
const explicitThreadFilterList = JSON.parse(
explicitThreadFilterListResult.stdout
) as {
threadHandle: string;
filters: Array<{
transforms: Array<{ type: string; funcIndex?: number }>;
}>;
};
) as FilterStackResult;

expect(explicitThreadFilterList.threadHandle).toBe('t-0');
expect(explicitThreadFilterList.filters).toHaveLength(1);
Expand All @@ -252,9 +234,7 @@ describe('profiler-cli basic functionality', () => {
't-0',
'--json',
]);
const afterPop = JSON.parse(afterPopResult.stdout) as {
filters: unknown[];
};
const afterPop = JSON.parse(afterPopResult.stdout) as FilterStackResult;
expect(afterPop.filters).toHaveLength(0);
});

Expand Down Expand Up @@ -286,11 +266,9 @@ describe('profiler-cli basic functionality', () => {
'--merge',
'f-1',
]);
const samples = JSON.parse(samplesResult.stdout) as {
type: string;
ephemeralFilters?: Array<{ type: string; funcIndexes?: number[] }>;
activeFilters?: unknown[];
};
const samples = JSON.parse(
samplesResult.stdout
) as WithContext<ThreadSamplesResult>;

expect(samples.type).toBe('thread-samples');
expect(samples.ephemeralFilters).toEqual([
Expand All @@ -299,15 +277,11 @@ describe('profiler-cli basic functionality', () => {
expect(samples.activeFilters).toBeUndefined();

const filterListResult = await cli(ctx, ['filter', 'list', '--json']);
const filterList = JSON.parse(filterListResult.stdout) as {
filters: unknown[];
};
const filterList = JSON.parse(filterListResult.stdout) as FilterStackResult;
expect(filterList.filters).toHaveLength(0);

const statusResult = await cli(ctx, ['status', '--json']);
const status = JSON.parse(statusResult.stdout) as {
filterStacks: unknown[];
};
const status = JSON.parse(statusResult.stdout) as StatusResult;
expect(status.filterStacks).toHaveLength(0);
});

Expand Down Expand Up @@ -338,10 +312,9 @@ describe('profiler-cli basic functionality', () => {
const sessionId = match![1];

const metadataPath = join(ctx.sessionDir, `${sessionId}.json`);
const metadata = JSON.parse(await readFile(metadataPath, 'utf-8')) as {
buildHash: string;
pid: number;
};
const metadata = JSON.parse(
await readFile(metadataPath, 'utf-8')
) as SessionMetadata;

await writeFile(
metadataPath,
Expand Down
Loading