@escape-game-over/atlas 0.1.29 → 0.1.31

package/docs/NOT-BUILT.md

@@ -500,27 +500,22 @@ looking at" better than any link can.
 
 ### Should `/en-US/about-us` redirect when the default locale is unprefixed?
 
-**No. Only `/en-US` itself does.**
+**Yes, by one wildcard — not by a rule per page.**
 
 With `prefixDefaultLocale: false` the default locale is served at `/about-us`
-and nothing is built under `/en-US/`. Claiming the prefixed root is one rule and
-answers the URL people actually type, having seen every other language wear a
-prefix. Claiming the pages under it is a different proposition: a rule per page,
-and slugs are translated per locale, so the URL a reader lands on by editing
-`/el-GR/sxetika-me-emas` down to English keeps the *Greek* slug —
+and nothing is built under `/en-US/`. Claiming the pages under it one rule at a
+time does not work: slugs are translated per locale, so the URL a reader lands
+on by editing `/el-GR/sxetika-me-emas` down to English keeps the *Greek* slug —
 `/en-US/sxetika-me-emas`. Covering that means the cross product of the prefix
-with every locale's spelling of every slug, which is a `_redirects` of hundreds
-against the 2000 a host reads, all of it for URLs nothing has ever linked.
-
-This was built first, in the one-rule-per-default-locale-page form, which is
-worth naming because it looks complete and is not: it answers `/en-US/about-us`
-and misses `/en-US/sxetika-me-emas`, so the case that motivated it is the case
-it does not cover.
-
-A wildcard would sidestep the count — `/en-US/* /:splat 301` is one line — but
-not the translated slug, and it is Cloudflare's syntax rather than something
-`ResolvedRedirect` can carry to another host. The pages get the 404 page, which
-is what it is for.
+with every locale's spelling of every slug, a `_redirects` of hundreds against
+the 2000 a host reads.
+
+`/en-US/* /:splat 301` is one line instead. It still does not cover the
+translated slug — `/en-US/sxetika-me-emas` goes to `/sxetika-me-emas`, which
+404s — but that URL 404ed without the rule too, so it is never worse and it
+answers every English slug. It is Cloudflare's syntax, which is what every site
+deploys to. It is written last, so a stated `/en-US/old` rule still fires, and
+left out if anything is built under the prefix.
 
 ---
 

package/docs/toolchain.md

@@ -93,14 +93,16 @@ slug or a switched-off page moves the rule with the page:
 | -------------- | ------------- | ---------------------------------------------- |
 | `/`            | `/en-US`      | `prefixDefaultLocale: true` leaves `/` unowned |
 | `/en-US`       | `/`           | `prefixDefaultLocale: false` leaves it unbuilt |
+| `/en-US/*`     | `/:splat`     | the same, for every page under the prefix      |
 | `/news/page/1` | `/news`       | page one is the bare slug, never `page/1`      |
 
 The first two are the same rule in its two directions: whichever root the
 routing mode does not serve points at the one it does. Both together cost one
-rule; the third costs one per paginated list per language. Nothing here scales
-with the number of pages a site has — see [`NOT-BUILT.md`](NOT-BUILT.md) for why
-the prefixed form of every *page* is left to the 404 instead. A project that
-states its own rule for one of these paths keeps it: the inferred one steps
+rule. The wildcard costs one more, and it is written last in the file, because
+Cloudflare fires the first rule that matches and a stated `/en-US/old` rule has
+to be reached before it. The page-one rule costs one per paginated list per
+language. Nothing here scales with the number of pages a site has. A project
+that states its own rule for one of these paths keeps it: the inferred one steps
 aside.
 
 The root points at whichever route has an empty slug, so nothing has to name a

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@escape-game-over/atlas",
-    "version": "0.1.29",
+    "version": "0.1.31",
     "type": "module",
     "description": "Typed, data-driven machinery for static multi-locale, multi-deployment Astro sites.",
     "private": false,

package/src/astro/carousel.ts

@@ -62,6 +62,17 @@ export interface CarouselOptions {
      * renders, and calling would make a project write the first position twice.
      */
     readonly onChange: (index: number) => void;
+    /**
+     * Called with `autoplayMs` whenever a countdown to the next automatic
+     * advance begins, and with `null` when autoplay stops.
+     *
+     * For a progress bar. A countdown begins on attach, after every tick and
+     * after every manual move, and each one starts from zero — so the bar
+     * restarts on every number and stops on `null`, and never has to know why.
+     * A hold (hover, focus, a hidden tab, `pause`) and a detach report `null`
+     * once, not once per reason.
+     */
+    readonly onCountdown?: (ms: number | null) => void;
 }
 
 export interface Carousel {
@@ -107,6 +118,7 @@ export function carousel(options: CarouselOptions): Carousel {
         swipeThreshold = 10,
         lockMs = 500,
         onChange,
+        onCountdown,
     } = options;
 
     /**
@@ -143,9 +155,19 @@ export function carousel(options: CarouselOptions): Carousel {
      */
     const holds = new Set<string>();
 
+    /** Whether a countdown is running, so `null` is reported once per stop. */
+    let counting = false;
+
+    const stopAutoplay = (): void => {
+        clearInterval(autoplayTimer);
+        if (!counting) return;
+        counting = false;
+        onCountdown?.(null);
+    };
+
     const hold = (reason: string): void => {
         holds.add(reason);
-        clearInterval(autoplayTimer);
+        stopAutoplay();
     };
 
     const release = (reason: string): void => {
@@ -171,16 +193,28 @@ export function carousel(options: CarouselOptions): Carousel {
     };
 
     const restartAutoplay = (): void => {
-        clearInterval(autoplayTimer);
         // Nothing to rotate through, nobody watching, or no autoplay asked
         // for — in each case, nothing to schedule.
-        if (autoplayMs === undefined || !canMove || !attached) return;
-        if (holds.size > 0) return;
+        if (
+            autoplayMs === undefined ||
+            !canMove ||
+            !attached ||
+            holds.size > 0
+        ) {
+            stopAutoplay();
+            return;
+        }
+        clearInterval(autoplayTimer);
         autoplayTimer = setInterval(() => {
             // No `restartAutoplay` here: the interval already paces itself, and
             // resetting it from inside its own tick would only churn timers.
             if (claim()) move(index + 1);
+            // Reported even when the lock refused the move: the next tick is
+            // still `autoplayMs` away either way.
+            onCountdown?.(autoplayMs);
         }, autoplayMs);
+        counting = true;
+        onCountdown?.(autoplayMs);
     };
 
     /** The only place `index` changes. `at` may be out of range or negative. */
@@ -326,7 +360,7 @@ export function carousel(options: CarouselOptions): Carousel {
             return () => {
                 listeners.abort();
                 attached = false;
-                clearInterval(autoplayTimer);
+                stopAutoplay();
 
                 // The automatic holds belong to this attachment: an element
                 // detached while hovered would otherwise keep "hover" forever,

package/src/site/api.ts

@@ -309,14 +309,11 @@ export interface Site<
      * **What comes back is more than what went in.** lib adds the rules the
      * route table implies, for the URLs its own design leaves unpublished but
      * reachable: whichever site root the routing mode does not serve — `/` when
-     * every locale is prefixed, `/en-US` when the default locale is not — and
-     * `/news/page/1` for a list whose page one is the bare path. A rule you
-     * state for one of those paths replaces the inferred one, so pass `[]` and
-     * you still get a file worth writing.
-     *
-     * Pages under an unused locale prefix are *not* claimed: that is a rule per
-     * page per language, and it still misses the reader who edits a translated
-     * slug's prefix. See `NOT-BUILT.md`.
+     * every locale is prefixed, `/en-US` when the default locale is not — the
+     * pages under that unused `/en-US/`, as one `/en-US/* /:splat` wildcard
+     * written last, and `/news/page/1` for a list whose page one is the bare
+     * path. A rule you state for one of those paths replaces the inferred one,
+     * so pass `[]` and you still get a file worth writing.
      *
      * Returns the rules as data. Rendering is a separate step —
      * `buildCloudflareRedirects` writes the `_redirects` that Cloudflare and

package/src/site/create.ts

@@ -513,10 +513,8 @@ export function createSite<
      * switched-off page moves the rule with it instead of leaving one pointing
      * at a 404.
      *
-     * Two, and deliberately not a third per *page*: mirroring every URL a
-     * project builds is a rule per page, and with slugs translated per locale
-     * it is a rule per page per language — a file of hundreds against the 2000
-     * a host reads, for URLs nothing ever linked. See `NOT-BUILT.md`.
+     * The pages under an unused prefix are `prefixSplat`'s, as one wildcard
+     * rather than a rule per page per language. See `NOT-BUILT.md`.
      *
      * Both permanent. Neither is a state that changes while the config stays as
      * it is: page one will never live at `/page/1`, and the root will not move
@@ -570,6 +568,32 @@ export function createSite<
         return [...root, ...pageOne];
     }
 
+    /**
+     * `/en-US/about` → `/about` when the default locale is unprefixed: the
+     * pages under the prefix `inferredRedirects` points at the root, in one
+     * Cloudflare wildcard. A translated slug under the wrong prefix still ends
+     * on the 404, one hop later — no worse than without it.
+     *
+     * Kept apart because it has to be written last: Cloudflare fires the first
+     * rule that matches, and a wildcard ahead of a stated `/en-US/old` rule
+     * would swallow it. Skipped when anything is built under the prefix, which
+     * the wildcard would make unreachable.
+     */
+    function prefixSplat(): readonly ResolvedRedirect[] {
+        if (prefixDefaultLocale) return [];
+        const prefix = `/${defaultLocale}/`;
+        for (const path of builtPaths) {
+            if (path.startsWith(prefix)) return [];
+        }
+        return [
+            {
+                from: `${prefix}*`,
+                to: "/:splat",
+                status: statusFor("permanent"),
+            },
+        ];
+    }
+
     function redirects(
         rules: readonly RedirectRule<RouteId, L>[]
     ): readonly ResolvedRedirect[] {
@@ -590,6 +614,7 @@ export function createSite<
         }));
 
         const claimed = new Set(stated.map((rule) => rule.from));
+        const splat = prefixSplat().filter((rule) => !claimed.has(rule.from));
         const inferred = inferredRedirects().filter(
             // Dropped rather than reported, both times, because neither is a
             // mistake anyone made: a rule the project wrote for one of these
@@ -604,7 +629,7 @@ export function createSite<
             // So a rule that shadows a real page is rejected rather than
             // sitting dead in the file.
             builtPaths,
-            rules: [...inferred, ...stated],
+            rules: [...inferred, ...stated, ...splat],
         });
     }