Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .chronus/changes/migrate-tester-v2-libs-2026-2-4-17-51-22.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
changeKind: internal
packages:
- "@typespec/html-program-viewer"
---

Migrate all libraries except compiler to tester v2
1 change: 1 addition & 0 deletions .chronus/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,5 @@ additionalPackages:
changedFiles:
- "!**/*.md"
- "!**/*.test.ts"
- "!**/packages/*/test/**/*"
- "!**/*.e2e.ts"
33 changes: 9 additions & 24 deletions packages/asset-emitter/test/host.ts
Original file line number Diff line number Diff line change
@@ -1,37 +1,22 @@
import { resolvePath } from "@typespec/compiler";
import { createTestHost, type TypeSpecTestLibrary } from "@typespec/compiler/testing";
import { fileURLToPath } from "url";
import { createTester, mockFile } from "@typespec/compiler/testing";
import { expect, type MockInstance, vi } from "vitest";
import { createAssetEmitter, TypeEmitter } from "../src/index.js";

export const lib: TypeSpecTestLibrary = {
name: "typespec-ts-interface-emitter",
packageRoot: resolvePath(fileURLToPath(import.meta.url), "../../../"),
files: [
{
realDir: "",
pattern: "package.json",
virtualPath: "./node_modules/typespec-ts-interface-emitter",
},
{
realDir: "dist/src",
pattern: "*.js",
virtualPath: "./node_modules/typespec-ts-interface-emitter/dist/src",
},
],
};
const Tester = createTester(resolvePath(import.meta.dirname, ".."), {
libraries: [],
});

export async function getHostForTypeSpecFile(contents: string, decorators?: Record<string, any>) {
const host = await createTestHost();
let tester = Tester;
if (decorators) {
await host.addJsFile("dec.js", decorators);
tester = tester.files({ "dec.js": mockFile.js(decorators) });
contents = `import "./dec.js";\n` + contents;
}
await host.addTypeSpecFile("main.tsp", contents);
await host.compile("main.tsp", {
outputDir: "tsp-output",
const [result] = await tester.compileAndDiagnose(contents, {
compilerOptions: { outputDir: "tsp-output" },
});
return host;
return { program: result.program, compilerHost: result.fs.compilerHost };
}

export async function emitTypeSpec(
Expand Down
94 changes: 34 additions & 60 deletions packages/events/test/decorators.test.ts
Original file line number Diff line number Diff line change
@@ -1,41 +1,31 @@
import type { Model, Union } from "@typespec/compiler";
import {
expectDiagnosticEmpty,
expectDiagnostics,
type BasicTestRunner,
} from "@typespec/compiler/testing";
import { assert, beforeEach, describe, expect, it } from "vitest";
import type { Model } from "@typespec/compiler";
import { expectDiagnosticEmpty, expectDiagnostics, t } from "@typespec/compiler/testing";
import { describe, expect, it } from "vitest";
import { getContentType, isEventData, isEvents } from "../src/decorators.js";
import { unsafe_getEventDefinitions as getEventDefinitions } from "../src/experimental/index.js";
import { createEventsTestRunner } from "./test-host.js";

let runner: BasicTestRunner;

beforeEach(async () => {
runner = await createEventsTestRunner();
});
import { Tester } from "./test-host.js";

describe("@events", () => {
it("marks the union as containing event definitions", async () => {
const { MixedEvents } = await runner.compile(`@test @events union MixedEvents {}`);
const { MixedEvents, program } = await Tester.compile(
t.code`@events union ${t.union("MixedEvents")} {}`,
);

expect(isEvents(runner.program, MixedEvents as Union)).toBe(true);
expect(isEvents(program, MixedEvents)).toBe(true);
});

it("can contain multiple event definitions", async () => {
const { MixedEvents, JsonEvent, StringEvent } = await runner.compile(
`
@test
model StringEvent {
const { MixedEvents, JsonEvent, StringEvent, program } = await Tester.compile(
t.code`
model ${t.model("StringEvent")} {
payload: {
@Events.contentType("text/plain")
@Events.data
foo: string;
};
}

@test
model JsonEvent {
model ${t.model("JsonEvent")} {
@Events.data
@Events.contentType("application/json")
payload: {
Expand All @@ -44,9 +34,8 @@ model JsonEvent {
};
}

@test
@events
union MixedEvents {
union ${t.union("MixedEvents")} {
@Events.contentType("application/json")
stringEvent: StringEvent,

Expand All @@ -58,14 +47,10 @@ union MixedEvents {
`,
);

assert(MixedEvents.kind === "Union");
assert(JsonEvent.kind === "Model");
assert(StringEvent.kind === "Model");

const variants = Array.from(MixedEvents.variants.values());

expect(isEvents(runner.program, MixedEvents)).toBe(true);
const [eventDefinitions, diagnostics] = getEventDefinitions(runner.program, MixedEvents);
expect(isEvents(program, MixedEvents)).toBe(true);
const [eventDefinitions, diagnostics] = getEventDefinitions(program, MixedEvents);
expectDiagnosticEmpty(diagnostics);

expect(eventDefinitions.length).toBe(3);
Expand Down Expand Up @@ -101,14 +86,15 @@ union MixedEvents {

describe("@data", () => {
it("marks a model property as being the event payload", async () => {
const { Event } = await runner.compile(`@test model Event { @data foo: string }`);
assert(Event.kind === "Model");
const { Event, program } = await Tester.compile(
t.code`model ${t.model("Event")} { @data foo: string }`,
);

expect(isEventData(runner.program, Event.properties.get("foo")!)).toBe(true);
expect(isEventData(program, Event.properties.get("foo")!)).toBe(true);
});

it("can be applied directly only once in an event model", async () => {
const diagnostics = await runner.diagnose(
const diagnostics = await Tester.diagnose(
`
model SampleEvent {
@data
Expand All @@ -131,7 +117,7 @@ union SampleEvents {
});

it("cannot be applied directly more than once in an event model", async () => {
const diagnostics = await runner.diagnose(
const diagnostics = await Tester.diagnose(
`
model SampleEvent {
@data
Expand All @@ -155,7 +141,7 @@ union SampleEvents {
});

it("cannot be applied indirectly more than once in an event model", async () => {
const diagnostics = await runner.diagnose(
const diagnostics = await Tester.diagnose(
`
model Foo {
@data
Expand All @@ -181,7 +167,7 @@ union SampleEvents {
});

it("cannot be applied in a Record", async () => {
const diagnostics = await runner.diagnose(
const diagnostics = await Tester.diagnose(
`
model Foo {
@data
Expand All @@ -206,7 +192,7 @@ union SampleEvents {
});

it("cannot be applied in an Array", async () => {
const diagnostics = await runner.diagnose(
const diagnostics = await Tester.diagnose(
`
model Foo {
@data
Expand All @@ -231,7 +217,7 @@ union SampleEvents {
});

it("detects multiple event payloads nested in tuples", async () => {
const diagnostics = await runner.diagnose(
const diagnostics = await Tester.diagnose(
`
model Foo {
@data
Expand Down Expand Up @@ -265,41 +251,34 @@ union SampleEvents {

describe("@contentType", () => {
it("can set the top-level event's content-type", async () => {
const { MixedEvents, TargetEvent } = await runner.compile(
`
const { stringEvent, program } = await Tester.compile(
t.code`
model StringEvent {
@Events.contentType("text/plain")
@Events.data
payload: string;
}

@test
@events
union MixedEvents {
@test("TargetEvent")
@Events.contentType("application/json")
stringEvent: StringEvent,
${t.unionVariant("stringEvent")}: StringEvent,
}
`,
);

assert(MixedEvents.kind === "Union");
assert(TargetEvent.kind === "UnionVariant");

expect(getContentType(runner.program, TargetEvent)).toBe("application/json");
expect(getContentType(program, stringEvent)).toBe("application/json");
});

it("can set the event payload's content-type", async () => {
const { MixedEvents, EventPayload } = await runner.compile(
`
const { payload, program } = await Tester.compile(
t.code`
model StringEvent {
@test("EventPayload")
@Events.contentType("text/plain")
@Events.data
payload: string;
${t.modelProperty("payload")}: string;
}

@test
@events
union MixedEvents {
@Events.contentType("application/json")
Expand All @@ -308,22 +287,17 @@ union MixedEvents {
`,
);

assert(MixedEvents.kind === "Union");
assert(EventPayload.kind === "ModelProperty");

expect(getContentType(runner.program, EventPayload)).toBe("text/plain");
expect(getContentType(program, payload)).toBe("text/plain");
});

it("cannot be set on a non-payload property", async () => {
const diagnostics = await runner.diagnose(
const diagnostics = await Tester.diagnose(
`
model StringEvent {
@test("EventPayload")
@Events.contentType("text/plain")
payload: string;
}

@test
@events
union MixedEvents {
stringEvent: StringEvent,
Expand Down
19 changes: 7 additions & 12 deletions packages/events/test/test-host.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import { createTestHost, createTestWrapper } from "@typespec/compiler/testing";
import { EventsTestLibrary } from "../src/testing/index.js";
import { resolvePath } from "@typespec/compiler";
import { createTester } from "@typespec/compiler/testing";

export async function createEventsTestHost() {
return createTestHost({
libraries: [EventsTestLibrary],
});
}

export async function createEventsTestRunner() {
const host = await createEventsTestHost();
return createTestWrapper(host, { autoUsings: ["TypeSpec.Events"] });
}
export const Tester = createTester(resolvePath(import.meta.dirname, ".."), {
libraries: ["@typespec/events"],
})
.importLibraries()
.using("Events");
7 changes: 3 additions & 4 deletions packages/html-program-viewer/src/react/type-graph.test.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { render } from "@testing-library/react";
import { it } from "vitest";
import { createViewerTestRunner } from "../../test/test-host.js";
import { Tester } from "../../test/test-host.js";
import { TypeGraph } from "./index.js";

async function renderTypeGraphFor(code: string) {
const runner = await createViewerTestRunner();
await runner.compile(code);
render(<TypeGraph program={runner.program} />);
const { program } = await Tester.compile(code);
render(<TypeGraph program={program} />);
}

it("operation", async () => {
Expand Down
15 changes: 4 additions & 11 deletions packages/html-program-viewer/test/emitter.test.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
import type { BasicTestRunner } from "@typespec/compiler/testing";
import { beforeEach, it } from "vitest";
import { createViewerTestRunner } from "./test-host.js";
import { it } from "vitest";
import { Tester } from "./test-host.js";

let runner: BasicTestRunner;

beforeEach(async () => {
runner = await createViewerTestRunner();
});
const EmitterTester = Tester.emit("@typespec/html-program-viewer");

it("runs emitter", async () => {
await runner.compile(`op foo(): string;`, {
emit: ["@typespec/html-program-viewer"],
});
await EmitterTester.compile(`op foo(): string;`);
});
19 changes: 5 additions & 14 deletions packages/html-program-viewer/test/test-host.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
import { createTestHost, createTestWrapper } from "@typespec/compiler/testing";
import { ProgramViewerTestLibrary } from "../src/testing/index.js";
import { resolvePath } from "@typespec/compiler";
import { createTester } from "@typespec/compiler/testing";

export async function createViewerTestHost() {
return createTestHost({
libraries: [ProgramViewerTestLibrary],
});
}

export async function createViewerTestRunner() {
const host = await createViewerTestHost();
return createTestWrapper(host, {
autoImports: [],
});
}
export const Tester = createTester(resolvePath(import.meta.dirname, ".."), {
libraries: ["@typespec/html-program-viewer"],
});
Loading
Loading