@rmdes/indiekit-endpoint-site-config 1.0.0-beta.1 → 1.0.0-beta.2

package/index.js

@@ -13,6 +13,7 @@ import { apiRouter        } from "./lib/controllers/api.js";
 import { getSiteConfig     } from "./lib/storage/get-site-config.js";
 import { getHomepageConfig } from "./lib/storage/get-homepage-config.js";
 import { maybeSeedFromEnv  } from "./lib/storage/seed-from-env.js";
+import { maybeBackfillIdentity } from "./lib/storage/backfill-identity.js";
 
 import { writeThemeCss    } from "./lib/render/write-theme-css.js";
 import { writeCriticalCss } from "./lib/render/write-critical-css.js";
@@ -84,6 +85,7 @@ export default class SiteConfigEndpoint {
     // First-boot seed + initial file write
     try {
       await maybeSeedFromEnv(Indiekit);
+      await maybeBackfillIdentity(Indiekit);
       const config   = await getSiteConfig(Indiekit);
       const homepage = await getHomepageConfig(Indiekit);
       await writeThemeCss(config);

package/lib/storage/backfill-identity.js

@@ -0,0 +1,65 @@
+/**
+ * One-time backfill: copy homepageConfig.identity → siteConfig.identity
+ * when the latter is empty/stub.
+ *
+ * The legacy @rmdes/indiekit-endpoint-homepage plugin persisted identity
+ * inside the homepageConfig collection. The unified plugin reads identity
+ * from siteConfig.identity. Without a backfill, operators upgrading from
+ * homepage v1.0.24 → site-config v1.0.0-beta.2 would see an empty Identity
+ * tab even though the data is sitting one collection over.
+ *
+ * Heuristic for "empty/stub": none of name, avatar, bio populated.
+ * If those three are all empty/missing, we consider the identity stub-shaped
+ * and backfill from homepageConfig.identity if a richer version exists.
+ *
+ * Idempotent: once siteConfig.identity has data, the function no-ops.
+ *
+ * @module storage/backfill-identity
+ */
+
+import { saveSiteConfig } from "./save-site-config.js";
+
+function isStubIdentity(identity) {
+  if (!identity || typeof identity !== "object") return true;
+  // The three load-bearing h-card fields. If none populated, treat as stub.
+  const name = (identity.name || "").trim();
+  const avatar = (identity.avatar || "").trim();
+  const bio = (identity.bio || "").trim();
+  return name === "" && avatar === "" && bio === "";
+}
+
+function hasRichIdentity(identity) {
+  if (!identity || typeof identity !== "object") return false;
+  // Source must have at least one of the three load-bearing fields
+  return Boolean(
+    (identity.name || "").trim() ||
+    (identity.avatar || "").trim() ||
+    (identity.bio || "").trim()
+  );
+}
+
+/**
+ * If siteConfig.identity is stub-shaped AND homepageConfig.identity has
+ * rich data, copy the rich identity over. Idempotent.
+ *
+ * @param {object} Indiekit - Indiekit application instance
+ * @returns {Promise<boolean>} true if backfill ran, false otherwise
+ */
+export async function maybeBackfillIdentity(Indiekit) {
+  const db = Indiekit.database;
+  if (!db) return false;
+
+  const siteDoc = await db.collection("siteConfig").findOne({ _id: "primary" });
+  if (!siteDoc) return false; // seed-from-env handles greenfield install
+  if (!isStubIdentity(siteDoc.identity)) return false;
+
+  const homepageDoc = await db.collection("homepageConfig").findOne({ _id: "homepage" });
+  if (!homepageDoc || !hasRichIdentity(homepageDoc.identity)) return false;
+
+  // Copy the rich identity over. saveSiteConfig handles the deepMerge + replaceOne
+  // so we preserve any other siteConfig keys (branding, navigation, features).
+  await saveSiteConfig(Indiekit, { identity: homepageDoc.identity }, "backfill-from-homepage");
+
+  console.log("[site-config] backfilled identity from homepageConfig (one-time migration)");
+  return true;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-site-config",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "type": "module",
   "description": "Site identity, branding, layout, and feature flag configuration for Indiekit",
   "main": "index.js",

package/views/site-config-identity.njk

@@ -224,34 +224,34 @@
     <h2>{{ __("siteConfig.identity.profile.legend") }}</h2>
     <div class="hp-field-grid">
       <div class="field">
-        <label class="field__label" for="identity-name">{{ __("siteConfig.identity.profile.name.label") }}</label>
-        <input class="field__input" type="text" id="identity-name" name="identity-name" value="{{ config.identity.name or '' }}">
+        <label class="field__label" for="name">{{ __("siteConfig.identity.profile.name.label") }}</label>
+        <input class="field__input" type="text" id="name" name="name" value="{{ config.identity.name or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.profile.name.hint") }}</p>
       </div>
       <div class="field">
-        <label class="field__label" for="identity-title">{{ __("siteConfig.identity.profile.title.label") }}</label>
-        <input class="field__input" type="text" id="identity-title" name="identity-title" value="{{ config.identity.title or '' }}">
+        <label class="field__label" for="title">{{ __("siteConfig.identity.profile.title.label") }}</label>
+        <input class="field__input" type="text" id="title" name="title" value="{{ config.identity.title or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.profile.title.hint") }}</p>
       </div>
       <div class="field field--full">
-        <label class="field__label" for="identity-avatar">{{ __("siteConfig.identity.profile.avatar.label") }}</label>
-        <input class="field__input" type="url" id="identity-avatar" name="identity-avatar" value="{{ config.identity.avatar or '' }}">
+        <label class="field__label" for="avatar">{{ __("siteConfig.identity.profile.avatar.label") }}</label>
+        <input class="field__input" type="url" id="avatar" name="avatar" value="{{ config.identity.avatar or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.profile.avatar.hint") }}</p>
       </div>
       <div class="field">
-        <label class="field__label" for="identity-pronoun">{{ __("siteConfig.identity.profile.pronoun.label") }}</label>
-        <input class="field__input" type="text" id="identity-pronoun" name="identity-pronoun" value="{{ config.identity.pronoun or '' }}">
+        <label class="field__label" for="pronoun">{{ __("siteConfig.identity.profile.pronoun.label") }}</label>
+        <input class="field__input" type="text" id="pronoun" name="pronoun" value="{{ config.identity.pronoun or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.profile.pronoun.hint") }}</p>
       </div>
       <div class="field"></div>
       <div class="field field--full">
-        <label class="field__label" for="identity-bio">{{ __("siteConfig.identity.profile.bio.label") }}</label>
-        <textarea class="field__input" id="identity-bio" name="identity-bio" rows="3">{{ config.identity.bio or '' }}</textarea>
+        <label class="field__label" for="bio">{{ __("siteConfig.identity.profile.bio.label") }}</label>
+        <textarea class="field__input" id="bio" name="bio" rows="3">{{ config.identity.bio or '' }}</textarea>
         <p class="field__hint">{{ __("siteConfig.identity.profile.bio.hint") }}</p>
       </div>
       <div class="field field--full">
-        <label class="field__label" for="identity-description">{{ __("siteConfig.identity.profile.description.label") }}</label>
-        <textarea class="field__input" id="identity-description" name="identity-description" rows="3">{{ config.identity.description or '' }}</textarea>
+        <label class="field__label" for="description">{{ __("siteConfig.identity.profile.description.label") }}</label>
+        <textarea class="field__input" id="description" name="description" rows="3">{{ config.identity.description or '' }}</textarea>
         <p class="field__hint">{{ __("siteConfig.identity.profile.description.hint") }}</p>
       </div>
     </div>
@@ -262,17 +262,17 @@
     <h2>{{ __("siteConfig.identity.location.legend") }}</h2>
     <div class="hp-field-grid">
       <div class="field">
-        <label class="field__label" for="identity-locality">{{ __("siteConfig.identity.location.locality.label") }}</label>
-        <input class="field__input" type="text" id="identity-locality" name="identity-locality" value="{{ config.identity.locality or '' }}">
+        <label class="field__label" for="locality">{{ __("siteConfig.identity.location.locality.label") }}</label>
+        <input class="field__input" type="text" id="locality" name="locality" value="{{ config.identity.locality or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.location.locality.hint") }}</p>
       </div>
       <div class="field">
-        <label class="field__label" for="identity-country">{{ __("siteConfig.identity.location.country.label") }}</label>
-        <input class="field__input" type="text" id="identity-country" name="identity-country" value="{{ config.identity.country or '' }}">
+        <label class="field__label" for="country">{{ __("siteConfig.identity.location.country.label") }}</label>
+        <input class="field__input" type="text" id="country" name="country" value="{{ config.identity.country or '' }}">
       </div>
       <div class="field">
-        <label class="field__label" for="identity-org">{{ __("siteConfig.identity.location.org.label") }}</label>
-        <input class="field__input" type="text" id="identity-org" name="identity-org" value="{{ config.identity.org or '' }}">
+        <label class="field__label" for="org">{{ __("siteConfig.identity.location.org.label") }}</label>
+        <input class="field__input" type="text" id="org" name="org" value="{{ config.identity.org or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.location.org.hint") }}</p>
       </div>
     </div>
@@ -283,17 +283,17 @@
     <h2>{{ __("siteConfig.identity.contact.legend") }}</h2>
     <div class="hp-field-grid">
       <div class="field field--full">
-        <label class="field__label" for="identity-url">{{ __("siteConfig.identity.contact.url.label") }}</label>
-        <input class="field__input" type="url" id="identity-url" name="identity-url" value="{{ config.identity.url or '' }}">
+        <label class="field__label" for="url">{{ __("siteConfig.identity.contact.url.label") }}</label>
+        <input class="field__input" type="url" id="url" name="url" value="{{ config.identity.url or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.contact.url.hint") }}</p>
       </div>
       <div class="field">
-        <label class="field__label" for="identity-email">{{ __("siteConfig.identity.contact.email.label") }}</label>
-        <input class="field__input" type="email" id="identity-email" name="identity-email" value="{{ config.identity.email or '' }}">
+        <label class="field__label" for="email">{{ __("siteConfig.identity.contact.email.label") }}</label>
+        <input class="field__input" type="email" id="email" name="email" value="{{ config.identity.email or '' }}">
       </div>
       <div class="field">
-        <label class="field__label" for="identity-keyUrl">{{ __("siteConfig.identity.contact.keyUrl.label") }}</label>
-        <input class="field__input" type="url" id="identity-keyUrl" name="identity-keyUrl" value="{{ config.identity.keyUrl or '' }}">
+        <label class="field__label" for="keyUrl">{{ __("siteConfig.identity.contact.keyUrl.label") }}</label>
+        <input class="field__input" type="url" id="keyUrl" name="keyUrl" value="{{ config.identity.keyUrl or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.contact.keyUrl.hint") }}</p>
       </div>
     </div>
@@ -303,8 +303,8 @@
   <section class="hp-section">
     <h2>{{ __("siteConfig.identity.categories.legend") }}</h2>
     <div class="field">
-      <label class="field__label" for="identity-categories">{{ __("siteConfig.identity.categories.tags.label") }}</label>
-      <input class="field__input" type="text" id="identity-categories" name="identity-categories" value="{{ config.identity.categories | join(', ') if config.identity.categories else '' }}">
+      <label class="field__label" for="categories">{{ __("siteConfig.identity.categories.tags.label") }}</label>
+      <input class="field__input" type="text" id="categories" name="categories" value="{{ config.identity.categories | join(', ') if config.identity.categories else '' }}">
       <p class="field__hint">{{ __("siteConfig.identity.categories.tags.hint") }}</p>
     </div>
   </section>