scribe-cms 0.0.8 → 0.0.10

package/dist/runtime.js

@@ -1,4 +1,4 @@
-import path3 from 'path';
+import path from 'path';
 import { z } from 'zod';
 import fs2 from 'fs';
 import matter from 'gray-matter';
@@ -11,14 +11,14 @@ var SLUG_PLACEHOLDER = "{slug}";
 function isRoutableType(type) {
   return typeof type.path === "string" && type.path.length > 0;
 }
-function assertValidPathTemplate(path5, typeId) {
-  if (!path5.startsWith("/")) {
-    throw new Error(`Content type "${typeId}": path must start with / (got "${path5}")`);
+function assertValidPathTemplate(path6, typeId) {
+  if (!path6.startsWith("/")) {
+    throw new Error(`Content type "${typeId}": path must start with / (got "${path6}")`);
   }
-  const count = (path5.match(/\{slug\}/g) ?? []).length;
+  const count = (path6.match(/\{slug\}/g) ?? []).length;
   if (count !== 1) {
     throw new Error(
-      `Content type "${typeId}": path must contain exactly one {slug} (got "${path5}")`
+      `Content type "${typeId}": path must contain exactly one {slug} (got "${path6}")`
     );
   }
 }
@@ -32,19 +32,69 @@ function pathSuffix(template) {
   if (idx === -1) throw new Error(`Invalid path template (missing {slug}): ${template}`);
   return template.slice(idx + SLUG_PLACEHOLDER.length);
 }
-function resolvePath(template, slug, locale, defaultLocale) {
-  const relative = template.replace(SLUG_PLACEHOLDER, slug);
-  if (locale === defaultLocale) return relative;
-  return `/${locale}${relative}`;
+function resolveDefaultLocaleRouting() {
+  return { strategy: "path-prefix", prefixDefaultLocale: false };
 }
-function extractSlugFromResolvedPath(template, resolvedPath) {
-  const prefix = pathPrefix(template);
-  const suffix = pathSuffix(template);
-  if (!resolvedPath.startsWith(prefix)) return null;
-  if (suffix && !resolvedPath.endsWith(suffix)) return null;
-  const slugEnd = suffix ? resolvedPath.length - suffix.length : resolvedPath.length;
-  const slug = resolvedPath.slice(prefix.length, slugEnd);
-  return slug.length > 0 ? slug : null;
+function splitPathAndSearch(pathname) {
+  const q = pathname.indexOf("?");
+  if (q === -1) return { pathname, search: "" };
+  return { pathname: pathname.slice(0, q), search: pathname.slice(q) };
+}
+function createUrlBuilder(config) {
+  const localeRouting = config.localeRouting ?? resolveDefaultLocaleRouting();
+  const defaultLocale = config.defaultLocale;
+  const prefixedLocales = localeRouting.strategy === "path-prefix" ? localeRouting.prefixDefaultLocale ? [...config.locales] : config.locales.filter((locale) => locale !== defaultLocale) : config.locales.filter((locale) => locale !== defaultLocale);
+  function applyLocaleToPath(pathname, locale) {
+    if (locale === defaultLocale) {
+      if (localeRouting.strategy === "path-prefix" && localeRouting.prefixDefaultLocale) {
+        return `/${defaultLocale}${pathname}`;
+      }
+      return pathname;
+    }
+    if (localeRouting.strategy === "search-param") {
+      const { pathname: base, search } = splitPathAndSearch(pathname);
+      const params = new URLSearchParams(search.startsWith("?") ? search.slice(1) : search);
+      params.set(localeRouting.param, locale);
+      const qs = params.toString();
+      return qs ? `${base}?${qs}` : base;
+    }
+    return `/${locale}${pathname}`;
+  }
+  function resolvePath(template, slug, locale) {
+    const relative = template.replace(SLUG_PLACEHOLDER, slug);
+    return applyLocaleToPath(relative, locale);
+  }
+  function extractSlugFromResolvedPath(template, resolvedPath) {
+    let pathname = resolvedPath;
+    if (localeRouting.strategy === "search-param") {
+      pathname = splitPathAndSearch(resolvedPath).pathname;
+    } else if (localeRouting.strategy === "path-prefix") {
+      for (const locale of config.locales) {
+        if (locale === defaultLocale && !localeRouting.prefixDefaultLocale) continue;
+        const prefix2 = `/${locale}`;
+        if (pathname === prefix2 || pathname.startsWith(`${prefix2}/`)) {
+          pathname = pathname.slice(prefix2.length) || "/";
+          break;
+        }
+      }
+    }
+    const prefix = pathPrefix(template);
+    const suffix = pathSuffix(template);
+    if (!pathname.startsWith(prefix)) return null;
+    if (suffix && !pathname.endsWith(suffix)) return null;
+    const slugEnd = suffix ? pathname.length - suffix.length : pathname.length;
+    const slug = pathname.slice(prefix.length, slugEnd);
+    return slug.length > 0 ? slug : null;
+  }
+  return {
+    defaultLocale,
+    locales: config.locales,
+    localeRouting,
+    prefixedLocales,
+    resolvePath,
+    extractSlugFromResolvedPath,
+    applyLocaleToPath
+  };
 }
 
 // src/config/resolve-config.ts
@@ -67,10 +117,17 @@ function resolveConfig(input, baseDir) {
       `scribe config: defaultLocale "${defaultLocale}" is not in locales [${raw.locales.join(", ")}]`
     );
   }
-  const projectRoot = path3.resolve(process.cwd(), raw.rootDir);
-  const contentRoot = path3.resolve(projectRoot, raw.contentDir ?? "content");
-  const storePath = path3.resolve(projectRoot, raw.store ?? ".scribe/store.sqlite");
-  const assetsPath = raw.assetsDir ? path3.resolve(projectRoot, raw.assetsDir) : void 0;
+  const localeRouting = raw.localeRouting ?? {
+    strategy: "path-prefix",
+    prefixDefaultLocale: false
+  };
+  if (localeRouting.strategy === "search-param" && !localeRouting.param) {
+    throw new Error('scribe config: localeRouting search-param requires a "param" name');
+  }
+  const projectRoot = path.resolve(process.cwd(), raw.rootDir);
+  const contentRoot = path.resolve(projectRoot, raw.contentDir ?? "content");
+  const storePath = path.resolve(projectRoot, raw.store ?? ".scribe/store.sqlite");
+  const assetsPath = raw.assetsDir ? path.resolve(projectRoot, raw.assetsDir) : void 0;
   const seenIds = /* @__PURE__ */ new Set();
   const types = raw.types.map((type) => {
     if (seenIds.has(type.id)) {
@@ -94,6 +151,7 @@ function resolveConfig(input, baseDir) {
     assetsPath,
     locales: [...raw.locales],
     defaultLocale,
+    localeRouting,
     localePresets: raw.localePresets,
     translate: raw.translate,
     types
@@ -193,10 +251,10 @@ function introspectSchema(schema, prefix = []) {
 }
 function extractByPaths(data, paths) {
   const out = {};
-  for (const path5 of paths) {
-    const value = getAtPath(data, path5);
+  for (const path6 of paths) {
+    const value = getAtPath(data, path6);
     if (value !== void 0) {
-      setAtPath(out, path5.filter((p) => p !== "*"), value);
+      setAtPath(out, path6.filter((p) => p !== "*"), value);
     }
   }
   return out;
@@ -214,13 +272,13 @@ function mergeStructuralOntoLocale(localeData, enData, schema) {
   const translatable = pickTranslatable(localeData, schema);
   return deepMerge(structural, translatable);
 }
-function getAtPath(obj, path5) {
+function getAtPath(obj, path6) {
   let current = obj;
-  for (const segment of path5) {
+  for (const segment of path6) {
     if (segment === "*") {
       if (!Array.isArray(current)) return void 0;
       return current.map(
-        (item) => typeof item === "object" && item !== null ? getAtPath(item, path5.slice(path5.indexOf("*") + 1)) : void 0
+        (item) => typeof item === "object" && item !== null ? getAtPath(item, path6.slice(path6.indexOf("*") + 1)) : void 0
       );
     }
     if (typeof current !== "object" || current === null || Array.isArray(current)) return void 0;
@@ -228,13 +286,13 @@ function getAtPath(obj, path5) {
   }
   return current;
 }
-function setAtPath(obj, path5, value) {
-  if (path5.length === 0) return;
-  if (path5.length === 1) {
-    obj[path5[0]] = value;
+function setAtPath(obj, path6, value) {
+  if (path6.length === 0) return;
+  if (path6.length === 1) {
+    obj[path6[0]] = value;
     return;
   }
-  const [head, ...rest] = path5;
+  const [head, ...rest] = path6;
   if (!(head in obj) || typeof obj[head] !== "object" || obj[head] === null) {
     obj[head] = {};
   }
@@ -269,45 +327,23 @@ var SLUG_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 var slugPatternSchema = z.string().regex(SLUG_PATTERN, "slug must be lowercase-kebab-case");
 var isoDateSchema = z.string().regex(/^\d{4}-\d{2}-\d{2}(T[\d:.Z+-]*)?$/, "Use ISO date YYYY-MM-DD or full ISO 8601");
 var canonicalPathSchema = z.string().regex(/^\//, "canonicalPath must start with /");
-function extractBuiltinEnFields(data, pathTemplate, enSlug, defaultLocale) {
+var DEPRECATED_REDIRECT_FIELDS = [
+  [
+    "aliases",
+    "aliases frontmatter is removed \u2014 add redirects to content/<type>/_redirects.json instead"
+  ],
+  [
+    "redirect_to",
+    "redirect_to frontmatter is removed \u2014 add redirects to content/<type>/_redirects.json instead"
+  ]
+];
+function extractBuiltinEnFields(data, _pathTemplate, _enSlug, _defaultLocale) {
   const issues = [];
   const rest = { ...data };
-  const aliasesResult = z.array(slugPatternSchema).max(20).optional().default([]).safeParse(rest.aliases ?? []);
-  delete rest.aliases;
-  const redirectRaw = rest.redirect_to;
-  delete rest.redirect_to;
-  let redirectTo;
-  if (redirectRaw !== void 0 && redirectRaw !== null && redirectRaw !== "") {
-    if (typeof redirectRaw !== "string") {
-      issues.push({
-        field: "redirect_to",
-        message: "redirect_to must be a string path",
-        level: "error"
-      });
-    } else if (!pathTemplate) {
-      issues.push({
-        field: "redirect_to",
-        message: "redirect_to is not allowed on reference-only content types",
-        level: "error"
-      });
-    } else if (!extractSlugFromResolvedPath(pathTemplate, redirectRaw)) {
-      issues.push({
-        field: "redirect_to",
-        message: `redirect_to must match path template "${pathTemplate}" (prefix "${pathPrefix(pathTemplate)}"${pathSuffix(pathTemplate) ? `, suffix "${pathSuffix(pathTemplate)}"` : ""})`,
-        level: "error"
-      });
-    } else {
-      redirectTo = redirectRaw;
-    }
-  }
-  const aliases = aliasesResult.success ? aliasesResult.data : [];
-  if (!aliasesResult.success) {
-    for (const issue of aliasesResult.error.issues) {
-      issues.push({
-        field: `aliases.${issue.path.join(".")}`,
-        message: issue.message,
-        level: "error"
-      });
+  for (const [field, message] of DEPRECATED_REDIRECT_FIELDS) {
+    if (rest[field] !== void 0) {
+      issues.push({ field, message, level: "error" });
+      delete rest[field];
     }
   }
   let publishedAt;
@@ -369,8 +405,6 @@ function extractBuiltinEnFields(data, pathTemplate, enSlug, defaultLocale) {
   }
   return {
     builtin: {
-      aliases,
-      redirectTo,
       publishedAt,
       updatedAt,
       noindex,
@@ -386,20 +420,24 @@ function documentLastModified(doc) {
   const date = new Date(raw);
   return Number.isNaN(date.getTime()) ? void 0 : date.toISOString();
 }
-function resolveCanonicalPathname(type, doc, defaultLocale) {
+function resolveCanonicalPathname(type, doc, defaultLocale, localeRouting) {
+  const urlBuilder = createUrlBuilder({
+    locales: [defaultLocale, ...doc.locale !== defaultLocale ? [doc.locale] : []],
+    defaultLocale,
+    localeRouting: localeRouting ?? { strategy: "path-prefix", prefixDefaultLocale: false }
+  });
   if (doc.canonicalPathOverride) {
-    if (doc.locale === defaultLocale) return doc.canonicalPathOverride;
-    return `/${doc.locale}${doc.canonicalPathOverride}`;
+    return urlBuilder.applyLocaleToPath(doc.canonicalPathOverride, doc.locale);
   }
   if (!type.path) return `/${doc.slug}`;
-  return resolvePath(type.path, doc.slug, doc.locale, defaultLocale);
+  return urlBuilder.resolvePath(type.path, doc.slug, doc.locale);
 }
-function mergeBuiltinsIntoFrontmatter(frontmatter, doc, type, defaultLocale) {
+function mergeBuiltinsIntoFrontmatter(frontmatter, doc, type, defaultLocale, localeRouting) {
   const out = { ...frontmatter };
   if (doc.publishedAt !== void 0) out.publishedAt = doc.publishedAt;
   if (doc.updatedAt !== void 0) out.updatedAt = doc.updatedAt;
   out.noindex = doc.noindex;
-  out.canonicalPath = resolveCanonicalPathname(type, doc, defaultLocale);
+  out.canonicalPath = resolveCanonicalPathname(type, doc, defaultLocale, localeRouting);
   return out;
 }
 function seoFieldsFromEn(enDoc) {
@@ -407,8 +445,7 @@ function seoFieldsFromEn(enDoc) {
     publishedAt: enDoc.publishedAt,
     updatedAt: enDoc.updatedAt,
     noindex: enDoc.noindex,
-    canonicalPathOverride: enDoc.canonicalPathOverride,
-    redirectTo: enDoc.redirectTo
+    canonicalPathOverride: enDoc.canonicalPathOverride
   };
 }
 var SCHEMA_VERSION = 4;
@@ -467,7 +504,7 @@ function resolveStorePath(config) {
 function openStore(config, mode = "readwrite") {
   const storePath = resolveStorePath(config);
   if (mode === "readwrite") {
-    fs2.mkdirSync(path3.dirname(storePath), { recursive: true });
+    fs2.mkdirSync(path.dirname(storePath), { recursive: true });
   }
   const db = new Database(storePath, { readonly: mode === "readonly" });
   if (mode === "readwrite") {
@@ -531,10 +568,10 @@ function isPostFile(name) {
 }
 function listEnFiles(contentDir) {
   if (!fs2.existsSync(contentDir)) return [];
-  return fs2.readdirSync(contentDir).filter(isPostFile).map((f) => path3.join(contentDir, f));
+  return fs2.readdirSync(contentDir).filter(isPostFile).map((f) => path.join(contentDir, f));
 }
 function slugFromPath(filePath) {
-  return path3.basename(filePath).replace(/\.(md|mdx)$/, "");
+  return path.basename(filePath).replace(/\.(md|mdx)$/, "");
 }
 function parseEnMdx(filePath, config, type) {
   const raw = fs2.readFileSync(filePath, "utf8");
@@ -580,7 +617,8 @@ function parseEnMdx(filePath, config, type) {
       locale: config.defaultLocale
     },
     type,
-    config.defaultLocale
+    config.defaultLocale,
+    config.localeRouting
   );
   const crossIssues = type.crossValidate?.(result.data, {
     locale: config.defaultLocale,
@@ -594,8 +632,6 @@ function parseEnMdx(filePath, config, type) {
     slug,
     enSlug: slug,
     locale: config.defaultLocale,
-    aliases: builtin.aliases,
-    redirectTo: builtin.redirectTo,
     publishedAt: builtin.publishedAt,
     updatedAt: builtin.updatedAt,
     noindex: builtin.noindex,
@@ -606,7 +642,7 @@ function parseEnMdx(filePath, config, type) {
   };
   return { document, issues };
 }
-function buildDocumentFromTranslation(row, enDoc, type) {
+function buildDocumentFromTranslation(row, enDoc, type, config) {
   const localeFm = JSON.parse(row.frontmatter_json);
   const merged = mergeStructuralOntoLocale(localeFm, enDoc.frontmatter, type.schema);
   const seo = seoFieldsFromEn(enDoc);
@@ -614,14 +650,13 @@ function buildDocumentFromTranslation(row, enDoc, type) {
     merged,
     { ...seo, slug: row.slug, locale: row.locale },
     type,
-    enDoc.locale
+    config.defaultLocale,
+    config.localeRouting
   );
   return {
     slug: row.slug,
     enSlug: row.en_slug,
     locale: row.locale,
-    aliases: [],
-    redirectTo: seo.redirectTo,
     publishedAt: seo.publishedAt,
     updatedAt: seo.updatedAt,
     noindex: seo.noindex,
@@ -635,7 +670,7 @@ function createContentLoader(config, type) {
   let cached = null;
   let signature = "";
   let lastCheck = 0;
-  const contentDir = path3.join(
+  const contentDir = path.join(
     /* turbopackIgnore: true */
     config.rootDir,
     type.contentDir
@@ -699,7 +734,7 @@ function createContentLoader(config, type) {
       for (const row of rowsByLocale.get(locale) ?? []) {
         const enDoc = englishBySlug.get(row.en_slug);
         if (!enDoc) continue;
-        const doc = buildDocumentFromTranslation(row, enDoc, type);
+        const doc = buildDocumentFromTranslation(row, enDoc, type, config);
         bySlug.set(doc.slug, doc);
         byEnSlug.set(row.en_slug, doc);
       }
@@ -725,72 +760,18 @@ function createContentLoader(config, type) {
     return cached;
   };
 }
-function readEnDocument(config, type, enSlug) {
-  const contentDir = path3.join(
-    /* turbopackIgnore: true */
-    config.rootDir,
-    type.contentDir
-  );
-  for (const ext of [".mdx", ".md"]) {
-    const filePath = path3.join(contentDir, `${enSlug}${ext}`);
-    if (!fs2.existsSync(filePath)) continue;
-    const { document } = parseEnMdx(filePath, config, type);
-    return document;
-  }
-  return null;
-}
 
 // src/i18n/resolve-document.ts
-function findEnDocByAlias(slug, allDocs, defaultLocale) {
-  const enIdx = allDocs.get(defaultLocale);
-  if (!enIdx) return null;
-  for (const doc of enIdx.bySlug.values()) {
-    if (doc.aliases.includes(slug)) return doc;
-  }
-  return null;
-}
-function enCanonicalDoc(doc, allDocs, defaultLocale) {
-  if (doc.locale === defaultLocale) return doc;
-  return allDocs.get(defaultLocale)?.bySlug.get(doc.enSlug) ?? doc;
-}
-function redirectPathForDocument(doc, locale, defaultLocale, allDocs, type) {
-  if (!type.path) return void 0;
-  const enDoc = enCanonicalDoc(doc, allDocs, defaultLocale);
-  if (!enDoc.redirectTo) return void 0;
-  const targetEnSlug = extractSlugFromResolvedPath(type.path, enDoc.redirectTo);
-  if (!targetEnSlug) return void 0;
-  const targetEnDoc = allDocs.get(defaultLocale)?.bySlug.get(targetEnSlug);
-  const targetSlug = targetEnDoc ? getSlugForLocale(targetEnDoc, defaultLocale, locale, allDocs, defaultLocale) ?? targetEnSlug : targetEnSlug;
-  return resolvePath(type.path, targetSlug, locale, defaultLocale);
-}
-function withRedirectTo(result, locale, defaultLocale, allDocs, type) {
-  if (result.shouldRedirectTo || !result.document) return result;
-  const redirect = redirectPathForDocument(result.document, locale, defaultLocale, allDocs, type);
-  if (!redirect) return result;
-  return {
-    document: null,
-    actualLocale: result.actualLocale,
-    shouldRedirectTo: redirect
-  };
-}
-function resolveLocalizedDocument(slug, locale, defaultLocale, allDocs, type) {
+function resolveLocalizedDocument(slug, locale, defaultLocale, allDocs, type, localeRouting) {
+  const urlBuilder = createUrlBuilder({
+    locales: [defaultLocale, locale],
+    defaultLocale,
+    localeRouting: localeRouting ?? { strategy: "path-prefix", prefixDefaultLocale: false }
+  });
   const idx = allDocs.get(locale);
   const direct = idx?.bySlug.get(slug);
   if (direct) {
-    return withRedirectTo({ document: direct, actualLocale: locale }, locale, defaultLocale, allDocs, type);
-  }
-  const aliasDoc = findEnDocByAlias(slug, allDocs, defaultLocale);
-  if (aliasDoc && type.path) {
-    const canonicalSlug = aliasDoc.slug;
-    const localizedSlug = getSlugForLocale(aliasDoc, defaultLocale, locale, allDocs, defaultLocale);
-    const targetSlug = localizedSlug ?? canonicalSlug;
-    if (targetSlug !== slug) {
-      return {
-        document: null,
-        actualLocale: locale,
-        shouldRedirectTo: resolvePath(type.path, targetSlug, locale, defaultLocale)
-      };
-    }
+    return { document: direct, actualLocale: locale };
   }
   for (const [docLocale, docIdx] of allDocs) {
     const found = docIdx.bySlug.get(slug);
@@ -803,17 +784,11 @@ function resolveLocalizedDocument(slug, locale, defaultLocale, allDocs, type) {
       return {
         document: null,
         actualLocale: locale,
-        shouldRedirectTo: resolvePath(type.path, correctSlug, locale, defaultLocale)
+        shouldRedirectTo: urlBuilder.resolvePath(type.path, correctSlug, locale)
       };
     }
     if (docLocale === defaultLocale) {
-      return withRedirectTo(
-        { document: found, actualLocale: defaultLocale },
-        locale,
-        defaultLocale,
-        allDocs,
-        type
-      );
+      return { document: found, actualLocale: defaultLocale };
     }
     if (!type.path) {
       return { document: null, actualLocale: locale };
@@ -821,39 +796,21 @@ function resolveLocalizedDocument(slug, locale, defaultLocale, allDocs, type) {
     return {
       document: null,
       actualLocale: locale,
-      shouldRedirectTo: resolvePath(type.path, found.enSlug, locale, defaultLocale)
+      shouldRedirectTo: urlBuilder.resolvePath(type.path, found.enSlug, locale)
     };
   }
   if (locale !== defaultLocale) {
     const enDoc = allDocs.get(defaultLocale)?.bySlug.get(slug);
     if (enDoc && type.indexFallback === "en") {
-      return withRedirectTo(
-        { document: enDoc, actualLocale: defaultLocale },
-        locale,
-        defaultLocale,
-        allDocs,
-        type
-      );
+      return { document: enDoc, actualLocale: defaultLocale };
     }
     const byEn = idx?.byEnSlug.get(slug);
     if (byEn) {
-      return withRedirectTo(
-        { document: byEn, actualLocale: locale },
-        locale,
-        defaultLocale,
-        allDocs,
-        type
-      );
+      return { document: byEn, actualLocale: locale };
     }
     const fallback = allDocs.get(defaultLocale)?.bySlug.get(slug);
     if (fallback && type.indexFallback === "en") {
-      return withRedirectTo(
-        { document: fallback, actualLocale: defaultLocale },
-        locale,
-        defaultLocale,
-        allDocs,
-        type
-      );
+      return { document: fallback, actualLocale: defaultLocale };
     }
   }
   return { document: null, actualLocale: locale };
@@ -895,6 +852,7 @@ function buildRuntime(config, type, getRuntime) {
     }
     return type.path;
   }
+  const urlBuilder = createUrlBuilder(config);
   const runtime = {
     id: type.id,
     config: type,
@@ -910,15 +868,21 @@ function buildRuntime(config, type, getRuntime) {
       return load().get(locale)?.bySlug.get(slug) ?? null;
     },
     resolve(slug, locale) {
-      const result = resolveLocalizedDocument(slug, locale, config.defaultLocale, load(), type);
+      const result = resolveLocalizedDocument(
+        slug,
+        locale,
+        config.defaultLocale,
+        load(),
+        type,
+        config.localeRouting
+      );
       if (result.document && type.path) {
         return {
           ...result,
-          canonicalPath: resolvePath(
+          canonicalPath: urlBuilder.resolvePath(
             type.path,
             result.document.slug,
-            result.actualLocale,
-            config.defaultLocale
+            result.actualLocale
           )
         };
       }
@@ -942,10 +906,9 @@ function buildRuntime(config, type, getRuntime) {
     alternates(doc) {
       const pathTemplate = assertRoutable("alternates");
       const out = {
-        [config.defaultLocale]: resolvePath(
+        [config.defaultLocale]: urlBuilder.resolvePath(
           pathTemplate,
           doc.enSlug,
-          config.defaultLocale,
           config.defaultLocale
         )
       };
@@ -954,7 +917,7 @@ function buildRuntime(config, type, getRuntime) {
         if (locale === config.defaultLocale) continue;
         const translated = all.get(locale)?.byEnSlug.get(doc.enSlug);
         if (translated) {
-          out[locale] = resolvePath(pathTemplate, translated.slug, locale, config.defaultLocale);
+          out[locale] = urlBuilder.resolvePath(pathTemplate, translated.slug, locale);
         }
       }
       return out;
@@ -969,7 +932,7 @@ function buildRuntime(config, type, getRuntime) {
     },
     url(slug, locale) {
       const pathTemplate = assertRoutable("url");
-      return resolvePath(pathTemplate, slug, locale, config.defaultLocale);
+      return urlBuilder.resolvePath(pathTemplate, slug, locale);
     },
     related(doc, fieldName, locale) {
       const meta = relationFields.get(fieldName);
@@ -1031,87 +994,150 @@ function createProject(config) {
     }
   };
 }
-function listEnSlugs(rootDir, contentDir) {
-  const dir = path3.join(rootDir, contentDir);
-  if (!fs2.existsSync(dir)) return [];
-  return fs2.readdirSync(dir).filter(isPublishableContentFile).map((f) => f.replace(/\.(md|mdx)$/, ""));
+var redirectFromSchema = z.union([
+  slugPatternSchema,
+  z.array(slugPatternSchema).min(1).max(20)
+]);
+var typeRedirectEntrySchema = z.object({
+  from: redirectFromSchema,
+  toSlug: slugPatternSchema.optional(),
+  toType: z.string().min(1).optional(),
+  toUrl: z.string().min(1).optional(),
+  permanent: z.boolean().optional()
+}).superRefine((entry, ctx) => {
+  const hasToSlug = entry.toSlug !== void 0;
+  const hasToUrl = entry.toUrl !== void 0;
+  const hasToType = entry.toType !== void 0;
+  const targetCount = Number(hasToSlug) + Number(hasToUrl);
+  if (targetCount !== 1) {
+    ctx.addIssue({
+      code: "custom",
+      message: "Each redirect must specify exactly one of toSlug/toType+toSlug or toUrl",
+      path: ["toSlug"]
+    });
+    return;
+  }
+  if (hasToUrl && hasToType) {
+    ctx.addIssue({
+      code: "custom",
+      message: "toUrl cannot be combined with toType",
+      path: ["toUrl"]
+    });
+  }
+  if (hasToType && !hasToSlug) {
+    ctx.addIssue({
+      code: "custom",
+      message: "Cross-type redirects require both toType and toSlug",
+      path: ["toSlug"]
+    });
+  }
+});
+var typeRedirectsFileSchema = z.object({
+  redirects: z.array(typeRedirectEntrySchema).max(500)
+});
+function normalizeRedirectFrom(from) {
+  return Array.isArray(from) ? from : [from];
+}
+function parseRedirectEntry(entry) {
+  const fromSlugs = normalizeRedirectFrom(entry.from);
+  if (entry.toUrl !== void 0) {
+    return {
+      fromSlugs,
+      kind: "anywhere",
+      toUrl: entry.toUrl,
+      permanent: entry.permanent ?? true
+    };
+  }
+  if (entry.toType !== void 0) {
+    return {
+      fromSlugs,
+      kind: "cross-type",
+      toType: entry.toType,
+      toSlug: entry.toSlug,
+      permanent: entry.permanent ?? true
+    };
+  }
+  return {
+    fromSlugs,
+    kind: "same-type",
+    toSlug: entry.toSlug,
+    permanent: entry.permanent ?? true
+  };
 }
 
-// src/core/slug-aliases.ts
-function buildGlobalAliasIndex(project) {
-  const { config } = project;
-  const aliasToTarget = /* @__PURE__ */ new Map();
-  const allAliasSlugs = /* @__PURE__ */ new Set();
-  const issues = [];
-  const canonicalSlugsByType = /* @__PURE__ */ new Map();
-  for (const type of config.types) {
-    const slugs = listEnSlugs(config.rootDir, type.contentDir);
-    canonicalSlugsByType.set(type.id, new Set(slugs));
+// src/redirects/load-type-redirects.ts
+var TYPE_REDIRECTS_FILENAME = "_redirects.json";
+function redirectsFilePath(config, type) {
+  return path.join(config.rootDir, type.contentDir, TYPE_REDIRECTS_FILENAME);
+}
+function loadTypeRedirectsFile(config, type) {
+  const filePath = redirectsFilePath(config, type);
+  if (!fs2.existsSync(filePath)) return null;
+  let raw;
+  try {
+    raw = JSON.parse(fs2.readFileSync(filePath, "utf8"));
+  } catch (error) {
+    throw new Error(
+      `${type.id}: failed to parse ${TYPE_REDIRECTS_FILENAME}: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  const parsed = typeRedirectsFileSchema.safeParse(raw);
+  if (!parsed.success) {
+    const details = parsed.error.issues.map((issue) => `${issue.path.join(".") || "root"}: ${issue.message}`).join("; ");
+    throw new Error(`${type.id}: invalid ${TYPE_REDIRECTS_FILENAME}: ${details}`);
   }
+  return {
+    contentTypeId: type.id,
+    contentDir: type.contentDir,
+    filePath,
+    entries: parsed.data.redirects.map(parseRedirectEntry)
+  };
+}
+function loadAllTypeRedirects(config) {
+  const out = [];
   for (const type of config.types) {
-    if (!type.path) continue;
-    const canonicalSlugs = canonicalSlugsByType.get(type.id) ?? /* @__PURE__ */ new Set();
-    for (const enSlug of canonicalSlugs) {
-      const doc = readEnDocument(config, type, enSlug);
-      if (!doc) continue;
-      for (const alias of doc.aliases) {
-        if (alias === enSlug) {
-          issues.push({
-            contentTypeId: type.id,
-            enSlug,
-            field: "aliases",
-            message: `Alias "${alias}" must not equal the canonical slug`,
-            level: "error"
-          });
-          continue;
-        }
-        if (canonicalSlugs.has(alias)) {
-          issues.push({
-            contentTypeId: type.id,
-            enSlug,
-            field: "aliases",
-            message: `Alias "${alias}" collides with another document's canonical slug`,
-            level: "error"
-          });
-          continue;
-        }
-        const existing = aliasToTarget.get(alias);
-        if (existing) {
-          issues.push({
-            contentTypeId: type.id,
-            enSlug,
-            field: "aliases",
-            message: `Alias "${alias}" is already claimed by ${existing.contentTypeId}/${existing.canonicalSlug}`,
-            level: "error"
-          });
-          continue;
-        }
-        aliasToTarget.set(alias, {
-          contentTypeId: type.id,
-          canonicalSlug: enSlug,
-          path: type.path
-        });
-        allAliasSlugs.add(alias);
+    const loaded = loadTypeRedirectsFile(config, type);
+    if (loaded) out.push(loaded);
+  }
+  return out;
+}
+function collectRedirectSourceSlugs(loaded) {
+  const slugs = /* @__PURE__ */ new Set();
+  for (const file of loaded) {
+    for (const entry of file.entries) {
+      for (const from of entry.fromSlugs) {
+        slugs.add(from);
+      }
+    }
+  }
+  return slugs;
+}
+function collectOutboundRedirectSourcesByType(loaded) {
+  const out = /* @__PURE__ */ new Map();
+  for (const file of loaded) {
+    const set = out.get(file.contentTypeId) ?? /* @__PURE__ */ new Set();
+    for (const entry of file.entries) {
+      for (const from of entry.fromSlugs) {
+        set.add(from);
       }
     }
+    out.set(file.contentTypeId, set);
   }
-  return { aliasToTarget, allAliasSlugs, issues };
+  return out;
 }
 
 // src/redirects/build-redirects.ts
 function getRedirectSourceSlugs(project) {
-  const aliasIndex = buildGlobalAliasIndex(project);
-  const outboundByType = /* @__PURE__ */ new Map();
+  const loaded = loadAllTypeRedirects(project.config);
+  const aliasSlugs = collectRedirectSourceSlugs(loaded);
+  const outboundByType = collectOutboundRedirectSourcesByType(loaded);
   for (const type of project.config.types) {
-    const outbound = /* @__PURE__ */ new Set();
-    for (const enSlug of listEnSlugs(project.config.rootDir, type.contentDir)) {
-      const doc = readEnDocument(project.config, type, enSlug);
-      if (doc?.redirectTo) outbound.add(enSlug);
+    if (!outboundByType.has(type.id)) {
+      outboundByType.set(type.id, /* @__PURE__ */ new Set());
     }
-    outboundByType.set(type.id, outbound);
   }
   return {
-    aliasSlugs: aliasIndex.allAliasSlugs,
+    aliasSlugs,
     outboundByType
   };
 }
@@ -1119,13 +1145,12 @@ function getRedirectSourceSlugs(project) {
 // src/sitemap/join-base-url.ts
 function joinBaseUrl(baseUrl, pathname) {
   const origin = baseUrl.replace(/\/$/, "");
-  const path5 = pathname.startsWith("/") ? pathname : `/${pathname}`;
-  return `${origin}${path5}`;
+  const path6 = pathname.startsWith("/") ? pathname : `/${pathname}`;
+  return `${origin}${path6}`;
 }
 
 // src/sitemap/generate-sitemap.ts
 function shouldIncludeEnDoc(enDoc, enSlug, redirectSources, contentTypeId, excludeNoindex) {
-  if (enDoc.redirectTo) return false;
   if (redirectSources.aliasSlugs.has(enSlug)) return false;
   const outbound = redirectSources.outboundByType.get(contentTypeId);
   if (outbound?.has(enSlug)) return false;
@@ -1223,6 +1248,6 @@ function createScribe(input) {
   return scribe;
 }
 
-export { createScribe, isRoutableType };
+export { createScribe, createUrlBuilder, isRoutableType };
 //# sourceMappingURL=runtime.js.map
 //# sourceMappingURL=runtime.js.map