scribe-cms 0.0.12 → 0.0.13

package/dist/runtime.js

@@ -127,6 +127,39 @@ function resolveConfig(input, baseDir) {
   if (localeRouting.strategy === "search-param" && !localeRouting.param) {
     throw new Error('scribe config: localeRouting search-param requires a "param" name');
   }
+  const localeFallbacks = {};
+  for (const [locale, chain] of Object.entries(raw.localeFallbacks ?? {})) {
+    if (!raw.locales.includes(locale)) {
+      throw new Error(
+        `scribe config: localeFallbacks key "${locale}" is not in locales [${raw.locales.join(", ")}]`
+      );
+    }
+    const seen = /* @__PURE__ */ new Set();
+    for (const fallback of chain) {
+      if (!raw.locales.includes(fallback)) {
+        throw new Error(
+          `scribe config: localeFallbacks["${locale}"] entry "${fallback}" is not in locales [${raw.locales.join(", ")}]`
+        );
+      }
+      if (fallback === locale) {
+        throw new Error(
+          `scribe config: localeFallbacks["${locale}"] must not contain its own key "${locale}"`
+        );
+      }
+      if (fallback === defaultLocale) {
+        throw new Error(
+          `scribe config: localeFallbacks["${locale}"] must not contain the defaultLocale "${defaultLocale}" \u2014 it is always the final fallback; remove it`
+        );
+      }
+      if (seen.has(fallback)) {
+        throw new Error(
+          `scribe config: localeFallbacks["${locale}"] contains duplicate entry "${fallback}"`
+        );
+      }
+      seen.add(fallback);
+    }
+    localeFallbacks[locale] = [...chain];
+  }
   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");
@@ -156,6 +189,7 @@ function resolveConfig(input, baseDir) {
     defaultLocale,
     localeRouting,
     localePresets: raw.localePresets,
+    localeFallbacks,
     translate: raw.translate,
     types
   };
@@ -194,20 +228,16 @@ function getRelationTarget(schema) {
   }
   return null;
 }
-function unwrapSchema(schema) {
+function peelOptionalWrappers(schema) {
   let current = schema;
   for (let i = 0; i < 8; i++) {
-    const anySchema = current;
-    if (typeof anySchema.unwrap === "function") {
-      current = anySchema.unwrap();
-      continue;
-    }
-    if (typeof anySchema.removeDefault === "function") {
-      current = anySchema.removeDefault();
+    const type = current._def?.type;
+    if (type === "optional" || type === "nullable") {
+      current = current.unwrap();
       continue;
     }
-    if (anySchema._def?.innerType) {
-      current = anySchema._def.innerType;
+    if (type === "default") {
+      current = current.removeDefault();
       continue;
     }
     break;
@@ -216,6 +246,12 @@ function unwrapSchema(schema) {
 }
 
 // src/core/introspect-schema.ts
+function getArrayElement(schema) {
+  if (schema instanceof Object && "element" in schema && schema._def?.type === "array") {
+    return schema.element;
+  }
+  return null;
+}
 function introspectSchema(schema, prefix = []) {
   const relation = getRelationTarget(schema);
   if (relation && prefix.length > 0) {
@@ -229,7 +265,10 @@ function introspectSchema(schema, prefix = []) {
       }
     ];
   }
-  const base = unwrapSchema(schema);
+  if (prefix.length > 0 && getFieldKind(schema) === "translatable") {
+    return [{ path: prefix, kind: "translatable" }];
+  }
+  const base = peelOptionalWrappers(schema);
   if (base instanceof Object && "shape" in base) {
     const shape = base.shape;
     const fields = [];
@@ -238,9 +277,9 @@ function introspectSchema(schema, prefix = []) {
     }
     return fields;
   }
-  if (base instanceof Object && "element" in base) {
-    const element = base.element;
-    const elementBase = unwrapSchema(element);
+  const element = getArrayElement(base);
+  if (element) {
+    const elementBase = peelOptionalWrappers(element);
     if (elementBase instanceof Object && "shape" in elementBase) {
       const shape = elementBase.shape;
       const fields = [];
@@ -252,15 +291,48 @@ function introspectSchema(schema, prefix = []) {
   }
   return [{ path: prefix, kind: getFieldKind(schema) }];
 }
-function extractByPaths(data, paths) {
-  const out = {};
+function buildPathTrie(paths) {
+  const root = { leaf: false, children: /* @__PURE__ */ new Map() };
   for (const path6 of paths) {
-    const value = getAtPath(data, path6);
+    let node = root;
+    for (const segment of path6) {
+      let child = node.children.get(segment);
+      if (!child) {
+        child = { leaf: false, children: /* @__PURE__ */ new Map() };
+        node.children.set(segment, child);
+      }
+      node = child;
+    }
+    node.leaf = true;
+  }
+  return root;
+}
+function extractNode(data, trie) {
+  if (trie.leaf) return data;
+  const star = trie.children.get("*");
+  if (star) {
+    if (!Array.isArray(data)) return void 0;
+    return data.map(
+      (item) => typeof item === "object" && item !== null ? extractNode(item, star) ?? {} : {}
+    );
+  }
+  if (typeof data !== "object" || data === null || Array.isArray(data)) return void 0;
+  const record = data;
+  const out = {};
+  let any = false;
+  for (const [key, child] of trie.children) {
+    const value = extractNode(record[key], child);
     if (value !== void 0) {
-      setAtPath(out, path6.filter((p) => p !== "*"), value);
+      out[key] = value;
+      any = true;
     }
   }
-  return out;
+  return any ? out : void 0;
+}
+function extractByPaths(data, paths) {
+  if (paths.length === 0) return {};
+  const extracted = extractNode(data, buildPathTrie(paths));
+  return extracted && typeof extracted === "object" && !Array.isArray(extracted) ? extracted : {};
 }
 function pickTranslatable(data, schema) {
   const translatablePaths = introspectSchema(schema).filter((f) => f.kind === "translatable").map((f) => f.path);
@@ -275,32 +347,6 @@ function mergeStructuralOntoLocale(localeData, enData, schema) {
   const translatable = pickTranslatable(localeData, schema);
   return deepMerge(structural, translatable);
 }
-function getAtPath(obj, path6) {
-  let current = obj;
-  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, path6.slice(path6.indexOf("*") + 1)) : void 0
-      );
-    }
-    if (typeof current !== "object" || current === null || Array.isArray(current)) return void 0;
-    current = current[segment];
-  }
-  return current;
-}
-function setAtPath(obj, path6, value) {
-  if (path6.length === 0) return;
-  if (path6.length === 1) {
-    obj[path6[0]] = value;
-    return;
-  }
-  const [head, ...rest] = path6;
-  if (!(head in obj) || typeof obj[head] !== "object" || obj[head] === null) {
-    obj[head] = {};
-  }
-  setAtPath(obj[head], rest, value);
-}
 function deepMerge(base, overlay) {
   const out = { ...base };
   for (const [key, value] of Object.entries(overlay)) {
@@ -451,7 +497,7 @@ function seoFieldsFromEn(enDoc) {
     canonicalPathOverride: enDoc.canonicalPathOverride
   };
 }
-var SCHEMA_VERSION = 4;
+var SCHEMA_VERSION = 5;
 var MIGRATIONS = [
   `CREATE TABLE IF NOT EXISTS meta (
     key TEXT PRIMARY KEY,
@@ -499,7 +545,30 @@ var MIGRATIONS = [
     UNIQUE (content_type, en_slug, en_hash)
   )`,
   `CREATE INDEX IF NOT EXISTS idx_en_snapshots_lookup
-    ON en_snapshots(content_type, en_slug, created_at DESC)`
+    ON en_snapshots(content_type, en_slug, created_at DESC)`,
+  `CREATE TABLE IF NOT EXISTS translation_batch_jobs (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    job_name TEXT NOT NULL UNIQUE,
+    model TEXT NOT NULL,
+    display_model TEXT NOT NULL,
+    created_at TEXT NOT NULL,
+    state TEXT NOT NULL,
+    completed_at TEXT
+  )`,
+  `CREATE TABLE IF NOT EXISTS translation_batch_items (
+    job_id INTEGER NOT NULL,
+    request_index INTEGER NOT NULL,
+    content_type TEXT NOT NULL,
+    en_slug TEXT NOT NULL,
+    locale TEXT NOT NULL,
+    en_hash TEXT NOT NULL,
+    snapshot_id INTEGER NOT NULL,
+    status TEXT NOT NULL,
+    error TEXT,
+    PRIMARY KEY (job_id, request_index)
+  )`,
+  `CREATE INDEX IF NOT EXISTS idx_batch_items_status
+    ON translation_batch_items(status)`
 ];
 function resolveStorePath(config) {
   return config.storePath;
@@ -522,6 +591,8 @@ function addColumnIfMissing(db, table, column, ddlType) {
   }
 }
 function readSchemaVersion(db) {
+  const metaTable = db.prepare(`SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'meta'`).get();
+  if (!metaTable) return 0;
   const row = db.prepare(`SELECT value FROM meta WHERE key = 'schema_version'`).get();
   return row ? Number.parseInt(row.value, 10) || 0 : 0;
 }
@@ -582,7 +653,8 @@ function sanitizeMdxJsxAttributeQuotes(body) {
       if (i >= body.length || body[i] === ">" || body[i] === "/") break;
       const attrStart = i;
       while (i < body.length && /[\w:.-]/.test(body[i] ?? "")) i += 1;
-      body.slice(attrStart, i);
+      const attrName = body.slice(attrStart, i);
+      if (!attrName) break;
       while (i < body.length && /\s/.test(body[i] ?? "")) i += 1;
       if (body[i] !== "=") {
         tagOut += body.slice(attrStart, i);
@@ -591,10 +663,12 @@ function sanitizeMdxJsxAttributeQuotes(body) {
       tagOut += body.slice(attrStart, i);
       tagOut += "=";
       i += 1;
+      const wsStart = i;
       while (i < body.length && /\s/.test(body[i] ?? "")) i += 1;
+      tagOut += body.slice(wsStart, i);
       const quote = body[i];
       if (quote !== '"' && quote !== "'") {
-        continue;
+        break;
       }
       if (quote === "'") {
         const valStart2 = i + 1;
@@ -877,7 +951,7 @@ function createContentLoader(config, type) {
 }
 
 // src/i18n/resolve-document.ts
-function resolveLocalizedDocument(slug, locale, defaultLocale, allDocs, type, localeRouting) {
+function resolveLocalizedDocument(slug, locale, defaultLocale, allDocs, type, localeRouting, fallbackLocales = []) {
   const urlBuilder = createUrlBuilder({
     locales: [defaultLocale, locale],
     defaultLocale,
@@ -891,15 +965,28 @@ function resolveLocalizedDocument(slug, locale, defaultLocale, allDocs, type, lo
   for (const [docLocale, docIdx] of allDocs) {
     const found = docIdx.bySlug.get(slug);
     if (!found) continue;
-    const correctSlug = getSlugForLocale(found, docLocale, locale, allDocs, defaultLocale);
-    if (correctSlug && correctSlug !== slug) {
+    const enSlug = docLocale === defaultLocale ? found.slug : found.enSlug;
+    let target;
+    let targetLocale = locale;
+    for (const candidateLocale of [locale, ...fallbackLocales]) {
+      const cand = candidateLocale === defaultLocale ? allDocs.get(candidateLocale)?.bySlug.get(enSlug) : allDocs.get(candidateLocale)?.byEnSlug.get(enSlug);
+      if (cand) {
+        target = cand;
+        targetLocale = candidateLocale;
+        break;
+      }
+    }
+    if (target) {
+      if (target.slug === slug) {
+        return { document: target, actualLocale: targetLocale };
+      }
       if (!type.path) {
         return { document: null, actualLocale: locale };
       }
       return {
         document: null,
         actualLocale: locale,
-        shouldRedirectTo: urlBuilder.resolvePath(type.path, correctSlug, locale)
+        shouldRedirectTo: urlBuilder.resolvePath(type.path, target.slug, locale)
       };
     }
     if (docLocale === defaultLocale) {
@@ -930,13 +1017,6 @@ function resolveLocalizedDocument(slug, locale, defaultLocale, allDocs, type, lo
   }
   return { document: null, actualLocale: locale };
 }
-function getSlugForLocale(document, sourceLocale, targetLocale, allDocs, defaultLocale) {
-  if (sourceLocale === targetLocale) return document.slug;
-  const englishSlug = sourceLocale === defaultLocale ? document.slug : document.enSlug;
-  if (!englishSlug) return null;
-  if (targetLocale === defaultLocale) return englishSlug;
-  return allDocs.get(targetLocale)?.byEnSlug.get(englishSlug)?.slug ?? null;
-}
 
 // src/create-project.ts
 function comparatorFor(orderBy) {
@@ -989,7 +1069,8 @@ function buildRuntime(config, type, getRuntime) {
         config.defaultLocale,
         load(),
         type,
-        config.localeRouting
+        config.localeRouting,
+        config.localeFallbacks[locale] ?? []
       );
       if (result.document && type.path) {
         return {
@@ -1011,8 +1092,14 @@ function buildRuntime(config, type, getRuntime) {
       const params = [];
       for (const locale of options.locales ?? config.locales) {
         const localeIdx = all.get(locale);
+        const fallbacks = config.localeFallbacks[locale] ?? [];
         for (const doc of enIdx.bySlug.values()) {
-          const slug = locale === config.defaultLocale ? doc.slug : localeIdx?.byEnSlug.get(doc.slug)?.slug ?? doc.slug;
+          let slug;
+          if (locale === config.defaultLocale) {
+            slug = doc.slug;
+          } else {
+            slug = localeIdx?.byEnSlug.get(doc.slug)?.slug ?? fallbacks.map((fb) => all.get(fb)?.byEnSlug.get(doc.slug)?.slug).find((s) => s !== void 0) ?? doc.slug;
+          }
           params.push({ locale, slug });
         }
       }