@taprootio/site-authoring 0.27.1 → 0.29.0

package/src/verbs/pages-push.js

@@ -51,6 +51,7 @@ import {
   FRONT_MATTER_KEYS,
   PAGE_TEMPLATES,
   requireTemplateName,
+  RETIRED_GENERATED_PAGE_KINDS,
   sentDisplayDate,
   TEMPLATE_FREE_FORM,
   TEMPLATE_GENERATED,
@@ -486,6 +487,20 @@ function peekJsonTemplate(text) {
   }
 }
 
+/**
+ * Whether a generated-page source names a kind Taproot retired (TR01308). The
+ * site deletes such a page on its next synchronization, but until then it is still listed,
+ * so a pulled source of that kind is judged here, before its document is read.
+ */
+function isRetiredGeneratedSource(source) {
+  if (source.template !== TEMPLATE_GENERATED || typeof source.text !== "string") return false;
+  try {
+    return RETIRED_GENERATED_PAGE_KINDS.includes(JSON.parse(source.text)?.data?.kind);
+  } catch {
+    return false;
+  }
+}
+
 /**
  * Reads one editable page source and resolves the metadata that says *which
  * page it is* — no Markdown conversion, no media resolution, no document
@@ -1293,7 +1308,6 @@ export async function planPages({
       let observedRecord;
       let legalRevisionGuard;
       requireCompletePageMetadata(source);
-      const document_ = await convertWorkspacePageSource({ source, mediaManifest, content });
 
       const target = manifestEntry?.pageId !== undefined
         ? liveById.get(manifestEntry.pageId)
@@ -1307,21 +1321,26 @@ export async function planPages({
           file,
         );
       }
-      const generated = documentTemplate(document_) === TEMPLATE_GENERATED;
-      if (documentTemplate(document_) === TEMPLATE_LEGAL && target === undefined && manifestEntry?.pageId !== undefined) {
-        throw documentError("pages.legal_missing", `'${file}' tracks a legal page that the site no longer lists. Pull and reconcile it before creating another page.`, file);
-      }
-      if (generated && target === undefined) {
+      // A generated source the site no longer has, or whose kind Taproot retired
+      // (TR01308; the site deletes the page on its next synchronization), is
+      // judged before its document is read: it is reported stale like any
+      // other and never refused as an unknown kind that blocks the push.
+      const generated = source.template === TEMPLATE_GENERATED;
+      const retiredKind = generated && isRetiredGeneratedSource(source);
+      if (generated && (target === undefined || retiredKind)) {
         if (targeted) {
           throw documentError(
             "pages.generated_create",
-            `'${file}' is a generated-page source, but the site has no generated page for it. Taproot creates `
-              + "generated pages from the site's content; a push cannot create one. If the page no longer exists, "
-              + "delete this file and run 'taproot-site pull'.",
+            retiredKind
+              ? `'${file}' is the source of a generated page of a kind Taproot no longer publishes, and a push `
+                + "cannot send one. Delete the file."
+              : `'${file}' is a generated-page source, but the site has no generated page for it. Taproot creates `
+                + "generated pages from the site's content; a push cannot create one. If the page no longer exists, "
+                + "delete this file and run 'taproot-site pull'.",
             file,
           );
         }
-        // The site retired this page (its tag, month, place or folder is gone),
+        // The site retired this page (its folder or its kind is gone),
         // which is Taproot's doing, not a mistake in the workspace: it cannot
         // block the pages that do exist.
         staleGenerated.push({ file, path: displayPagePath(pagePath) });
@@ -1331,6 +1350,10 @@ export async function planPages({
         );
         return;
       }
+      const document_ = await convertWorkspacePageSource({ source, mediaManifest, content });
+      if (documentTemplate(document_) === TEMPLATE_LEGAL && target === undefined && manifestEntry?.pageId !== undefined) {
+        throw documentError("pages.legal_missing", `'${file}' tracks a legal page that the site no longer lists. Pull and reconcile it before creating another page.`, file);
+      }
       // The file-keyed entry is gone whenever the file was renamed or replaced —
       // which is exactly what the pull, delete the `.pm.json`, author a `.md`
       // flow does. Falling back through the page's own identity keeps the
@@ -1371,7 +1394,7 @@ export async function planPages({
         && targetEntry.file === file
         && targetEntry.sourceFormat === source.sourceFormat;
       // An untouched generated page is not this push's to judge. Taproot
-      // moves its revision and its path on its own (a tag rename, a month that
+      // moves its revision and its path on its own (a folder that
       // gained a post), and refusing the whole push for a page nothing here
       // sends would make one renamed page block every other edit.
       let untouchedGenerated = false;

package/src/verbs/places.js

@@ -83,8 +83,8 @@ export async function placesSelect(invocation) {
  *
  * A place's category is shared by every site, and Google's types do not always
  * give the one an owner wants. The override is the site's alone: its place
- * reviews and `/places/<category>` pages use it from the next deployment, and
- * the platform-wide place is never changed. The server owns the closed list, so
+ * reviews use it from the next deployment, and the platform-wide place is
+ * never changed. The server owns the closed list, so
  * the CLI sends the name as given and lets the server check it.
  */
 export async function placesCategorySet(invocation) {

package/src/verbs/pull.js

@@ -728,7 +728,7 @@ export async function pull(invocation) {
       registeredFiles.add(record.file);
     }
     const tracked = await resolveTrackedSources(config.workspaceDir, authorable, registry, onProgress);
-    // A generated page the site retired (its tag, month, place or folder is
+    // A generated page the site retired (its folder or its kind is
     // gone) leaves its pulled file behind: authored content, so pull will not
     // delete it, and settles it before naming any page's file so that a page
     // created since at the same path never writes over it. It is recorded