gazetta 0.5.0 → 0.7.0

package/dist/sidecars.js

@@ -1,28 +1,23 @@
 /**
  * Sidecar file I/O for pages and fragments — one module owning all reads
- * and writes of the three sidecar kinds:
+ * and writes of the two sidecar kinds:
  *
  *   .{8hex}.hash           — content hash, used by compare-targets
- *   .uses-{fragment}       — one per @ reference; used by dependents lookup
- *   .tpl-{template}        — template name; used to flag republish-needed
+ *   .pub-...               — publish timestamp + noindex flag
  *
- * Filenames encode the whole picture — a single readDir returns the full
- * dependency state of an item without any content reads. Scaling goal:
- * listing calls, not GETs, at 10k pages.
+ * Filenames encode the publish-state picture — a single readDir returns
+ * the full sidecar state of an item without any content reads. Scaling
+ * goal: listing calls, not GETs, at 10k pages.
  *
- * Publish-rendered.ts, compare.ts, publish.ts all used to inline this
- * logic separately; centralizing here reduces duplication and gives us
- * one place to swap the storage shape (e.g. future single-index file)
- * without touching every caller.
+ * Reverse dep relationships (fragment-deps, asset-refs) live in
+ * `.gazetta/{relation}/{target}/{source}` per-edge sidecars (see
+ * dep-sidecars.ts), not in per-item filename suffixes.
  */
-import { parseSidecarName, sidecarNameFor, parseUsesSidecarName, usesSidecarNameFor, parseTemplateSidecarName, templateSidecarNameFor, } from './hash.js';
+import { parseSidecarName, parseSidecarLocale, sidecarNameFor, parsePubSidecarName, parsePubSidecarLocale, pubSidecarNameFor, } from './hash.js';
 import { mapLimit } from './concurrency.js';
 /**
  * Read sidecar filenames for a single item directory. Returns null if
- * the directory doesn't exist or has no hash sidecar. `uses` and
- * `template` default to empty/null when their sidecars are absent —
- * old items published before we started writing them will still work,
- * the caller just won't have dependency info for them.
+ * the directory doesn't exist or has no hash sidecar.
  */
 export async function readSidecars(storage, dir) {
     let entries;
@@ -33,8 +28,7 @@ export async function readSidecars(storage, dir) {
         return null;
     }
     let hash = null;
-    const uses = [];
-    let template = null;
+    let pub = null;
     for (const e of entries) {
         if (e.isDirectory)
             continue;
@@ -43,50 +37,111 @@ export async function readSidecars(storage, dir) {
             hash = h;
             continue;
         }
-        const u = parseUsesSidecarName(e.name);
-        if (u) {
-            uses.push(u);
-            continue;
-        }
-        const t = parseTemplateSidecarName(e.name);
-        if (t)
-            template = t;
+        const p = parsePubSidecarName(e.name);
+        if (p)
+            pub = p;
     }
     if (!hash)
         return null;
-    return { hash, uses, template };
+    return { hash, pub };
 }
 /**
- * Write (or rewrite) all three sidecar kinds for one item. Stale sidecars
- * of any kind that aren't in the new state are removed first, so
- * fragment-references removed from a page's components don't linger as
- * .uses-*.
+ * Write (or rewrite) sidecars for one item, optionally locale-scoped.
+ * When `locale` is set, only locale-specific sidecars (.hash.fr, .pub.fr)
+ * are written/cleaned — default-locale sidecars are untouched.
+ *
+ * Concurrency:
+ *   Calls targeting the same directory are serialized via `withDirLock`.
+ *   Without serialization, Call A's cleanup phase (readDir → rm stale)
+ *   would see Call B's in-flight `write-file-atomic` temp files and
+ *   mistake them for stale sidecars — B's rename would then fail with
+ *   ENOENT. Queueing at dir granularity eliminates the race class,
+ *   matching the same idiom `write-file-atomic` itself uses per-file
+ *   within a process.
  */
-export async function writeSidecars(storage, dir, state) {
-    const want = new Set([sidecarNameFor(state.hash)]);
-    for (const frag of state.uses)
-        want.add(usesSidecarNameFor(frag));
-    if (state.template)
-        want.add(templateSidecarNameFor(state.template));
-    // Remove stale sidecars of known kinds that aren't in `want`.
+export async function writeSidecars(storage, dir, state, locale) {
+    return withDirLock(dir, () => doWriteSidecars(storage, dir, state, locale));
+}
+async function doWriteSidecars(storage, dir, state, locale) {
+    const want = new Set([sidecarNameFor(state.hash, locale)]);
+    if (state.pub)
+        want.add(pubSidecarNameFor(new Date(state.pub.lastPublished), state.pub.noindex, locale));
+    // Remove stale sidecars of the SAME locale scope that aren't in `want`.
+    // Safe because `withDirLock` serializes concurrent callers on this dir —
+    // no other writer's atomic-write temp files can be in flight right now.
     try {
         const entries = await storage.readDir(dir);
         for (const e of entries) {
             if (want.has(e.name))
                 continue;
-            if (parseSidecarName(e.name) || parseUsesSidecarName(e.name) || parseTemplateSidecarName(e.name)) {
+            const hashLocale = parseSidecarLocale(e.name);
+            const pubLocale = parsePubSidecarLocale(e.name);
+            if (parseSidecarName(e.name) && hashLocale === (locale ?? undefined)) {
+                try {
+                    await storage.rm(`${dir}/${e.name}`);
+                }
+                catch {
+                    /* already gone */
+                }
+            }
+            else if (parsePubSidecarName(e.name) && pubLocale === (locale ?? undefined)) {
                 try {
                     await storage.rm(`${dir}/${e.name}`);
                 }
-                catch { /* already gone */ }
+                catch {
+                    /* already gone */
+                }
             }
         }
     }
-    catch { /* dir doesn't exist yet — mkdir below */ }
+    catch {
+        /* dir doesn't exist yet — mkdir below */
+    }
     await storage.mkdir(dir);
-    // Parallel tiny writes; each is a zero-byte file.
     await Promise.all([...want].map(name => storage.writeFile(`${dir}/${name}`, '')));
 }
+/**
+ * Per-directory Promise-queue serialization for `writeSidecars`.
+ *
+ * Single responsibility: ensure at most one `writeSidecars` call is
+ * operating on a given directory at a time within this process. The
+ * race we're closing:
+ *
+ *   Call A: readDir → sees `.hash` → rm `.hash` → writeFile new `.hash`
+ *                                                      ↑ creates temp
+ *   Call B (parallel):  readDir → sees A's temp file
+ *                                 → matches permissive regex → rm temp
+ *                                 → A's rename ENOENTs
+ *
+ * With serialization, B's readDir can only observe finalized state from
+ * A's completed run. No temp files exist when any call does its cleanup.
+ *
+ * Shape: per-key Promise chain. Each caller awaits the prior Promise for
+ * its key before running, and publishes its own Promise as the next
+ * "current holder" for that key. Matches the pattern `write-file-atomic`
+ * uses per-file (node_modules/write-file-atomic/lib/index.js, the
+ * `activeFiles` map), lifted here to per-directory granularity.
+ *
+ * Cross-process safety: not provided — the map is in-process state.
+ * Gazetta's admin is a single writer (one dev server, one publish
+ * process); cross-process coordination would require a sibling `.lock`
+ * file (git's pattern), which we don't need in this regime.
+ */
+const dirLocks = new Map();
+async function withDirLock(dir, fn) {
+    const prev = dirLocks.get(dir) ?? Promise.resolve();
+    const current = prev.then(fn, fn); // run `fn` whether prev resolved or rejected
+    dirLocks.set(dir, current);
+    try {
+        return await current;
+    }
+    finally {
+        // Clean up the map entry only if we're still the tail of the chain.
+        // Otherwise a later caller's Promise is in flight and owns the slot.
+        if (dirLocks.get(dir) === current)
+            dirLocks.delete(dir);
+    }
+}
 /**
  * Walk a directory tree collecting every sub-directory's sidecar state.
  * Bounded-parallel recursion — flat Promise.all over 10k dirs would blow
@@ -106,17 +161,60 @@ export async function listSidecars(storage, rootDir) {
         catch {
             return;
         }
+        // Parse sidecar state directly from the entries we already have —
+        // avoids a second readDir per directory (readSidecars would re-read
+        // the same dir). At 10k pages this halves the I/O calls.
         if (relative) {
-            const state = await readSidecars(storage, dir).catch(() => null);
-            if (state)
-                out.set(relative, state);
+            const parsed = parseSidecarEntries(entries);
+            if (parsed.default)
+                out.set(relative, parsed.default);
+            for (const [loc, locState] of parsed.locales) {
+                out.set(`${relative}:${loc}`, locState);
+            }
         }
         const subdirs = entries.filter(e => e.isDirectory);
-        await mapLimit(subdirs, (e) => walk(`${dir}/${e.name}`, relative ? `${relative}/${e.name}` : e.name));
+        await mapLimit(subdirs, e => walk(`${dir}/${e.name}`, relative ? `${relative}/${e.name}` : e.name));
     }
     await walk(rootDir, '');
     return out;
 }
+/**
+ * Parse sidecar state from already-read directory entries.
+ * Returns the default-locale state plus any locale variants.
+ */
+function parseSidecarEntries(entries) {
+    let hash = null;
+    let pub = null;
+    const localeHashes = new Map();
+    const localePubs = new Map();
+    for (const e of entries) {
+        if (e.isDirectory)
+            continue;
+        const h = parseSidecarName(e.name);
+        if (h) {
+            const loc = parseSidecarLocale(e.name);
+            if (loc)
+                localeHashes.set(loc, h);
+            else
+                hash = h;
+            continue;
+        }
+        const p = parsePubSidecarName(e.name);
+        if (p) {
+            const loc = parsePubSidecarLocale(e.name);
+            if (loc)
+                localePubs.set(loc, p);
+            else
+                pub = p;
+        }
+    }
+    const defaultState = hash ? { hash, pub } : null;
+    const locales = new Map();
+    for (const [loc, lHash] of localeHashes) {
+        locales.set(loc, { hash: lHash, pub: localePubs.get(loc) ?? null });
+    }
+    return { default: defaultState, locales };
+}
 /**
  * Walk a component tree and collect every @fragment reference, recursing
  * into inline components' children. Used when building SidecarState from

package/dist/sidecars.js.map

@@ -1 +1 @@
-{"version":3,"file":"sidecars.js","sourceRoot":"","sources":["../src/sidecars.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sidecars.js","sourceRoot":"","sources":["../src/sidecars.ts"],"names":[],"mappings":"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"}

package/dist/site-loader.d.ts

@@ -1,24 +1,92 @@
 import type { PageManifest, FragmentManifest, SiteManifest, StorageProvider } from './types.js';
+import { type ContentRoot } from './content-root.js';
+/** A page entry with its name, manifest, and optional locale. */
+export interface PageEntry {
+    name: string;
+    page: PageManifest & {
+        dir: string;
+    };
+    locale?: string;
+}
+/** A fragment entry with its name, manifest, and optional locale. */
+export interface FragmentEntry {
+    name: string;
+    fragment: FragmentManifest & {
+        dir: string;
+    };
+    locale?: string;
+}
+/** Flatten all pages including locale variants into a single list. */
+export declare function allPageEntries(site: Site): PageEntry[];
+/** Flatten all fragments including locale variants into a single list. */
+export declare function allFragmentEntries(site: Site): FragmentEntry[];
 /** Derive route from page folder name: home → /, about → /about, blog/[slug] → /blog/:slug */
 export declare function deriveRoute(pageName: string): string;
+/** A page or fragment with its locale variants. */
+export interface LocalizedEntry<T> {
+    /** Default locale manifest (from page.json / fragment.json). */
+    default: T;
+    /** Locale variants keyed by normalized locale code. Empty if single-locale. */
+    locales: Map<string, T>;
+}
 export interface Site {
     manifest: SiteManifest;
     pages: Map<string, PageManifest & {
         dir: string;
     }>;
+    /** Locale variants for pages. Only populated when site has `locales` config. */
+    pageLocales: Map<string, LocalizedEntry<PageManifest & {
+        dir: string;
+    }>>;
     fragments: Map<string, FragmentManifest & {
         dir: string;
     }>;
+    /** Locale variants for fragments. Only populated when site has `locales` config. */
+    fragmentLocales: Map<string, LocalizedEntry<FragmentManifest & {
+        dir: string;
+    }>>;
+    /** Content root — `{storage, rootPath}` pair for accessing site content. */
+    contentRoot: ContentRoot;
+    /**
+     * Storage provider for site content. Equivalent to `contentRoot.storage` —
+     * kept as a convenience because resolver and template loading use it directly.
+     */
+    storage: StorageProvider;
+    /**
+     * Rooting prefix for content under `storage`. Equivalent to `contentRoot.rootPath`.
+     * Empty string when storage is target-rooted.
+     */
     siteDir: string;
-    /** Directory containing template packages. Defaults to siteDir/templates for flat projects. */
+    /** Directory containing template packages. Project-level, separate from content rooting. */
     templatesDir: string;
-    storage: StorageProvider;
 }
 export interface LoadSiteOptions {
-    siteDir: string;
-    storage: StorageProvider;
-    /** Override templates directory (default: siteDir/templates) */
+    /** @deprecated Pass `contentRoot` instead (preferred for new code). */
+    siteDir?: string;
+    /** @deprecated Pass `contentRoot` instead (preferred for new code). */
+    storage?: StorageProvider;
+    /** Content root — where site content lives. Preferred over siteDir/storage. */
+    contentRoot?: ContentRoot;
+    /** Override templates directory (default: siteDir/templates). */
     templatesDir?: string;
+    /**
+     * Pre-parsed site manifest. If provided, site.yaml is not read from the
+     * content root. Used when site.yaml is a project-level bootstrap file
+     * that lives outside target storage.
+     */
+    manifest?: SiteManifest;
 }
-export declare function loadSite(siteDirOrOpts: string | LoadSiteOptions, storage?: StorageProvider): Promise<Site>;
+/**
+ * Load a site from a storage provider.
+ *
+ * Two input shapes are supported:
+ * - **Preferred**: `{ contentRoot, templatesDir }` — storage rooting is
+ *   whatever the caller chose (cwd-rooted with siteDir prefix, or target-
+ *   rooted with empty prefix). Callers construct the root once; this
+ *   function doesn't care.
+ * - **Legacy**: `{ siteDir, storage, templatesDir? }` — the pair is wrapped
+ *   in a ContentRoot internally. Retained for callers that haven't
+ *   migrated yet.
+ */
+export declare function loadSite(opts: LoadSiteOptions): Promise<Site>;
 //# sourceMappingURL=site-loader.d.ts.map

package/dist/site-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"site-loader.d.ts","sourceRoot":"","sources":["../src/site-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAI/F,8FAA8F;AAC9F,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGpD;AAED,MAAM,WAAW,IAAI;IACnB,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAClD,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC1D,OAAO,EAAE,MAAM,CAAA;IACf,+FAA+F;IAC/F,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,eAAe,CAAA;CACzB;AAoED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,eAAe,CAAA;IACxB,gEAAgE;IAChE,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,wBAAsB,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,eAAe,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBhH"}
+{"version":3,"file":"site-loader.d.ts","sourceRoot":"","sources":["../src/site-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAG/F,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAGvE,iEAAiE;AACjE,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,YAAY,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;IACpC,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,qEAAqE;AACrE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,gBAAgB,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,sEAAsE;AACtE,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,EAAE,CAOtD;AAED,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,aAAa,EAAE,CAO9D;AAED,8FAA8F;AAC9F,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGpD;AAED,mDAAmD;AACnD,MAAM,WAAW,cAAc,CAAC,CAAC;IAC/B,gEAAgE;IAChE,OAAO,EAAE,CAAC,CAAA;IACV,+EAA+E;IAC/E,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;CACxB;AAED,MAAM,WAAW,IAAI;IACnB,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAClD,gFAAgF;IAChF,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,YAAY,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAA;IACxE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC1D,oFAAoF;IACpF,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,gBAAgB,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAA;IAChF,4EAA4E;IAC5E,WAAW,EAAE,WAAW,CAAA;IACxB;;;OAGG;IACH,OAAO,EAAE,eAAe,CAAA;IACxB;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAA;IACf,4FAA4F;IAC5F,YAAY,EAAE,MAAM,CAAA;CACrB;AAmHD,MAAM,WAAW,eAAe;IAC9B,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,uEAAuE;IACvE,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,iEAAiE;IACjE,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,YAAY,CAAA;CACxB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAkDnE"}

package/dist/site-loader.js

@@ -1,17 +1,41 @@
 import { join } from 'node:path';
 import { parseSiteManifest, parsePageManifest, parseFragmentManifest } from './manifest.js';
 import { mapLimit } from './concurrency.js';
+import { createContentRoot } from './content-root.js';
+import { localeFromFilename, localeRoutePrefix, resolveSiteLocales } from './locale.js';
+/** Flatten all pages including locale variants into a single list. */
+export function allPageEntries(site) {
+    const entries = [];
+    for (const [name, page] of site.pages)
+        entries.push({ name, page });
+    for (const [name, entry] of site.pageLocales) {
+        for (const [locale, page] of entry.locales)
+            entries.push({ name, page, locale });
+    }
+    return entries;
+}
+/** Flatten all fragments including locale variants into a single list. */
+export function allFragmentEntries(site) {
+    const entries = [];
+    for (const [name, fragment] of site.fragments)
+        entries.push({ name, fragment });
+    for (const [name, entry] of site.fragmentLocales) {
+        for (const [locale, fragment] of entry.locales)
+            entries.push({ name, fragment, locale });
+    }
+    return entries;
+}
 /** Derive route from page folder name: home → /, about → /about, blog/[slug] → /blog/:slug */
 export function deriveRoute(pageName) {
     if (pageName === 'home')
         return '/';
     return '/' + pageName.replace(/\[([^\]]+)\]/g, ':$1');
 }
-async function discoverPages(storage, pagesDir, pages = new Map(), prefix = '') {
-    if (!await storage.exists(pagesDir)) {
+async function discoverPages(storage, pagesDir, siteManifest, result = { pages: new Map(), pageLocales: new Map() }, prefix = '') {
+    if (!(await storage.exists(pagesDir))) {
         if (!prefix)
             console.warn(`  Warning: pages/ directory not found at ${pagesDir}`);
-        return pages;
+        return result;
     }
     const entries = await storage.readDir(pagesDir);
     const subdirs = entries.filter(e => e.isDirectory);
@@ -25,58 +49,144 @@ async function discoverPages(storage, pagesDir, pages = new Map(), prefix = '')
             try {
                 const manifest = await parsePageManifest(storage, manifestPath);
                 const route = deriveRoute(name);
-                pages.set(name, { ...manifest, route, dir });
+                const pageWithDir = { ...manifest, route, dir };
+                result.pages.set(name, pageWithDir);
+                // Discover locale variants (page.fr.json, page.en-gb.json, etc.)
+                const locales = new Map();
+                const dirEntries = await storage.readDir(dir);
+                for (const f of dirEntries) {
+                    if (f.isDirectory)
+                        continue;
+                    const locale = localeFromFilename(f.name, 'page');
+                    if (!locale)
+                        continue;
+                    try {
+                        const localeManifest = await parsePageManifest(storage, join(dir, f.name));
+                        const siteLocales = resolveSiteLocales(siteManifest);
+                        const routePrefix = siteLocales ? localeRoutePrefix(locale, siteLocales) : `/${locale}`;
+                        const localeRoute = `${routePrefix}${route === '/' ? '' : route}` || '/';
+                        locales.set(locale, { ...localeManifest, route: localeRoute, dir });
+                    }
+                    catch (err) {
+                        console.warn(`  Warning: skipping page "${name}" locale "${locale}": ${err.message}`);
+                    }
+                }
+                if (locales.size > 0) {
+                    result.pageLocales.set(name, { default: pageWithDir, locales });
+                }
             }
             catch (err) {
                 console.warn(`  Warning: skipping page "${name}": ${err.message}`);
             }
         }
         // Recurse into subdirectories to find nested pages (e.g., blog/[slug]).
-        // Recursive call inherits the same bounded mapLimit — workers at each
-        // level compete for the same concurrency budget.
-        await discoverPages(storage, dir, pages, name);
+        await discoverPages(storage, dir, siteManifest, result, name);
     });
-    return pages;
+    return result;
 }
 async function discoverFragments(storage, fragmentsDir) {
-    const fragments = new Map();
-    if (!await storage.exists(fragmentsDir)) {
+    const result = { fragments: new Map(), fragmentLocales: new Map() };
+    if (!(await storage.exists(fragmentsDir))) {
         console.warn(`  Warning: fragments/ directory not found at ${fragmentsDir}`);
-        return fragments;
+        return result;
     }
     const entries = await storage.readDir(fragmentsDir);
     const subdirs = entries.filter(e => e.isDirectory);
     await mapLimit(subdirs, async (entry) => {
         const fragDir = join(fragmentsDir, entry.name);
         const manifestPath = join(fragDir, 'fragment.json');
-        if (!await storage.exists(manifestPath))
+        if (!(await storage.exists(manifestPath)))
             return;
         try {
             const manifest = await parseFragmentManifest(storage, manifestPath);
-            fragments.set(entry.name, { ...manifest, dir: fragDir });
+            const fragWithDir = { ...manifest, dir: fragDir };
+            result.fragments.set(entry.name, fragWithDir);
+            // Discover locale variants (fragment.fr.json, etc.)
+            const locales = new Map();
+            const dirEntries = await storage.readDir(fragDir);
+            for (const f of dirEntries) {
+                if (f.isDirectory)
+                    continue;
+                const locale = localeFromFilename(f.name, 'fragment');
+                if (!locale)
+                    continue;
+                try {
+                    const localeManifest = await parseFragmentManifest(storage, join(fragDir, f.name));
+                    locales.set(locale, { ...localeManifest, dir: fragDir });
+                }
+                catch (err) {
+                    console.warn(`  Warning: skipping fragment "${entry.name}" locale "${locale}": ${err.message}`);
+                }
+            }
+            if (locales.size > 0) {
+                result.fragmentLocales.set(entry.name, { default: fragWithDir, locales });
+            }
         }
         catch (err) {
             console.warn(`  Warning: skipping fragment "${entry.name}": ${err.message}`);
         }
     });
-    return fragments;
+    return result;
 }
-export async function loadSite(siteDirOrOpts, storage) {
-    const opts = typeof siteDirOrOpts === 'string'
-        ? { siteDir: siteDirOrOpts, storage: storage }
-        : siteDirOrOpts;
-    const { siteDir } = opts;
-    const templatesDir = opts.templatesDir ?? join(siteDir, 'templates');
-    const siteYaml = join(siteDir, 'site.yaml');
-    if (!await opts.storage.exists(siteYaml)) {
-        throw new Error(`No site.yaml found at ${siteDir}. Is this a Gazetta site directory?`);
+/**
+ * Load a site from a storage provider.
+ *
+ * Two input shapes are supported:
+ * - **Preferred**: `{ contentRoot, templatesDir }` — storage rooting is
+ *   whatever the caller chose (cwd-rooted with siteDir prefix, or target-
+ *   rooted with empty prefix). Callers construct the root once; this
+ *   function doesn't care.
+ * - **Legacy**: `{ siteDir, storage, templatesDir? }` — the pair is wrapped
+ *   in a ContentRoot internally. Retained for callers that haven't
+ *   migrated yet.
+ */
+export async function loadSite(opts) {
+    let contentRoot;
+    let siteDir;
+    let templatesDir;
+    if (opts.contentRoot) {
+        // Preferred: caller built the ContentRoot
+        contentRoot = opts.contentRoot;
+        siteDir = contentRoot.rootPath;
+        templatesDir = opts.templatesDir ?? join(siteDir, 'templates');
+    }
+    else {
+        // Legacy options bag: { siteDir, storage, templatesDir? }
+        if (!opts.siteDir || !opts.storage) {
+            throw new Error('loadSite: either contentRoot, or both siteDir and storage, must be provided');
+        }
+        siteDir = opts.siteDir;
+        contentRoot = createContentRoot(opts.storage, siteDir);
+        templatesDir = opts.templatesDir ?? join(siteDir, 'templates');
+    }
+    let manifest;
+    if (opts.manifest) {
+        // Project-level bootstrap passed in the manifest — skip the storage read.
+        manifest = opts.manifest;
+    }
+    else {
+        const siteYamlPath = contentRoot.path('site.yaml');
+        if (!(await contentRoot.storage.exists(siteYamlPath))) {
+            throw new Error(`No site.yaml found at ${siteYamlPath}. Is this a Gazetta site directory?`);
+        }
+        manifest = await parseSiteManifest(contentRoot.storage, siteYamlPath);
     }
-    const manifest = await parseSiteManifest(opts.storage, siteYaml);
-    const pages = await discoverPages(opts.storage, join(siteDir, 'pages'));
-    const fragments = await discoverFragments(opts.storage, join(siteDir, 'fragments'));
+    const { pages, pageLocales } = await discoverPages(contentRoot.storage, contentRoot.path('pages'), manifest);
+    const { fragments, fragmentLocales } = await discoverFragments(contentRoot.storage, contentRoot.path('fragments'));
     if (pages.size === 0) {
-        console.warn(`  Warning: no pages found in ${join(siteDir, 'pages')}`);
+        console.warn(`  Warning: no pages found in ${contentRoot.path('pages')}`);
     }
-    return { manifest, pages, fragments, siteDir, templatesDir, storage: opts.storage };
+    return {
+        manifest,
+        pages,
+        pageLocales,
+        fragments,
+        fragmentLocales,
+        contentRoot,
+        // backward-compat fields
+        siteDir,
+        templatesDir,
+        storage: contentRoot.storage,
+    };
 }
 //# sourceMappingURL=site-loader.js.map

package/dist/site-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"site-loader.js","sourceRoot":"","sources":["../src/site-loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"site-loader.js","sourceRoot":"","sources":["../src/site-loader.ts"],"names":[],"mappings":"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"}