includio-cms 0.7.2 → 0.13.1

package/dist/core/server/fields/populateEntry.js

@@ -1,51 +1,9 @@
-import { walkInlineBlockNodes } from '../../../admin/components/tiptap/structured-content-utils.js';
-import { translateObject } from '../entries/utils/getEntryTranslation.js';
 import { resolveMediaFields } from './resolveImageFields.js';
 import { resolveRelationFields } from './resolveRelationFields.js';
 import { resolveRichtextLinks } from './resolveRichtextLinks.js';
 import { resolveUrlFields } from './resolveUrlFields.js';
+import { resolveTypographyOrphans } from './resolveTypographyOrphans.js';
 import { getCMS } from '../../cms.js';
-function translateInlineBlockData(data, fields, language) {
-    for (const field of fields) {
-        const val = data[field.slug];
-        if (val == null)
-            continue;
-        switch (field.type) {
-            case 'content': {
-                const cf = field;
-                if (cf.inlineBlocks?.length &&
-                    val &&
-                    typeof val === 'object' &&
-                    'type' in val &&
-                    val.type === 'doc') {
-                    walkInlineBlockNodes(val, (node) => {
-                        if (node.attrs?.blockData && typeof node.attrs.blockData === 'object') {
-                            node.attrs.blockData = translateObject(node.attrs.blockData, language);
-                            const def = cf.inlineBlocks.find((b) => b.slug === node.attrs?.blockType);
-                            if (def) {
-                                translateInlineBlockData(node.attrs.blockData, def.fields, language);
-                            }
-                        }
-                    });
-                }
-                break;
-            }
-            case 'object':
-                if (val && typeof val === 'object' && 'data' in val)
-                    translateInlineBlockData(val.data, field.fields, language);
-                break;
-            case 'blocks':
-                if (Array.isArray(val)) {
-                    for (const item of val) {
-                        const def = field.of.find((d) => d.slug === item.slug);
-                        if (def)
-                            translateInlineBlockData(item.data, def.fields, language);
-                    }
-                }
-                break;
-        }
-    }
-}
 async function resolveCustomFields(data, fields) {
     // Check if any custom fields exist before accessing CMS
     const hasCustom = fields.some((f) => f.type === 'custom' ||
@@ -72,19 +30,16 @@ async function resolveCustomFields(data, fields) {
                 break;
             }
             case 'object':
-                if (val && typeof val === 'object' && 'data' in val) {
-                    result[field.slug] = {
-                        ...val,
-                        data: await resolveCustomFields(val.data, field.fields)
-                    };
+                if (val && typeof val === 'object') {
+                    result[field.slug] = await resolveCustomFields(val, field.fields);
                 }
                 break;
             case 'blocks':
                 if (Array.isArray(val)) {
                     result[field.slug] = await Promise.all(val.map(async (item) => {
-                        const blockDef = field.of.find((d) => d.slug === item.slug);
+                        const blockDef = field.of.find((d) => d.slug === item._slug);
                         if (blockDef) {
-                            return { ...item, data: await resolveCustomFields(item.data, blockDef.fields) };
+                            return await resolveCustomFields(item, blockDef.fields);
                         }
                         return item;
                     }));
@@ -100,7 +55,16 @@ export async function populateEntryData(data, fields, language) {
     populatedData = await resolveMediaFields(populatedData, fields);
     populatedData = await resolveRichtextLinks(populatedData, fields, language);
     populatedData = (await resolveCustomFields(populatedData, fields));
-    populatedData = translateObject(populatedData, language);
-    translateInlineBlockData(populatedData, fields, language);
+    // Typography orphan fix — enabled by default, opt-out via config
+    let fixOrphans = true;
+    try {
+        fixOrphans = getCMS().typographyConfig.fixOrphans !== false;
+    }
+    catch {
+        // CMS not initialized — keep default
+    }
+    if (fixOrphans) {
+        populatedData = resolveTypographyOrphans(populatedData, fields);
+    }
     return populatedData;
 }

package/dist/core/server/fields/resolveImageFields.js

@@ -14,7 +14,6 @@ export async function resolveMediaFields(data, fields) {
                 continue;
             switch (field.type) {
                 case 'media':
-                case 'image':
                 case 'file': {
                     if (field.multiple && Array.isArray(val)) {
                         val.forEach((id) => {
@@ -38,39 +37,32 @@ export async function resolveMediaFields(data, fields) {
                     break;
                 }
                 case 'object':
-                    collectIds(val.data, field.fields);
+                    collectIds(val, field.fields);
                     break;
                 case 'blocks':
                     if (Array.isArray(val)) {
                         val.forEach((item) => {
-                            // Find the object definition for this item based on its slug
-                            const objectDef = field.of.find((objDef) => objDef.slug === item.slug);
+                            const objectDef = field.of.find((objDef) => objDef.slug === item._slug);
                             if (objectDef) {
-                                collectIds(item.data, objectDef.fields);
+                                collectIds(item, objectDef.fields);
                             }
                         });
                     }
                     break;
                 case 'content': {
                     const contentField = field;
-                    // Content field is localized: { lang: StructuredContentDoc }
-                    if (typeof val === 'object' && val !== null) {
-                        for (const doc of Object.values(val)) {
-                            if (doc && typeof doc === 'object' && doc.type === 'doc') {
-                                // Regular media nodes (figure/video/image)
-                                mediaIds.push(...extractMediaIdsFromDoc(doc));
-                                // Inline block fields (image/file/media inside blocks/objects)
-                                if (contentField.inlineBlocks?.length) {
-                                    walkInlineBlockNodes(doc, (node) => {
-                                        const bd = node.attrs?.blockData;
-                                        if (!bd || typeof bd !== 'object')
-                                            return;
-                                        const def = contentField.inlineBlocks.find((b) => b.slug === node.attrs?.blockType);
-                                        if (def)
-                                            collectIds(bd, def.fields);
-                                    });
-                                }
-                            }
+                    // Content is now a single doc, not Record<lang, doc>
+                    if (val && typeof val === 'object' && val.type === 'doc') {
+                        mediaIds.push(...extractMediaIdsFromDoc(val));
+                        if (contentField.inlineBlocks?.length) {
+                            walkInlineBlockNodes(val, (node) => {
+                                const bd = node.attrs?.blockData;
+                                if (!bd || typeof bd !== 'object')
+                                    return;
+                                const def = contentField.inlineBlocks.find((b) => b.slug === node.attrs?.blockType);
+                                if (def)
+                                    collectIds(bd, def.fields);
+                            });
                         }
                     }
                     break;
@@ -105,12 +97,18 @@ export async function resolveMediaFields(data, fields) {
                         if (!mediaFile)
                             return { data: null, styles: {} };
                         if (mediaFile.type === 'image') {
-                            const imgResult = await getImageStyles({ ...field, type: 'image' }, mediaFile);
-                            return {
-                                data: mediaFile,
-                                styles: imgResult.styles,
-                                blurDataUrl: imgResult.blurDataUrl
-                            };
+                            try {
+                                const imgResult = await getImageStyles(field, mediaFile);
+                                return {
+                                    data: mediaFile,
+                                    styles: imgResult.styles,
+                                    blurDataUrl: imgResult.blurDataUrl
+                                };
+                            }
+                            catch (e) {
+                                console.warn(`[CMS] Image style resolution failed for media field "${field.slug}", media ${mediaFile.id}:`, e);
+                                return { data: mediaFile, styles: {}, blurDataUrl: null };
+                            }
                         }
                         // Video/audio: resolve transcript + audioDescription
                         let transcript = null;
@@ -143,37 +141,6 @@ export async function resolveMediaFields(data, fields) {
                     }
                     break;
                 }
-                case 'image': {
-                    if (field.multiple && Array.isArray(val)) {
-                        result[field.slug] = await Promise.all(val.map(async (id) => {
-                            const mediaFile = mediaMap[id];
-                            if (!mediaFile) {
-                                return { data: null, styles: {} };
-                            }
-                            const imgResult = await getImageStyles(field, mediaFile);
-                            return {
-                                data: mediaFile,
-                                styles: imgResult.styles,
-                                blurDataUrl: imgResult.blurDataUrl
-                            };
-                        }));
-                    }
-                    else {
-                        const mediaFile = mediaMap[val];
-                        if (!mediaFile) {
-                            result[field.slug] = { data: null, styles: {} };
-                            break;
-                        }
-                        const imgResult = await getImageStyles(field, mediaFile);
-                        result[field.slug] = {
-                            data: mediaFile,
-                            styles: imgResult.styles,
-                            blurDataUrl: imgResult.blurDataUrl
-                        };
-                        break;
-                    }
-                    break;
-                }
                 case 'file': {
                     if (field.multiple && Array.isArray(val)) {
                         result[field.slug] = val.map((id) => mediaMap[id] ?? null);
@@ -198,80 +165,62 @@ export async function resolveMediaFields(data, fields) {
                     break;
                 }
                 case 'object':
-                    result[field.slug] = {
-                        ...val,
-                        data: await resolveValues(val.data, field.fields)
-                    };
+                    result[field.slug] = await resolveValues(val, field.fields);
                     break;
                 case 'blocks':
                     result[field.slug] = await Promise.all(
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     val.map(async (item) => {
-                        // Find the object definition for this item based on its slug
-                        const objectDef = field.of.find((objDef) => objDef.slug === item.slug);
+                        const objectDef = field.of.find((objDef) => objDef.slug === item._slug);
                         if (objectDef) {
-                            return {
-                                ...item,
-                                data: await resolveValues(item.data, objectDef.fields)
-                            };
+                            return await resolveValues(item, objectDef.fields);
                         }
-                        // If no matching object definition found, return item unchanged
                         return item;
                     }));
                     break;
                 case 'content': {
-                    // Content field is localized: { lang: StructuredContentDoc }
+                    // Content is now a single doc, not Record<lang, doc>
                     const contentField = field;
-                    if (typeof val === 'object' && val !== null) {
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        const resolved = {};
-                        for (const [lang, doc] of Object.entries(val)) {
-                            if (doc && typeof doc === 'object' && doc.type === 'doc') {
-                                const cloned = cloneDoc(doc);
-                                walkMediaNodes(cloned, (node) => {
-                                    const mediaId = node.attrs?.['data-media-id'];
-                                    if (!mediaId)
-                                        return;
-                                    const mediaFile = mediaMap[mediaId];
-                                    if (!mediaFile)
-                                        return;
-                                    node.attrs.src = mediaFile.url;
-                                    if (mediaFile.width)
-                                        node.attrs.width = mediaFile.width;
-                                    if (mediaFile.height)
-                                        node.attrs.height = mediaFile.height;
-                                    if (mediaFile.alt && !node.attrs.alt)
-                                        node.attrs.alt = mediaFile.alt;
-                                    node.attrs._media = {
-                                        data: mediaFile,
-                                        ...(mediaFile.type === 'image' ? { blurDataUrl: mediaFile.blurDataUrl } : {})
-                                    };
-                                });
-                                // Resolve inline block fields
-                                if (contentField.inlineBlocks?.length) {
-                                    const promises = [];
-                                    walkInlineBlockNodes(cloned, (node) => {
-                                        const bd = node.attrs?.blockData;
-                                        if (!bd || typeof bd !== 'object')
-                                            return;
-                                        const def = contentField.inlineBlocks.find((b) => b.slug === node.attrs?.blockType);
-                                        if (!def)
-                                            return;
-                                        promises.push(resolveValues(bd, def.fields).then((resolvedBd) => {
-                                            node.attrs.blockData = resolvedBd;
-                                        }));
-                                    });
-                                    if (promises.length > 0) {
-                                        await Promise.all(promises);
-                                    }
-                                }
-                                resolved[lang] = cloned;
-                            }
-                            else {
-                                resolved[lang] = doc;
+                    if (val && typeof val === 'object' && val.type === 'doc') {
+                        const cloned = cloneDoc(val);
+                        walkMediaNodes(cloned, (node) => {
+                            const mediaId = node.attrs?.['data-media-id'];
+                            if (!mediaId)
+                                return;
+                            const mediaFile = mediaMap[mediaId];
+                            if (!mediaFile)
+                                return;
+                            node.attrs.src = mediaFile.url;
+                            if (mediaFile.width)
+                                node.attrs.width = mediaFile.width;
+                            if (mediaFile.height)
+                                node.attrs.height = mediaFile.height;
+                            if (mediaFile.alt && !node.attrs.alt)
+                                node.attrs.alt = mediaFile.alt;
+                            node.attrs._media = {
+                                data: mediaFile,
+                                ...(mediaFile.type === 'image' ? { blurDataUrl: mediaFile.blurDataUrl } : {})
+                            };
+                        });
+                        // Resolve inline block fields
+                        if (contentField.inlineBlocks?.length) {
+                            const promises = [];
+                            walkInlineBlockNodes(cloned, (node) => {
+                                const bd = node.attrs?.blockData;
+                                if (!bd || typeof bd !== 'object')
+                                    return;
+                                const def = contentField.inlineBlocks.find((b) => b.slug === node.attrs?.blockType);
+                                if (!def)
+                                    return;
+                                promises.push(resolveValues(bd, def.fields).then((resolvedBd) => {
+                                    node.attrs.blockData = resolvedBd;
+                                }));
+                            });
+                            if (promises.length > 0) {
+                                await Promise.all(promises);
                             }
                         }
-                        result[field.slug] = resolved;
+                        result[field.slug] = cloned;
                     }
                     break;
                 }

package/dist/core/server/fields/resolveRelationFields.js

@@ -25,34 +25,30 @@ export async function resolveRelationFields(data, fields, language) {
                     break;
                 }
                 case 'object':
-                    collectIds(val.data, field.fields);
+                    collectIds(val, field.fields);
                     break;
                 case 'blocks':
                     if (Array.isArray(val)) {
                         val.forEach((item) => {
-                            // Find the object definition for this item based on its slug
-                            const objectDef = field.of.find((objDef) => objDef.slug === item.slug);
+                            const objectDef = field.of.find((objDef) => objDef.slug === item._slug);
                             if (objectDef) {
-                                collectIds(item.data, objectDef.fields);
+                                collectIds(item, objectDef.fields);
                             }
                         });
                     }
                     break;
                 case 'content': {
                     const cf = field;
-                    if (typeof val === 'object' && val !== null && cf.inlineBlocks?.length) {
-                        for (const doc of Object.values(val)) {
-                            if (doc && typeof doc === 'object' && doc.type === 'doc') {
-                                walkInlineBlockNodes(doc, (node) => {
-                                    const bd = node.attrs?.blockData;
-                                    if (!bd || typeof bd !== 'object')
-                                        return;
-                                    const def = cf.inlineBlocks.find((b) => b.slug === node.attrs?.blockType);
-                                    if (def)
-                                        collectIds(bd, def.fields);
-                                });
-                            }
-                        }
+                    // Content is now a single doc, not Record<lang, doc>
+                    if (val && typeof val === 'object' && val.type === 'doc' && cf.inlineBlocks?.length) {
+                        walkInlineBlockNodes(val, (node) => {
+                            const bd = node.attrs?.blockData;
+                            if (!bd || typeof bd !== 'object')
+                                return;
+                            const def = cf.inlineBlocks.find((b) => b.slug === node.attrs?.blockType);
+                            if (def)
+                                collectIds(bd, def.fields);
+                        });
                     }
                     break;
                 }
@@ -69,7 +65,7 @@ export async function resolveRelationFields(data, fields, language) {
         ids: entriesIds,
         language
     });
-    const entriesMap = Object.fromEntries(entries.map((e) => [e.id, e]));
+    const entriesMap = Object.fromEntries(entries.map((e) => [e._id, e]));
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const resolveValues = (value, fields) => {
         // Start with a copy of all original data to preserve non-field properties
@@ -92,50 +88,33 @@ export async function resolveRelationFields(data, fields, language) {
                     break;
                 }
                 case 'object':
-                    result[field.slug] = {
-                        ...val,
-                        data: resolveValues(val.data, field.fields)
-                    };
+                    result[field.slug] = resolveValues(val, field.fields);
                     break;
                 case 'blocks':
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     result[field.slug] = val.map((item) => {
-                        // Find the object definition for this item based on its slug
-                        const objectDef = field.of.find((objDef) => objDef.slug === item.slug);
+                        const objectDef = field.of.find((objDef) => objDef.slug === item._slug);
                         if (objectDef) {
-                            return {
-                                ...item,
-                                data: resolveValues(item.data, objectDef.fields)
-                            };
+                            return resolveValues(item, objectDef.fields);
                         }
-                        // If no matching object definition found, return item unchanged
                         return item;
                     });
                     break;
                 case 'content': {
                     const cf = field;
-                    if (typeof val === 'object' && val !== null && cf.inlineBlocks?.length) {
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        const resolved = {};
-                        for (const [lang, doc] of Object.entries(val)) {
-                            if (doc && typeof doc === 'object' && doc.type === 'doc') {
-                                const cloned = cloneDoc(doc);
-                                walkInlineBlockNodes(cloned, (node) => {
-                                    const bd = node.attrs?.blockData;
-                                    if (!bd || typeof bd !== 'object')
-                                        return;
-                                    const def = cf.inlineBlocks.find((b) => b.slug === node.attrs?.blockType);
-                                    if (!def)
-                                        return;
-                                    node.attrs.blockData = resolveValues(bd, def.fields);
-                                });
-                                resolved[lang] = cloned;
-                            }
-                            else {
-                                resolved[lang] = doc;
-                            }
-                        }
-                        result[field.slug] = resolved;
+                    // Content is now a single doc, not Record<lang, doc>
+                    if (val && typeof val === 'object' && val.type === 'doc' && cf.inlineBlocks?.length) {
+                        const cloned = cloneDoc(val);
+                        walkInlineBlockNodes(cloned, (node) => {
+                            const bd = node.attrs?.blockData;
+                            if (!bd || typeof bd !== 'object')
+                                return;
+                            const def = cf.inlineBlocks.find((b) => b.slug === node.attrs?.blockType);
+                            if (!def)
+                                return;
+                            node.attrs.blockData = resolveValues(bd, def.fields);
+                        });
+                        result[field.slug] = cloned;
                     }
                     break;
                 }