meno-core 1.0.49 → 1.0.50

package/dist/chunks/{chunk-EQYDSPBB.js → chunk-CVLFID6V.js}

@@ -1,6 +1,6 @@
 import {
   configService
-} from "./chunk-KPU2XHOS.js";
+} from "./chunk-PQ2HRXDR.js";
 import {
   projectPaths,
   resolveProjectPath,
@@ -26,7 +26,7 @@ import {
   processStructure,
   resolveHtmlMapping,
   skipEmptyTemplateAttributes
-} from "./chunk-LKAGAQ3M.js";
+} from "./chunk-EDQSMAMP.js";
 import {
   DEFAULT_PREFETCH_CONFIG,
   SSRRegistry,
@@ -66,7 +66,7 @@ import {
   validateCMSDraftItem,
   validateCMSItem,
   validateComponentDefinition
-} from "./chunk-S2CX6HFM.js";
+} from "./chunk-7NIC4I3V.js";
 import {
   DEFAULT_BREAKPOINTS,
   DEFAULT_FLUID_RANGE,
@@ -2038,6 +2038,18 @@ function getDOMPurify() {
   }
   return _DOMPurify;
 }
+function resolveI18nAttrs(attrs, locale, i18nConfig) {
+  let mutated = null;
+  const config = i18nConfig ?? DEFAULT_I18N_CONFIG;
+  const effectiveLocale = locale || config.defaultLocale;
+  for (const [key, value] of Object.entries(attrs)) {
+    if (isI18nValue(value)) {
+      mutated = mutated ?? { ...attrs };
+      mutated[key] = resolveI18nValue(value, effectiveLocale, config);
+    }
+  }
+  return mutated ?? attrs;
+}
 function getTemplateContext(ctx) {
   return ctx.templateContext || null;
 }
@@ -2520,6 +2532,15 @@ async function renderNode(node, ctx) {
     }))).join("");
   }
   if (typeof node !== "object") return "";
+  if (isI18nValue(node)) {
+    const i18nResolveConfig = i18nConfig ?? DEFAULT_I18N_CONFIG;
+    const i18nEffectiveLocale = locale || i18nResolveConfig.defaultLocale;
+    const resolved = resolveI18nValue(node, i18nEffectiveLocale, i18nResolveConfig);
+    return renderNode(
+      resolved,
+      ctx
+    );
+  }
   if (!evaluateIfCondition(node, ctx)) {
     return "";
   }
@@ -2559,7 +2580,7 @@ async function renderNode(node, ctx) {
       KEEP_CONTENT: true
     }) : htmlContent;
     const optimizedHtml = ctx.imageMetadataMap ? rewriteRichTextImages(sanitizedHtml, ctx.imageMetadataMap, ctx.imageFormat) : sanitizedHtml;
-    const nodeAttributes2 = extractAttributesFromNode(node);
+    const nodeAttributes2 = resolveI18nAttrs(extractAttributesFromNode(node), locale, i18nConfig);
     const classNames = ["oem"];
     if (nodeStyle) {
       const utilityClasses2 = processStyleToClasses(nodeStyle, ctx);
@@ -2618,7 +2639,7 @@ async function renderNode(node, ctx) {
       href = processCMSTemplate(href, ctx.cmsContext.cms, locale, i18nConfig);
     }
     href = localizeHref(href, ctx);
-    const nodeAttributes2 = extractAttributesFromNode(node);
+    const nodeAttributes2 = resolveI18nAttrs(extractAttributesFromNode(node), locale, i18nConfig);
     const classNames = ["olink"];
     if (nodeStyle) {
       const utilityClasses2 = processStyleToClasses(nodeStyle, ctx);
@@ -2670,7 +2691,7 @@ async function renderNode(node, ctx) {
   if (!ctx.templateMode && templateCtx && Object.keys(nodeProps).length > 0) {
     nodeProps = processItemPropsTemplate(nodeProps, templateCtx, i18nResolver);
   }
-  let nodeAttributes = extractAttributesFromNode(node);
+  let nodeAttributes = resolveI18nAttrs(extractAttributesFromNode(node), locale, i18nConfig);
   const originalAttributes = { ...nodeAttributes };
   if (ctx.cmsContext?.cms && Object.keys(nodeAttributes).length > 0) {
     nodeAttributes = processCMSPropsTemplate(nodeAttributes, ctx.cmsContext.cms, locale, i18nConfig);
@@ -3056,7 +3077,7 @@ function renderLocaleList(node, ctx) {
       links.push(`<a href="${escapeHtml(link.path)}"${hreflangAttr}${currentAttr} data-locale="${escapeHtml(link.locale)}"${classAttrForLink}>${linkContent}</a>`);
     }
     const linksHTML = showSeparator ? links.join(`<span${separatorClassAttr}></span>`) : links.join("");
-    const nodeAttributes = extractAttributesFromNode(node);
+    const nodeAttributes = resolveI18nAttrs(extractAttributesFromNode(node), locale, i18nConfig);
     const attrsStr = buildAttributes(nodeAttributes);
     const localeListResult = `<div data-locale-list="true"${containerClassAttr}${localeListStyleAttr}${attrsStr}${editorAttrs(ctx)}>${linksHTML}</div>`;
     if (ctx.ssrFallbackCollector && ctx.elementPath) {
@@ -3632,9 +3653,11 @@ picture {
   const cmsInlineScript = cmsTemplatePath && cms && (!useBundled || injectLiveReload) ? `<script>window.__MENO_CMS__=${JSON.stringify({ item: cms.cms, templatePath: cmsTemplatePath })}</script>
   ` : "";
   const clientDataScripts = finalClientDataCollections && finalClientDataCollections.size > 0 ? generateAllInlineDataScripts(finalClientDataCollections) + "\n  " : "";
-  const faviconTag = iconsConfig.favicon ? `<link rel="icon" href="${escapeHtml(iconsConfig.favicon)}" />` : "";
+  const hasDarkFavicon = !!(iconsConfig.favicon && iconsConfig.faviconDark);
+  const faviconTag = iconsConfig.favicon ? `<link rel="icon" href="${escapeHtml(iconsConfig.favicon)}"${hasDarkFavicon ? ' media="(prefers-color-scheme: light)"' : ""} />` : "";
+  const faviconDarkTag = iconsConfig.faviconDark ? `<link rel="icon" href="${escapeHtml(iconsConfig.faviconDark)}" media="(prefers-color-scheme: dark)" />` : "";
   const appleTouchIconTag = iconsConfig.appleTouchIcon ? `<link rel="apple-touch-icon" href="${escapeHtml(iconsConfig.appleTouchIcon)}" />` : "";
-  const iconTags = [faviconTag, appleTouchIconTag].filter(Boolean).join("\n  ");
+  const iconTags = [faviconTag, faviconDarkTag, appleTouchIconTag].filter(Boolean).join("\n  ");
   const scriptPreloadTag = extScriptPath ? `<link rel="preload" href="${extScriptPath}" as="script">` : "";
   const imagePreloadTags = generateImagePreloadTags(rendered.preloadImages);
   const wsUrl = serverPort ? `'ws://localhost:${serverPort}/hmr'` : `location.origin.replace('http','ws')+'/hmr'`;
@@ -5833,8 +5856,10 @@ async function loadJSONFile2(filePath) {
   }
 }
 function normalizeItem(content, filename, isDraft = false) {
+  const raw = content;
   const base = {
-    ...content,
+    ...raw,
+    _id: raw._id || filename,
     _slug: filename,
     _filename: filename
   };
@@ -5842,8 +5867,12 @@ function normalizeItem(content, filename, isDraft = false) {
   return base;
 }
 function stripTransient(item) {
-  const { _slug, _isDraft, _hasDraft, _url, ...rest } = item;
-  return rest;
+  const { _slug, _isDraft, _hasDraft, _url, _filename, ...rest } = item;
+  const out = rest;
+  if (typeof _filename === "string" && _filename !== out._id) {
+    out._filename = _filename;
+  }
+  return out;
 }
 var FileSystemCMSProvider = class {
   constructor(templatesDir, cmsDir) {
@@ -5974,8 +6003,10 @@ var FileSystemCMSProvider = class {
     return items.find((item) => item._id === id) || null;
   }
   /**
-   * Save item to file system
-   * Uses _filename for file path (stable, doesn't change when slug changes)
+   * Save item to file system.
+   * The on-disk filename is derived from `_filename` (legacy alias) when set,
+   * otherwise from `_id` (canonical identifier; equals the filename for new
+   * items). Falls back to the slugField value as a last resort.
    */
   async saveItem(collection, item) {
     this.validateCollection(collection);
@@ -5991,10 +6022,16 @@ var FileSystemCMSProvider = class {
     } else {
       const slugField = schemaInfo.schema.slugField;
       const slugValue = item[slugField];
-      filename = typeof slugValue === "string" ? slugValue : String(slugValue);
+      if (typeof slugValue === "string" && slugValue) {
+        filename = slugValue;
+      } else if (typeof item._id === "string" && item._id) {
+        filename = item._id;
+      } else {
+        filename = String(slugValue);
+      }
     }
     if (!filename || filename === "[object Object]") {
-      throw new Error("Missing _filename field. Items must have _filename set on creation.");
+      throw new Error("Cannot derive filename: item is missing _id, _filename, and a usable slug-field value.");
     }
     this.validateFilename(filename);
     const collectionDir = join2(this.cmsDir, collection);
@@ -6082,7 +6119,8 @@ var FileSystemCMSProvider = class {
   /**
    * Save the draft version of an item. Loose validation — drafts may have
    * missing required fields or partial data. Strict validation only runs at
-   * publish time. The item's `_filename` determines the target file.
+   * publish time. The on-disk filename is derived the same way as for
+   * `saveItem` (prefer `_filename`, fall back to `_id`).
    */
   async saveDraft(collection, item) {
     this.validateCollection(collection);
@@ -6098,10 +6136,16 @@ var FileSystemCMSProvider = class {
     } else {
       const slugField = schemaInfo.schema.slugField;
       const slugValue = item[slugField];
-      filename = typeof slugValue === "string" ? slugValue : String(slugValue);
+      if (typeof slugValue === "string" && slugValue) {
+        filename = slugValue;
+      } else if (typeof item._id === "string" && item._id) {
+        filename = item._id;
+      } else {
+        filename = String(slugValue);
+      }
     }
     if (!filename || filename === "[object Object]") {
-      throw new Error("Missing _filename field. Drafts must have _filename set on creation.");
+      throw new Error("Cannot derive draft filename: item is missing _id, _filename, and a usable slug-field value.");
     }
     this.validateFilename(filename);
     const collectionDir = join2(this.cmsDir, collection);
@@ -6288,4 +6332,4 @@ export {
   FileSystemCMSProvider,
   migrateTemplatesDirectory
 };
-//# sourceMappingURL=chunk-EQYDSPBB.js.map
+//# sourceMappingURL=chunk-CVLFID6V.js.map