@willwade/aac-processors 0.0.5 → 0.0.6

package/dist/processors/obfProcessor.js

@@ -9,12 +9,15 @@ const treeStructure_1 = require("../core/treeStructure");
 // Removed unused import: FileProcessor
 const adm_zip_1 = __importDefault(require("adm-zip"));
 const fs_1 = __importDefault(require("fs"));
+// Removed unused import: path
+const OBF_FORMAT_VERSION = 'open-board-0.1';
 class ObfProcessor extends baseProcessor_1.BaseProcessor {
     constructor(options) {
         super(options);
     }
     processBoard(boardData, _boardPath) {
-        const buttons = (boardData.buttons || []).map((btn) => {
+        const sourceButtons = boardData.buttons || [];
+        const buttons = sourceButtons.map((btn) => {
             const semanticAction = btn.load_board
                 ? {
                     category: treeStructure_1.AACSemanticCategory.NAVIGATION,
@@ -46,33 +49,62 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                 targetPageId: btn.load_board?.path,
             });
         });
+        const buttonMap = new Map(buttons.map((btn) => [btn.id, btn]));
         const page = new treeStructure_1.AACPage({
             id: String(boardData?.id || ''),
             name: String(boardData?.name || ''),
             grid: [],
             buttons,
             parentId: null,
+            locale: boardData.locale,
+            descriptionHtml: boardData.description_html,
+            images: boardData.images,
+            sounds: boardData.sounds,
         });
         // Process grid layout if available
         if (boardData.grid) {
-            const rows = boardData.grid.rows;
-            const cols = boardData.grid.columns;
-            const grid = Array(rows)
-                .fill(null)
-                .map(() => Array(cols).fill(null));
-            for (const btn of boardData.buttons) {
-                if (typeof btn.box_id === 'number') {
-                    const row = Math.floor(btn.box_id / cols);
-                    const col = btn.box_id % cols;
-                    if (row < rows && col < cols) {
-                        const aacBtn = buttons.find((b) => b.id === btn.id);
-                        if (aacBtn) {
-                            grid[row][col] = aacBtn;
+            const rows = typeof boardData.grid.rows === 'number'
+                ? boardData.grid.rows
+                : boardData.grid.order?.length || 0;
+            const cols = typeof boardData.grid.columns === 'number'
+                ? boardData.grid.columns
+                : boardData.grid.order
+                    ? boardData.grid.order.reduce((max, row) => Math.max(max, Array.isArray(row) ? row.length : 0), 0)
+                    : 0;
+            if (rows > 0 && cols > 0) {
+                const grid = Array.from({ length: rows }, () => Array.from({ length: cols }, () => null));
+                if (Array.isArray(boardData.grid.order) && boardData.grid.order.length) {
+                    boardData.grid.order.forEach((orderRow, rowIndex) => {
+                        if (!Array.isArray(orderRow))
+                            return;
+                        orderRow.forEach((cellId, colIndex) => {
+                            if (cellId === null || cellId === undefined)
+                                return;
+                            if (rowIndex >= rows || colIndex >= cols)
+                                return;
+                            const aacBtn = buttonMap.get(String(cellId));
+                            if (aacBtn) {
+                                grid[rowIndex][colIndex] = aacBtn;
+                            }
+                        });
+                    });
+                }
+                else {
+                    for (const btn of sourceButtons) {
+                        if (typeof btn.box_id === 'number') {
+                            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));
+                                if (aacBtn) {
+                                    grid[row][col] = aacBtn;
+                                }
+                            }
                         }
                     }
                 }
+                page.grid = grid;
             }
-            page.grid = grid;
         }
         return page;
     }
@@ -123,9 +155,8 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
         }
         // If input is a string path and ends with .obf, treat as JSON
         if (typeof filePathOrBuffer === 'string' && filePathOrBuffer.endsWith('.obf')) {
-            const fs = require('fs');
             try {
-                const content = fs.readFileSync(filePathOrBuffer, 'utf8');
+                const content = fs_1.default.readFileSync(filePathOrBuffer, 'utf8');
                 const boardData = tryParseObfJson(content);
                 if (boardData) {
                     console.log('[OBF] Detected .obf file, parsed as JSON');
@@ -186,6 +217,73 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
         });
         return tree;
     }
+    buildGridMetadata(page) {
+        const buttonPositions = new Map();
+        const totalRows = Array.isArray(page.grid) ? page.grid.length : 0;
+        const totalColumns = totalRows > 0
+            ? page.grid.reduce((max, row) => Math.max(max, Array.isArray(row) ? row.length : 0), 0)
+            : 0;
+        if (totalRows === 0 || totalColumns === 0) {
+            if (!page.buttons.length) {
+                return { rows: 0, columns: 0, order: [], buttonPositions };
+            }
+            const fallbackRow = page.buttons.map((button, index) => {
+                const id = String(button.id ?? '');
+                buttonPositions.set(id, index);
+                return id;
+            });
+            return { rows: 1, columns: fallbackRow.length, order: [fallbackRow], buttonPositions };
+        }
+        const order = [];
+        for (let rowIndex = 0; rowIndex < totalRows; rowIndex++) {
+            const sourceRow = page.grid[rowIndex] || [];
+            const orderRow = [];
+            for (let colIndex = 0; colIndex < totalColumns; colIndex++) {
+                const cell = sourceRow[colIndex] || null;
+                if (cell) {
+                    const id = String(cell.id ?? '');
+                    orderRow.push(id);
+                    buttonPositions.set(id, rowIndex * totalColumns + colIndex);
+                }
+                else {
+                    orderRow.push(null);
+                }
+            }
+            order.push(orderRow);
+        }
+        return { rows: totalRows, columns: totalColumns, order, buttonPositions };
+    }
+    createObfBoardFromPage(page, fallbackName) {
+        const { rows, columns, order, buttonPositions } = this.buildGridMetadata(page);
+        const boardName = page.name || fallbackName;
+        return {
+            format: OBF_FORMAT_VERSION,
+            id: page.id,
+            locale: page.locale || 'en',
+            name: boardName,
+            description_html: page.descriptionHtml || boardName,
+            grid: {
+                rows,
+                columns,
+                order,
+            },
+            buttons: page.buttons.map((button) => ({
+                id: button.id,
+                label: button.label,
+                vocalization: button.message || button.label,
+                load_board: button.semanticAction?.intent === treeStructure_1.AACSemanticIntent.NAVIGATE_TO && button.targetPageId
+                    ? {
+                        path: button.targetPageId,
+                    }
+                    : undefined,
+                background_color: button.style?.backgroundColor,
+                border_color: button.style?.borderColor,
+                box_id: buttonPositions.get(String(button.id ?? '')),
+            })),
+            images: Array.isArray(page.images) ? page.images : [],
+            sounds: Array.isArray(page.sounds) ? page.sounds : [],
+        };
+    }
     processTexts(filePathOrBuffer, translations, outputPath) {
         // Load the tree, apply translations, and save to new file
         const tree = this.loadIntoTree(filePathOrBuffer);
@@ -193,15 +291,24 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
         Object.values(tree.pages).forEach((page) => {
             // Translate page names
             if (page.name && translations.has(page.name)) {
-                page.name = translations.get(page.name);
+                const translatedName = translations.get(page.name);
+                if (translatedName !== undefined) {
+                    page.name = translatedName;
+                }
             }
             // Translate button labels and messages
             page.buttons.forEach((button) => {
                 if (button.label && translations.has(button.label)) {
-                    button.label = translations.get(button.label);
+                    const translatedLabel = translations.get(button.label);
+                    if (translatedLabel !== undefined) {
+                        button.label = translatedLabel;
+                    }
                 }
                 if (button.message && translations.has(button.message)) {
-                    button.message = translations.get(button.message);
+                    const translatedMessage = translations.get(button.message);
+                    if (translatedMessage !== undefined) {
+                        button.message = translatedMessage;
+                    }
                 }
             });
         });
@@ -216,44 +323,14 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
             if (!rootPage) {
                 throw new Error('No pages to save');
             }
-            const obfBoard = {
-                id: rootPage.id,
-                name: rootPage.name || 'Exported Board',
-                buttons: rootPage.buttons.map((button) => ({
-                    id: button.id,
-                    label: button.label,
-                    vocalization: button.message || button.label,
-                    load_board: button.semanticAction?.intent === treeStructure_1.AACSemanticIntent.NAVIGATE_TO && button.targetPageId
-                        ? {
-                            path: button.targetPageId,
-                        }
-                        : undefined,
-                    background_color: button.style?.backgroundColor,
-                    border_color: button.style?.borderColor,
-                })),
-            };
+            const obfBoard = this.createObfBoardFromPage(rootPage, 'Exported Board');
             fs_1.default.writeFileSync(outputPath, JSON.stringify(obfBoard, null, 2));
         }
         else {
             // Save as OBZ (zip with multiple OBF files)
             const zip = new adm_zip_1.default();
             Object.values(tree.pages).forEach((page) => {
-                const obfBoard = {
-                    id: page.id,
-                    name: page.name || 'Board',
-                    buttons: page.buttons.map((button) => ({
-                        id: button.id,
-                        label: button.label,
-                        vocalization: button.message || button.label,
-                        load_board: button.semanticAction?.intent === treeStructure_1.AACSemanticIntent.NAVIGATE_TO && button.targetPageId
-                            ? {
-                                path: button.targetPageId,
-                            }
-                            : undefined,
-                        background_color: button.style?.backgroundColor,
-                        border_color: button.style?.borderColor,
-                    })),
-                };
+                const obfBoard = this.createObfBoardFromPage(page, 'Board');
                 const obfContent = JSON.stringify(obfBoard, null, 2);
                 zip.addFile(`${page.id}.obf`, Buffer.from(obfContent, 'utf8'));
             });

package/dist/processors/opmlProcessor.js

@@ -173,7 +173,18 @@ class OpmlProcessor extends baseProcessor_1.BaseProcessor {
                 .filter((b) => b.semanticAction?.intent === treeStructure_1.AACSemanticIntent.NAVIGATE_TO &&
                 !!b.targetPageId &&
                 !!tree.pages[b.targetPageId])
-                .map((b) => buildOutline(tree.pages[b.targetPageId], new Set(visited))); // Pass copy of visited set
+                .map((b) => {
+                const targetId = b.targetPageId;
+                if (!targetId) {
+                    return null;
+                }
+                const targetPage = tree.pages[targetId];
+                if (!targetPage) {
+                    return null;
+                }
+                return buildOutline(targetPage, new Set(visited));
+            })
+                .filter((childOutline) => childOutline !== null);
             if (childOutlines.length)
                 outline.outline = childOutlines;
             return outline;
@@ -206,8 +217,7 @@ class OpmlProcessor extends baseProcessor_1.BaseProcessor {
             },
         };
         // Convert to XML
-        const { XMLBuilder } = require('fast-xml-parser');
-        const builder = new XMLBuilder({
+        const builder = new fast_xml_parser_1.XMLBuilder({
             ignoreAttributes: false,
             format: true,
             indentBy: '    ',

package/dist/processors/snapProcessor.js

@@ -185,7 +185,6 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
                     }
                     // Create semantic action for Snap button
                     let semanticAction;
-                    let legacyAction = null;
                     if (targetPageUniqueId) {
                         semanticAction = {
                             category: treeStructure_1.AACSemanticCategory.NAVIGATION,
@@ -202,10 +201,6 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
                                 targetPageId: targetPageUniqueId,
                             },
                         };
-                        legacyAction = {
-                            type: 'NAVIGATE',
-                            targetPageId: targetPageUniqueId,
-                        };
                     }
                     else {
                         semanticAction = {
@@ -283,15 +278,16 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
             return tree;
         }
         catch (error) {
+            const fileIdentifier = typeof filePathOrBuffer === 'string' ? filePathOrBuffer : '[buffer input]';
             // Provide more specific error messages
             if (error.code === 'SQLITE_NOTADB') {
                 throw new Error(`Invalid SQLite database file: ${typeof filePathOrBuffer === 'string' ? filePathOrBuffer : 'buffer'}`);
             }
             else if (error.code === 'ENOENT') {
-                throw new Error(`File not found: ${filePathOrBuffer}`);
+                throw new Error(`File not found: ${fileIdentifier}`);
             }
             else if (error.code === 'EACCES') {
-                throw new Error(`Permission denied accessing file: ${filePathOrBuffer}`);
+                throw new Error(`Permission denied accessing file: ${fileIdentifier}`);
             }
             else {
                 throw new Error(`Failed to load Snap file: ${error.message}`);
@@ -320,15 +316,24 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
         Object.values(tree.pages).forEach((page) => {
             // Translate page names
             if (page.name && translations.has(page.name)) {
-                page.name = translations.get(page.name);
+                const translatedName = translations.get(page.name);
+                if (translatedName !== undefined) {
+                    page.name = translatedName;
+                }
             }
             // Translate button labels and messages
             page.buttons.forEach((button) => {
                 if (button.label && translations.has(button.label)) {
-                    button.label = translations.get(button.label);
+                    const translatedLabel = translations.get(button.label);
+                    if (translatedLabel !== undefined) {
+                        button.label = translatedLabel;
+                    }
                 }
                 if (button.message && translations.has(button.message)) {
-                    button.message = translations.get(button.message);
+                    const translatedMessage = translations.get(button.message);
+                    if (translatedMessage !== undefined) {
+                        button.message = translatedMessage;
+                    }
                 }
             });
         });
@@ -419,6 +424,9 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
             // Second pass: create buttons with proper page references
             Object.values(tree.pages).forEach((page) => {
                 const numericPageId = pageIdMap.get(page.id);
+                if (numericPageId === undefined) {
+                    return;
+                }
                 page.buttons.forEach((button, index) => {
                     // Find button position in grid layout
                     let gridPosition = `${index % 4},${Math.floor(index / 4)}`; // Default fallback

package/dist/processors/touchchatProcessor.js

@@ -12,6 +12,9 @@ const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
+const toNumberOrUndefined = (value) => typeof value === 'number' ? value : undefined;
+const toStringOrUndefined = (value) => typeof value === 'string' && value.length > 0 ? value : undefined;
+const toBooleanOrUndefined = (value) => typeof value === 'number' ? value !== 0 : undefined;
 function intToHex(colorInt) {
     if (colorInt === null || typeof colorInt === 'undefined') {
         return undefined;
@@ -84,7 +87,9 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
             const buttonStyles = new Map();
             const pageStyles = new Map();
             try {
-                const buttonStyleRows = db.prepare('SELECT * FROM button_styles').all();
+                const buttonStyleRows = db
+                    .prepare('SELECT * FROM button_styles')
+                    .all();
                 buttonStyleRows.forEach((style) => {
                     buttonStyles.set(style.id, style);
                 });
@@ -162,15 +167,15 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                         style: {
                             backgroundColor: intToHex(style?.body_color),
                             borderColor: intToHex(style?.border_color),
-                            borderWidth: style?.border_width,
+                            borderWidth: toNumberOrUndefined(style?.border_width),
                             fontColor: intToHex(style?.font_color),
-                            fontSize: style?.font_height,
-                            fontFamily: style?.font_name,
-                            fontWeight: style?.font_bold ? 'bold' : 'normal',
-                            fontStyle: style?.font_italic ? 'italic' : 'normal',
-                            textUnderline: style?.font_underline,
-                            transparent: style?.transparent,
-                            labelOnTop: style?.label_on_top,
+                            fontSize: toNumberOrUndefined(style?.font_height),
+                            fontFamily: toStringOrUndefined(style?.font_name),
+                            fontWeight: style?.font_bold ? 'bold' : undefined,
+                            fontStyle: style?.font_italic ? 'italic' : undefined,
+                            textUnderline: toBooleanOrUndefined(style?.font_underline),
+                            transparent: toBooleanOrUndefined(style?.transparent),
+                            labelOnTop: toBooleanOrUndefined(style?.label_on_top),
                         },
                     });
                     buttonBoxes.get(cell.box_id)?.push({
@@ -276,15 +281,15 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                         style: {
                             backgroundColor: intToHex(style?.body_color),
                             borderColor: intToHex(style?.border_color),
-                            borderWidth: style?.border_width,
+                            borderWidth: toNumberOrUndefined(style?.border_width),
                             fontColor: intToHex(style?.font_color),
-                            fontSize: style?.font_height,
-                            fontFamily: style?.font_name,
-                            fontWeight: style?.font_bold ? 'bold' : 'normal',
-                            fontStyle: style?.font_italic ? 'italic' : 'normal',
-                            textUnderline: style?.font_underline,
-                            transparent: style?.transparent,
-                            labelOnTop: style?.label_on_top,
+                            fontSize: toNumberOrUndefined(style?.font_height),
+                            fontFamily: toStringOrUndefined(style?.font_name),
+                            fontWeight: style?.font_bold ? 'bold' : undefined,
+                            fontStyle: style?.font_italic ? 'italic' : undefined,
+                            textUnderline: toBooleanOrUndefined(style?.font_underline),
+                            transparent: toBooleanOrUndefined(style?.transparent),
+                            labelOnTop: toBooleanOrUndefined(style?.label_on_top),
                         },
                     });
                     // Find the page that references this resource
@@ -380,15 +385,24 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
         Object.values(tree.pages).forEach((page) => {
             // Translate page names
             if (page.name && translations.has(page.name)) {
-                page.name = translations.get(page.name);
+                const translatedName = translations.get(page.name);
+                if (translatedName !== undefined) {
+                    page.name = translatedName;
+                }
             }
             // Translate button labels and messages
             page.buttons.forEach((button) => {
                 if (button.label && translations.has(button.label)) {
-                    button.label = translations.get(button.label);
+                    const translatedLabel = translations.get(button.label);
+                    if (translatedLabel !== undefined) {
+                        button.label = translatedLabel;
+                    }
                 }
                 if (button.message && translations.has(button.message)) {
-                    button.message = translations.get(button.message);
+                    const translatedMessage = translations.get(button.message);
+                    if (translatedMessage !== undefined) {
+                        button.message = translatedMessage;
+                    }
                 }
             });
         });
@@ -560,7 +574,10 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                         insertPageStyle.run(pageStyleId, hexToInt(page.style.backgroundColor), page.style.backgroundColor ? 1 : 0);
                     }
                     else {
-                        pageStyleId = pageStyleMap.get(styleKey);
+                        const existingPageStyleId = pageStyleMap.get(styleKey);
+                        if (typeof existingPageStyleId === 'number') {
+                            pageStyleId = existingPageStyleId;
+                        }
                     }
                 }
                 // Insert resource for page name
@@ -577,6 +594,9 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
             // Second pass: create buttons and their relationships
             Object.values(tree.pages).forEach((page) => {
                 const numericPageId = pageIdMap.get(page.id);
+                if (numericPageId === undefined) {
+                    return;
+                }
                 if (page.buttons.length > 0) {
                     // Calculate grid dimensions from page.grid or use fallback
                     let gridWidth = 4; // Default fallback
@@ -631,7 +651,10 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                                 insertButtonStyle.run(buttonStyleId, button.style.labelOnTop ? 1 : 0, button.style.transparent ? 1 : 0, hexToInt(button.style.fontColor), hexToInt(button.style.backgroundColor), hexToInt(button.style.borderColor), button.style.borderWidth, button.style.fontFamily, button.style.fontWeight === 'bold' ? 1 : 0, button.style.textUnderline ? 1 : 0, button.style.fontStyle === 'italic' ? 1 : 0, button.style.fontSize);
                             }
                             else {
-                                buttonStyleId = buttonStyleMap.get(styleKey);
+                                const existingButtonStyleId = buttonStyleMap.get(styleKey);
+                                if (typeof existingButtonStyleId === 'number') {
+                                    buttonStyleId = existingButtonStyleId;
+                                }
                             }
                         }
                         if (!insertedButtonIds.has(numericButtonId)) {

package/dist/types/aac.d.ts

@@ -33,6 +33,10 @@ export interface AACPage {
     buttons: AACButton[];
     parentId: string | null;
     style?: AACStyle;
+    locale?: string;
+    descriptionHtml?: string;
+    images?: any[];
+    sounds?: any[];
 }
 export interface AACTree {
     pages: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willwade/aac-processors",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "A comprehensive TypeScript library for processing AAC (Augmentative and Alternative Communication) file formats with translation support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",