* chore: close a batch of quality-gate & tidy gaps (#1785 #1787 #1789 #1790 #1767) Bundles five small, related tidy/gate items into one PR: - #1785: delete the dead src/types/navigation.ts InspectorTab (0 importers; duplicated/drifted from utils/inspectorTabs InspectorTabId). src/types/ now holds only ambient .d.ts stubs. - #1787: add src/hooks/** to the web coverage `include` (it was silently outside the ≥90 gate) and add tests for the two untested hooks, useServerJsonImport and useImportClientConfig, bringing every hook to ≥90 on lines/statements/functions/branches. - #1789: widen clients/{cli,tui,launcher} format/format:check to their top-level configs; add root format:shared / format:check:shared covering test-servers/src/**, vitest.shared.mts, and the repo-root eslint.config.js. - #1790: pin prettier to an exact version (3.8.4, dropping the ^3.8.1 caret) in all five package.json files so the format gate's verdict can't shift with an in-range patch bump; lockfiles synced. - #1767: its root-file format+lint gap is closed here (format:shared + a new lint:shared via a second files block in the root eslint.config.js; web/server/ was already gated in #1788). Its larger cli/tui __tests__ typecheck piece (76 type errors) is split out to #1791. Prettier-normalized the newly-covered files (pure formatting). No runtime behavior change. `npm run ci` green. Closes #1785 Closes #1787 Closes #1789 Closes #1790 Closes #1767 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * chore: address PR #1792 review findings - #1789 gap: widen clients/web format to include .storybook and clients/ launcher format to include scripts/; reformat the 3 .storybook files (were non-conforming under the pinned prettier 3.8.4). Audited all 885 tracked source files — now fully prettier-clean. - Export VALIDATE_DEBOUNCE_MS / COLLAPSE_DELAY_MS / HIGHLIGHT_DURATION_MS from useServerJsonImport and use them in the test instead of hardcoded 300/1000/250 (so a tuned constant can't silently desync the test). - Assert the symmetric renameErrors["alpha"] alongside ["beta"] so a one-directional collision-check regression fails. - Comment the blank-rename test as exercising a UI-unreachable defensive branch (canImport gates submit). - Un-stale the two specification/v2_ux_interfaces_plan.md references to the now-removed navigation.ts InspectorTab. npm run ci green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * docs: sync AGENTS.md format-surface description with the widened globs (#1792 review r2) 1ce3b64 added .storybook to clients/web's format glob and scripts/ to clients/launcher's, but AGENTS.md:222 still described the pre-fix scope. Bring it in line and note the non-recursive top-level glob is why nested dirs are named explicitly. Docs only. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * chore: handle PR #1792 round-3 follow-ups in-place (format-coverage guard, uniform globs, theme gate) Rather than defer these to tickets, fold them into this PR: - Obs 2: widen every client + root format glob to a uniform *.{ts,tsx,mts,cts,js,jsx,mjs,cjs} so a future .mts/.cjs/.tsx top-level file can't silently slip the gate. - Obs 1: add scripts/verify-format-coverage.mjs (wired into `validate`) — it parses the format:check globs out of every package.json, enumerates all tracked source files, and fails listing any not covered by a glob. The durable, standing version of #1789's one-shot audit; negative-tested. - Obs 3: bring src/theme/** under the coverage gate (21/23 files were already ≥90 transitively; add Paper.test.tsx for the one laggard, Paper.ts). src/App.tsx (~4.5k lines, ~42% branches) is converted from a silent omission into an explicit, documented exclusion (comment on the coverage `include` + AGENTS.md) — gating it is a dedicated effort, not a whitelist tweak. npm run ci green (the new guard reports 885/885 tracked source files gated). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * chore: address PR #1792 round-4 findings (guard hardening, docs, exclusion list) - Harden verify-format-coverage: only harvest format:check globs from scripts transitively reachable from `validate` (via npm run refs), so an unwired/renamed format:check no longer counts as coverage. Negative-tested — renaming clients/web format:check to an unreferenced name now fails the guard (627 files flagged) instead of passing. - Name src/main.tsx and src/index.ts (browser + bin bootstraps) alongside src/App.tsx in the coverage-include comment and AGENTS.md, so the documented exclusion list is complete rather than claiming App.tsx is the only one. - Doc sync: document verify:format-coverage (AGENTS.md + README script table + scripts/ layout line), fix the `validate` ordering (verify:format- coverage now runs before validate:core) in AGENTS.md and README, and update the quoted globs to the uniform *.{ts,tsx,mts,cts,js,jsx,mjs,cjs} / test-servers *.{ts,tsx,mts,cts}. npm run ci green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * chore: address PR #1792 round-5 findings (airtight guard + doc/config sync) - verify-format-coverage: assert the root `validate` chain invokes each client's `validate` (cd <dir> && npm run validate), closing the last reachability edge — a client dropped from the root chain now fails the guard even though its own globs still exist. Negative-tested. - eslint.config.js: widen the shared `files` block to test-servers/src/**/*.{ts,tsx,mts,cts} to match the widened lint:shared glob, so a future .mts/.cts there is lint-gated, not just prettier-gated. - AGENTS.md: scope the "uniform extension set" claim to client globs (core stays {ts,tsx}, shared {ts,tsx,mts,cts}), with verify:format-coverage as the backstop — removing the self-contradiction with the line below. npm run ci green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
257 lines
8.6 KiB
TypeScript
257 lines
8.6 KiB
TypeScript
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
|
import { renderHook, act } from "@testing-library/react";
|
|
import {
|
|
useServerJsonImport,
|
|
VALIDATE_DEBOUNCE_MS,
|
|
COLLAPSE_DELAY_MS,
|
|
HIGHLIGHT_DURATION_MS,
|
|
type UseServerJsonImportOptions,
|
|
} from "./useServerJsonImport";
|
|
|
|
// A valid registry server.json with two runnable options; option 0 declares a
|
|
// required env var (with no default) and an optional one (with a default).
|
|
const VALID_SERVER_JSON = JSON.stringify({
|
|
name: "io.github.acme/weather",
|
|
packages: [
|
|
{
|
|
registryType: "npm",
|
|
identifier: "weather-mcp",
|
|
environmentVariables: [
|
|
{ name: "API_KEY", isRequired: true, description: "The key" },
|
|
{ name: "REGION", isRequired: false, default: "us" },
|
|
],
|
|
},
|
|
{ registryType: "pypi", identifier: "weather-py" },
|
|
],
|
|
});
|
|
|
|
function setup(over: Partial<UseServerJsonImportOptions> = {}) {
|
|
const onAddServer = over.onAddServer ?? vi.fn(async () => {});
|
|
const opts: UseServerJsonImportOptions = {
|
|
opened: true,
|
|
existingIds: [],
|
|
onAddServer,
|
|
...over,
|
|
};
|
|
const view = renderHook(
|
|
(p: UseServerJsonImportOptions) => useServerJsonImport(p),
|
|
{ initialProps: opts },
|
|
);
|
|
return { ...view, onAddServer };
|
|
}
|
|
|
|
/** Set the textarea content and flush the validation debounce. */
|
|
function typeAndFlush(
|
|
result: { current: ReturnType<typeof useServerJsonImport> },
|
|
content: string,
|
|
) {
|
|
act(() => result.current.setRawText(content));
|
|
act(() => {
|
|
vi.advanceTimersByTime(VALIDATE_DEBOUNCE_MS);
|
|
});
|
|
}
|
|
|
|
describe("useServerJsonImport", () => {
|
|
beforeEach(() => {
|
|
vi.useFakeTimers();
|
|
});
|
|
afterEach(() => {
|
|
vi.runOnlyPendingTimers();
|
|
vi.useRealTimers();
|
|
});
|
|
|
|
it("starts empty with an info prompt and the Add button disabled", () => {
|
|
const { result } = setup();
|
|
expect(result.current.draft.rawText).toBe("");
|
|
expect(result.current.canAdd).toBe(false);
|
|
expect(result.current.validation).toEqual([
|
|
{ type: "info", message: "Paste server.json content to validate." },
|
|
]);
|
|
expect(result.current.packages).toBeUndefined();
|
|
expect(result.current.envVars).toEqual([]);
|
|
});
|
|
|
|
it("validates pasted content and enables Add", () => {
|
|
const { result } = setup();
|
|
typeAndFlush(result, VALID_SERVER_JSON);
|
|
expect(result.current.canAdd).toBe(true);
|
|
expect(result.current.defaultServerName).toBe("weather");
|
|
expect(result.current.packages).toHaveLength(2);
|
|
expect(result.current.validation[0]).toMatchObject({ type: "success" });
|
|
expect(result.current.validation[1]).toMatchObject({ type: "info" });
|
|
// Env vars of the first option, with the optional one's default prefilled.
|
|
expect(result.current.envVars).toEqual([
|
|
{ name: "API_KEY", description: "The key", required: true, value: "" },
|
|
{ name: "REGION", description: undefined, required: false, value: "us" },
|
|
]);
|
|
});
|
|
|
|
it("surfaces a parse error for invalid JSON", () => {
|
|
const { result } = setup();
|
|
typeAndFlush(result, "{ not json");
|
|
expect(result.current.canAdd).toBe(false);
|
|
expect(result.current.validation[0].type).toBe("error");
|
|
});
|
|
|
|
it("flags an invalid overridden id", () => {
|
|
const { result } = setup();
|
|
typeAndFlush(result, VALID_SERVER_JSON);
|
|
act(() => result.current.setServerName("bad id!"));
|
|
expect(result.current.canAdd).toBe(false);
|
|
expect(
|
|
result.current.validation.some(
|
|
(v) => v.type === "error" && v.message.includes("Server id"),
|
|
),
|
|
).toBe(true);
|
|
});
|
|
|
|
it("warns on a duplicate id", () => {
|
|
const { result } = setup({ existingIds: ["weather"] });
|
|
typeAndFlush(result, VALID_SERVER_JSON);
|
|
expect(result.current.canAdd).toBe(false);
|
|
expect(
|
|
result.current.validation.some(
|
|
(v) => v.type === "warning" && v.message.includes("already exists"),
|
|
),
|
|
).toBe(true);
|
|
});
|
|
|
|
it("selectPackage switches the active option and its env vars", () => {
|
|
const { result } = setup();
|
|
typeAndFlush(result, VALID_SERVER_JSON);
|
|
act(() => result.current.selectPackage(1));
|
|
expect(result.current.draft.selectedPackageIndex).toBe(1);
|
|
// The pypi option declares no env vars.
|
|
expect(result.current.envVars).toEqual([]);
|
|
});
|
|
|
|
it("setEnvVar overrides a declared env value", () => {
|
|
const { result } = setup();
|
|
typeAndFlush(result, VALID_SERVER_JSON);
|
|
act(() => result.current.setEnvVar("API_KEY", "secret"));
|
|
expect(
|
|
result.current.envVars.find((v) => v.name === "API_KEY")?.value,
|
|
).toBe("secret");
|
|
});
|
|
|
|
it("re-opens the File Contents disclosure when cleared", () => {
|
|
const { result } = setup();
|
|
typeAndFlush(result, VALID_SERVER_JSON);
|
|
act(() => result.current.setFileContentsOpen(false));
|
|
expect(result.current.fileContentsOpen).toBe(false);
|
|
typeAndFlush(result, "");
|
|
expect(result.current.fileContentsOpen).toBe(true);
|
|
});
|
|
|
|
it("flashes then auto-collapses the disclosure after content loads", () => {
|
|
const { result } = setup();
|
|
act(() => result.current.setRawText(VALID_SERVER_JSON));
|
|
expect(result.current.fileContentsOpen).toBe(true);
|
|
act(() => {
|
|
vi.advanceTimersByTime(COLLAPSE_DELAY_MS);
|
|
});
|
|
expect(result.current.fileContentsHighlight).toBe(true);
|
|
act(() => {
|
|
vi.advanceTimersByTime(HIGHLIGHT_DURATION_MS);
|
|
});
|
|
expect(result.current.fileContentsHighlight).toBe(false);
|
|
expect(result.current.fileContentsOpen).toBe(false);
|
|
});
|
|
|
|
it("resets its state when the modal is re-opened", () => {
|
|
const { result, rerender } = setup({ opened: false });
|
|
// Open, dirty the draft, then close and re-open — the draft must clear.
|
|
rerender({ opened: true, existingIds: [], onAddServer: vi.fn() });
|
|
typeAndFlush(result, VALID_SERVER_JSON);
|
|
expect(result.current.draft.rawText).not.toBe("");
|
|
rerender({ opened: false, existingIds: [], onAddServer: vi.fn() });
|
|
rerender({ opened: true, existingIds: [], onAddServer: vi.fn() });
|
|
expect(result.current.draft.rawText).toBe("");
|
|
});
|
|
|
|
it("pickFile reads a file into the draft", async () => {
|
|
const { result } = setup();
|
|
const file = new File([VALID_SERVER_JSON], "server.json");
|
|
await act(async () => {
|
|
await result.current.pickFile(file);
|
|
});
|
|
expect(result.current.draft.rawText).toBe(VALID_SERVER_JSON);
|
|
});
|
|
|
|
it("pickFile ignores a null file", async () => {
|
|
const { result } = setup();
|
|
await act(async () => {
|
|
await result.current.pickFile(null);
|
|
});
|
|
expect(result.current.draft.rawText).toBe("");
|
|
});
|
|
|
|
it("pickFile surfaces a read error", async () => {
|
|
const { result } = setup();
|
|
const file = new File(["x"], "server.json");
|
|
vi.spyOn(file, "text").mockRejectedValue(new Error("read boom"));
|
|
await act(async () => {
|
|
await result.current.pickFile(file);
|
|
});
|
|
expect(
|
|
result.current.validation.some((v) => v.message.includes("read boom")),
|
|
).toBe(true);
|
|
});
|
|
|
|
it("submit persists the selected server and resolves true", async () => {
|
|
const onAddServer = vi.fn(async () => {});
|
|
const { result } = setup({ onAddServer });
|
|
typeAndFlush(result, VALID_SERVER_JSON);
|
|
let ok = false;
|
|
await act(async () => {
|
|
ok = await result.current.submit();
|
|
});
|
|
expect(ok).toBe(true);
|
|
expect(onAddServer).toHaveBeenCalledWith("weather", expect.any(Object));
|
|
});
|
|
|
|
it("submit refuses invalid content", async () => {
|
|
const onAddServer = vi.fn(async () => {});
|
|
const { result } = setup({ onAddServer });
|
|
typeAndFlush(result, "{ not json");
|
|
let ok = true;
|
|
await act(async () => {
|
|
ok = await result.current.submit();
|
|
});
|
|
expect(ok).toBe(false);
|
|
expect(onAddServer).not.toHaveBeenCalled();
|
|
expect(
|
|
result.current.validation.some((v) =>
|
|
v.message.includes("Fix the validation errors"),
|
|
),
|
|
).toBe(true);
|
|
});
|
|
|
|
it("submit refuses a duplicate id", async () => {
|
|
const onAddServer = vi.fn(async () => {});
|
|
const { result } = setup({ existingIds: ["weather"], onAddServer });
|
|
typeAndFlush(result, VALID_SERVER_JSON);
|
|
let ok = true;
|
|
await act(async () => {
|
|
ok = await result.current.submit();
|
|
});
|
|
expect(ok).toBe(false);
|
|
expect(onAddServer).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("submit surfaces an onAddServer failure", async () => {
|
|
const onAddServer = vi.fn(async () => {
|
|
throw new Error("save boom");
|
|
});
|
|
const { result } = setup({ onAddServer });
|
|
typeAndFlush(result, VALID_SERVER_JSON);
|
|
let ok = true;
|
|
await act(async () => {
|
|
ok = await result.current.submit();
|
|
});
|
|
expect(ok).toBe(false);
|
|
expect(
|
|
result.current.validation.some((v) => v.message.includes("save boom")),
|
|
).toBe(true);
|
|
});
|
|
});
|