scribe-cms 0.0.7 → 0.0.9

package/dist/studio/server.cjs

@@ -195,65 +195,93 @@ 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/core/builtin-fields.ts
 var SLUG_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-var slugPatternSchema = zod.z.string().regex(SLUG_PATTERN, "slug must be lowercase-kebab-case");
+zod.z.string().regex(SLUG_PATTERN, "slug must be lowercase-kebab-case");
 var isoDateSchema = zod.z.string().regex(/^\d{4}-\d{2}-\d{2}(T[\d:.Z+-]*)?$/, "Use ISO date YYYY-MM-DD or full ISO 8601");
 var canonicalPathSchema = zod.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 = zod.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;
@@ -315,8 +343,6 @@ function extractBuiltinEnFields(data, pathTemplate, enSlug, defaultLocale) {
   }
   return {
     builtin: {
-      aliases,
-      redirectTo,
       publishedAt,
       updatedAt,
       noindex,
@@ -326,20 +352,24 @@ function extractBuiltinEnFields(data, pathTemplate, enSlug, defaultLocale) {
     issues
   };
 }
-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;
 }
 var SCHEMA_VERSION = 4;
@@ -512,7 +542,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,
@@ -526,8 +557,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,