canopycms 0.4.0 → 0.6.0

package/dist/static/index.js

@@ -68,11 +68,13 @@ async function enumerateRoutableEntries(ctx, rootPath, phaseLabel, resolveRefere
  * when you actually mean to — omission should be a decision, not an oversight.
  *
  * `noindex` is NOT applied here: an entry that must not be advertised must still be built. Apply
- * `isNoindexEntry` at the advertising surface (as `generateContentSitemap` does).
+ * `isNoindexEntry` at the advertising surface (as `generateContentSitemap` does), at the SEO
+ * location in `CanopyConfig.seo`.
  *
  * @example
- * const entries = await collectRoutableEntries(await getCanopyForBuild())
- * const published = entries.filter((e) => !isNoindexEntry(e.data))
+ * const ctx = await getCanopyForBuild()
+ * const entries = await collectRoutableEntries(ctx)
+ * const published = entries.filter((e) => !isNoindexEntry(e.data, ctx.services.config.seo))
  */
 export async function collectRoutableEntries(ctx, options = {}) {
     const entries = await enumerateRoutableEntries(ctx, options.rootPath, 'routable entry enumeration', options.resolveReferences);
@@ -283,22 +285,45 @@ export function warnUnsafeMarkdown(items, phaseLabel, siteAllow) {
  *
  * Fails the build rather than silently skipping the offending entry: a page that silently
  * disappears from a static build is a worse failure mode than a red build. Lists every
- * offending entry so one build catches every abandoned scaffold, not just the first.
+ * offending entry so one build catches every abandoned scaffold, not just the first. An
+ * over-`maxItems` list gets its own line per list, with the fix; the abandoned-scaffold advice
+ * appears only when some entry has another kind of error.
  */
 export function assertBuildEntriesValid(items, phaseLabel) {
     const invalid = findInvalidEntries(items);
     if (invalid.length === 0)
         return;
-    const lines = invalid.map(({ entryPath, errors }) => {
-        const [first, ...rest] = errors;
-        const summary = rest.length > 0
-            ? `${first.fieldPath}: ${first.message} (+${rest.length} more)`
-            : `${first.fieldPath}: ${first.message}`;
-        return `  - ${entryPath} — ${summary}`;
-    });
+    const lines = [];
+    let hasOverCap = false;
+    let hasOrdinary = false;
+    for (const { entryPath, errors } of invalid) {
+        const ordinary = errors.filter((e) => e.maxItems === undefined);
+        if (ordinary.length > 0) {
+            hasOrdinary = true;
+            const [first, ...rest] = ordinary;
+            const summary = rest.length > 0
+                ? `${first.fieldPath}: ${first.message} (+${rest.length} more)`
+                : `${first.fieldPath}: ${first.message}`;
+            lines.push(`  - ${entryPath} — ${summary}`);
+        }
+        for (const { fieldPath, maxItems } of errors) {
+            if (maxItems === undefined)
+                continue;
+            hasOverCap = true;
+            lines.push(`  - ${entryPath} — ${fieldPath}: ${maxItems.count} items, but maxItems is ${maxItems.cap}`);
+        }
+    }
+    const advice = [];
+    if (hasOverCap) {
+        advice.push(`A list over its maxItems: open the entry in the editor and remove a pick from that list (or remove items) until it holds at most maxItems, then rebuild. ` +
+            `This usually happens when two branches each add one item to the same list and are merged one after the other.`);
+    }
+    if (hasOrdinary) {
+        advice.push(`${hasOverCap ? 'The other errors are' : 'These are'} likely abandoned create-scaffolds (empty entries left behind when a create was started but never finished). ` +
+            `Finish editing the entry (fill in its required fields) or delete the abandoned draft, then rebuild.`);
+    }
     throw new Error(`CanopyCMS static build: found ${invalid.length} schema-invalid ${invalid.length === 1 ? 'entry' : 'entries'} during ${phaseLabel}:\n${lines.join('\n')}\n` +
-        `These are likely abandoned create-scaffolds (empty entries left behind when a create was started but never finished). ` +
-        `Finish editing the entry (fill in its required fields) or delete the abandoned draft, then rebuild.`);
+        advice.join('\n'));
 }
 /**
  * Find every `urlPath` claimed by two or more entries.

package/dist/static/seo.d.ts

@@ -72,14 +72,16 @@ export type SeoFieldLocation = Pick<ExtractSeoFieldsOptions, 'fields' | 'group'>
  */
 export declare function extractSeoFields(entryData: unknown, opts?: ExtractSeoFieldsOptions): SeoFields;
 /**
- * THE `noindex` predicate. Every surface that suppresses an entry must route through this one
- * function rather than re-deriving the flag:
+ * THE `noindex` predicate. Every surface that reads the flag routes through this one function,
+ * with `opts` taken from `CanopyConfig.seo` (canopycms-next's free helpers take it as an
+ * argument instead), rather than re-deriving it:
  *
  * - the page's own `robots: { index: false }` (canopycms-next's `entryToMetadata`),
- * - exclusion from the sitemap (canopycms-next's `generateContentSitemap`), and
- * - exclusion from AI content (`ai/generate.ts`, unless `exclude.noindex: false`).
+ * - exclusion from the sitemap (canopycms-next's `generateContentSitemap`),
+ * - exclusion from AI content (`ai/generate.ts`, unless `exclude.noindex: false`), and
+ * - the marker on a reference picker's option (`ReferenceResolver.loadReferenceOptions`).
  *
- * Those surfaces shipping from one predicate is the point. Derived separately, a `noindex` entry
+ * One predicate at one configured location is the point. Derived separately, a `noindex` entry
  * stays advertised in one surface while correctly absent from another, and nothing warns.
  *
  * NOT applied to enumeration: `noindex` means "don't advertise this", not "don't build this".

package/dist/static/seo.js

@@ -75,7 +75,12 @@ const asTwitterCard = (value) => {
  * rather than throwing.
  */
 export function extractSeoFields(entryData, opts = {}) {
-    const names = { ...DEFAULT_SEO_FIELD_NAMES, ...opts.fields };
+    const names = { ...DEFAULT_SEO_FIELD_NAMES };
+    // Only a real name overrides: `{ noindex: undefined }` (an unset env var, say) keeps the default.
+    for (const [key, name] of Object.entries(opts.fields ?? {})) {
+        if (typeof name === 'string' && name !== '')
+            names[key] = name;
+    }
     const entry = asRecord(entryData);
     const source = opts.group ? asRecord(entry?.[opts.group]) : entry;
     return {
@@ -89,14 +94,16 @@ export function extractSeoFields(entryData, opts = {}) {
     };
 }
 /**
- * THE `noindex` predicate. Every surface that suppresses an entry must route through this one
- * function rather than re-deriving the flag:
+ * THE `noindex` predicate. Every surface that reads the flag routes through this one function,
+ * with `opts` taken from `CanopyConfig.seo` (canopycms-next's free helpers take it as an
+ * argument instead), rather than re-deriving it:
  *
  * - the page's own `robots: { index: false }` (canopycms-next's `entryToMetadata`),
- * - exclusion from the sitemap (canopycms-next's `generateContentSitemap`), and
- * - exclusion from AI content (`ai/generate.ts`, unless `exclude.noindex: false`).
+ * - exclusion from the sitemap (canopycms-next's `generateContentSitemap`),
+ * - exclusion from AI content (`ai/generate.ts`, unless `exclude.noindex: false`), and
+ * - the marker on a reference picker's option (`ReferenceResolver.loadReferenceOptions`).
  *
- * Those surfaces shipping from one predicate is the point. Derived separately, a `noindex` entry
+ * One predicate at one configured location is the point. Derived separately, a `noindex` entry
  * stays advertised in one surface while correctly absent from another, and nothing warns.
  *
  * NOT applied to enumeration: `noindex` means "don't advertise this", not "don't build this".

package/dist/validation/entry-validator.d.ts

@@ -20,6 +20,11 @@ import type { ContentFormat, EntrySchema } from '../config/index.js';
 export interface EntryFieldError {
     fieldPath: string;
     message: string;
+    /** Set on an over-cap list's error, so a caller can say how to fix it. */
+    maxItems?: {
+        count: number;
+        cap: number;
+    };
 }
 /**
  * Merge an md/mdx body string into the data record under the schema's body

package/dist/validation/entry-validator.js

@@ -173,6 +173,18 @@ export function validateEntryData(fields, data, pathPrefix = '', options = {}) {
         }
         if (value === undefined || value === null)
             continue;
+        // No `continue`: the items inside an over-cap list are still checked and reported.
+        if (Array.isArray(value) &&
+            'maxItems' in field &&
+            typeof field.maxItems === 'number' &&
+            value.length > field.maxItems) {
+            const cap = field.maxItems;
+            errors.push({
+                fieldPath: path,
+                message: `At most ${cap} ${cap === 1 ? 'item' : 'items'}; this list has ${value.length}`,
+                maxItems: { count: value.length, cap },
+            });
+        }
         if (field.type === 'block') {
             const blockField = field;
             if (!Array.isArray(value)) {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const CANOPYCMS_VERSION = "0.4.0";
+export declare const CANOPYCMS_VERSION = "0.6.0";

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by scripts/bump-version.mjs, its only writer. The package builds with plain
 // tsc (rootDir: src), so src/ cannot import ../package.json; version.test.ts keeps the two equal.
-export const CANOPYCMS_VERSION = '0.4.0';
+export const CANOPYCMS_VERSION = '0.6.0';

package/dist/worker/github-gateway-http.js

@@ -631,8 +631,8 @@ const POLL_WAIT_MS = MAX_POLL_WAIT_MS;
 /** How long `health` waits for the gateway: `getSecret` alone has taken 87 s. */
 const HEALTH_WAIT_MS = 300_000;
 /**
- * How long `authSnapshot` waits: a membership request per user, one at a time, so tens of thousands
- * of users take tens of minutes. A later call joins a fetch an earlier one stopped waiting for.
+ * How long `authSnapshot` waits: a generous bound on a fetch that pages the provider's whole user,
+ * organization and membership lists one page at a time. A later call joins a fetch an earlier one stopped waiting for.
  */
 const AUTH_SNAPSHOT_WAIT_MS = 30 * 60_000;
 /** How long `termination` and `completeLifecycle` wait: a poll's wait is well inside it. */

package/dist/worker/github-gateway.js

@@ -283,8 +283,8 @@ class LocalGitHubGateway {
     }
     /**
      * One fetch serves every caller: concurrent callers join it, and its result is answered again
-     * for {@link AUTH_SNAPSHOT_REUSE_MS}. A fetch is a request per user, so a worker asking in a loop
-     * would otherwise hold the provider's API at its rate limit. The fetch runs apart from every
+     * for {@link AUTH_SNAPSHOT_REUSE_MS}. A fetch pages the provider's whole user and membership lists,
+     * so a worker asking in a loop would otherwise hold the provider's API at its rate limit. The fetch runs apart from every
      * caller's signal, which ends only that caller's wait, so a retry after a timed-out wait joins it.
      */
     async authSnapshot(signal) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "//": "@codemirror/language, @lezer/highlight: workaround — @mdxeditor/editor uses cm6-theme-basic-light which peer-requires these but mdxeditor doesn't declare them as dependencies",
   "name": "canopycms",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "CanopyCMS core package: schema-driven content, branch-aware editing, and editor UI for Next.js.",
   "license": "MIT",
   "repository": {