@willwade/aac-processors 0.0.21 → 0.0.23

package/dist/processors/astericsGridProcessor.js

@@ -12,6 +12,8 @@ exports.getContrastingTextColor = getContrastingTextColor;
 const baseProcessor_1 = require("../core/baseProcessor");
 const treeStructure_1 = require("../core/treeStructure");
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const validation_1 = require("../validation");
 const DEFAULT_COLOR_SCHEME_DEFINITIONS = [
     {
         name: 'CS_MODIFIED_FITZGERALD_KEY_VERY_LIGHT',
@@ -664,122 +666,136 @@ class AstericsGridProcessor extends baseProcessor_1.BaseProcessor {
     }
     loadIntoTree(filePathOrBuffer) {
         const tree = new treeStructure_1.AACTree();
-        let content = Buffer.isBuffer(filePathOrBuffer)
-            ? filePathOrBuffer.toString('utf-8')
-            : fs_1.default.readFileSync(filePathOrBuffer, 'utf-8');
-        // Remove BOM if present
-        if (content.charCodeAt(0) === 0xfeff) {
-            content = content.slice(1);
-        }
-        const grdFile = JSON.parse(content);
-        if (!grdFile.grids) {
-            return tree;
-        }
-        const rawColorConfig = grdFile.metadata?.colorConfig;
-        const colorConfig = isRecord(rawColorConfig)
-            ? rawColorConfig
-            : undefined;
-        const activeColorSchemeDefinition = getActiveColorSchemeDefinition(colorConfig);
-        // First pass: create all pages
-        grdFile.grids.forEach((grid) => {
-            const page = new treeStructure_1.AACPage({
-                id: grid.id,
-                name: this.getLocalizedLabel(grid.label) || grid.id,
-                grid: [],
-                buttons: [],
-                parentId: null,
-                style: {
-                    backgroundColor: colorConfig?.gridBackgroundColor || '#FFFFFF',
-                    borderColor: colorConfig?.elementBorderColor || '#CCCCCC',
-                    borderWidth: colorConfig?.borderWidth || 1,
-                    fontFamily: colorConfig?.fontFamily || 'Arial',
-                    fontSize: colorConfig?.fontSizePct ? colorConfig.fontSizePct * 16 : 16, // Convert percentage to pixels, default to 16
-                    fontColor: colorConfig?.fontColor || '#000000',
-                },
-            });
-            tree.addPage(page);
-        });
-        // Second pass: add buttons and establish navigation
-        grdFile.grids.forEach((grid) => {
-            const page = tree.getPage(grid.id);
-            if (!page)
-                return;
-            // Create a 2D grid to track button positions
-            const gridLayout = [];
-            const maxRows = Math.max(10, grid.rowCount || 10);
-            const maxCols = Math.max(10, grid.minColumnCount || 10);
-            for (let r = 0; r < maxRows; r++) {
-                gridLayout[r] = new Array(maxCols).fill(null);
+        const filename = typeof filePathOrBuffer === 'string' ? path_1.default.basename(filePathOrBuffer) : 'upload.grd';
+        const buffer = Buffer.isBuffer(filePathOrBuffer)
+            ? filePathOrBuffer
+            : fs_1.default.readFileSync(filePathOrBuffer);
+        try {
+            let content = buffer.toString('utf-8');
+            // Remove BOM if present
+            if (content.charCodeAt(0) === 0xfeff) {
+                content = content.slice(1);
             }
-            grid.gridElements.forEach((element) => {
-                const button = this.createButtonFromElement(element, colorConfig, activeColorSchemeDefinition);
-                page.addButton(button);
-                // Place button in grid layout using its x,y coordinates
-                const buttonX = element.x || 0;
-                const buttonY = element.y || 0;
-                const buttonWidth = element.width || 1;
-                const buttonHeight = element.height || 1;
-                // Place button in grid (handle width/height span)
-                for (let r = buttonY; r < buttonY + buttonHeight && r < maxRows; r++) {
-                    for (let c = buttonX; c < buttonX + buttonWidth && c < maxCols; c++) {
-                        if (gridLayout[r] && gridLayout[r][c] === null) {
-                            gridLayout[r][c] = button;
+            const grdFile = JSON.parse(content);
+            if (!grdFile.grids) {
+                const validationResult = (0, validation_1.buildValidationResultFromMessage)({
+                    filename,
+                    filesize: buffer.byteLength,
+                    format: 'asterics',
+                    message: 'Missing grids array in Asterics .grd file',
+                    type: 'structure',
+                    description: 'Asterics grid collection',
+                });
+                throw new validation_1.ValidationFailureError('Invalid Asterics grid file', validationResult);
+            }
+            const rawColorConfig = grdFile.metadata?.colorConfig;
+            const colorConfig = isRecord(rawColorConfig)
+                ? rawColorConfig
+                : undefined;
+            const activeColorSchemeDefinition = getActiveColorSchemeDefinition(colorConfig);
+            grdFile.grids.forEach((grid) => {
+                const page = new treeStructure_1.AACPage({
+                    id: grid.id,
+                    name: this.getLocalizedLabel(grid.label) || grid.id,
+                    grid: [],
+                    buttons: [],
+                    parentId: null,
+                    style: {
+                        backgroundColor: colorConfig?.gridBackgroundColor || '#FFFFFF',
+                        borderColor: colorConfig?.elementBorderColor || '#CCCCCC',
+                        borderWidth: colorConfig?.borderWidth || 1,
+                        fontFamily: colorConfig?.fontFamily || 'Arial',
+                        fontSize: colorConfig?.fontSizePct ? colorConfig.fontSizePct * 16 : 16,
+                        fontColor: colorConfig?.fontColor || '#000000',
+                    },
+                });
+                tree.addPage(page);
+            });
+            grdFile.grids.forEach((grid) => {
+                const page = tree.getPage(grid.id);
+                if (!page)
+                    return;
+                const gridLayout = [];
+                const maxRows = Math.max(10, grid.rowCount || 10);
+                const maxCols = Math.max(10, grid.minColumnCount || 10);
+                for (let r = 0; r < maxRows; r++) {
+                    gridLayout[r] = new Array(maxCols).fill(null);
+                }
+                grid.gridElements.forEach((element) => {
+                    const button = this.createButtonFromElement(element, colorConfig, activeColorSchemeDefinition);
+                    page.addButton(button);
+                    const buttonX = element.x || 0;
+                    const buttonY = element.y || 0;
+                    const buttonWidth = element.width || 1;
+                    const buttonHeight = element.height || 1;
+                    for (let r = buttonY; r < buttonY + buttonHeight && r < maxRows; r++) {
+                        for (let c = buttonX; c < buttonX + buttonWidth && c < maxCols; c++) {
+                            if (gridLayout[r] && gridLayout[r][c] === null) {
+                                gridLayout[r][c] = button;
+                            }
                         }
                     }
-                }
-                // Handle navigation relationships
-                const navAction = element.actions.find((a) => a.modelName === 'GridActionNavigate');
-                const targetGridId = navAction && typeof navAction.toGridId === 'string' ? navAction.toGridId : undefined;
-                if (targetGridId) {
-                    const targetPage = tree.getPage(targetGridId);
-                    if (targetPage) {
-                        targetPage.parentId = page.id;
+                    const navAction = element.actions.find((a) => a.modelName === 'GridActionNavigate');
+                    const targetGridId = navAction && typeof navAction.toGridId === 'string' ? navAction.toGridId : undefined;
+                    if (targetGridId) {
+                        const targetPage = tree.getPage(targetGridId);
+                        if (targetPage) {
+                            targetPage.parentId = page.id;
+                        }
                     }
-                }
+                });
+                page.grid = gridLayout;
             });
-            // Set the page's grid layout
-            page.grid = gridLayout;
-        });
-        // Set metadata for Asterics Grid files
-        const astericsMetadata = {
-            format: 'asterics',
-            hasGlobalGrid: false, // Can be extended in the future
-        };
-        if (grdFile.grids && grdFile.grids.length > 0) {
-            astericsMetadata.name = this.getLocalizedLabel(grdFile.grids[0].label);
-            // Extract all unique languages from all grids and elements
-            const languages = new Set();
-            grdFile.grids.forEach((grid) => {
-                if (grid.label) {
-                    Object.keys(grid.label).forEach((lang) => languages.add(lang));
-                }
-                grid.gridElements?.forEach((element) => {
-                    if (element.label) {
-                        Object.keys(element.label).forEach((lang) => languages.add(lang));
+            const astericsMetadata = {
+                format: 'asterics',
+                hasGlobalGrid: false,
+            };
+            if (grdFile.grids && grdFile.grids.length > 0) {
+                astericsMetadata.name = this.getLocalizedLabel(grdFile.grids[0].label);
+                const languages = new Set();
+                grdFile.grids.forEach((grid) => {
+                    if (grid.label) {
+                        Object.keys(grid.label).forEach((lang) => languages.add(lang));
                     }
-                    // Also check word forms for languages
-                    element.wordForms?.forEach((wf) => {
-                        if (wf.lang)
-                            languages.add(wf.lang);
+                    grid.gridElements?.forEach((element) => {
+                        if (element.label) {
+                            Object.keys(element.label).forEach((lang) => languages.add(lang));
+                        }
+                        element.wordForms?.forEach((wf) => {
+                            if (wf.lang)
+                                languages.add(wf.lang);
+                        });
                     });
                 });
-            });
-            if (languages.size > 0) {
-                astericsMetadata.languages = Array.from(languages).sort();
-                // Set primary locale to English if available, otherwise the first language found
-                astericsMetadata.locale = languages.has('en')
-                    ? 'en'
-                    : languages.has('de')
-                        ? 'de'
-                        : astericsMetadata.languages[0];
+                if (languages.size > 0) {
+                    astericsMetadata.languages = Array.from(languages).sort();
+                    astericsMetadata.locale = languages.has('en')
+                        ? 'en'
+                        : languages.has('de')
+                            ? 'de'
+                            : astericsMetadata.languages[0];
+                }
+            }
+            tree.metadata = astericsMetadata;
+            if (grdFile.metadata && grdFile.metadata.homeGridId) {
+                tree.rootId = grdFile.metadata.homeGridId;
             }
+            return tree;
         }
-        tree.metadata = astericsMetadata;
-        // Set the home page from metadata.homeGridId
-        if (grdFile.metadata && grdFile.metadata.homeGridId) {
-            tree.rootId = grdFile.metadata.homeGridId;
+        catch (err) {
+            if (err instanceof validation_1.ValidationFailureError) {
+                throw err;
+            }
+            const validationResult = (0, validation_1.buildValidationResultFromMessage)({
+                filename,
+                filesize: buffer.byteLength,
+                format: 'asterics',
+                message: err?.message || 'Failed to parse Asterics grid file',
+                type: 'parse',
+                description: 'Parse Asterics grid JSON',
+            });
+            throw new validation_1.ValidationFailureError('Failed to load Asterics grid', validationResult, err);
         }
-        return tree;
     }
     getLocalizedLabel(labelMap) {
         if (!labelMap)

package/dist/processors/dotProcessor.js

@@ -8,6 +8,8 @@ const baseProcessor_1 = require("../core/baseProcessor");
 const treeStructure_1 = require("../core/treeStructure");
 // Removed unused import: FileProcessor
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const validation_1 = require("../validation");
 class DotProcessor extends baseProcessor_1.BaseProcessor {
     constructor(options) {
         super(options);
@@ -72,78 +74,94 @@ class DotProcessor extends baseProcessor_1.BaseProcessor {
         return texts;
     }
     loadIntoTree(filePathOrBuffer) {
-        let content;
+        const filename = typeof filePathOrBuffer === 'string' ? path_1.default.basename(filePathOrBuffer) : 'upload.dot';
+        const buffer = Buffer.isBuffer(filePathOrBuffer)
+            ? filePathOrBuffer
+            : fs_1.default.readFileSync(filePathOrBuffer);
+        const filesize = buffer.byteLength;
         try {
-            content =
-                typeof filePathOrBuffer === 'string'
-                    ? fs_1.default.readFileSync(filePathOrBuffer, 'utf8')
-                    : filePathOrBuffer.toString('utf8');
+            const content = buffer.toString('utf8');
+            if (!content || content.trim().length === 0) {
+                const validation = (0, validation_1.buildValidationResultFromMessage)({
+                    filename,
+                    filesize,
+                    format: 'dot',
+                    message: 'DOT file is empty',
+                    type: 'content',
+                    description: 'DOT file content',
+                });
+                throw new validation_1.ValidationFailureError('Empty DOT content', validation);
+            }
+            // Check for binary data (contains null bytes or non-printable characters)
+            const head = content.substring(0, 100);
+            for (let i = 0; i < head.length; i++) {
+                const code = head.charCodeAt(i);
+                if (code === 0 || (code >= 0 && code <= 8) || (code >= 14 && code <= 31)) {
+                    const validation = (0, validation_1.buildValidationResultFromMessage)({
+                        filename,
+                        filesize,
+                        format: 'dot',
+                        message: 'DOT appears to be binary data',
+                        type: 'content',
+                        description: 'DOT file content',
+                    });
+                    throw new validation_1.ValidationFailureError('Invalid DOT content', validation);
+                }
+            }
+            const { nodes, edges } = this.parseDotFile(content);
+            const tree = new treeStructure_1.AACTree();
+            tree.metadata.format = 'dot';
+            // Create pages for each node and add a self button representing the node label
+            for (const node of nodes) {
+                const page = new treeStructure_1.AACPage({
+                    id: node.id,
+                    name: node.label,
+                    grid: [],
+                    buttons: [],
+                    parentId: null,
+                });
+                tree.addPage(page);
+                // Add a self button so single-node graphs yield one button
+                page.addButton(new treeStructure_1.AACButton({
+                    id: `${node.id}_self`,
+                    label: node.label,
+                    message: node.label,
+                    semanticAction: {
+                        intent: treeStructure_1.AACSemanticIntent.SPEAK_TEXT,
+                        text: node.label,
+                        fallback: { type: 'SPEAK', message: node.label },
+                    },
+                }));
+            }
+            // Create navigation buttons based on edges
+            for (const edge of edges) {
+                const fromPage = tree.getPage(edge.from);
+                if (fromPage) {
+                    const button = new treeStructure_1.AACButton({
+                        id: `nav_${edge.from}_${edge.to}`,
+                        label: edge.label || edge.to,
+                        message: '',
+                        targetPageId: edge.to,
+                    });
+                    fromPage.addButton(button);
+                }
+            }
+            return tree;
         }
         catch (error) {
-            // Re-throw file system errors (like file not found)
-            if (typeof filePathOrBuffer === 'string') {
+            if (error instanceof validation_1.ValidationFailureError) {
                 throw error;
             }
-            // For buffer errors, return empty tree
-            return new treeStructure_1.AACTree();
-        }
-        // Check if content looks like text and is non-empty
-        if (!content || content.trim().length === 0) {
-            return new treeStructure_1.AACTree();
-        }
-        // Check for binary data (contains null bytes or non-printable characters) without control-regex
-        const head = content.substring(0, 100);
-        let hasControl = false;
-        for (let i = 0; i < head.length; i++) {
-            const code = head.charCodeAt(i);
-            // Allow UTF-8 characters (code >= 127)
-            if (code === 0 || (code >= 0 && code <= 8) || (code >= 14 && code <= 31)) {
-                hasControl = true;
-                break;
-            }
-        }
-        if (hasControl) {
-            return new treeStructure_1.AACTree();
-        }
-        const { nodes, edges } = this.parseDotFile(content);
-        const tree = new treeStructure_1.AACTree();
-        tree.metadata.format = 'dot';
-        // Create pages for each node and add a self button representing the node label
-        for (const node of nodes) {
-            const page = new treeStructure_1.AACPage({
-                id: node.id,
-                name: node.label,
-                grid: [],
-                buttons: [],
-                parentId: null,
+            const validation = (0, validation_1.buildValidationResultFromMessage)({
+                filename,
+                filesize,
+                format: 'dot',
+                message: error?.message || 'Failed to parse DOT file',
+                type: 'parse',
+                description: 'Parse DOT graph',
             });
-            tree.addPage(page);
-            // Add a self button so single-node graphs yield one button
-            page.addButton(new treeStructure_1.AACButton({
-                id: `${node.id}_self`,
-                label: node.label,
-                message: node.label,
-                semanticAction: {
-                    intent: treeStructure_1.AACSemanticIntent.SPEAK_TEXT,
-                    text: node.label,
-                    fallback: { type: 'SPEAK', message: node.label },
-                },
-            }));
-        }
-        // Create navigation buttons based on edges
-        for (const edge of edges) {
-            const fromPage = tree.getPage(edge.from);
-            if (fromPage) {
-                const button = new treeStructure_1.AACButton({
-                    id: `nav_${edge.from}_${edge.to}`,
-                    label: edge.label || edge.to,
-                    message: '',
-                    targetPageId: edge.to,
-                });
-                fromPage.addButton(button);
-            }
+            throw new validation_1.ValidationFailureError('Failed to load DOT file', validation, error);
         }
-        return tree;
     }
     processTexts(filePathOrBuffer, translations, outputPath) {
         const safeBuffer = Buffer.isBuffer(filePathOrBuffer)

package/dist/processors/gridsetProcessor.js

@@ -1400,6 +1400,8 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                     const homeGridId = gridNameToIdMap.get(startGridName);
                     if (homeGridId) {
                         metadata.defaultHomePageId = homeGridId;
+                        // Also set tree.rootId so BoardViewer knows which page to show first
+                        tree.rootId = homeGridId;
                     }
                 }
                 const keyboardGridName = settingsData?.GridSetSettings?.KeyboardGrid ||

package/dist/processors/obfProcessor.js

@@ -29,6 +29,12 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
     }
     processBoard(boardData, _boardPath) {
         const sourceButtons = boardData.buttons || [];
+        // Calculate page ID first (used to make button IDs unique)
+        const pageId = _boardPath && _boardPath.endsWith('.obf') && !_boardPath.includes('/')
+            ? _boardPath // Zip entry - use filename to match navigation paths
+            : boardData?.id
+                ? String(boardData.id)
+                : _boardPath?.split('/').pop() || '';
         const buttons = sourceButtons.map((btn) => {
             const semanticAction = btn.load_board
                 ? {
@@ -50,7 +56,8 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                     },
                 };
             return new treeStructure_1.AACButton({
-                id: String(btn?.id || ''),
+                // Make button ID unique by combining page ID and button ID
+                id: `${pageId}::${btn?.id || ''}`,
                 label: String(btn?.label || ''),
                 message: String(btn?.vocalization || btn?.label || ''),
                 visibility: mapObfVisibility(btn.hidden),
@@ -65,7 +72,7 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
         });
         const buttonMap = new Map(buttons.map((btn) => [btn.id, btn]));
         const page = new treeStructure_1.AACPage({
-            id: String(boardData?.id || ''),
+            id: pageId, // Use the page ID we calculated earlier
             name: String(boardData?.name || ''),
             grid: [],
             buttons,
@@ -96,7 +103,7 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                                 return;
                             if (rowIndex >= rows || colIndex >= cols)
                                 return;
-                            const aacBtn = buttonMap.get(String(cellId));
+                            const aacBtn = buttonMap.get(`${pageId}::${cellId}`);
                             if (aacBtn) {
                                 grid[rowIndex][colIndex] = aacBtn;
                             }
@@ -109,7 +116,7 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                             const row = Math.floor(btn.box_id / cols);
                             const col = btn.box_id % cols;
                             if (row < rows && col < cols) {
-                                const aacBtn = buttonMap.get(String(btn.id));
+                                const aacBtn = buttonMap.get(`${pageId}::${btn.id}`);
                                 if (aacBtn) {
                                     grid[row][col] = aacBtn;
                                 }

package/dist/processors/opmlProcessor.js

@@ -9,6 +9,8 @@ const treeStructure_1 = require("../core/treeStructure");
 // Removed unused import: FileProcessor
 const fast_xml_parser_1 = require("fast-xml-parser");
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const validation_1 = require("../validation");
 class OpmlProcessor extends baseProcessor_1.BaseProcessor {
     constructor(options) {
         super(options);
@@ -88,55 +90,91 @@ class OpmlProcessor extends baseProcessor_1.BaseProcessor {
         return texts;
     }
     loadIntoTree(filePathOrBuffer) {
-        const content = typeof filePathOrBuffer === 'string'
-            ? fs_1.default.readFileSync(filePathOrBuffer, 'utf8')
-            : filePathOrBuffer.toString('utf8');
-        if (!content || !content.trim()) {
-            throw new Error('Empty OPML content');
-        }
-        // Validate XML before parsing, fast-xml-parser is permissive by default
-        const validationResult = fast_xml_parser_1.XMLValidator.validate(content);
-        if (validationResult !== true) {
-            const reason = validationResult?.err?.msg || JSON.stringify(validationResult);
-            throw new Error(`Invalid OPML XML: ${reason}`);
-        }
-        const parser = new fast_xml_parser_1.XMLParser({ ignoreAttributes: false });
-        let data;
+        const filename = typeof filePathOrBuffer === 'string' ? path_1.default.basename(filePathOrBuffer) : 'upload.opml';
+        const buffer = Buffer.isBuffer(filePathOrBuffer)
+            ? filePathOrBuffer
+            : fs_1.default.readFileSync(filePathOrBuffer);
+        const content = buffer.toString('utf8');
         try {
-            data = parser.parse(content);
-        }
-        catch (e) {
-            throw new Error(`Invalid OPML XML: ${e?.message || String(e)}`);
-        }
-        const tree = new treeStructure_1.AACTree();
-        tree.metadata.format = 'opml';
-        // Handle case where body.outline might not exist or be in different formats
-        const bodyOutline = data.opml?.body?.outline;
-        if (!bodyOutline) {
-            return tree; // Return empty tree if no outline data
-        }
-        const outlines = Array.isArray(bodyOutline) ? bodyOutline : [bodyOutline];
-        let firstRootId = null;
-        outlines.forEach((outline) => {
-            const { page, childPages } = this.processOutline(outline);
-            if (page && page.id) {
-                tree.addPage(page);
-                if (!firstRootId)
-                    firstRootId = page.id;
+            if (!content || !content.trim()) {
+                const validationResult = (0, validation_1.buildValidationResultFromMessage)({
+                    filename,
+                    filesize: buffer.byteLength,
+                    format: 'opml',
+                    message: 'Empty OPML content',
+                    type: 'content',
+                    description: 'OPML content is empty',
+                });
+                throw new validation_1.ValidationFailureError('Empty OPML content', validationResult);
             }
-            childPages.forEach((childPage) => {
-                if (childPage && childPage.id)
-                    tree.addPage(childPage);
+            // Validate XML before parsing, fast-xml-parser is permissive by default
+            const validationResult = fast_xml_parser_1.XMLValidator.validate(content);
+            if (validationResult !== true) {
+                const reason = validationResult?.err?.msg || JSON.stringify(validationResult);
+                const structured = (0, validation_1.buildValidationResultFromMessage)({
+                    filename,
+                    filesize: buffer.byteLength,
+                    format: 'opml',
+                    message: `Invalid OPML XML: ${reason}`,
+                    type: 'xml',
+                    description: 'OPML XML validation',
+                });
+                throw new validation_1.ValidationFailureError('Invalid OPML XML', structured);
+            }
+            const parser = new fast_xml_parser_1.XMLParser({ ignoreAttributes: false });
+            const data = parser.parse(content);
+            const tree = new treeStructure_1.AACTree();
+            tree.metadata.format = 'opml';
+            // Handle case where body.outline might not exist or be in different formats
+            const bodyOutline = data.opml?.body?.outline;
+            if (!bodyOutline) {
+                const structured = (0, validation_1.buildValidationResultFromMessage)({
+                    filename,
+                    filesize: buffer.byteLength,
+                    format: 'opml',
+                    message: 'Missing body.outline in OPML document',
+                    type: 'structure',
+                    description: 'OPML outline root',
+                });
+                throw new validation_1.ValidationFailureError('Invalid OPML structure', structured);
+            }
+            const outlines = Array.isArray(bodyOutline) ? bodyOutline : [bodyOutline];
+            let firstRootId = null;
+            outlines.forEach((outline) => {
+                const { page, childPages } = this.processOutline(outline);
+                if (page && page.id) {
+                    tree.addPage(page);
+                    if (!firstRootId)
+                        firstRootId = page.id;
+                }
+                childPages.forEach((childPage) => {
+                    if (childPage && childPage.id)
+                        tree.addPage(childPage);
+                });
             });
-        });
-        // Set rootId to first root page, or fallback to first page if any exist
-        if (firstRootId) {
-            tree.rootId = firstRootId;
+            // Set rootId to first root page, or fallback to first page if any exist
+            if (firstRootId) {
+                tree.rootId = firstRootId;
+            }
+            else if (Object.keys(tree.pages).length > 0) {
+                tree.rootId = Object.keys(tree.pages)[0];
+            }
+            return tree;
         }
-        else if (Object.keys(tree.pages).length > 0) {
-            tree.rootId = Object.keys(tree.pages)[0];
+        catch (err) {
+            if (err instanceof validation_1.ValidationFailureError) {
+                throw err;
+            }
+            const validationResult = (0, validation_1.buildValidationResultFromMessage)({
+                filename,
+                filesize: buffer.byteLength,
+                format: 'opml',
+                message: err?.message || 'Failed to parse OPML',
+                type: 'parse',
+                description: 'Parse OPML XML',
+            });
+            throw new validation_1.ValidationFailureError('Failed to load OPML file', validationResult, err);
         }
-        return tree;
     }
     processTexts(filePathOrBuffer, translations, outputPath) {
         const content = typeof filePathOrBuffer === 'string'