@shapio/cms 0.5.7 → 0.5.9

package/dist/admin/index.html

@@ -17,82 +17,84 @@
          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-DoJsnLI1.js"></script>
+    <script type="module" crossorigin src="./assets/index-BRx5mel0.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/createLucideIcon-CLmh7Go-.js">
-    <link rel="modulepreload" crossorigin href="./assets/src-ndgTSYLX.js">
-    <link rel="modulepreload" crossorigin href="./assets/auth-CQO4MBUj.js">
-    <link rel="modulepreload" crossorigin href="./assets/es2015-BJge4oQL.js">
+    <link rel="modulepreload" crossorigin href="./assets/createLucideIcon-BOsNKleB.js">
+    <link rel="modulepreload" crossorigin href="./assets/src-CMor9izq.js">
+    <link rel="modulepreload" crossorigin href="./assets/auth-BFSvtV59.js">
+    <link rel="modulepreload" crossorigin href="./assets/es2015-1nJWBurR.js">
     <link rel="modulepreload" crossorigin href="./assets/cn-DVhJ55Mo.js">
-    <link rel="modulepreload" crossorigin href="./assets/skeleton-vXOCdnJv.js">
-    <link rel="modulepreload" crossorigin href="./assets/badge-DNQwGXBl.js">
+    <link rel="modulepreload" crossorigin href="./assets/skeleton-Dk-qdg0z.js">
+    <link rel="modulepreload" crossorigin href="./assets/badge-DEe9tqLS.js">
     <link rel="modulepreload" crossorigin href="./assets/root-CDpNo7ef.js">
-    <link rel="modulepreload" crossorigin href="./assets/Match-Dc8bXsKo.js">
-    <link rel="modulepreload" crossorigin href="./assets/RowTitle-Cn5mAU58.js">
-    <link rel="modulepreload" crossorigin href="./assets/theme-65PB8uAu.js">
+    <link rel="modulepreload" crossorigin href="./assets/Match-DJq8wn3e.js">
+    <link rel="modulepreload" crossorigin href="./assets/RowTitle-DVOfgxOd.js">
+    <link rel="modulepreload" crossorigin href="./assets/theme-Cv-MfOv8.js">
     <link rel="modulepreload" crossorigin href="./assets/table-zG68ipQc.js">
     <link rel="modulepreload" crossorigin href="./assets/coerce-DSIVtcR-.js">
-    <link rel="modulepreload" crossorigin href="./assets/useResolvedScheme-CScQpr-P.js">
-    <link rel="modulepreload" crossorigin href="./assets/InfoHint-B3XcXtiN.js">
-    <link rel="modulepreload" crossorigin href="./assets/field-C6NmRYUN.js">
-    <link rel="modulepreload" crossorigin href="./assets/InlineConfirm-BfsNH5S_.js">
+    <link rel="modulepreload" crossorigin href="./assets/useResolvedScheme-DEq7P4R5.js">
+    <link rel="modulepreload" crossorigin href="./assets/InfoHint-ymRmHKMr.js">
+    <link rel="modulepreload" crossorigin href="./assets/field-BDCHXkZE.js">
+    <link rel="modulepreload" crossorigin href="./assets/InlineConfirm-A4IqkrGp.js">
     <link rel="modulepreload" crossorigin href="./assets/settle-CFU6YpQ0.js">
-    <link rel="modulepreload" crossorigin href="./assets/HintedLabel-CiTDE112.js">
-    <link rel="modulepreload" crossorigin href="./assets/zod-hUh5nXnX.js">
-    <link rel="modulepreload" crossorigin href="./assets/FormCheckboxGroup-1fYisXrr.js">
-    <link rel="modulepreload" crossorigin href="./assets/useSchemaScopeAccess-ByrxIdKM.js">
-    <link rel="modulepreload" crossorigin href="./assets/calendar-clock-BZGtAvWR.js">
-    <link rel="modulepreload" crossorigin href="./assets/clock-2arjsgZ4.js">
-    <link rel="modulepreload" crossorigin href="./assets/link-Pyr2Y35S.js">
-    <link rel="modulepreload" crossorigin href="./assets/search-BdwIwOzC.js">
-    <link rel="modulepreload" crossorigin href="./assets/image-DT79QFa_.js">
-    <link rel="modulepreload" crossorigin href="./assets/layers-BmcodiaH.js">
-    <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-0dyAtBEd.js">
-    <link rel="modulepreload" crossorigin href="./assets/constants-miV4q1ur.js">
-    <link rel="modulepreload" crossorigin href="./assets/boxes-CAygw8zF.js">
-    <link rel="modulepreload" crossorigin href="./assets/chevron-left-DGU3HGYG.js">
-    <link rel="modulepreload" crossorigin href="./assets/CursorPager-DwLW13ov.js">
-    <link rel="modulepreload" crossorigin href="./assets/file-stack-28ZtO1xW.js">
-    <link rel="modulepreload" crossorigin href="./assets/circle-check-C37MSJqX.js">
-    <link rel="modulepreload" crossorigin href="./assets/ellipsis-F91991on.js">
-    <link rel="modulepreload" crossorigin href="./assets/schema-D-qo7XSF.js">
+    <link rel="modulepreload" crossorigin href="./assets/HintedLabel-Cd9nuSqV.js">
+    <link rel="modulepreload" crossorigin href="./assets/zod-vPzaNsuW.js">
+    <link rel="modulepreload" crossorigin href="./assets/FormCheckboxGroup-VjWVMiF3.js">
+    <link rel="modulepreload" crossorigin href="./assets/Trans-B3UWiZaU.js">
+    <link rel="modulepreload" crossorigin href="./assets/useSchemaScopeAccess-JXOMx51q.js">
+    <link rel="modulepreload" crossorigin href="./assets/calendar-clock-VXok22Xj.js">
+    <link rel="modulepreload" crossorigin href="./assets/clock-BtvZR9KD.js">
+    <link rel="modulepreload" crossorigin href="./assets/link-C98FG_p5.js">
+    <link rel="modulepreload" crossorigin href="./assets/search-wj7zbkx1.js">
+    <link rel="modulepreload" crossorigin href="./assets/image-CX4mT-_R.js">
+    <link rel="modulepreload" crossorigin href="./assets/layers-swLuw-3a.js">
+    <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-B7dJyA8h.js">
+    <link rel="modulepreload" crossorigin href="./assets/constants-FKg_ke3y.js">
+    <link rel="modulepreload" crossorigin href="./assets/boxes-_5klpWNM.js">
+    <link rel="modulepreload" crossorigin href="./assets/chevron-left-CkRxDtvO.js">
+    <link rel="modulepreload" crossorigin href="./assets/CursorPager-CsnzX1P8.js">
+    <link rel="modulepreload" crossorigin href="./assets/file-stack-X4OGmkLA.js">
+    <link rel="modulepreload" crossorigin href="./assets/circle-check-DtDq7QMo.js">
+    <link rel="modulepreload" crossorigin href="./assets/ellipsis-Ci0rsbCJ.js">
     <link rel="modulepreload" crossorigin href="./assets/modelPermissions-DZ1lWfQZ.js">
-    <link rel="modulepreload" crossorigin href="./assets/contentCounts-DP7YYeZZ.js">
-    <link rel="modulepreload" crossorigin href="./assets/usePlaces-DC47wVeU.js">
-    <link rel="modulepreload" crossorigin href="./assets/globe-DFr3Gd2w.js">
-    <link rel="modulepreload" crossorigin href="./assets/inbox-CySnQydm.js">
-    <link rel="modulepreload" crossorigin href="./assets/key-round-D36CePnN.js">
-    <link rel="modulepreload" crossorigin href="./assets/sparkles-CvT-jxrW.js">
-    <link rel="modulepreload" crossorigin href="./assets/sections-BfxPwK0u.js">
-    <link rel="modulepreload" crossorigin href="./assets/plus-BoDtdLCo.js">
-    <link rel="modulepreload" crossorigin href="./assets/scroll-text-PqeZm472.js">
-    <link rel="modulepreload" crossorigin href="./assets/send-XPWo3m4u.js">
-    <link rel="modulepreload" crossorigin href="./assets/UserAvatar-BItYDTyH.js">
+    <link rel="modulepreload" crossorigin href="./assets/contentCounts-BzC7IQqP.js">
+    <link rel="modulepreload" crossorigin href="./assets/schema-BMQEabwO.js">
+    <link rel="modulepreload" crossorigin href="./assets/useResolvedDefinitions-C279ueCH.js">
+    <link rel="modulepreload" crossorigin href="./assets/usePlaces-CySN2Vwz.js">
+    <link rel="modulepreload" crossorigin href="./assets/globe-DBw84s8Z.js">
+    <link rel="modulepreload" crossorigin href="./assets/inbox-D9SmWt5L.js">
+    <link rel="modulepreload" crossorigin href="./assets/key-round-C8sd9CLN.js">
+    <link rel="modulepreload" crossorigin href="./assets/sparkles-D_kmZJVd.js">
+    <link rel="modulepreload" crossorigin href="./assets/sections-SX-oiQoE.js">
+    <link rel="modulepreload" crossorigin href="./assets/plus-cr9ZfO6j.js">
+    <link rel="modulepreload" crossorigin href="./assets/scroll-text-B5vfi9fD.js">
+    <link rel="modulepreload" crossorigin href="./assets/send-CzFdgUc_.js">
+    <link rel="modulepreload" crossorigin href="./assets/UserAvatar-If-zlQNY.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-DNjfDxmj.js">
-    <link rel="modulepreload" crossorigin href="./assets/users-DM7CXUBJ.js">
-    <link rel="modulepreload" crossorigin href="./assets/sections-BTS683ur.js">
-    <link rel="modulepreload" crossorigin href="./assets/tooltip-CS_8cJu2.js">
-    <link rel="modulepreload" crossorigin href="./assets/TextLink-HRn66VL1.js">
+    <link rel="modulepreload" crossorigin href="./assets/searchSchemas-fO_49fDI.js">
+    <link rel="modulepreload" crossorigin href="./assets/users-DYwcVDqp.js">
+    <link rel="modulepreload" crossorigin href="./assets/sections-DBQpB0uv.js">
+    <link rel="modulepreload" crossorigin href="./assets/tooltip-CCOeMqiL.js">
+    <link rel="modulepreload" crossorigin href="./assets/TextLink-Dfs5wsc5.js">
     <link rel="modulepreload" crossorigin href="./assets/sites-C6_THCVK.js">
-    <link rel="modulepreload" crossorigin href="./assets/store-CdIFG90N.js">
-    <link rel="modulepreload" crossorigin href="./assets/usePaletteItems-DtReWmkd.js">
-    <link rel="modulepreload" crossorigin href="./assets/useDiscardGuard-CMMJgkI2.js">
-    <link rel="modulepreload" crossorigin href="./assets/SharedGlyph-CA8tb7UH.js">
+    <link rel="modulepreload" crossorigin href="./assets/store-CznhNKEi.js">
+    <link rel="modulepreload" crossorigin href="./assets/usePaletteItems-CFpNlSOs.js">
+    <link rel="modulepreload" crossorigin href="./assets/useDiscardGuard-DvBI3VIz.js">
+    <link rel="modulepreload" crossorigin href="./assets/SharedGlyph-nsXJPCew.js">
     <link rel="modulepreload" crossorigin href="./assets/useShortcutLabel-BJMslX8p.js">
     <link rel="modulepreload" crossorigin href="./assets/preload-helper-BaNbYf_w.js">
-    <link rel="modulepreload" crossorigin href="./assets/QueryView-KFtwko9F.js">
+    <link rel="modulepreload" crossorigin href="./assets/QueryView-DO9TFWYE.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-BoN9R_3K.js">
-    <link rel="modulepreload" crossorigin href="./assets/FormRadioGroup-B0VZyb1t.js">
-    <link rel="modulepreload" crossorigin href="./assets/useNetworkPermission-Cts98h9d.js">
-    <link rel="stylesheet" crossorigin href="./assets/index-lxe7WimO.css">
+    <link rel="modulepreload" crossorigin href="./assets/radio-group-Btmx7dlD.js">
+    <link rel="modulepreload" crossorigin href="./assets/FormRadioGroup-BQurJa8M.js">
+    <link rel="modulepreload" crossorigin href="./assets/useNetworkPermission-DehDln-U.js">
+    <link rel="stylesheet" crossorigin href="./assets/index-DZsQq6fY.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/cli.js

@@ -10,7 +10,7 @@ if (refusal) {
 	process.stderr.write(`${refusal}\n`);
 	process.exit(1);
 }
-await import("./cliMain-D08HeAd_.js");
+await import("./cliMain-DzBXO7Oa.js");
 //#endregion
 export {};
 

package/dist/{cliMain-D08HeAd_.js → cliMain-DzBXO7Oa.js}

@@ -1,4 +1,4 @@
-import { $ as routeKeyOf, A as listForAssets, B as SCHEMA_KIND_DIRECTORIES, C as SITE_KEY_PATTERN, D as EXTENSION_JOB_PREFIX, E as BEFORE_EVENTS, F as describeError, G as generatedNames, H as THEME_VARIANTS, J as lockCoversSite, K as hashDefinition, L as RESERVED_DEFINITION_API_KEYS, M as listLiveByDriver, N as lockById, O as EXTENSION_ROUTE_ROOT, P as update, Q as parseLockFile, R as RESERVED_FIELD_API_KEYS, S as loopbackUrl, T as AFTER_EVENTS, U as checkThemeContrast, V as SITES_DIRECTORY, W as foldApiKey, X as mergePulledLock, Y as lockEntriesForSite, Z as parseDefinition, _ as createAdminDirect, a as loadConfig, at as toTypeName, b as createLogger, c as getPendingMigrations, ct as validateSchema, d as EmailSchema, dt as SAFE_LINK_PATTERN, et as schemaFilePath, f as PasswordSchema, ft as createStableId, g as listAllSites, h as createSite, ht as sqliteDriverOf, i as assertDatabaseReachable, it as suggestPlural, j as STORAGE_DRIVERS, k as buildEditorManifest, l as migrateToLatest, lt as withSiteCovered, m as createMediaStorage, mt as createDb, n as startServer, nt as serializeDefinition, o as loadEnvFileIfPresent, ot as typeChangeDropsValues, p as PersonNameSchema, pt as validateRichText, q as isDataType, r as copyObjectVerified, rt as serializeLockFile, st as upgradeLockFile, t as startDedicatedWorker, tt as scopeDirectory, u as SHAPIO_VERSION, ut as RICHTEXT_FORMAT, v as SYSTEM_CLI_ACTOR, w as loadProjectConfig, x as createUrlBuilder, y as generateToken, z as RESERVED_TYPE_NAMES } from "./worker-jspgh10V.js";
+import { $ as parseLockFile, A as listForAssets, B as SCHEMA_KIND_DIRECTORIES, C as SITE_KEY_PATTERN, D as EXTENSION_JOB_PREFIX, E as BEFORE_EVENTS, F as describeError, G as foldApiKey, H as THEME_VARIANTS, J as isDataType, K as generatedNames, L as RESERVED_DEFINITION_API_KEYS, M as listLiveByDriver, N as lockById, O as EXTENSION_ROUTE_ROOT, P as update, Q as parseDefinition, R as RESERVED_FIELD_API_KEYS, S as loopbackUrl, T as AFTER_EVENTS, U as checkThemeContrast, V as SITES_DIRECTORY, W as createDefinitionIndex, X as lockEntriesForSite, Y as lockCoversSite, Z as mergePulledLock, _ as createAdminDirect, a as loadConfig, at as suggestPlural, b as createLogger, c as getPendingMigrations, ct as upgradeLockFile, d as EmailSchema, dt as RICHTEXT_FORMAT, et as routeKeyOf, f as PasswordSchema, ft as SAFE_LINK_PATTERN, g as listAllSites, gt as sqliteDriverOf, h as createSite, ht as createDb, i as assertDatabaseReachable, it as serializeLockFile, j as STORAGE_DRIVERS, k as buildEditorManifest, l as migrateToLatest, lt as validateSchema, m as createMediaStorage, mt as validateRichText, n as startServer, nt as scopeDirectory, o as loadEnvFileIfPresent, ot as toTypeName, p as PersonNameSchema, pt as createStableId, q as hashDefinition, r as copyObjectVerified, rt as serializeDefinition, st as typeChangeDropsValues, t as startDedicatedWorker, tt as schemaFilePath, u as SHAPIO_VERSION, ut as withSiteCovered, v as SYSTEM_CLI_ACTOR, w as loadProjectConfig, x as createUrlBuilder, y as generateToken, z as RESERVED_TYPE_NAMES } from "./worker-6ru1tYBs.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";
@@ -349,6 +349,19 @@ const createContentApi = (request) => ({
 			method: "POST",
 			body
 		}),
+		/** What changing the entry's kind would drop, without changing anything. */
+		previewKindChange: (modelKey, id, body) => request(`${entryPath$1(modelKey, id)}/kind${toQueryString({ dryRun: 1 })}`, {
+			method: "POST",
+			body
+		}),
+		/**
+		* Moves the entry to another kind of its family, dropping the values of fields the target lacks; the
+		* answer carries the entry under its new kind. 409 while it is in an open change set or scheduled.
+		*/
+		changeKind: (modelKey, id, body) => request(`${entryPath$1(modelKey, id)}/kind`, {
+			method: "POST",
+			body
+		}),
 		revisions: async (modelKey, id, { locale } = {}) => (await request(`${revisionsPath(modelKey, id)}${toQueryString({ locale })}`)).items,
 		/** Revisions with their authors' names, and the entry's publications (who published, when, how). */
 		history: (modelKey, id, { locale } = {}) => request(`${revisionsPath(modelKey, id)}${toQueryString({ locale })}`),
@@ -791,16 +804,35 @@ const createAppAuthApi = (request, baseUrl) => ({
 });
 const TAG_PREFIX = "shapio";
 /**
+* A route key and each ancestor's, root first: `posts/guides` → `posts`, `posts/guides`. A type that extends
+* another is read under a nested route key, and its entries are also in every ancestor's list.
+*/
+const routeKeyPrefixes = (routeKey) => {
+	const segments = routeKey.split("/");
+	return segments.map((_, index) => segments.slice(0, index + 1).join("/"));
+};
+const modelTag = (routeKey) => `${TAG_PREFIX}:${routeKey}`;
+const entryTag = (routeKey, entryId) => `${TAG_PREFIX}:${routeKey}:${entryId}`;
+/**
 * 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.
+* Models are named by their route key: a collection's plural API ID, a singleton's API ID, and for a type that
+* extends another its ancestors' plural API IDs and its own joined by `/` (`posts/guides`).
 */
 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}`,
+	model: modelTag,
 	/** Reads of one entry by its ID. */
-	entry: (routeKey, entryId) => `${TAG_PREFIX}:${routeKey}:${entryId}`
+	entry: entryTag,
+	/**
+	* Everything to revalidate when an entry of `routeKey` changes (a webhook's or a snapshot diff's
+	* `routeKey`): the model and entry tags of its route key and of every ancestor's, since a Guide is also
+	* in the Posts list and readable as `posts/<id>`. `shapioTags.changed('posts/guides', id)` gives
+	* `shapio:posts`, `shapio:posts:<id>`, `shapio:posts/guides` and `shapio:posts/guides:<id>`. Without an
+	* entry ID, the model tags only.
+	*/
+	changed: (routeKey, entryId) => routeKeyPrefixes(routeKey).flatMap((prefix) => entryId === void 0 ? [modelTag(prefix)] : [modelTag(prefix), entryTag(prefix, entryId)])
 };
 /** Spelled out so bundlers that inline `process.env.NEXT_RUNTIME` see it; guarded for browsers. */
 const isNextRuntime = () => {
@@ -834,7 +866,11 @@ const nextFetchInit = ({ client, read, tags, pinned, drafts = false }) => {
 	};
 };
 const DELIVERY_PATH = "/api/content";
-const routePath = (routeKey) => `${DELIVERY_PATH}/${encodeURIComponent(routeKey)}`;
+/**
+* The delivery path of a route key. A type that extends another has a nested key (`posts/guides`), sent as
+* nested path segments: each segment is encoded, the `/` between them never is.
+*/
+const routePath = (routeKey) => `${DELIVERY_PATH}/${routeKey.split("/").map(encodeURIComponent).join("/")}`;
 /**
 * The content query string plus `snapshot`, `richText` and `seo`, which only delivery reads take, and
 * `publicationState=draft` in drafts mode.
@@ -854,7 +890,9 @@ const deliveryQueryString = ({ snapshot, richText, seo, ...query }, drafts) => {
 const draftsPinned = () => Promise.reject(/* @__PURE__ */ new Error("Drafts mode reads saved drafts, which have no publication snapshot: leave `snapshot` out when the client has `drafts: true`"));
 /**
 * 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`. Each read
+* A collection is read with `list` (a page) and `get` (one entry); a singleton with `singleton`. A type that
+* extends another is read by its nested route key (`delivery.list('posts/guides')`); a parent's list
+* holds every kind, each entry naming its own in `__model`. 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. In drafts mode (`drafts: true`) every read asks for
 * drafts (`publicationState=draft`), is never cached or tagged under Next, and refuses a pinned snapshot.
@@ -3020,7 +3058,10 @@ const writeDefinitionFile = async (dir, definition, site) => {
 };
 const removeFile = (path) => rm(path, { force: true });
 const displayPath = (path) => relative(process.cwd(), path) || path;
-/** Human-readable output for schema sync: decisions, per-definition diffs and server refusals. */
+/** The `ParentIds` key of a model by API ID (a stable ID never contains `:`). */
+const parentKeyOf = (apiKey) => `apiKey:${apiKey}`;
+/** A definition's API ID from the files, else its ID; `(none)` for a model that extends nothing. */
+const definitionName = (id, names) => typeof id === "string" && id !== "" ? names.get(id) ?? id : "(none)";
 const isObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const sortKeys = (value) => {
 	if (Array.isArray(value)) return value.map(sortKeys);
@@ -3070,6 +3111,7 @@ const formatChange = (change, names) => {
 		case "field.added": return [`+ field ${field}`];
 		case "field.removed": return [`- field ${field}`];
 		case "field.order": return ["~ field order"];
+		case "model.extends": return [`~ extends: ${definitionName(change.from, names)} → ${definitionName(change.to, names)}`];
 		default: {
 			const subject = change.kind.startsWith("field.") ? `field ${field} ` : "";
 			const property = change.property ?? change.kind.split(".")[1] ?? change.kind;
@@ -3099,13 +3141,20 @@ const describeDecision = (item) => {
 	if (decision.action === "skip" || decision.action === "conflict") return `${decision.action}: ${DECISION_LABELS[decision.reason] ?? decision.reason}`;
 	return decision.action;
 };
-const formatItem = (item, names) => {
+/**
+* A change the server reports on another member of the item's family (a parent's new field, as each kind
+* that inherits it sees it) names that member, so the same line twice never reads as a duplicate.
+*/
+const onMember = (change, item, names) => change.definitionId && change.definitionId !== item.definitionId ? ` (on ${definitionName(change.definitionId, names)})` : "";
+const formatItem = (item, names, parents = /* @__PURE__ */ new Map()) => {
 	const flags = [
 		item.plan?.summary?.breaking ? "BREAKING" : "",
 		item.plan?.summary?.destructive ? "DESTRUCTIVE" : "",
 		item.outcome === "pending" ? `pending change ${item.changeId ?? ""}` : ""
 	].filter(Boolean);
-	return [`${item.kind === "component" ? "component" : "model"} ${item.apiKey}: ${describeDecision(item)}${flags.length ? ` [${flags.join(", ")}]` : ""}`, ...item.changes.flatMap((change) => formatChange(change, names).map((line) => `    ${line}`))].join("\n");
+	const parent = parents.get(item.definitionId) ?? parents.get(parentKeyOf(item.apiKey));
+	const extendsNote = parent === void 0 ? "" : ` (extends ${definitionName(parent, names)})`;
+	return [`${item.kind === "component" ? "component" : "model"} ${item.apiKey}${extendsNote}: ${describeDecision(item)}${flags.length ? ` [${flags.join(", ")}]` : ""}`, ...item.changes.flatMap((change) => formatChange(change, names).map((line) => `    ${line}${onMember(change, item, names)}`))].join("\n");
 };
 const FOLDER_OF = {
 	network: "the shared folders",
@@ -3124,12 +3173,19 @@ const scopeItemLines = (code, items) => items.map((item) => {
 	const name = item.apiKey ?? item.definitionId ?? "?";
 	return code === "SCOPE_MISMATCH" ? `  ${name}: its file is in ${FOLDER_OF[item.local ?? ""] ?? "?"}, but on the instance it is ${PLACE_OF[item.remote ?? ""] ?? "?"}` : `  ${name} (${SCOPE_OF[item.scope ?? ""] ?? item.scope ?? "?"}): ${item.message ?? "not allowed"}`;
 });
-/** What to do next, per refusal. */
+/** What to do next, per refusal (an error code, or the code of an issue in an invalid file). */
 const HINTS = {
 	SCHEMA_CHANGE_NOT_ACKNOWLEDGED: "Review the changes with `shapio schema diff`, then re-run with --allow-breaking and/or --allow-destructive.",
 	SCHEMA_SYNC_CONFLICT: "Commit your files, run `shapio schema pull --force`, reconcile with git, then apply again.",
 	SCOPE_MISMATCH: "Sync never moves a definition between sites: run `shapio schema pull` to get the instance’s layout, or change the scope with `shapio schema scope`.",
-	FORBIDDEN_SCOPE: "Shared definitions (in models/ and components/) need schema permission on every site: apply with a network token, or leave those files unchanged."
+	FORBIDDEN_SCOPE: "Shared definitions (in models/ and components/) need schema permission on every site: apply with a network token, or leave those files unchanged.",
+	UNKNOWN_PARENT: "\"extends\" holds the stable ID of the parent type: check the ID, or add the parent’s file (it can be in the same apply).",
+	INVALID_PARENT: "Only a collection can extend another collection, and both must be in the same place: both shared (models/), or both in one site’s folder.",
+	INHERITANCE_CYCLE: "Follow the \"extends\" chain from the type named above and remove the link that leads back to it.",
+	INHERITANCE_TOO_DEEP: "A family can be at most 8 types deep: make the type extend one higher up the chain.",
+	INHERITED_FLAG_MISMATCH: "A type and the type it extends must agree on \"localized\" and \"draftAndPublish\": set the value the message names.",
+	INHERITED_FIELD_COLLISION: "A type cannot declare a field its parent already has: rename its own field, or remove it and use the inherited one.",
+	HAS_CHILDREN: "Delete the types that extend it first, or make them extend another type, then apply again."
 };
 const issueWhere = (found, filePaths) => {
 	const match = /^\/definitions\/(\d+)(.*)$/.exec(found.path ?? "");
@@ -3138,15 +3194,15 @@ const issueWhere = (found, filePaths) => {
 };
 const siteCountLines = (sites) => (sites ?? []).flatMap((site) => typeof site === "object" && site.entries !== void 0 ? [`  site ${site.key ?? site.siteId ?? "?"}: ${site.entries} entr${site.entries === 1 ? "y" : "ies"}`] : []);
 /** Explains a refused request: conflicts with diffs, invalid files, scope refusals, missing acknowledgements. */
-const formatApiError = (error, filePaths, names) => {
+const formatApiError = (error, filePaths, names, parents = /* @__PURE__ */ new Map()) => {
 	const details = error.details ?? {};
 	const lines = [`${error.code}: ${error.message}`];
-	for (const conflict of details.conflicts ?? []) lines.push(formatItem(conflict, names));
+	for (const conflict of details.conflicts ?? []) lines.push(formatItem(conflict, names, parents));
 	for (const found of details.issues ?? []) lines.push(`  ${issueWhere(found, filePaths)}: ${found.message ?? ""}`);
 	lines.push(...scopeItemLines(error.code, details.items ?? []));
 	if (error.code === "SCOPE_IN_USE") lines.push(...siteCountLines(details.sites));
-	const hint = HINTS[error.code];
-	if (hint) lines.push(hint);
+	const codes = /* @__PURE__ */ new Set([error.code, ...(details.issues ?? []).flatMap((found) => found.code ?? [])]);
+	lines.push(...[...codes].flatMap((code) => HINTS[code] ?? []));
 	return `${lines.join("\n")}\n`;
 };
 /**
@@ -3206,7 +3262,11 @@ const EMPTY_LOCK = {
 	sites: [],
 	definitions: {}
 };
-/** Field and definition names by ID from the local files, for readable diffs. */
+/**
+* Field and definition names by ID from every local file (all sites' folders too), for readable diffs. A type
+* that extends another stores only its own fields, and an inherited field keeps its parent's ID, so the
+* parent's file names it: the whole file set is read, never one site's part, and inherited fields resolve.
+*/
 const collectNames = (files) => {
 	const names = /* @__PURE__ */ new Map();
 	for (const file of files) {
@@ -3216,12 +3276,27 @@ const collectNames = (files) => {
 	}
 	return names;
 };
+/**
+* Each model's parent ID (`extends`, a stable ID like a relation's target) from the local files, keyed by the
+* model's ID and by its API ID (`parentKeyOf`): a new file may have no ID yet, which the instance assigns.
+*/
+const collectParents = (files) => {
+	const parents = /* @__PURE__ */ new Map();
+	for (const file of files) {
+		const raw = file.raw;
+		if (typeof raw.extends !== "string" || raw.extends === "") continue;
+		if (raw.id) parents.set(raw.id, raw.extends);
+		if (raw.apiKey) parents.set(parentKeyOf(raw.apiKey), raw.extends);
+	}
+	return parents;
+};
 const readLocalState = async (options) => {
 	const files = await readLocalFiles(options.dir);
 	return {
 		files,
 		lock: await readLockFile(options.lockPath) ?? EMPTY_LOCK,
-		names: collectNames(files)
+		names: collectNames(files),
+		parents: collectParents(files)
 	};
 };
 /** The admin client for the command's site (`--site`, else the token's site, else the primary). */
@@ -3270,14 +3345,14 @@ const sendApply = async (options, state, dryRun, io) => {
 		});
 	} catch (error) {
 		if (error instanceof ShapioApiError) {
-			io.stderr(formatApiError(error, state.sent.map((file) => displayPath(file.path)), state.names));
+			io.stderr(formatApiError(error, state.sent.map((file) => displayPath(file.path)), state.names, state.parents));
 			return;
 		}
 		throw error;
 	}
 };
 const printResults = (response, state, io, verbose) => {
-	for (const item of response.results) if (verbose || item.decision.action !== "skip" || item.decision.reason !== "unchangedLocally") io.stdout(`${formatItem(item, state.names)}\n`);
+	for (const item of response.results) if (verbose || item.decision.action !== "skip" || item.decision.reason !== "unchangedLocally") io.stdout(`${formatItem(item, state.names, state.parents)}\n`);
 };
 /** Where `--plan` puts the schema files and their (empty) lock file inside the plan directory. */
 const PLAN_SCHEMA_DIR = "schema";
@@ -3428,6 +3503,7 @@ const formatWarnings = (warnings) => {
 };
 const resolveLiveSchema = (map, definitions) => {
 	const live = new Map(definitions.map((definition) => [definition.id, definition]));
+	const index = createDefinitionIndex(definitions);
 	const byKey = /* @__PURE__ */ new Map();
 	const byId = /* @__PURE__ */ new Map();
 	const missing = [];
@@ -3437,7 +3513,8 @@ const resolveLiveSchema = (map, definitions) => {
 			missing.push(planned.apiKey);
 			continue;
 		}
-		const fieldsById = new Map(definition.fields.map((field) => [field.id, field]));
+		const effective = index.resolve(definition.id)?.fields ?? definition.fields;
+		const fieldsById = new Map(effective.map((field) => [field.id, field]));
 		const fields = /* @__PURE__ */ new Map();
 		for (const [fieldKey, fieldId] of Object.entries(planned.fields)) {
 			const field = fieldsById.get(fieldId);
@@ -5768,4 +5845,4 @@ runCli(process.argv.slice(2), io).then((code) => {
 //#endregion
 export {};
 
-//# sourceMappingURL=cliMain-D08HeAd_.js.map
+//# sourceMappingURL=cliMain-DzBXO7Oa.js.map