@acms-subir/core 0.3.25 → 0.3.27

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @acms-subir/core
 
+## 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
+
+- 89ecf3c: Apps can now follow a collection's old addresses. Each `features.blog` entry in the app API's `/api/v1/site` (and the client's `Site` type) gains `redirectFrom`: the absolute addresses the website 301s to that collection's `url`. It lists the collection's `redirectFrom` bases, plus `/blog` for `posts` once its base moved away from that default, so on a site whose posts live at `/sermon`, an app can open a `/blog` link as the sermons list instead of looking for a page called "blog". The list comes from the same place as the website's redirects, so the two can't drift apart. An address another collection lives at is left out, so a site with sermons at `/sermon` and its own blog at `/blog` keeps `/blog` for the blog.
+
 ## 0.3.25
 
 ### Patch Changes

package/package.json

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

package/src/lib/content.ts

@@ -33,6 +33,12 @@ export const collectionUrl = (key: string, slug?: string) => {
   return slug ? `${base}/${slug}` : base;
 };
 
+// Old bases a collection 301s from (middleware.ts), also listed in the app
+// API's site features so apps can follow them: its redirectFrom, plus '/blog'
+// for the built-in collection (its historic default) once it moved away.
+export const legacyBases = (key: string, c: CollectionConfig) =>
+  [...new Set([...(key === 'posts' ? ['/blog'] : []), ...c.redirectFrom])].filter((from) => from !== c.base);
+
 // Which collection a public URL belongs to — injected routes share one page
 // file per shape (blog/index.astro, blog/[slug].astro), and Astro's
 // injectRoute can't attach props, so pages resolve their collection from the

package/src/lib/mobile/schemas.ts

@@ -8,7 +8,7 @@ const Palette = z.object({ bg: str, ink: str, muted: str, line: str, accent: str
 export const Site = z.object({
   name: str, description: str, logo: str, logoDark: str, icon: str, menu: z.array(z.object({ label: str, href: str })),
   languages: z.object({ default: locale, locales: z.array(z.object({ code: str, name: str })) }),
-  features: z.object({ blog: z.array(z.object({ key: str, name: str, url: str })), calendar: bool, bookings: bool, search: bool, bookingChanges: bool, guestSignIn: bool, forms: bool, links: bool }), apiVersion: z.literal(1),
+  features: z.object({ blog: z.array(z.object({ key: str, name: str, url: str, redirectFrom: strings })), calendar: bool, bookings: bool, search: bool, bookingChanges: bool, guestSignIn: bool, forms: bool, links: bool }), apiVersion: z.literal(1),
 });
 export const Theme = z.object({
   id: str, name: str, scheme: z.enum(['auto', 'light', 'dark']), colors: z.object({ light: Palette, dark: Palette }),

package/src/lib/mobile/site.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { ContentRepository } from '../repo/types';
-import { CONTENT } from '../content';
+import { CONTENT, legacyBases } from '../content';
 import { I18N, localeName } from '../i18n';
 import { CALENDAR, bookingsEnabled } from '../calendar/config';
 import { SEARCH } from '../search-config';
@@ -15,6 +15,7 @@ export async function getSite(repo: ContentRepository, url: URL, _id = '', local
   z.object({}).strict().parse(queryParams(url));
   const [settings, nav, pages] = await Promise.all([repo.getSettings(), repo.listNavItems(), repo.listPages()]);
   const origin = siteOrigin(settings, url);
+  const bases = new Set(Object.values(CONTENT.collections).map(c => c.base));
   const header = nav.filter(n => n.area === 'header').sort((a, b) => a.order - b.order);
   const menu = header.length ? header : [
     { label: 'Home', url: '/' },
@@ -28,7 +29,9 @@ export async function getSite(repo: ContentRepository, url: URL, _id = '', local
     menu: menu.map(n => ({ label: n.label, href: safeUrl(n.url, origin, true) })),
     languages: { default: I18N.defaultLocale || null, locales: I18N.locales.map(code => ({ code, name: localeName(code, true) })) },
     features: {
-      blog: Object.entries(CONTENT.collections).map(([key, c]) => ({ key, name: c.plural, url: safeUrl(c.base, origin) })), calendar: CALENDAR.enabled, bookings: bookingsEnabled(), search: SEARCH.enabled,
+      // redirectFrom: old addresses the website 301s to url, so apps can follow them too,
+      // minus any another collection now lives at (the website serves that one first)
+      blog: Object.entries(CONTENT.collections).map(([key, c]) => ({ key, name: c.plural, url: safeUrl(c.base, origin), redirectFrom: legacyBases(key, c).filter(from => !bases.has(from)).map(from => safeUrl(from, origin)) })), calendar: CALENDAR.enabled, bookings: bookingsEnabled(), search: SEARCH.enabled,
       // Admin → Mobile app → App access
       bookingChanges: CALENDAR.enabled && settings.mobileAccess.bookingChanges, guestSignIn: await guestSignInReady(repo, locals),
       forms: settings.mobileAccess.forms, links: settings.mobileAccess.links,

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 } from './lib/content';
+import { CONTENT, legacyBases } from './lib/content';
 import { processDueDeliveries, waitUntilFrom } from './lib/webhooks';
 import { dispatchEmail } from './lib/email/service';
 import { decideOverdue, sendDueReminders } from './lib/booking/service';
@@ -28,10 +28,7 @@ const TAG_SOURCES = [
   ]),
 ];
 const COLLECTION_SOURCES: Array<{ from: string; to: string }> = Object.entries(CONTENT.collections).flatMap(
-  ([key, c]) =>
-    [...new Set([...(key === 'posts' ? ['/blog'] : []), ...c.redirectFrom])]
-      .filter((from) => from !== c.base)
-      .map((from) => ({ from, to: c.base }))
+  ([key, c]) => legacyBases(key, c).map((from) => ({ from, to: c.base }))
 );
 
 export function legacyContentRedirect(pathname: string): string | null {
@@ -47,6 +44,15 @@ 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 and targets that already
+// name a language stay as written.
+export function localizedRedirect(to: string, locale: string | undefined): string {
+  if (!locale || !to.startsWith('/') || to.startsWith('//') || stripLocale(to) !== 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
@@ -207,16 +213,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

@@ -8,6 +8,7 @@ import type { Permission } from '../../lib/permissions/catalog';
 import { AUTH } from '../../lib/auth/config';
 import { invalidateRedirectCache } from '../../middleware';
 import { CONTENT } 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,8 @@ 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
+const extraLang = extraLocales()[0] ?? '';
 const backend = (Astro.locals as { runtime?: { env?: { DB?: unknown } } }).runtime?.env?.DB
   ? 'd1'
   : 'sqlite';
@@ -441,7 +444,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.{extraLang && ` A rule for /old-path also sends /${extraLang}/old-path to /${extraLang}/new-path; rules that start with /${extraLang}/ are used exactly as written.`}</p></div>
         </header>
         {redirects.length > 0 && (
           <div class="rd-list">