@shapio/cms 0.4.0 → 0.5.0

package/dist/admin/index.html

@@ -17,76 +17,76 @@
          API serves it (empty without extension themes); `vite-ignore` keeps Vite from bundling it. -->
     <link rel="stylesheet" href="../api/admin/extensions/themes.css"  />
     <script type="importmap">{"imports":{"react":"./assets/shared-react-KADNSNpb.js","react/jsx-runtime":"./assets/shared-react-jsx-runtime-CU_Fm1m8.js","react-dom":"./assets/shared-react-dom-BpneAejY.js","react-dom/client":"./assets/shared-react-dom-client-CnpZTXxo.js","@shapio/editor-sdk":"./assets/shared-shapio-editor-sdk-9ANIbEN0.js"}}</script>
-    <script type="module" crossorigin src="./assets/index-C6FrF34G.js"></script>
+    <script type="module" crossorigin src="./assets/index-DHmfMpqz.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/rolldown-runtime-Dd_uD5pT.js">
     <link rel="modulepreload" crossorigin href="./assets/react-CQOZoUwg.js">
     <link rel="modulepreload" crossorigin href="./assets/react-dom-pEVw9mjF.js">
     <link rel="modulepreload" crossorigin href="./assets/client-C8vMCv-p.js">
     <link rel="modulepreload" crossorigin href="./assets/jsx-runtime-DREnUpxT.js">
-    <link rel="modulepreload" crossorigin href="./assets/cn-CL1YHRrS.js">
-    <link rel="modulepreload" crossorigin href="./assets/auth-YVfK3SxF.js">
-    <link rel="modulepreload" crossorigin href="./assets/skeleton-B5GJgv7y.js">
-    <link rel="modulepreload" crossorigin href="./assets/badge-C5oMRtwJ.js">
+    <link rel="modulepreload" crossorigin href="./assets/cn-h5ORT3LK.js">
+    <link rel="modulepreload" crossorigin href="./assets/auth-BzCgJtgr.js">
+    <link rel="modulepreload" crossorigin href="./assets/skeleton-DJVukcn6.js">
+    <link rel="modulepreload" crossorigin href="./assets/badge-DBoaS0nQ.js">
     <link rel="modulepreload" crossorigin href="./assets/root-CDpNo7ef.js">
-    <link rel="modulepreload" crossorigin href="./assets/Match-Zu4pwfCC.js">
-    <link rel="modulepreload" crossorigin href="./assets/RowTitle-BdDgA5Lb.js">
-    <link rel="modulepreload" crossorigin href="./assets/src-B2qcqjNM.js">
-    <link rel="modulepreload" crossorigin href="./assets/theme-C0Tv6M38.js">
-    <link rel="modulepreload" crossorigin href="./assets/table-DQ5ILlSh.js">
-    <link rel="modulepreload" crossorigin href="./assets/coerce-B4MJTGg1.js">
-    <link rel="modulepreload" crossorigin href="./assets/useResolvedScheme-D0moXjaP.js">
-    <link rel="modulepreload" crossorigin href="./assets/InfoHint-DWn9kLf1.js">
-    <link rel="modulepreload" crossorigin href="./assets/ConfirmDialog-BfpN2MQx.js">
+    <link rel="modulepreload" crossorigin href="./assets/Match-CgfZTzqs.js">
+    <link rel="modulepreload" crossorigin href="./assets/RowTitle-mkKp4yfl.js">
+    <link rel="modulepreload" crossorigin href="./assets/src-Be3Ds5Dc.js">
+    <link rel="modulepreload" crossorigin href="./assets/theme-RHTVnR9j.js">
+    <link rel="modulepreload" crossorigin href="./assets/table-BMbbRUK9.js">
+    <link rel="modulepreload" crossorigin href="./assets/coerce-DDQ1vGLx.js">
+    <link rel="modulepreload" crossorigin href="./assets/useResolvedScheme-DHD-zisP.js">
+    <link rel="modulepreload" crossorigin href="./assets/InfoHint-D3uwei-E.js">
+    <link rel="modulepreload" crossorigin href="./assets/ConfirmDialog-BW-l3Whg.js">
     <link rel="modulepreload" crossorigin href="./assets/settle-LRKtTN_e.js">
-    <link rel="modulepreload" crossorigin href="./assets/HintedLabel-BDV81kIT.js">
-    <link rel="modulepreload" crossorigin href="./assets/zod-CS0EvbwG.js">
-    <link rel="modulepreload" crossorigin href="./assets/FormCheckboxGroup-8ObPh9cH.js">
-    <link rel="modulepreload" crossorigin href="./assets/useSchemaScopeAccess-WQKmj8_3.js">
-    <link rel="modulepreload" crossorigin href="./assets/calendar-clock-VENf4s1R.js">
-    <link rel="modulepreload" crossorigin href="./assets/clock-DrSTMGjp.js">
-    <link rel="modulepreload" crossorigin href="./assets/search-CcJQqtRw.js">
-    <link rel="modulepreload" crossorigin href="./assets/image-CXZXXH58.js">
-    <link rel="modulepreload" crossorigin href="./assets/layers-mGfmMsKE.js">
-    <link rel="modulepreload" crossorigin href="./assets/link-b2pFaN-A.js">
-    <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-DPzDthV7.js">
-    <link rel="modulepreload" crossorigin href="./assets/constants-DT4WPUvz.js">
-    <link rel="modulepreload" crossorigin href="./assets/boxes-DRvd25_u.js">
-    <link rel="modulepreload" crossorigin href="./assets/chevron-left-D2DnQyeV.js">
-    <link rel="modulepreload" crossorigin href="./assets/CursorPager-DkZs6rPg.js">
-    <link rel="modulepreload" crossorigin href="./assets/preload-helper-CJNJ4S3k.js">
-    <link rel="modulepreload" crossorigin href="./assets/circle-check-jmRQz1Jq.js">
-    <link rel="modulepreload" crossorigin href="./assets/ellipsis-DEHUaCkn.js">
-    <link rel="modulepreload" crossorigin href="./assets/schema-B7L9OJrX.js">
+    <link rel="modulepreload" crossorigin href="./assets/HintedLabel-BGidukgy.js">
+    <link rel="modulepreload" crossorigin href="./assets/zod-Dcwk-m8X.js">
+    <link rel="modulepreload" crossorigin href="./assets/FormCheckboxGroup-JP1xzReQ.js">
+    <link rel="modulepreload" crossorigin href="./assets/useSchemaScopeAccess-BNeVslcv.js">
+    <link rel="modulepreload" crossorigin href="./assets/calendar-clock-BEA3tG17.js">
+    <link rel="modulepreload" crossorigin href="./assets/clock-BKNNASKp.js">
+    <link rel="modulepreload" crossorigin href="./assets/search-Dy2dtwyR.js">
+    <link rel="modulepreload" crossorigin href="./assets/image-D9p_gGE2.js">
+    <link rel="modulepreload" crossorigin href="./assets/layers-CkZyCaeb.js">
+    <link rel="modulepreload" crossorigin href="./assets/link-Bvqcg7db.js">
+    <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-DGSMTf23.js">
+    <link rel="modulepreload" crossorigin href="./assets/constants-DH7oqfO_.js">
+    <link rel="modulepreload" crossorigin href="./assets/boxes-DhN0ctLo.js">
+    <link rel="modulepreload" crossorigin href="./assets/chevron-left-BeJdUVAX.js">
+    <link rel="modulepreload" crossorigin href="./assets/CursorPager-BW2Dl_hn.js">
+    <link rel="modulepreload" crossorigin href="./assets/preload-helper-DEbJbZwX.js">
+    <link rel="modulepreload" crossorigin href="./assets/circle-check-ktACw37r.js">
+    <link rel="modulepreload" crossorigin href="./assets/ellipsis-BMP-j3yO.js">
+    <link rel="modulepreload" crossorigin href="./assets/schema-CWHuez0q.js">
     <link rel="modulepreload" crossorigin href="./assets/modelPermissions-DZ1lWfQZ.js">
-    <link rel="modulepreload" crossorigin href="./assets/contentCounts-DzIvdeXR.js">
-    <link rel="modulepreload" crossorigin href="./assets/usePlaces-6iTN15Xy.js">
-    <link rel="modulepreload" crossorigin href="./assets/globe-TooNSp9V.js">
-    <link rel="modulepreload" crossorigin href="./assets/inbox-B8c9Kj_z.js">
-    <link rel="modulepreload" crossorigin href="./assets/key-round-CFJ61iCd.js">
-    <link rel="modulepreload" crossorigin href="./assets/sparkles-D88gf3vX.js">
-    <link rel="modulepreload" crossorigin href="./assets/sections-iNOzo7pL.js">
-    <link rel="modulepreload" crossorigin href="./assets/plus-BDZHQBlU.js">
-    <link rel="modulepreload" crossorigin href="./assets/scroll-text-BLThe4Ki.js">
-    <link rel="modulepreload" crossorigin href="./assets/send-CbP0Rc9_.js">
-    <link rel="modulepreload" crossorigin href="./assets/UserAvatar--pMv2i3c.js">
+    <link rel="modulepreload" crossorigin href="./assets/contentCounts-BpGlmyeZ.js">
+    <link rel="modulepreload" crossorigin href="./assets/usePlaces-Cj5PljTy.js">
+    <link rel="modulepreload" crossorigin href="./assets/globe-DOoGBy23.js">
+    <link rel="modulepreload" crossorigin href="./assets/inbox-CMzYVMZo.js">
+    <link rel="modulepreload" crossorigin href="./assets/key-round-HBvMrmMo.js">
+    <link rel="modulepreload" crossorigin href="./assets/sparkles-Dd6S_roX.js">
+    <link rel="modulepreload" crossorigin href="./assets/sections-BfG6DTFr.js">
+    <link rel="modulepreload" crossorigin href="./assets/plus-BXMBYPoB.js">
+    <link rel="modulepreload" crossorigin href="./assets/scroll-text-DlcDEi2k.js">
+    <link rel="modulepreload" crossorigin href="./assets/send-DVgq5Iwg.js">
+    <link rel="modulepreload" crossorigin href="./assets/UserAvatar-BHNWHDVb.js">
     <link rel="modulepreload" crossorigin href="./assets/constants-DUBUgzpU.js">
     <link rel="modulepreload" crossorigin href="./assets/constants-DCtq_UOe.js">
-    <link rel="modulepreload" crossorigin href="./assets/searchSchemas-BdwAFaVO.js">
-    <link rel="modulepreload" crossorigin href="./assets/users-B01EH47o.js">
-    <link rel="modulepreload" crossorigin href="./assets/sections-TIN_Nl1b.js">
-    <link rel="modulepreload" crossorigin href="./assets/tooltip-BK5FqmJ0.js">
-    <link rel="modulepreload" crossorigin href="./assets/TextLink-DIqr5zkJ.js">
+    <link rel="modulepreload" crossorigin href="./assets/searchSchemas-Cz4P1iku.js">
+    <link rel="modulepreload" crossorigin href="./assets/users-CppI8ctO.js">
+    <link rel="modulepreload" crossorigin href="./assets/sections-EgXyXN3-.js">
+    <link rel="modulepreload" crossorigin href="./assets/tooltip-BfSF6EyR.js">
+    <link rel="modulepreload" crossorigin href="./assets/TextLink-DzNaAft6.js">
     <link rel="modulepreload" crossorigin href="./assets/sites-C6_THCVK.js">
-    <link rel="modulepreload" crossorigin href="./assets/store-jUWyOXDG.js">
-    <link rel="modulepreload" crossorigin href="./assets/usePaletteItems-neKzBlys.js">
-    <link rel="modulepreload" crossorigin href="./assets/SharedGlyph-y6ZsA_gz.js">
-    <link rel="modulepreload" crossorigin href="./assets/QueryView-Cu-KPtQI.js">
+    <link rel="modulepreload" crossorigin href="./assets/store-BP-xStwU.js">
+    <link rel="modulepreload" crossorigin href="./assets/usePaletteItems-D3PZsW0Q.js">
+    <link rel="modulepreload" crossorigin href="./assets/SharedGlyph-CuDT7OUU.js">
+    <link rel="modulepreload" crossorigin href="./assets/QueryView-C2d392ly.js">
     <link rel="modulepreload" crossorigin href="./assets/useDebouncedValue-Dqs3wwhn.js">
     <link rel="modulepreload" crossorigin href="./assets/useSearchInput-1fDoEtXe.js">
-    <link rel="modulepreload" crossorigin href="./assets/radio-group-DSK5LPaM.js">
-    <link rel="modulepreload" crossorigin href="./assets/FormRadioGroup-CAB3qzVS.js">
-    <link rel="modulepreload" crossorigin href="./assets/useDiscardGuard-CGFgC3xY.js">
-    <link rel="stylesheet" crossorigin href="./assets/index-Bbb2ER3l.css">
+    <link rel="modulepreload" crossorigin href="./assets/radio-group-BIhT_uEK.js">
+    <link rel="modulepreload" crossorigin href="./assets/FormRadioGroup-BvSC8SRm.js">
+    <link rel="modulepreload" crossorigin href="./assets/useDiscardGuard-Dhbif7VL.js">
+    <link rel="stylesheet" crossorigin href="./assets/index-6iVBpUhu.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as toTypeName, A as update, B as checkThemeContrast, C as BEFORE_EVENTS, D as listForAssets, E as buildEditorManifest, F as RESERVED_FIELD_API_KEYS, G as mergePulledLock, H as hashDefinition, I as RESERVED_TYPE_NAMES, J as schemaFilePath, K as parseDefinition, L as SCHEMA_KIND_DIRECTORIES, M as describeError, O as listLiveByDriver, P as RESERVED_DEFINITION_API_KEYS, Q as suggestPlural, R as SITES_DIRECTORY, S as AFTER_EVENTS, T as EXTENSION_ROUTE_ROOT, U as lockCoversSite, V as foldApiKey, W as lockEntriesForSite, X as serializeDefinition, Y as scopeDirectory, Z as serializeLockFile, _ as createLogger, a as loadConfig, at as createStableId, b as SITE_KEY_PATTERN, c as getPendingMigrations, ct as sqliteDriverOf, d as createMediaStorage, et as upgradeLockFile, f as createSite, g as generateToken, h as SYSTEM_CLI_ACTOR, i as assertDatabaseReachable, it as SAFE_LINK_PATTERN, j as STORAGE_DRIVERS, k as lockById, l as migrateToLatest, m as createAdminDirect, n as startServer, nt as withSiteCovered, o as loadEnvFileIfPresent, ot as validateRichText, p as listAllSites, q as parseLockFile, r as copyObjectVerified, rt as RICHTEXT_FORMAT, st as createDb, t as startDedicatedWorker, tt as validateSchema, u as SHAPIO_VERSION, v as createUrlBuilder, w as EXTENSION_JOB_PREFIX, x as loadProjectConfig, y as loopbackUrl, z as THEME_VARIANTS } from "./worker-i1rY2TIZ.js";
+import { $ as parseLockFile, A as buildEditorManifest, B as RESERVED_DEFINITION_API_KEYS, C as loopbackUrl, D as BEFORE_EVENTS, E as AFTER_EVENTS, F as lockById, G as THEME_VARIANTS, H as RESERVED_TYPE_NAMES, I as update, J as hashDefinition, K as checkThemeContrast, L as STORAGE_DRIVERS, N as listForAssets, O as EXTENSION_JOB_PREFIX, P as listLiveByDriver, Q as parseDefinition, R as describeError, S as createUrlBuilder, T as loadProjectConfig, U as SCHEMA_KIND_DIRECTORIES, V as RESERVED_FIELD_API_KEYS, W as SITES_DIRECTORY, X as lockEntriesForSite, Y as lockCoversSite, Z as mergePulledLock, _ as listAllSites, a as loadConfig, at as toTypeName, b as generateToken, ct as withSiteCovered, d as migrateToLatest, dt as createStableId, et as schemaFilePath, f as SHAPIO_VERSION, ft as validateRichText, g as createSite, i as assertDatabaseReachable, it as suggestPlural, k as EXTENSION_ROUTE_ROOT, lt as RICHTEXT_FORMAT, mt as sqliteDriverOf, n as startServer, nt as serializeDefinition, o as loadEnvFileIfPresent, ot as upgradeLockFile, p as createMediaStorage, pt as createDb, q as foldApiKey, r as copyObjectVerified, rt as serializeLockFile, st as validateSchema, t as startDedicatedWorker, tt as scopeDirectory, u as getPendingMigrations, ut as SAFE_LINK_PATTERN, v as createAdminDirect, w as SITE_KEY_PATTERN, x as createLogger, y as SYSTEM_CLI_ACTOR } from "./worker-jz_0yAmS.js";
 import { createDecipheriv, createHash, scryptSync } from "node:crypto";
 import { createReadStream, createWriteStream, existsSync, openAsBlob } from "node:fs";
 import { basename, dirname, extname, isAbsolute, join, posix, relative, resolve } from "node:path";
@@ -778,6 +778,49 @@ const createAppAuthApi = (request, baseUrl) => ({
 		}
 	})
 });
+const TAG_PREFIX = "shapio";
+/**
+* The cache tags delivery reads carry (`revalidateTag(shapioTags.entry('articles', id), { expire: 0 })`).
+* Models are named by their route key: a collection's plural API ID, a singleton's API ID.
+*/
+const shapioTags = {
+	/** Every delivery read of the site; `shapio:site` when the client names no site. */
+	site: (siteKey) => siteKey === void 0 ? `${TAG_PREFIX}:site` : `${TAG_PREFIX}:site:${siteKey}`,
+	/** Every read of one model (lists, singletons and its entries). */
+	model: (routeKey) => `${TAG_PREFIX}:${routeKey}`,
+	/** Reads of one entry by its ID. */
+	entry: (routeKey, entryId) => `${TAG_PREFIX}:${routeKey}:${entryId}`
+};
+/** Spelled out so bundlers that inline `process.env.NEXT_RUNTIME` see it; guarded for browsers. */
+const isNextRuntime = () => {
+	try {
+		return typeof process !== "undefined" && Boolean(process.env.NEXT_RUNTIME);
+	} catch {
+		return false;
+	}
+};
+/** The `cache` and `next` fetch options of one delivery read; empty outside Next unless asked for. */
+const nextFetchInit = ({ client, read, tags, pinned }) => {
+	if (read === false || read === void 0 && client === false) return {};
+	const configured = client === false ? read : read === void 0 ? client : {
+		...client,
+		...read
+	};
+	if (configured === void 0 && !isNextRuntime()) return {};
+	if (pinned && read?.cache === void 0) return {
+		cache: "force-cache",
+		next: { tags }
+	};
+	const cache = configured?.cache;
+	const revalidate = configured?.revalidate;
+	return {
+		...cache === void 0 ? {} : { cache },
+		next: {
+			tags,
+			...revalidate === void 0 ? {} : { revalidate }
+		}
+	};
+};
 const DELIVERY_PATH = "/api/content";
 const routePath = (routeKey) => `${DELIVERY_PATH}/${encodeURIComponent(routeKey)}`;
 /** The content query string plus `snapshot`, `richText` and `seo`, which only delivery reads take. */
@@ -793,16 +836,39 @@ const deliveryQueryString = ({ snapshot, richText, seo, ...query }) => {
 };
 /**
 * Published content, typed by the caller (`delivery.list<Article>('articles', { locale: 'fr', snapshot })`).
-* A collection is read with `list` (a page) and `get` (one entry); a singleton with `singleton`.
+* A collection is read with `list` (a page) and `get` (one entry); a singleton with `singleton`. Each read
+* takes Next.js cache options last and is tagged for `revalidateTag` (nextCache.ts): lists and singletons with
+* the site and model tags, `get` with the entry's tag too.
 */
-const createDeliveryApi = (request) => ({
-	list: (routeKey, query = {}) => request(`${routePath(routeKey)}${deliveryQueryString(query)}`),
-	singleton: (apiKey, query = {}) => request(`${routePath(apiKey)}${deliveryQueryString(query)}`),
-	get: (routeKey, id, query = {}) => request(`${routePath(routeKey)}/${encodeURIComponent(id)}${deliveryQueryString(query)}`)
-});
+const createDeliveryApi = (request, cacheContext) => {
+	const fetchInit = (tags, query, { next }) => nextFetchInit({
+		client: cacheContext.next,
+		read: next,
+		tags,
+		pinned: query.snapshot !== void 0
+	});
+	const siteTag = shapioTags.site(cacheContext.site);
+	return {
+		list: (routeKey, query = {}, options = {}) => request(`${routePath(routeKey)}${deliveryQueryString(query)}`, fetchInit([siteTag, shapioTags.model(routeKey)], query, options)),
+		singleton: (apiKey, query = {}, options = {}) => request(`${routePath(apiKey)}${deliveryQueryString(query)}`, fetchInit([siteTag, shapioTags.model(apiKey)], query, options)),
+		get: (routeKey, id, query = {}, options = {}) => request(`${routePath(routeKey)}/${encodeURIComponent(id)}${deliveryQueryString(query)}`, fetchInit([
+			siteTag,
+			shapioTags.model(routeKey),
+			shapioTags.entry(routeKey, id)
+		], query, options))
+	};
+};
 const DELIVERY_SITE_PATH = "/api/site";
-/** The request's site as delivery sees it (key, name, SEO defaults), with the client's token and site. */
-const createSiteApi = (request) => ({ get: () => request(DELIVERY_SITE_PATH) });
+/**
+* The request's site as delivery sees it (key, name, SEO defaults), with the client's token and site. Under
+* Next.js the read carries the site tag (nextCache.ts).
+*/
+const createSiteApi = (request, cacheContext) => ({ get: ({ next } = {}) => request(DELIVERY_SITE_PATH, nextFetchInit({
+	client: cacheContext.next,
+	read: next,
+	tags: [shapioTags.site(cacheContext.site)],
+	pinned: false
+})) });
 const SNAPSHOT_PATHS = {
 	current: "/api/snapshots/current",
 	changes: "/api/snapshots/changes"
@@ -835,6 +901,25 @@ const createSnapshotsApi = (request) => {
 		}
 	};
 };
+/**
+* The read side of the client over any transport: published content (`delivery`), the site (`site`) and
+* publication snapshots (`snapshots`). `createClient` builds it over HTTP; `@shapio/local` over the delivery
+* API running in the same process. The transport receives exactly the paths the HTTP client sends.
+*/
+const createDeliveryClient = (request, { site, next } = {}) => {
+	const cacheContext = {
+		site,
+		next
+	};
+	return {
+		/** Published content (the delivery API), typed by the caller. */
+		delivery: createDeliveryApi(request, cacheContext),
+		/** The site as delivery sees it: key, name and SEO defaults (`GET /api/site`). */
+		site: createSiteApi(request, cacheContext),
+		/** Publication snapshots and the diff between two (incremental builds). */
+		snapshots: createSnapshotsApi(request)
+	};
+};
 /** Delivery reads name their site with `?site=`; everything else with the `Shapio-Site` header. */
 const SITE_QUERY_PARAMETER = "site";
 /** Delivery reads (content, snapshots, the site): a GET there carries the site in its URL. */
@@ -883,7 +968,7 @@ const parseBody = async (response) => {
 /** Builds the JSON request function every endpoint group uses. Non-2xx responses throw ShapioApiError. */
 const createRequest = ({ baseUrl, token, fetch, credentials, headers, site }) => {
 	const origin = baseUrl.replace(/\/+$/, "");
-	return async (requestPath, { method = "GET", body, signal } = {}) => {
+	return async (requestPath, { method = "GET", body, signal, cache, next } = {}) => {
 		const { path, headers: siteHeaders } = applySite(site, method, requestPath);
 		const requestHeaders = {
 			accept: "application/json",
@@ -892,19 +977,22 @@ const createRequest = ({ baseUrl, token, fetch, credentials, headers, site }) =>
 		};
 		if (token) requestHeaders.authorization = `Bearer ${token}`;
 		if (body !== void 0) requestHeaders["content-type"] = "application/json";
-		const response = await fetch(`${origin}${path}`, {
+		const init = {
 			method,
 			headers: requestHeaders,
 			...body !== void 0 ? { body: JSON.stringify(body) } : {},
 			...signal ? { signal } : {},
-			...credentials ? { credentials } : {}
-		});
+			...credentials ? { credentials } : {},
+			...cache ? { cache } : {},
+			...next ? { next } : {}
+		};
+		const response = await fetch(`${origin}${path}`, init);
 		const parsed = await parseBody(response);
 		if (!response.ok) throw new ShapioApiError(response.status, parsed);
 		return parsed;
 	};
 };
-const createClient = ({ baseUrl, token, fetch = globalThis.fetch, credentials, headers, site }) => {
+const createClient = ({ baseUrl, token, fetch = globalThis.fetch, credentials, headers, site, next }) => {
 	const request = createRequest({
 		baseUrl,
 		token,
@@ -913,6 +1001,10 @@ const createClient = ({ baseUrl, token, fetch = globalThis.fetch, credentials, h
 		headers,
 		site
 	});
+	const reads = createDeliveryClient(request, {
+		site,
+		next
+	});
 	return {
 		/**
 		* Any Shapio route, e.g. the delivery API. Delivery paths use the model's route key: a collection's
@@ -926,12 +1018,12 @@ const createClient = ({ baseUrl, token, fetch = globalThis.fetch, credentials, h
 			version: (signal) => request("/api/version", signal ? { signal } : {})
 		},
 		/** Published content (the delivery API), typed by the caller. */
-		delivery: createDeliveryApi(request),
+		delivery: reads.delivery,
 		/** The site as delivery sees it: key, name and SEO defaults (`GET /api/site`). */
-		site: createSiteApi(request),
+		site: reads.site,
 		admin: createAdminApi(request),
 		/** Publication snapshots and the diff between two (incremental builds). */
-		snapshots: createSnapshotsApi(request),
+		snapshots: reads.snapshots,
 		/** End users of your sites and apps: sign-up, sign-in, tokens, OAuth. */
 		appAuth: createAppAuthApi(request, baseUrl)
 	};
@@ -5124,7 +5216,7 @@ const runMigrate = async (parsed, io) => {
 			io.stderr("Database migrations are pending; run `shapio migrate` (or start the server) first.\n");
 			return 1;
 		}
-		const storage = createMediaStorage(config.storage, { urls: createUrlBuilder(config.server) });
+		const storage = await createMediaStorage(config.storage, { urls: createUrlBuilder(config.server) });
 		if (!storage.has("s3")) {
 			io.stderr("Set STORAGE_S3_BUCKET (and the other STORAGE_S3_* settings) to migrate media to or from S3.\n");
 			return 1;