ferst-core 0.9.0 → 0.9.2

package/bin/cms-config.mjs

@@ -108,18 +108,47 @@ export function deploymentBranch() {
   return 'main';
 }
 
+/** Ferst's managed GitHub org: its sites are on the Basic plan. */
+const MANAGED_OWNER = 'myai4webdev';
+
+/** The Pages collection's description on each plan. */
+const PAGES_DESCRIPTION = {
+  basic: "See each page and request a change — our team makes it and sends it back for you to check. You don't edit the page layout here.",
+  free: "You're on the free plan: you look after this site yourself and change its pages in your own repository. Asking the Ferst team to make changes for you comes with the Basic plan.",
+};
+
+/**
+ * The site's plan, for what its CMS offers. Requests (the Ferst team making a change for the
+ * site's people) come with the Basic plan: a managed site. A self-managed site, the client's
+ * own repo, is on the free plan and makes its own changes. The plan the platform records in
+ * `ferst-site.json` wins; otherwise the repo's owner decides. Unknown keeps the requests field:
+ * the platform refuses a free-plan site's request anyway.
+ * @param {string} repo owner/name
+ * @param {{ plan?: string }} [site] the parsed ferst-site.json
+ * @returns {'basic' | 'free'}
+ */
+export function planFor(repo, site = {}) {
+  if (site && (site.plan === 'basic' || site.plan === 'free')) return site.plan;
+  const owner = String(repo ?? '').split('/')[0].trim().toLowerCase();
+  if (!owner) return 'basic';
+  return owner === MANAGED_OWNER ? 'basic' : 'free';
+}
+
 /**
- * Fill the config template's placeholders. Pure — unit-testable.
+ * Fill the config template's placeholders. Pure — unit-testable. On the free plan the
+ * `# ferst:requests` … `# /ferst:requests` block (the pages' "Requested changes") is left out.
  * @param {string} tpl the template contents
- * @param {{ repo: string, base: string, branch: string }} vars
+ * @param {{ repo: string, base: string, branch: string, plan?: 'basic' | 'free' }} vars
  * @returns {string}
  */
-export function fillConfig(tpl, { repo, base, branch }) {
-  const out = tpl
+export function fillConfig(tpl, { repo, base, branch, plan = 'basic' }) {
+  const forPlan = plan === 'free' ? tpl.replace(/^[ \t]*# ferst:requests\b[\s\S]*?^[ \t]*# \/ferst:requests[^\n]*\n/m, '') : tpl;
+  const out = forPlan
     .split('__REPO__').join(repo)
     .split('__API_ROOT__').join(`${base}/git`)
     .split('__BASE_URL__').join(base)
-    .split('__BRANCH__').join(branch);
+    .split('__BRANCH__').join(branch)
+    .split('__PAGES_DESCRIPTION__').join(PAGES_DESCRIPTION[plan] ?? PAGES_DESCRIPTION.basic);
   const leftover = out.match(/__[A-Z][A-Z_]*__/);
   if (leftover) {
     throw new Error(`ferst-cms-config: unfilled placeholder ${leftover[0]} — add it to the filler.`);
@@ -147,9 +176,17 @@ function main() {
     process.exit(1);
   }
 
+  let site = {};
+  try {
+    site = JSON.parse(readFileSync(resolve(process.cwd(), 'ferst-site.json'), 'utf8')) ?? {};
+  } catch {
+    /* no ferst-site.json: the repo's owner decides the plan */
+  }
+  const plan = planFor(repo, site);
+
   let out;
   try {
-    out = fillConfig(tpl, { repo, base, branch });
+    out = fillConfig(tpl, { repo, base, branch, plan });
   } catch (e) {
     console.error(String(e.message ?? e));
     process.exit(1);
@@ -157,7 +194,7 @@ function main() {
 
   mkdirSync(dirname(outPath), { recursive: true });
   writeFileSync(outPath, out);
-  console.log(`ferst-cms-config: wrote ${outPath} (repo=${repo}, branch="${branch}", base=${base})`);
+  console.log(`ferst-cms-config: wrote ${outPath} (repo=${repo}, branch="${branch}", base=${base}, plan=${plan})`);
 }
 
 // Run when invoked directly as a bin — including via npm's node_modules/.bin symlink.

package/bin/ferst-update.mjs

@@ -142,6 +142,26 @@ export function coreRangeFor(version) {
   return `^${m[1]}.${m[2]}.0`;
 }
 
+/** Whether `b` is a newer plain x.y.z version than `a`; anything unparsable is not newer. */
+export function isNewerVersion(a, b) {
+  const parse = (v) => String(v ?? '').trim().replace(/^v/, '').match(/^(\d+)\.(\d+)\.(\d+)$/)?.slice(1).map(Number);
+  const [x, y] = [parse(a), parse(b)];
+  if (!x || !y) return false;
+  for (let i = 0; i < 3; i++) if (x[i] !== y[i]) return y[i] > x[i];
+  return false;
+}
+
+/**
+ * The dry run's line about the engine. A site's scheduled run decides from the dry run
+ * whether to update, so a newer ferst-core has to read as a change that WOULD apply, like
+ * the scaffold changes above it; otherwise an engine-only release never reaches the site.
+ */
+export function coreUpdateNote(installed, latest) {
+  if (!latest) return `ferst-core is ${installed ?? '(not installed)'}; the latest version is unknown`;
+  if (!installed) return `ferst-core ${latest} WOULD be installed (none installed yet)`;
+  return isNewerVersion(installed, latest) ? `ferst-core ${installed} → ${latest} WOULD be installed` : `ferst-core is current (${installed})`;
+}
+
 /** Read the `version` out of a package.json's text. Throws if absent. */
 export function extractVersion(pkgJsonText) {
   let v;
@@ -451,8 +471,7 @@ function main() {
     console.log('ferst-update: --no-core — skipping the ferst-core npm bump.');
   } else if (dryRun) {
     dryLatest = (tryExec('npm view ferst-core version', cwd) || '').trim() || null;
-    const current = readInstalledCoreVersion(cwd);
-    console.log(`ferst-update: ferst-core installed=${current ?? '(none)'} latest=${dryLatest || '(unknown)'}`);
+    console.log(`ferst-update: --dry-run — ${coreUpdateNote(readInstalledCoreVersion(cwd), dryLatest)}`);
   } else {
     const before = readInstalledCoreVersion(cwd);
     console.log('ferst-update: npm install ferst-core@latest --save ...');

package/cms/config.template.yml

@@ -177,6 +177,16 @@ collections:
           - { name: provider, label: Provider name, widget: string, default: Google Calendar }
           - { name: weekStart, label: Week starts on, widget: select, default: monday, options: [{ label: "Monday", value: monday }, { label: "Sunday", value: sunday }] }
 
+      - name: posts-settings
+        label: News
+        file: src/content/postsSettings/index.json
+        icon: newspaper
+        fields:
+          - { name: title, label: Heading, widget: string, default: News }
+          - { name: intro, label: Intro, widget: text, required: false }
+          - { name: perPage, label: Posts per page, widget: number, default: 12, value_type: int, min: 1, max: 48, hint: "How many posts each news page shows. 12 fills rows of one, two, three or four evenly." }
+          - { name: excludeFromIndex, label: Tags kept off the main news page, widget: list, required: false, hint: "Tag names (for example newsletter) whose posts appear only on their own tag page." }
+
   - name: posts
     label: Posts
     label_singular: Post
@@ -224,7 +234,7 @@ collections:
   - name: pages
     label: Pages
     label_singular: Page
-    description: "See each page and request a change — our team makes it and sends it back for you to check. You don't edit the page layout here."
+    description: "__PAGES_DESCRIPTION__"
     folder: src/content/pages
     extension: json
     format: json
@@ -234,6 +244,7 @@ collections:
     identifier_field: title
     fields:
       - { name: title, label: Page title, widget: string }
+      # ferst:requests (the Basic plan only: bin/cms-config.mjs leaves it out on the free plan)
       - name: requests
         label: Requested changes
         label_singular: Request
@@ -248,6 +259,7 @@ collections:
           - { name: issue, widget: hidden, required: false }
           - { name: by, widget: hidden, required: false }
           - { name: at, widget: hidden, required: false }
+      # /ferst:requests
       - { name: description, label: SEO description, widget: hidden, required: false }
       - { name: heroImage, widget: hidden, required: false }
       - { name: align, widget: hidden, required: false }

package/content/posts.ts

@@ -43,8 +43,8 @@ export const postsSettingsSchema = z.object({
   title: z.string().default('News'),
   /** Optional intro copy for the index. */
   intro: z.string().default(''),
-  /** Posts per page in the paginated index. */
-  perPage: z.number().int().min(1).default(9),
+  /** Posts per page in the paginated index. 12 fills rows of 1, 2, 3 or 4 tiles evenly. */
+  perPage: z.number().int().min(1).default(12),
   /** Tag slugs excluded from the MAIN index (e.g. a `newsletter` tag that has its
    *  own view). Kept generic — no capability knows what "newsletter" means. */
   excludeFromIndex: z.array(z.string()).default([]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ferst-core",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "type": "module",
   "description": "Ferst Core — the shared, brand-agnostic client-site system: Astro components, layouts, content schemas, the layered config resolver, and a neutral styling architecture that every client overrides.",
   "license": "BUSL-1.1",