@jxsuite/parser 1.4.1 → 1.5.0

package/dist/content-loader.js

@@ -80,6 +80,184 @@ function assetUrlFor(mounts, absolutePath) {
 }
 var URL_TERMINATOR = String.raw`"'\s<>()\\`;
 
+// ../../packages/schema/src/locale.ts
+var RTL_SCRIPTS = new Set([
+  "Adlm",
+  "Arab",
+  "Aran",
+  "Armi",
+  "Avst",
+  "Cprt",
+  "Egyd",
+  "Egyh",
+  "Elym",
+  "Gara",
+  "Hatr",
+  "Hebr",
+  "Hluw",
+  "Hung",
+  "Khar",
+  "Lydi",
+  "Mand",
+  "Mani",
+  "Mend",
+  "Merc",
+  "Mero",
+  "Narb",
+  "Nbat",
+  "Nkoo",
+  "Orkh",
+  "Palm",
+  "Phli",
+  "Phlp",
+  "Phnx",
+  "Prti",
+  "Rohg",
+  "Samr",
+  "Sarb",
+  "Sogd",
+  "Sogo",
+  "Syrc",
+  "Thaa",
+  "Todr",
+  "Yezi"
+]);
+function canonicalizeLocale(tag) {
+  if (typeof tag !== "string" || tag.trim() === "") {
+    return null;
+  }
+  try {
+    return new Intl.Locale(tag.trim()).toString();
+  } catch {
+    return null;
+  }
+}
+var DEFAULT_ROUTING = "prefix-except-default";
+function resolveI18n(projectConfig) {
+  const raw = projectConfig.i18n;
+  const errors = [];
+  if (!raw || typeof raw !== "object") {
+    return { errors, i18n: null };
+  }
+  const declared = Array.isArray(raw.locales) ? raw.locales : [];
+  const locales = [];
+  for (const tag of declared) {
+    const canonical = canonicalizeLocale(tag);
+    if (canonical === null) {
+      errors.push(`i18n.locales: "${String(tag)}" is not a well-formed BCP 47 language tag.`);
+      continue;
+    }
+    if (!locales.includes(canonical)) {
+      locales.push(canonical);
+    }
+  }
+  const defaultLocale = canonicalizeLocale(raw.defaultLocale) ?? locales[0] ?? null;
+  if (raw.defaultLocale !== undefined && canonicalizeLocale(raw.defaultLocale) === null) {
+    errors.push(`i18n.defaultLocale: "${String(raw.defaultLocale)}" is not a well-formed BCP 47 language tag.`);
+  }
+  if (defaultLocale === null) {
+    errors.push("i18n is declared with no usable locale — set `defaultLocale` or `locales`.");
+    return { errors, i18n: null };
+  }
+  if (!locales.includes(defaultLocale)) {
+    locales.unshift(defaultLocale);
+  }
+  const routing = raw.routing === "prefix-always" || raw.routing === "prefix-except-default" ? raw.routing : DEFAULT_ROUTING;
+  return { errors, i18n: { defaultLocale, locales, routing } };
+}
+
+// src/dates.ts
+var DATE_FORMATS = ["date", "date-time"];
+function isDateFormat(format) {
+  return typeof format === "string" && DATE_FORMATS.includes(format);
+}
+var DATE_ONLY = /^\d{4}-\d{2}-\d{2}$/;
+var RFC_3339 = /^\d{4}-\d{2}-\d{2}[Tt ]\d{2}:\d{2}(:\d{2}(\.\d+)?)?([Zz]|[+-]\d{2}:\d{2})?$/;
+function pad(n, width = 2) {
+  return String(n).padStart(width, "0");
+}
+function toDateOnly(d) {
+  return `${pad(d.getUTCFullYear(), 4)}-${pad(d.getUTCMonth() + 1)}-${pad(d.getUTCDate())}`;
+}
+function toInstant(d) {
+  return `${toDateOnly(d)}T${pad(d.getUTCHours())}:${pad(d.getUTCMinutes())}:${pad(d.getUTCSeconds())}Z`;
+}
+function parseDateValue(value, format) {
+  if (value instanceof Date) {
+    return Number.isNaN(value.getTime()) ? null : format === "date" ? toDateOnly(value) : toInstant(value);
+  }
+  if (typeof value !== "string") {
+    return null;
+  }
+  const text = value.trim();
+  if (text === "") {
+    return null;
+  }
+  if (DATE_ONLY.test(text)) {
+    const d = new Date(`${text}T00:00:00Z`);
+    if (Number.isNaN(d.getTime())) {
+      return null;
+    }
+    return format === "date" ? text : toInstant(d);
+  }
+  if (RFC_3339.test(text)) {
+    const normalized = /[Zz]|[+-]\d{2}:\d{2}$/.test(text) ? text : `${text.replace(" ", "T")}Z`;
+    const d = new Date(normalized);
+    if (Number.isNaN(d.getTime())) {
+      return null;
+    }
+    return format === "date" ? toDateOnly(d) : toInstant(d);
+  }
+  return null;
+}
+function isCoercedDate(value) {
+  return DATE_ONLY.test(value) || RFC_3339.test(value);
+}
+function coerceEntryDates(entries, schema, contentTypeName) {
+  const warnings = [];
+  const properties = schema?.properties;
+  if (!properties) {
+    return warnings;
+  }
+  const dateFields = Object.entries(properties).map(([field, def]) => [field, def.format]).filter((pair) => isDateFormat(pair[1]));
+  if (dateFields.length === 0) {
+    return warnings;
+  }
+  for (const entry of entries) {
+    for (const [field, format] of dateFields) {
+      const raw = entry.data[field];
+      if (raw === undefined || raw === null || raw === "") {
+        continue;
+      }
+      const coerced = parseDateValue(raw, format);
+      if (coerced === null) {
+        warnings.push({
+          entryId: entry.id,
+          field,
+          message: `Content dates: "${contentTypeName}/${entry.id}" field "${field}" is ` + `${JSON.stringify(raw)}, which is not an unambiguous ${format}. Write it as ` + `${format === "date" ? "YYYY-MM-DD" : "YYYY-MM-DDTHH:MM:SSZ"} — a form like ` + `"03/04/2025" means two different days depending on who reads it, so it is left as ` + `authored rather than guessed.`,
+          value: raw
+        });
+        continue;
+      }
+      if (coerced !== raw) {
+        entry._meta ??= {};
+        entry._meta.rawDates ??= {};
+        entry._meta.rawDates[field] = raw;
+      }
+      entry.data[field] = coerced;
+    }
+  }
+  return warnings;
+}
+function parseComparable(a, b) {
+  const aDate = typeof a === "string" && (DATE_ONLY.test(a) || RFC_3339.test(a));
+  const bDate = typeof b === "string" && (DATE_ONLY.test(b) || RFC_3339.test(b));
+  if (aDate && bDate) {
+    return [a, b];
+  }
+  return [Number(a), Number(b)];
+}
+
 // src/content-loader.ts
 function loadJSONEntries(filePath) {
   const raw = JSON.parse(readFileSync(filePath, "utf8"));
@@ -109,19 +287,53 @@ function discoverJSONFiles(resolvedSource) {
     return [];
   }
 }
+var LOCALE_PLACEHOLDER = "{locale}";
+function localesForExpansion(projectConfig) {
+  return resolveI18n(projectConfig ?? {}).i18n?.locales ?? [];
+}
+function localeSource(root, source, locale) {
+  const candidates = [locale, locale.toLowerCase()];
+  for (const spelling of candidates) {
+    const path = source.split(LOCALE_PLACEHOLDER).join(spelling);
+    if (existsSync(resolve(root, path))) {
+      return path;
+    }
+  }
+  const parent = resolve(root, source.slice(0, source.indexOf(LOCALE_PLACEHOLDER)));
+  if (existsSync(parent) && statSync(parent).isDirectory()) {
+    const match = readdirSync(parent).find((name) => name.toLowerCase() === locale.toLowerCase());
+    if (match !== undefined) {
+      return source.split(LOCALE_PLACEHOLDER).join(match);
+    }
+  }
+  return source.split(LOCALE_PLACEHOLDER).join(locale);
+}
 var SECTION_KEY = "content";
 var SAFE_TYPE_NAME = /^[\w.~-]+$/;
 var ASSET_KEYS = ["src", "poster"];
 function isNonRelativeRef(value) {
   return value === "" || value.startsWith("/") || value.startsWith("#") || value.includes("${") || /^[a-z][\w+.-]*:/i.test(value);
 }
-function contentAssetMounts(section, root) {
+function contentAssetMounts(section, root, projectConfig) {
   const mounts = [];
+  const locales = localesForExpansion(projectConfig);
   for (const [name, contentTypeDef] of Object.entries(section ?? {})) {
     const source = contentTypeDef?.source;
     if (!source || source.startsWith("http://") || source.startsWith("https://")) {
       continue;
     }
+    if (source.includes(LOCALE_PLACEHOLDER)) {
+      for (const locale of locales) {
+        if (!SAFE_TYPE_NAME.test(locale)) {
+          continue;
+        }
+        const dir = resolve(root, localeSource(root, source, locale)).split("\\").join("/");
+        if (SAFE_TYPE_NAME.test(name) && existsSync(dir) && statSync(dir).isDirectory()) {
+          mounts.push({ dir, urlPrefix: `/${SECTION_KEY}/${name}/${locale}` });
+        }
+      }
+      continue;
+    }
     if (!SAFE_TYPE_NAME.test(name)) {
       console.warn(`Content type "${name}": name is not URL-safe — its source directory is not published ` + `at /${SECTION_KEY}/${name}, so content-relative asset references stay unresolved.`);
       continue;
@@ -203,12 +415,35 @@ function loadContentConfig(projectRoot, projectConfig) {
   const config = { content: projectConfig?.content ?? {} };
   return { config, contentDir };
 }
-async function loadContentSection(section, root, formats) {
+async function loadContentSection(section, root, formats, projectConfig) {
   const contentTypes = new Map;
-  const mounts = new Map(contentAssetMounts(section, root).map((mount) => [mount.urlPrefix.split("/").pop(), mount]));
+  const mounts = new Map(contentAssetMounts(section, root, projectConfig).map((mount) => [
+    mount.urlPrefix.slice(`/${SECTION_KEY}/`.length),
+    mount
+  ]));
+  const locales = localesForExpansion(projectConfig);
   for (const [name, contentTypeDef] of Object.entries(section)) {
-    const entries = await loadContentType(name, contentTypeDef, root, formats, mounts.get(name));
-    contentTypes.set(name, entries);
+    const source = contentTypeDef?.source;
+    if (typeof source !== "string" || !source.includes(LOCALE_PLACEHOLDER)) {
+      const entries = await loadContentType(name, contentTypeDef, root, formats, mounts.get(name));
+      contentTypes.set(name, entries);
+      continue;
+    }
+    if (locales.length === 0) {
+      console.warn(`Content type "${name}": source "${source}" uses ${LOCALE_PLACEHOLDER}, but the project ` + `declares no i18n locales — nothing to expand it over, so no entries were loaded.`);
+      contentTypes.set(name, []);
+      continue;
+    }
+    const all = [];
+    for (const locale of locales) {
+      const localized = { ...contentTypeDef, source: localeSource(root, source, locale) };
+      const entries = await loadContentType(name, localized, root, formats, mounts.get(`${name}/${locale}`));
+      for (const entry of entries) {
+        entry._meta = { ...entry._meta, locale };
+      }
+      all.push(...entries);
+    }
+    contentTypes.set(name, all);
   }
   return contentTypes;
 }
@@ -295,6 +530,9 @@ async function loadContentType(name, contentTypeDef, projectRoot, registry, moun
     entries.push(...fileEntries);
   }
   if (schema) {
+    for (const warning of coerceEntryDates(entries, schema, name)) {
+      console.warn(warning.message);
+    }
     validateEntries(entries, schema, name);
   }
   return entries;
@@ -319,7 +557,9 @@ function validateEntries(entries, schema, contentTypeName) {
       if (value == null) {
         continue;
       }
-      if (def.type === "string" && typeof value !== "string") {
+      if (isDateFormat(def.format) && typeof value === "string" && !isCoercedDate(value)) {
+        console.warn(`Content validation: "${contentTypeName}/${entry.id}" field "${field}" is declared ` + `${def.format} but "${value}" was not coerced — it will sort and filter as plain text.`);
+      } else if (def.type === "string" && typeof value !== "string") {
         console.warn(`Content validation: "${contentTypeName}/${entry.id}" field "${field}" expected string, got ${typeof value}`);
       } else if (def.type === "number" && typeof value !== "number") {
         console.warn(`Content validation: "${contentTypeName}/${entry.id}" field "${field}" expected number, got ${typeof value}`);
@@ -389,12 +629,12 @@ function resolveContentTypeRefs(contentTypes, section) {
 class Content {
   static async projectData(sectionValue, ctx) {
     const section = sectionValue ?? {};
-    const data = await loadContentSection(section, ctx.root, ctx.registry.formats);
+    const data = await loadContentSection(section, ctx.root, ctx.registry.formats, ctx.projectConfig);
     resolveContentTypeRefs(data, section);
     return data;
   }
   static assets(sectionValue, ctx) {
-    return contentAssetMounts(sectionValue ?? {}, ctx.root);
+    return contentAssetMounts(sectionValue ?? {}, ctx.root, ctx.projectConfig);
   }
   static async resolvePaths(pathsDef, ctx) {
     const entries = ctx.data.get(pathsDef.contentType);
@@ -404,17 +644,33 @@ class Content {
     }
     const param = pathsDef.param ?? "slug";
     const field = pathsDef.field ?? "id";
-    return entries.map((entry) => ({
-      [param]: field === "id" ? entry.id : entry.data[field] ?? entry.id
-    })).filter((p) => p[param]);
+    const localized = entries.some((entry) => entry._meta?.locale !== undefined);
+    const wanted = ctx.locale;
+    const scoped = localized && typeof wanted === "string" ? entries.filter((entry) => entry._meta?.locale === wanted) : entries;
+    const paths = [];
+    for (const entry of scoped) {
+      const value = field === "id" ? entry.id : entry.data[field] ?? entry.id;
+      if (!value) {
+        continue;
+      }
+      const pathEntry = { [param]: value };
+      if (entry._meta !== undefined) {
+        pathEntry._meta = entry._meta;
+      }
+      paths.push(pathEntry);
+    }
+    return paths;
   }
 }
 export {
   rewriteEntryAssets,
   resolveContentTypeRefs,
+  localesForExpansion,
+  localeSource,
   loadContentSection,
   loadContentConfig,
   getContentTypeElements,
   contentAssetMounts,
+  LOCALE_PLACEHOLDER,
   Content
 };

package/dist/content.js

@@ -46,6 +46,98 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
+// src/dates.ts
+var DATE_FORMATS = ["date", "date-time"];
+function isDateFormat(format) {
+  return typeof format === "string" && DATE_FORMATS.includes(format);
+}
+var DATE_ONLY = /^\d{4}-\d{2}-\d{2}$/;
+var RFC_3339 = /^\d{4}-\d{2}-\d{2}[Tt ]\d{2}:\d{2}(:\d{2}(\.\d+)?)?([Zz]|[+-]\d{2}:\d{2})?$/;
+function pad(n, width = 2) {
+  return String(n).padStart(width, "0");
+}
+function toDateOnly(d) {
+  return `${pad(d.getUTCFullYear(), 4)}-${pad(d.getUTCMonth() + 1)}-${pad(d.getUTCDate())}`;
+}
+function toInstant(d) {
+  return `${toDateOnly(d)}T${pad(d.getUTCHours())}:${pad(d.getUTCMinutes())}:${pad(d.getUTCSeconds())}Z`;
+}
+function parseDateValue(value, format) {
+  if (value instanceof Date) {
+    return Number.isNaN(value.getTime()) ? null : format === "date" ? toDateOnly(value) : toInstant(value);
+  }
+  if (typeof value !== "string") {
+    return null;
+  }
+  const text = value.trim();
+  if (text === "") {
+    return null;
+  }
+  if (DATE_ONLY.test(text)) {
+    const d = new Date(`${text}T00:00:00Z`);
+    if (Number.isNaN(d.getTime())) {
+      return null;
+    }
+    return format === "date" ? text : toInstant(d);
+  }
+  if (RFC_3339.test(text)) {
+    const normalized = /[Zz]|[+-]\d{2}:\d{2}$/.test(text) ? text : `${text.replace(" ", "T")}Z`;
+    const d = new Date(normalized);
+    if (Number.isNaN(d.getTime())) {
+      return null;
+    }
+    return format === "date" ? toDateOnly(d) : toInstant(d);
+  }
+  return null;
+}
+function isCoercedDate(value) {
+  return DATE_ONLY.test(value) || RFC_3339.test(value);
+}
+function coerceEntryDates(entries, schema, contentTypeName) {
+  const warnings = [];
+  const properties = schema?.properties;
+  if (!properties) {
+    return warnings;
+  }
+  const dateFields = Object.entries(properties).map(([field, def]) => [field, def.format]).filter((pair) => isDateFormat(pair[1]));
+  if (dateFields.length === 0) {
+    return warnings;
+  }
+  for (const entry of entries) {
+    for (const [field, format] of dateFields) {
+      const raw = entry.data[field];
+      if (raw === undefined || raw === null || raw === "") {
+        continue;
+      }
+      const coerced = parseDateValue(raw, format);
+      if (coerced === null) {
+        warnings.push({
+          entryId: entry.id,
+          field,
+          message: `Content dates: "${contentTypeName}/${entry.id}" field "${field}" is ` + `${JSON.stringify(raw)}, which is not an unambiguous ${format}. Write it as ` + `${format === "date" ? "YYYY-MM-DD" : "YYYY-MM-DDTHH:MM:SSZ"} — a form like ` + `"03/04/2025" means two different days depending on who reads it, so it is left as ` + `authored rather than guessed.`,
+          value: raw
+        });
+        continue;
+      }
+      if (coerced !== raw) {
+        entry._meta ??= {};
+        entry._meta.rawDates ??= {};
+        entry._meta.rawDates[field] = raw;
+      }
+      entry.data[field] = coerced;
+    }
+  }
+  return warnings;
+}
+function parseComparable(a, b) {
+  const aDate = typeof a === "string" && (DATE_ONLY.test(a) || RFC_3339.test(a));
+  const bDate = typeof b === "string" && (DATE_ONLY.test(b) || RFC_3339.test(b));
+  if (aDate && bDate) {
+    return [a, b];
+  }
+  return [Number(a), Number(b)];
+}
+
 // src/content.ts
 function evaluateFilterRule(rule, entry) {
   const actual = rule.field === "id" ? entry.id : entry.data[rule.field];
@@ -75,16 +167,20 @@ function evaluateFilterRule(rule, entry) {
       return typeof actual === "string" && !actual.includes(String(rule.value ?? ""));
     }
     case ">": {
-      return Number(actual) > Number(rule.value);
+      const [a, b] = parseComparable(actual, rule.value);
+      return a > b;
     }
     case "<": {
-      return Number(actual) < Number(rule.value);
+      const [a, b] = parseComparable(actual, rule.value);
+      return a < b;
     }
     case ">=": {
-      return Number(actual) >= Number(rule.value);
+      const [a, b] = parseComparable(actual, rule.value);
+      return a >= b;
     }
     case "<=": {
-      return Number(actual) <= Number(rule.value);
+      const [a, b] = parseComparable(actual, rule.value);
+      return a <= b;
     }
     default: {
       return true;
@@ -175,10 +271,13 @@ class ContentEntry {
     if (!resolvedId) {
       return null;
     }
+    const wanted = _document?.route?.locale;
+    const localized = entries.some((e) => e._meta?.locale !== undefined);
+    const scoped = localized && typeof wanted === "string" ? entries.filter((e) => e._meta?.locale === wanted) : entries;
     if (field && field !== "id") {
-      return entries.find((e) => e.data[field] === resolvedId) ?? null;
+      return scoped.find((e) => e.data[field] === resolvedId) ?? null;
     }
-    return findEntry(entries, resolvedId);
+    return findEntry(scoped, resolvedId);
   }
 }
 export {