@acms-subir/core 0.3.26 → 0.3.28

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @acms-subir/core
 
+## 0.3.28
+
+### Patch Changes
+
+- 9964864: Collections get a `localizeRedirects` option, so a site whose posts are each written in one language can turn off 0.3.27's "keep the visitor's language" for them. It sits next to `base` and `redirectFrom`: `acms({ content: { posts: { base: '/sermon', redirectFrom: ['/sermons'], localizeRedirects: false } } })`, or under `content.collections.<key>` for any other collection. It defaults to `true`, the 0.3.27 behaviour, because ACMS posts can carry translations (`/es/sermon/<slug>` shows a post's Spanish words), so other sites don't change: `/es/blog` → `/es/sermon`.
+
+  With `localizeRedirects: false`, a redirect whose target is one of that collection's addresses (its base or an entry under it) goes to the target without adding the language: `/es/blog` → `/sermon`, `/es/blog/x` → `/sermon/x`, `/es/sermons` (a `redirectFrom` base) → `/sermon`, as in 0.3.26. Admin → Redirects rules are treated the same way: on a `/es/…` request, a rule `/old` → `/sermon/x` goes to `/sermon/x`. Tag addresses have no setting of their own. Tag archives are shared by every collection, and they replaced the built-in collection's old `/blog/tag/…`, so they follow `posts`: with it off, `/es/blog/tag/x` → `/tag/x`, and so do rules pointing at `/tag/…`. Redirects to pages keep the language either way, and a rule written for the full `/es/old` address is still used exactly as written. On a site with more than one language, the Redirects card names the addresses that stay as written. The value must be `true` or `false`; anything else fails the build. The app API (`/api/v1/site`) doesn't list it: apps don't follow the website's language redirects.
+
+  The option only covers redirects. Whether `/es/<collection>` pages render, their hreflang tags, the sitemap, and links from Spanish pages to `/es/sermon/…` are unchanged.
+
+## 0.3.27
+
+### Patch Changes
+
+- 2972283: Redirects from another language now keep it. On a bilingual site, `/es/blog` went to `/sermon` (English) instead of `/es/sermon`, and the same happened to `/es/blog/<slug>`, a collection's `redirectFrom` bases, old `/blog/tag/…` addresses, and Admin → Redirects rules: a rule `/old` → `/new` sent `/es/old` to `/new`. A redirect on a `/es/…` address now adds the language back to its target, so these go to `/es/sermon`, `/es/tag/…` and `/es/new`. Full URLs (`https://…`) and targets that already start with a language are left as written. An admin rule written for the full `/es/old` address, which could never match before, now wins over the `/old` rule and is used exactly as written. The Redirects card says so on sites with more than one language.
+
 ## 0.3.26
 
 ### Patch Changes

package/integration.mjs

@@ -161,6 +161,9 @@ function resolveContent(content = {}) {
     if (key !== 'posts' && RESERVED_COLLECTION_KEYS.has(key)) {
       throw new Error(`acms: collection key "${key}" is reserved (it collides with an admin section) — pick another key`);
     }
+    if (def.localizeRedirects !== undefined && typeof def.localizeRedirects !== 'boolean') {
+      throw new Error(`acms: content.collections.${key}.localizeRedirects must be true or false`);
+    }
     const fallbackPlural = key === 'posts' ? 'Posts' : key.charAt(0).toUpperCase() + key.slice(1);
     const plural = def.plural ?? fallbackPlural;
     collections[key] = {
@@ -168,6 +171,7 @@ function resolveContent(content = {}) {
       plural,
       base: def.base ?? (key === 'posts' ? '/blog' : `/${key}`),
       redirectFrom: def.redirectFrom ?? [],
+      localizeRedirects: def.localizeRedirects ?? true,
     };
   }
   const resolved = { collections, tags: { base: (content.tags ?? {}).base ?? '/tag' } };
@@ -571,14 +575,18 @@ function acmsVitePlugin(userConfig) {
  *   User-visible identity in the admin chrome (sidebar, titles, breadcrumb).
  * @param {{siteTitle?: string, tagline?: string, heroHeading?: string, heroSub?: string}} [options.seed]
  *   First-boot database seed content. Only read when the database is empty.
- * @param {{posts?: {singular?: string, plural?: string, base?: string, redirectFrom?: string[]}, collections?: Record<string, {singular?: string, plural?: string, base?: string, redirectFrom?: string[]}>, tags?: {base?: string}}} [options.content]
+ * @param {{posts?: {singular?: string, plural?: string, base?: string, redirectFrom?: string[], localizeRedirects?: boolean}, collections?: Record<string, {singular?: string, plural?: string, base?: string, redirectFrom?: string[], localizeRedirects?: boolean}>, tags?: {base?: string}}} [options.content]
  *   Content collections. `collections` is a keyed map — each key gets its own
  *   public routes at `base`, admin section at /admin/c/<key>, and labels from
  *   `singular`/`plural`. The `posts` key is the built-in collection (default
  *   base '/blog'); `content.posts` is shorthand for `collections.posts`.
- *   `redirectFrom` 301s extra legacy bases. Tags are standalone at `tags.base`
- *   (default '/tag'), shared across collections. Collection keys are permanent
- *   internal identifiers (DB rows, backups, admin URLs) — never renamed.
+ *   `redirectFrom` 301s extra legacy bases. On a site with `i18n`, a redirect
+ *   from /es/… to the collection keeps the language (/es/blog → /es/sermon);
+ *   `localizeRedirects: false` drops it (→ /sermon) for entries each written
+ *   in one language (tag addresses follow `posts`). Tags are standalone at
+ *   `tags.base` (default '/tag'), shared across collections. Collection keys
+ *   are permanent internal identifiers (DB rows, backups, admin URLs) — never
+ *   renamed.
  * @param {{locales?: string[], defaultLocale?: string}} [options.i18n]
  *   Site languages. The default locale (first entry unless `defaultLocale`
  *   says otherwise) is served at `/`; every other locale gets its own home

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.26",
+  "version": "0.3.28",
   "publishConfig": {
     "access": "public"
   },

package/src/lib/content.ts

@@ -14,9 +14,12 @@ export interface CollectionConfig {
   plural: string;
   base: string;
   redirectFrom: string[];
+  // false: a redirect from a /<locale>/… address to this collection drops the
+  // language, for entries each written in one language (localizesRedirectsTo)
+  localizeRedirects: boolean;
 }
 
-const FALLBACK_POSTS: CollectionConfig = { singular: 'Post', plural: 'Posts', base: '/blog', redirectFrom: [] };
+const FALLBACK_POSTS: CollectionConfig = { singular: 'Post', plural: 'Posts', base: '/blog', redirectFrom: [], localizeRedirects: true };
 
 const collections: Record<string, CollectionConfig> =
   userConfig.content?.collections ?? { posts: FALLBACK_POSTS };
@@ -53,6 +56,17 @@ export function collectionFromPath(pathname: string): (CollectionConfig & { key:
   return best;
 }
 
+// Whether a redirect from a /<locale>/… address to this path on the site
+// keeps the visitor's language (middleware.ts localizedRedirect): not for a
+// collection whose localizeRedirects is off. Tag archives are shared by every
+// collection and follow the built-in one, whose old /blog/tag/… they replace.
+export function localizesRedirectsTo(path: string): boolean {
+  const pathname = path.split(/[?#]/)[0];
+  const { base } = CONTENT.tags;
+  const c = pathname === base || pathname.startsWith(`${base}/`) ? CONTENT.posts : collectionFromPath(pathname);
+  return c?.localizeRedirects !== false;
+}
+
 // Aliases for the built-in collection — the bulk of call sites.
 export const postsIndexUrl = () => CONTENT.posts.base;
 export const postUrl = (slug: string) => `${CONTENT.posts.base}/${slug}`;

package/src/middleware.ts

@@ -1,11 +1,11 @@
 import { defineMiddleware } from 'astro:middleware';
 import type { APIContext, MiddlewareNext } from 'astro';
-import { I18N } from './lib/i18n';
+import { I18N, localePath, stripLocale } from './lib/i18n';
 import { bindAuthEnvironment, getRequestAuth, requestPerson, shouldResolveClerk, validateRequestSession, withClerkHeaders, type RequestAuth } from './lib/auth/request';
 import { roleHome } from './lib/roles';
 import { AUTH } from './lib/auth/config';
 import { getRepo } from './lib/repo';
-import { CONTENT, legacyBases } from './lib/content';
+import { CONTENT, legacyBases, localizesRedirectsTo } from './lib/content';
 import { processDueDeliveries, waitUntilFrom } from './lib/webhooks';
 import { dispatchEmail } from './lib/email/service';
 import { decideOverdue, sendDueReminders } from './lib/booking/service';
@@ -44,6 +44,16 @@ export function legacyContentRedirect(pathname: string): string | null {
   return null;
 }
 
+// A /es/… request reaches the redirect lookup rewritten to its bare path (see
+// handle), so a target on this site gets the visitor's language back: /blog →
+// /sermon serves /es/blog → /es/sermon. Full URLs, targets that already name a
+// language, and addresses of a collection with localizeRedirects off (tag
+// pages go with posts) stay as written.
+export function localizedRedirect(to: string, locale: string | undefined): string {
+  if (!locale || !to.startsWith('/') || to.startsWith('//') || stripLocale(to) !== to || !localizesRedirectsTo(to)) return to;
+  return localePath(to, locale);
+}
+
 // An admin form sent after the minute-long Clerk sign-in cookie lapsed (a page
 // whose script couldn't renew it in time): Clerk renews it only on a page GET,
 // so the POST arrives signed out and what it carried is gone. Back to the same
@@ -204,16 +214,22 @@ async function handle(context: APIContext, next: MiddlewareNext): Promise<Respon
 
   // Redirects fire only when the request would otherwise 404, so a rule can
   // never shadow real content. The table is cached per isolate for a minute.
+  // On a /es/… request a rule for the full address wins as written; otherwise
+  // the bare path's rule or legacy move applies in the visitor's language.
   if (response.status === 404 && !pathname.startsWith('/admin') && !pathname.startsWith('/api')) {
+    const { acmsLocale: locale, acmsPath } = context.locals as { acmsLocale?: string; acmsPath?: string };
     try {
-      const hit = (await getRedirects(context.locals, now)).get(pathname);
-      if (hit) return context.redirect(hit.toPath + context.url.search, hit.code);
+      const redirects = await getRedirects(context.locals, now);
+      const exact = acmsPath ? redirects.get(acmsPath) : undefined;
+      if (exact) return context.redirect(exact.toPath + context.url.search, exact.code);
+      const hit = redirects.get(pathname);
+      if (hit) return context.redirect(localizedRedirect(hit.toPath, locale) + context.url.search, hit.code);
     } catch {
       // a broken redirect lookup must never break the 404 itself
     }
     // admin-authored rules win; config-derived legacy moves are the fallback
     const legacy = legacyContentRedirect(pathname);
-    if (legacy) return context.redirect(legacy + context.url.search, 301);
+    if (legacy) return context.redirect(localizedRedirect(legacy, locale) + context.url.search, 301);
   }
 
   return response;

package/src/pages/admin/settings.astro

@@ -7,7 +7,8 @@ import { accessFor } from '../../lib/permissions/access';
 import type { Permission } from '../../lib/permissions/catalog';
 import { AUTH } from '../../lib/auth/config';
 import { invalidateRedirectCache } from '../../middleware';
-import { CONTENT } from '../../lib/content';
+import { CONTENT, localizesRedirectsTo } from '../../lib/content';
+import { extraLocales } from '../../lib/i18n';
 import { UMAMI_ID_RE, META_PIXEL_ID_RE, TIKTOK_PIXEL_ID_RE, normalizeScriptUrl } from '../../lib/analytics';
 
 const repo = await getRepo(Astro.locals);
@@ -200,6 +201,15 @@ if (Astro.request.method === 'POST') {
 
 const settings = await repo.getSettings();
 const redirects = await repo.listRedirects();
+// the redirect card explains /<locale>/… rules with the site's first extra
+// language, and names the bases whose targets keep no language (collections
+// with localizeRedirects: false, and /tag with posts)
+const extraLang = extraLocales()[0] ?? '';
+const asWritten = [...Object.values(CONTENT.collections).map((c) => c.base), CONTENT.tags.base].filter((b) => !localizesRedirectsTo(b));
+const asWrittenList = asWritten.length > 1 ? `${asWritten.slice(0, -1).join(', ')} or ${asWritten.at(-1)}` : asWritten[0];
+const redirectsLangNote = extraLang
+  ? ` A rule for /old-path also sends /${extraLang}/old-path to /${extraLang}/new-path${asWrittenList ? `, or to the new path as written when it's under ${asWrittenList}` : ''}; rules that start with /${extraLang}/ are used exactly as written.`
+  : '';
 const backend = (Astro.locals as { runtime?: { env?: { DB?: unknown } } }).runtime?.env?.DB
   ? 'd1'
   : 'sqlite';
@@ -441,7 +451,7 @@ const groups = [
       <section class="scard" id="redirects">
         <header class="scard-head">
           <a class="scard-back" href="#" aria-label="All settings"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 6l-6 6 6 6" /></svg></a>
-          <div class="grow"><h2>Redirects</h2><p>Forward old URLs to new ones. They only fire when a URL would otherwise 404, and renaming a published post adds one automatically.</p></div>
+          <div class="grow"><h2>Redirects</h2><p>Forward old URLs to new ones. They only fire when a URL would otherwise 404, and renaming a published post adds one automatically.{redirectsLangNote}</p></div>
         </header>
         {redirects.length > 0 && (
           <div class="rd-list">

package/src/virtual.d.ts

@@ -9,7 +9,7 @@ declare module 'virtual:acms-config' {
     // resolved (defaults applied + validated) by integration.mjs; `posts`
     // always exists in collections, insertion order = display order
     content: {
-      collections: Record<string, { singular: string; plural: string; base: string; redirectFrom: string[] }>;
+      collections: Record<string, { singular: string; plural: string; base: string; redirectFrom: string[]; localizeRedirects: boolean }>;
       tags: { base: string };
     };
     // resolved by integration.mjs; empty locales = i18n not configured