@shapio/cms 0.3.1 → 0.4.1

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-C9uJxg4J.js"></script>
+    <script type="module" crossorigin src="./assets/index-D9KL7arJ.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-M4_WHiur.js">
-    <link rel="modulepreload" crossorigin href="./assets/auth-BaVAo0u_.js">
-    <link rel="modulepreload" crossorigin href="./assets/skeleton-CCwdO9oq.js">
-    <link rel="modulepreload" crossorigin href="./assets/badge-IBeVOhKd.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-DElTumgk.js">
+    <link rel="modulepreload" crossorigin href="./assets/badge-lJ4Ih_Zn.js">
     <link rel="modulepreload" crossorigin href="./assets/root-CDpNo7ef.js">
-    <link rel="modulepreload" crossorigin href="./assets/Match-UAw1Ss8a.js">
-    <link rel="modulepreload" crossorigin href="./assets/RowTitle-BD8QPs_v.js">
-    <link rel="modulepreload" crossorigin href="./assets/table-BEDv9IRM.js">
-    <link rel="modulepreload" crossorigin href="./assets/coerce-DWI5sgLW.js">
-    <link rel="modulepreload" crossorigin href="./assets/searchSchema-Ypl6gq9g.js">
-    <link rel="modulepreload" crossorigin href="./assets/InfoHint-Bz_yvehr.js">
-    <link rel="modulepreload" crossorigin href="./assets/ConfirmDialog-Tu-gjEwm.js">
+    <link rel="modulepreload" crossorigin href="./assets/Match-ErAxnNAY.js">
+    <link rel="modulepreload" crossorigin href="./assets/RowTitle-B-7RptyN.js">
+    <link rel="modulepreload" crossorigin href="./assets/src-Be3Ds5Dc.js">
+    <link rel="modulepreload" crossorigin href="./assets/theme-CHHVK8Ps.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-i1EwGHuF.js">
+    <link rel="modulepreload" crossorigin href="./assets/InfoHint-DtaHU1Cg.js">
+    <link rel="modulepreload" crossorigin href="./assets/ConfirmDialog-HS8Gc2t3.js">
     <link rel="modulepreload" crossorigin href="./assets/settle-LRKtTN_e.js">
-    <link rel="modulepreload" crossorigin href="./assets/HintedLabel-USQku9Yt.js">
-    <link rel="modulepreload" crossorigin href="./assets/zod-Gtw4e0qi.js">
-    <link rel="modulepreload" crossorigin href="./assets/FormCheckboxGroup-eg39IJvf.js">
-    <link rel="modulepreload" crossorigin href="./assets/useSchemaScopeAccess-bd8RQxuu.js">
-    <link rel="modulepreload" crossorigin href="./assets/calendar-clock-DKUk-w81.js">
-    <link rel="modulepreload" crossorigin href="./assets/clock-BOtPNp9-.js">
-    <link rel="modulepreload" crossorigin href="./assets/file-text-BJkQMeQO.js">
-    <link rel="modulepreload" crossorigin href="./assets/image-CGN6ffEu.js">
-    <link rel="modulepreload" crossorigin href="./assets/link-DPniuk00.js">
-    <link rel="modulepreload" crossorigin href="./assets/list-CkHF_4xh.js">
-    <link rel="modulepreload" crossorigin href="./assets/constants-CgUdkWmf.js">
-    <link rel="modulepreload" crossorigin href="./assets/boxes-BH0MDegO.js">
-    <link rel="modulepreload" crossorigin href="./assets/chevron-left-D259hWJn.js">
-    <link rel="modulepreload" crossorigin href="./assets/CursorPager-Bvu3CXpD.js">
-    <link rel="modulepreload" crossorigin href="./assets/preload-helper-BHNBIF88.js">
-    <link rel="modulepreload" crossorigin href="./assets/circle-check-Cidzt1Ww.js">
-    <link rel="modulepreload" crossorigin href="./assets/ellipsis-xDmHl1SK.js">
-    <link rel="modulepreload" crossorigin href="./assets/schema--xSR7cf9.js">
+    <link rel="modulepreload" crossorigin href="./assets/HintedLabel-CVe-PIyv.js">
+    <link rel="modulepreload" crossorigin href="./assets/zod-79xzBIrW.js">
+    <link rel="modulepreload" crossorigin href="./assets/FormCheckboxGroup-BrXY6qBg.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-DiYSm-g3.js">
+    <link rel="modulepreload" crossorigin href="./assets/constants-ahk0YSYl.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-C6PyD3wE.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/modelPermissions-DZ1lWfQZ.js">
-    <link rel="modulepreload" crossorigin href="./assets/contentCounts-T-LmvUf5.js">
-    <link rel="modulepreload" crossorigin href="./assets/usePlaces-CnSOZwtO.js">
-    <link rel="modulepreload" crossorigin href="./assets/globe-CAhrwBgv.js">
-    <link rel="modulepreload" crossorigin href="./assets/inbox-CukkApHK.js">
-    <link rel="modulepreload" crossorigin href="./assets/key-round-DnE-2gr0.js">
-    <link rel="modulepreload" crossorigin href="./assets/sparkles-B-0I44es.js">
-    <link rel="modulepreload" crossorigin href="./assets/src-CQu-YxUM.js">
-    <link rel="modulepreload" crossorigin href="./assets/sections-BBN2JErq.js">
-    <link rel="modulepreload" crossorigin href="./assets/plus-DLRcpVhJ.js">
-    <link rel="modulepreload" crossorigin href="./assets/scroll-text-BA9yh7Za.js">
-    <link rel="modulepreload" crossorigin href="./assets/search--71HzPvh.js">
-    <link rel="modulepreload" crossorigin href="./assets/send-NuSmLVSD.js">
-    <link rel="modulepreload" crossorigin href="./assets/UserAvatar-CiZ00-cr.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-v5Flaor9.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-DNOWhSWS.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-C-nQbyhd.js">
-    <link rel="modulepreload" crossorigin href="./assets/users-CbErtM7w.js">
-    <link rel="modulepreload" crossorigin href="./assets/sections-D0OZozD2.js">
-    <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-Cl20LCvY.js">
-    <link rel="modulepreload" crossorigin href="./assets/tooltip-Bji9fmSr.js">
-    <link rel="modulepreload" crossorigin href="./assets/TextLink-CegO3jom.js">
+    <link rel="modulepreload" crossorigin href="./assets/searchSchemas-BCRZ1jyL.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-BXqFQv9N.js">
+    <link rel="modulepreload" crossorigin href="./assets/TextLink-DIqr5zkJ.js">
     <link rel="modulepreload" crossorigin href="./assets/sites-C6_THCVK.js">
-    <link rel="modulepreload" crossorigin href="./assets/store-Bqd9L9DK.js">
-    <link rel="modulepreload" crossorigin href="./assets/usePaletteItems-BVjWCdow.js">
-    <link rel="modulepreload" crossorigin href="./assets/SharedGlyph-DDPdvsm_.js">
-    <link rel="modulepreload" crossorigin href="./assets/QueryView-Bkyizh1P.js">
+    <link rel="modulepreload" crossorigin href="./assets/store-jUWyOXDG.js">
+    <link rel="modulepreload" crossorigin href="./assets/usePaletteItems-wpn3ms6o.js">
+    <link rel="modulepreload" crossorigin href="./assets/SharedGlyph-97RaO6Bh.js">
+    <link rel="modulepreload" crossorigin href="./assets/QueryView-C630REML.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-CA3XlQcc.js">
-    <link rel="modulepreload" crossorigin href="./assets/FormRadioGroup-ZppSTZK6.js">
-    <link rel="modulepreload" crossorigin href="./assets/useDiscardGuard-t_N3l9TQ.js">
-    <link rel="stylesheet" crossorigin href="./assets/index-Cz3C-LxB.css">
+    <link rel="modulepreload" crossorigin href="./assets/radio-group-zOsGAYRP.js">
+    <link rel="modulepreload" crossorigin href="./assets/FormRadioGroup-BjE1Jhar.js">
+    <link rel="modulepreload" crossorigin href="./assets/useDiscardGuard-BAEGkGK9.js">
+    <link rel="stylesheet" crossorigin href="./assets/index-6iVBpUhu.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/admin/theme-init.js

@@ -1,12 +1,21 @@
 /* global window, document */
-// Runs before first paint: applies the theme saved by the admin's theme store (key and shape must match
-// src/stores/theme.ts; the resolution repeats src/helpers/theme.ts resolveScheme, and
-// src/test/themeInit.test.ts keeps them in step). Sets `data-theme` and the `dark` class on <html>.
-// Storage can be unavailable (private mode): the default is Shapio, following the OS.
+// Runs before first paint: applies the look saved by the admin's theme store (key, shape and migration must
+// match src/stores/theme.ts; the built-in variants repeat src/constants/themes.ts; the resolution repeats
+// src/helpers/theme.ts resolveScheme; src/test/themeInit.test.ts keeps them in step). Sets `data-theme` and
+// the `dark` class on <html>. Nothing follows the operating system. Storage can be unavailable (private
+// mode): the default is Shapio.
 (function () {
+  var BUILT_IN = {
+    shapio: ['dark'],
+    classic: ['dark'],
+    'murdered-out': ['dark'],
+    forest: ['dark'],
+    snowed: ['light'],
+    butter: ['light'],
+  };
   var theme = 'shapio';
-  var appearance = 'system';
-  var variants = ['light', 'dark'];
+  var appearance = 'dark';
+  var variants = ['dark'];
   try {
     var saved = JSON.parse(window.localStorage.getItem('shapio.theme') || 'null');
     var state = saved && saved.state;
@@ -14,9 +23,7 @@
       if (typeof state.theme === 'string' && /^[a-z][a-z0-9-]{0,40}$/.test(state.theme)) {
         theme = state.theme;
       }
-      if (typeof state.appearance === 'string') {
-        appearance = state.appearance;
-      }
+      appearance = state.appearance;
       if (Array.isArray(state.variants)) {
         var cached = ['light', 'dark'].filter(function (variant) {
           return state.variants.indexOf(variant) !== -1;
@@ -26,25 +33,20 @@
         }
       }
     } else if (state) {
-      // Version 1 (before themes): the original palette, now called Classic.
+      // Version 1 (before themes): the original palette, now the Cobalt look.
       theme = 'classic';
-      if (typeof state.preference === 'string') {
-        appearance = state.preference;
-      }
     }
   } catch {
     theme = 'shapio';
+    appearance = 'dark';
+  }
+  if (Object.prototype.hasOwnProperty.call(BUILT_IN, theme)) {
+    variants = BUILT_IN[theme];
   }
   if (appearance !== 'light' && appearance !== 'dark') {
-    appearance = 'system';
+    appearance = variants[0];
   }
-  var preferred =
-    appearance === 'system'
-      ? window.matchMedia('(prefers-color-scheme: dark)').matches
-        ? 'dark'
-        : 'light'
-      : appearance;
-  var scheme = variants.indexOf(preferred) !== -1 ? preferred : variants[0];
+  var scheme = variants.indexOf(appearance) !== -1 ? appearance : variants[0];
   document.documentElement.setAttribute('data-theme', theme);
   document.documentElement.classList.toggle('dark', scheme === 'dark');
 })();

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-BAmQPoTJ.js";
+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-BDYDbaea.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";
@@ -780,12 +780,16 @@ const createAppAuthApi = (request, baseUrl) => ({
 });
 const DELIVERY_PATH = "/api/content";
 const routePath = (routeKey) => `${DELIVERY_PATH}/${encodeURIComponent(routeKey)}`;
-/** The content query string plus `snapshot`, which only delivery reads take. */
-const deliveryQueryString = ({ snapshot, ...query }) => {
+/** The content query string plus `snapshot`, `richText` and `seo`, which only delivery reads take. */
+const deliveryQueryString = ({ snapshot, richText, seo, ...query }) => {
+	const extra = [
+		...snapshot === void 0 ? [] : [`snapshot=${encodeURIComponent(String(snapshot))}`],
+		...richText === void 0 ? [] : [`richText=${encodeURIComponent(richText)}`],
+		...seo === void 0 ? [] : [`seo=${encodeURIComponent(seo)}`]
+	];
 	const base = toContentQueryString(query);
-	if (snapshot === void 0) return base;
-	const pinned = `snapshot=${encodeURIComponent(String(snapshot))}`;
-	return base ? `${base}&${pinned}` : `?${pinned}`;
+	if (extra.length === 0) return base;
+	return base ? `${base}&${extra.join("&")}` : `?${extra.join("&")}`;
 };
 /**
 * Published content, typed by the caller (`delivery.list<Article>('articles', { locale: 'fr', snapshot })`).
@@ -796,6 +800,9 @@ const createDeliveryApi = (request) => ({
 	singleton: (apiKey, query = {}) => request(`${routePath(apiKey)}${deliveryQueryString(query)}`),
 	get: (routeKey, id, query = {}) => request(`${routePath(routeKey)}/${encodeURIComponent(id)}${deliveryQueryString(query)}`)
 });
+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) });
 const SNAPSHOT_PATHS = {
 	current: "/api/snapshots/current",
 	changes: "/api/snapshots/changes"
@@ -830,13 +837,14 @@ const createSnapshotsApi = (request) => {
 };
 /** Delivery reads name their site with `?site=`; everything else with the `Shapio-Site` header. */
 const SITE_QUERY_PARAMETER = "site";
-/** Delivery reads (content and snapshots): a GET there carries the site in its URL. */
+/** Delivery reads (content, snapshots, the site): a GET there carries the site in its URL. */
 const DELIVERY_READ_PREFIXES = [
 	`${DELIVERY_PATH}/`,
 	`${DELIVERY_PATH}?`,
-	"/api/snapshots/"
+	"/api/snapshots/",
+	`${DELIVERY_SITE_PATH}?`
 ];
-const isDeliveryRead = (method, path) => method === "GET" && (path === "/api/content" || Object.values(SNAPSHOT_PATHS).some((snapshotPath) => path === snapshotPath) || DELIVERY_READ_PREFIXES.some((prefix) => path.startsWith(prefix)));
+const isDeliveryRead = (method, path) => method === "GET" && (path === "/api/content" || path === "/api/site" || Object.values(SNAPSHOT_PATHS).some((snapshotPath) => path === snapshotPath) || DELIVERY_READ_PREFIXES.some((prefix) => path.startsWith(prefix)));
 const namesSite = (path) => {
 	const index = path.indexOf("?");
 	return index !== -1 && new URLSearchParams(path.slice(index + 1)).has("site");
@@ -919,6 +927,8 @@ const createClient = ({ baseUrl, token, fetch = globalThis.fetch, credentials, h
 		},
 		/** Published content (the delivery API), typed by the caller. */
 		delivery: createDeliveryApi(request),
+		/** The site as delivery sees it: key, name and SEO defaults (`GET /api/site`). */
+		site: createSiteApi(request),
 		admin: createAdminApi(request),
 		/** Publication snapshots and the diff between two (incremental builds). */
 		snapshots: createSnapshotsApi(request),