refactor: merge Prismic clients into one file

AGENTS.md

@@ -37,11 +37,11 @@ or app state; callers pass in what it needs.
 
 Prismic-domain logic shared by multiple commands. Still application-unaware.
 
-### `src/lib/prismic/clients/`
+### `src/lib/prismic/client.ts`
 
-One file per backend service. Network calls only: build the request, validate
-the response, return typed data. No orchestration, no business decisions, no
-console output.
+Every request to a Prismic backend service, in one file grouped by service.
+Network calls only: build the request, validate the response, return typed
+data. No orchestration, no business decisions, no console output.
 
 ## `src/adapters/`
 

src/adapters/index.ts

@@ -19,12 +19,7 @@ import {
 } from "../lib/file";
 import { stringify } from "../lib/json";
 import { getInstalledMajor, readPackageJson } from "../lib/packageJson";
-import {
-	addPreview,
-	getPreviews,
-	getSimulatorUrl,
-	setSimulatorUrl,
-} from "../lib/prismic/clients/core";
+import { addPreview, getPreviews, getSimulatorUrl, setSimulatorUrl } from "../lib/prismic/client";
 import {
 	canonicalizeCustomType,
 	canonicalizeSlice,
@@ -172,10 +167,10 @@ export abstract class Adapter {
 		if (setup) await this.setupProject();
 
 		const config = { repo: await getRepositoryName(), ...(await getCredentials()) };
-		if (!(await getSimulatorUrl(config))) {
+		if (!(await getSimulatorUrl(config)).simulator_url) {
 			await setSimulatorUrl(this.localSimulatorUrl, config);
 		}
-		if ((await getPreviews(config)).length === 0) {
+		if ((await getPreviews(config)).results.length === 0) {
 			await addPreview(this.localPreviewConfig, config);
 		}
 	}

src/auth.ts

@@ -10,7 +10,7 @@ import { CREDENTIALS_PATH } from "./config";
 import { DEFAULT_PRISMIC_HOST, env } from "./env";
 import { exists, readJsonFile, writeFileRecursive } from "./lib/file";
 import { stringify } from "./lib/json";
-import { refreshToken as baseRefreshToken } from "./lib/prismic/clients/auth";
+import { refreshToken as baseRefreshToken } from "./lib/prismic/client";
 import { appendTrailingSlash } from "./lib/url";
 import { forgetTrackedUser } from "./tracking";
 

src/commands/dev.ts

@@ -13,8 +13,7 @@ import { openBrowser } from "../lib/browser";
 import { createCommand, type CommandConfig, CommandError, exclusiveOptions } from "../lib/command";
 import { readJsonFile, watchFiles, writeFileRecursive } from "../lib/file";
 import { stringify } from "../lib/json";
-import { createRelease, deleteRelease } from "../lib/prismic/clients/core";
-import type { CustomTypesConfig } from "../lib/prismic/clients/custom-types";
+import { createRelease, type CustomTypesConfig, deleteRelease } from "../lib/prismic/client";
 import {
 	canonicalizeCustomType,
 	canonicalizeSlice,
@@ -175,13 +174,13 @@ async function saveSession(sessionPath: URL, session: Session): Promise<void> {
 }
 
 async function createSession({ repo, token, host }: CustomTypesConfig): Promise<Session> {
-	const releaseId = await createRelease(
+	const release = await createRelease(
 		{ label: "prismic dev", hidden: true },
 		{ repo, token, host },
 	).catch((error) => {
 		throw explainRequestError(error);
 	});
-	return { repo, releaseId, pid: process.pid, synced: {} };
+	return { repo, releaseId: release.id, pid: process.pid, synced: {} };
 }
 
 async function endSession({ releaseId, ...config }: Release, sessionPath: URL): Promise<void> {

src/commands/docs-list.ts

@@ -1,7 +1,7 @@
 import { env } from "../env";
 import { createCommand, type CommandConfig } from "../lib/command";
 import { stringify } from "../lib/json";
-import { getDocsIndex, getDocsPageIndex } from "../lib/prismic/clients/docs";
+import { getDocsIndex, getDocsPageIndex } from "../lib/prismic/client";
 import { formatTable } from "../lib/string";
 
 const config = {

src/commands/docs-view.ts

@@ -3,7 +3,7 @@ import GithubSlugger from "github-slugger";
 import { env } from "../env";
 import { CommandError, createCommand, type CommandConfig } from "../lib/command";
 import { stringify } from "../lib/json";
-import { getDocsPageContent } from "../lib/prismic/clients/docs";
+import { getDocsPageContent } from "../lib/prismic/client";
 import { getAnalyticsHeaders } from "../tracking";
 
 const config = {

src/commands/init.ts

@@ -16,16 +16,14 @@ import {
 } from "../lib/packageJson";
 import {
 	addPreview,
-	getPreviews,
-	removePreview,
-	setSimulatorUrl,
-} from "../lib/prismic/clients/core";
-import {
+	deletePreview,
 	enableTypeBuilder,
+	getPreviews,
 	getRepository,
+	getUserProfile,
 	type Repository,
-} from "../lib/prismic/clients/repository";
-import { getProfile } from "../lib/prismic/clients/user";
+	setSimulatorUrl,
+} from "../lib/prismic/client";
 import { diffModels, getLegacySlices, getRemoteModels } from "../lib/prismic/models";
 import { completeOnboardingSteps } from "../lib/prismic/onboarding";
 import { ForbiddenRequestError, UnauthorizedRequestError } from "../lib/request";
@@ -121,7 +119,7 @@ export default createCommand(config, async ({ values }) => {
 	const { host, token: initialToken } = await getCredentials();
 	let token = initialToken;
 	try {
-		await getProfile({ token, host });
+		await getUserProfile({ token, host });
 	} catch (error) {
 		if (error instanceof UnauthorizedRequestError || error instanceof ForbiddenRequestError) {
 			if (env.PRISMIC_TOKEN) throw error;
@@ -355,11 +353,11 @@ async function completeStarterHandoff(
 	config: { repo: string; token: string | undefined; host: string },
 ): Promise<void> {
 	try {
-		const previews = await getPreviews(config);
+		const { results: previews } = await getPreviews(config);
 		await Promise.all(
 			previews
 				.filter((preview) => preview.label === "Starter Preview")
-				.map((preview) => removePreview(preview.id, config)),
+				.map((preview) => deletePreview(preview.id, config)),
 		);
 		const hasDevelopmentPreview = previews.some(
 			(preview) => preview.url === adapter.localPreviewUrl,

src/commands/locale-add.ts

@@ -1,7 +1,7 @@
 import { getActiveRepositoryName } from "../adapters";
 import { getCredentials } from "../auth";
 import { createCommand, type CommandConfig } from "../lib/command";
-import { upsertLocale } from "../lib/prismic/clients/locale";
+import { upsertLocale } from "../lib/prismic/client";
 
 const config = {
 	name: "prismic locale add",

src/commands/locale-list.ts

@@ -2,7 +2,7 @@ import { getActiveRepositoryName } from "../adapters";
 import { getCredentials } from "../auth";
 import { createCommand, type CommandConfig } from "../lib/command";
 import { stringify } from "../lib/json";
-import { getLocales } from "../lib/prismic/clients/locale";
+import { getLocales } from "../lib/prismic/client";
 import { formatTable } from "../lib/string";
 
 const config = {
@@ -30,7 +30,7 @@ export default createCommand(config, async ({ values }) => {
 
 	const { token, host } = await getCredentials();
 
-	const locales = await getLocales({ repo, token, host });
+	const { results: locales } = await getLocales({ repo, token, host });
 
 	if (json) {
 		console.info(stringify(locales));

src/commands/locale-remove.ts

@@ -1,7 +1,7 @@
 import { getActiveRepositoryName } from "../adapters";
 import { getCredentials } from "../auth";
 import { createCommand, type CommandConfig } from "../lib/command";
-import { removeLocale } from "../lib/prismic/clients/locale";
+import { deleteLocale } from "../lib/prismic/client";
 
 const config = {
 	name: "prismic locale remove",
@@ -31,7 +31,7 @@ export default createCommand(config, async ({ positionals, values }) => {
 
 	const { token, host } = await getCredentials();
 
-	await removeLocale(code, { repo, token, host });
+	await deleteLocale(code, { repo, token, host });
 
 	console.info(`Locale removed: ${code}`);
 });

src/commands/locale-set-master.ts

@@ -1,7 +1,7 @@
 import { getActiveRepositoryName } from "../adapters";
 import { getCredentials } from "../auth";
 import { CommandError, createCommand, type CommandConfig } from "../lib/command";
-import { getLocales, upsertLocale } from "../lib/prismic/clients/locale";
+import { getLocales, upsertLocale } from "../lib/prismic/client";
 
 const config = {
 	name: "prismic locale set-master",
@@ -31,7 +31,7 @@ export default createCommand(config, async ({ positionals, values }) => {
 
 	const { token, host } = await getCredentials();
 
-	const locales = await getLocales({ repo, token, host });
+	const { results: locales } = await getLocales({ repo, token, host });
 
 	const locale = locales.find((l) => l.id === code);
 

src/commands/preview-add.ts

@@ -2,7 +2,7 @@ import { getActiveRepositoryName, getAdapter, NoSupportedFrameworkError } from "
 import { getCredentials } from "../auth";
 import { CommandError, createCommand, type CommandConfig } from "../lib/command";
 import { MissingPackageJson } from "../lib/packageJson";
-import { addPreview } from "../lib/prismic/clients/core";
+import { addPreview } from "../lib/prismic/client";
 
 const config = {
 	name: "prismic preview add",

src/commands/preview-list.ts

@@ -2,7 +2,7 @@ import { getActiveRepositoryName } from "../adapters";
 import { getCredentials } from "../auth";
 import { createCommand, type CommandConfig } from "../lib/command";
 import { stringify } from "../lib/json";
-import { getPreviews, getSimulatorUrl } from "../lib/prismic/clients/core";
+import { getPreviews, getSimulatorUrl } from "../lib/prismic/client";
 import { formatTable } from "../lib/string";
 
 const config = {
@@ -30,7 +30,7 @@ export default createCommand(config, async ({ values }) => {
 
 	const { token, host } = await getCredentials();
 
-	const [previews, simulatorUrl] = await Promise.all([
+	const [{ results: previews }, { simulator_url: simulatorUrl }] = await Promise.all([
 		getPreviews({ repo, token, host }),
 		getSimulatorUrl({ repo, token, host }),
 	]);

src/commands/preview-remove.ts

@@ -1,7 +1,7 @@
 import { getActiveRepositoryName } from "../adapters";
 import { getCredentials } from "../auth";
 import { CommandError, createCommand, type CommandConfig } from "../lib/command";
-import { getPreviews, removePreview } from "../lib/prismic/clients/core";
+import { deletePreview, getPreviews } from "../lib/prismic/client";
 
 const config = {
 	name: "prismic preview remove",
@@ -31,14 +31,14 @@ export default createCommand(config, async ({ positionals, values }) => {
 
 	const { token, host } = await getCredentials();
 
-	const previews = await getPreviews({ repo, token, host });
+	const { results: previews } = await getPreviews({ repo, token, host });
 
 	const preview = previews.find((p) => p.url === previewUrl);
 	if (!preview) {
 		throw new CommandError(`Preview not found: ${previewUrl}`);
 	}
 
-	await removePreview(preview.id, { repo, token, host });
+	await deletePreview(preview.id, { repo, token, host });
 
 	console.info(`Preview removed: ${previewUrl}`);
 });

src/commands/preview-set-simulator.ts

@@ -1,7 +1,7 @@
 import { getActiveRepositoryName } from "../adapters";
 import { getCredentials } from "../auth";
 import { CommandError, createCommand, type CommandConfig } from "../lib/command";
-import { setSimulatorUrl } from "../lib/prismic/clients/core";
+import { setSimulatorUrl } from "../lib/prismic/client";
 
 const config = {
 	name: "prismic preview set-simulator",

src/commands/push.ts

@@ -6,8 +6,7 @@ import { getAdapter } from "../adapters";
 import { getCredentials } from "../auth";
 import { CommandError, createCommand, type CommandConfig } from "../lib/command";
 import { getDirtyPaths, getGitRoot } from "../lib/git";
-import { getDocumentTotalByCustomTypes } from "../lib/prismic/clients/core";
-import { deleteScreenshots } from "../lib/prismic/clients/custom-types";
+import { deleteSliceScreenshots, getDocumentTotalByCustomType } from "../lib/prismic/client";
 import { diffModels, getRemoteModels, writeRemoteModels } from "../lib/prismic/models";
 import { completeOnboardingSteps, type OnboardingStep } from "../lib/prismic/onboarding";
 import { ForbiddenRequestError } from "../lib/request";
@@ -123,7 +122,7 @@ export default createCommand(config, async ({ values }) => {
 		throw await explainExistingDocuments(error, diff.customTypes.delete, { repo, token, host });
 	}
 	for (const { id } of diff.slices.delete) {
-		await deleteScreenshots(id, { repo, token, host }).catch((error) => {
+		await deleteSliceScreenshots(id, { repo, token, host }).catch((error) => {
 			const message = error instanceof Error ? error.message : String(error);
 			console.warn(
 				`Failed to delete screenshots for slice "${id}"${message ? `: ${message}` : "."}`,
@@ -173,7 +172,7 @@ async function explainExistingDocuments(
 
 		let documentCount: number;
 		try {
-			documentCount = await getDocumentTotalByCustomTypes(id, config);
+			documentCount = (await getDocumentTotalByCustomType(id, config)).total;
 		} catch {
 			return new CommandError(
 				`Could not check whether type "${id}" has associated pages. ` +

src/commands/repo-create.ts

@@ -2,8 +2,7 @@ import { FRAMEWORKS, getAdapter } from "../adapters";
 import { getCredentials } from "../auth";
 import { detectAgent } from "../lib/ai";
 import { CommandError, createCommand, type CommandConfig } from "../lib/command";
-import { upsertLocale } from "../lib/prismic/clients/locale";
-import { checkIsDomainAvailable, createRepository } from "../lib/prismic/clients/wroom";
+import { checkIsDomainAvailable, createRepository, upsertLocale } from "../lib/prismic/client";
 import { completeOnboardingSteps } from "../lib/prismic/onboarding";
 
 const MAX_DOMAIN_TRIES = 5;

src/commands/repo-list.ts

@@ -1,7 +1,7 @@
 import { getCredentials } from "../auth";
 import { createCommand, type CommandConfig } from "../lib/command";
 import { stringify } from "../lib/json";
-import { getRepositories } from "../lib/prismic/clients/user";
+import { getUserRepositories } from "../lib/prismic/client";
 import { formatTable } from "../lib/string";
 
 const config = {
@@ -17,7 +17,7 @@ export default createCommand(config, async ({ values }) => {
 
 	const { token, host } = await getCredentials();
 
-	const repos = await getRepositories({ token, host });
+	const { repositories: repos } = await getUserRepositories({ token, host });
 
 	if (json) {
 		console.info(

src/commands/repo-set-api-access.ts

@@ -1,9 +1,9 @@
 import { getCredentials } from "../auth";
 import { CommandError, createCommand, type CommandConfig } from "../lib/command";
-import { type RepositoryAccessLevel, setRepositoryAccess } from "../lib/prismic/clients/wroom";
+import { type RepositoryApiAccessLevel, setRepositoryApiAccess } from "../lib/prismic/client";
 import { getRepositoryName } from "../project";
 
-const VALID_LEVELS: RepositoryAccessLevel[] = ["private", "public", "open"];
+const VALID_LEVELS: RepositoryApiAccessLevel[] = ["private", "public", "open"];
 
 const config = {
 	name: "prismic repo set-api-access",
@@ -27,15 +27,15 @@ export default createCommand(config, async ({ positionals, values }) => {
 	const [level] = positionals;
 	const { repo = await getRepositoryName() } = values;
 
-	if (!VALID_LEVELS.includes(level as RepositoryAccessLevel)) {
+	if (!VALID_LEVELS.includes(level as RepositoryApiAccessLevel)) {
 		throw new CommandError(
 			`Invalid access level: ${level}. Must be one of: ${VALID_LEVELS.join(", ")}`,
 		);
 	}
 
 	const { token, host } = await getCredentials();
 
-	await setRepositoryAccess(level as RepositoryAccessLevel, { repo, token, host });
+	await setRepositoryApiAccess(level as RepositoryApiAccessLevel, { repo, token, host });
 
 	console.info(`Repository access set to: ${level}`);
 });

src/commands/repo-set-name.ts

@@ -1,6 +1,6 @@
 import { getCredentials } from "../auth";
 import { createCommand, type CommandConfig } from "../lib/command";
-import { setRepositoryName } from "../lib/prismic/clients/wroom";
+import { setRepositoryName } from "../lib/prismic/client";
 import { getRepositoryName } from "../project";
 
 const config = {
@@ -25,7 +25,7 @@ export default createCommand(config, async ({ positionals, values }) => {
 
 	const { token, host } = await getCredentials();
 
-	const confirmedName = await setRepositoryName(displayName, { repo, token, host });
+	const { repository } = await setRepositoryName(displayName, { repo, token, host });
 
-	console.info(`Repository name set to: ${confirmedName}`);
+	console.info(`Repository name set to: ${repository.name}`);
 });