@willwade/aac-processors 0.1.14 → 0.1.16

package/dist/browser/processors/gridsetProcessor.js

@@ -513,6 +513,29 @@ class GridsetProcessor extends BaseProcessor {
         if (gridEntries.length > 0) {
             console.log('[Gridset] First few grid entries:', gridEntries.slice(0, 3).map((e) => e.entryName));
         }
+        // Pre-load all image data for conversion to other formats (e.g., Snap)
+        const imageDataCache = new Map();
+        const imageEntries = entries.filter((e) => {
+            const name = e.entryName.toLowerCase();
+            return (name.endsWith('.png') ||
+                name.endsWith('.jpg') ||
+                name.endsWith('.jpeg') ||
+                name.endsWith('.gif') ||
+                name.endsWith('.svg'));
+        });
+        for (const imageEntry of imageEntries) {
+            try {
+                const raw = await imageEntry.getData();
+                const data = isEncryptedArchive
+                    ? decryptGridsetEntry(Buffer.from(raw), encryptedContentPassword)
+                    : Buffer.from(raw);
+                const normalizedEntry = imageEntry.entryName.replace(/\\/g, '/');
+                imageDataCache.set(normalizedEntry, data);
+            }
+            catch (err) {
+                // Silently fail - individual image loading failures shouldn't break the entire load
+            }
+        }
         // First pass: collect all grid names and IDs for navigation resolution
         const gridNameToIdMap = new Map();
         const gridIdToNameMap = new Map();
@@ -943,6 +966,10 @@ class GridsetProcessor extends BaseProcessor {
                         else if (declaredImageName && !resolvedImageEntry) {
                             console.log(`[GridsetProcessor] Cell (${cellX + 1},${cellY + 1}) [XML coords]: ${declaredImageName} -> NOT FOUND`);
                         }
+                        // Load binary image data from cache for conversion to other formats (e.g., Snap)
+                        const imageData = resolvedImageEntry
+                            ? imageDataCache.get(resolvedImageEntry)
+                            : undefined;
                         // Check if image is a symbol library reference
                         let symbolLibraryRef = null;
                         if (declaredImageName && isSymbolLibraryReference(declaredImageName)) {
@@ -1498,6 +1525,8 @@ class GridsetProcessor extends BaseProcessor {
                                     !isMoreButton
                                     ? wordListCellIndex - 1
                                     : undefined,
+                                // Store binary image data for conversion to other formats
+                                ...(imageData ? { imageData, image_id: resolvedImageEntry } : {}),
                             },
                         });
                         // Add button to page

package/dist/browser/processors/snap/helpers.js

@@ -1,4 +1,4 @@
-import { AACSemanticCategory, AACSemanticIntent } from '../../core/treeStructure';
+import { AACSemanticCategory, AACSemanticIntent, } from '../../core/treeStructure';
 import * as fs from 'fs';
 import * as path from 'path';
 import Database from 'better-sqlite3';
@@ -51,17 +51,83 @@ export function getPageTokenImageMap(tree, pageId) {
 }
 /**
  * Collect all image entry paths referenced in a Snap tree.
- * Currently empty until resolvedImageEntry is populated by the processor.
+ * Returns the set of symbol identifiers (e.g., "SYM:12345") that are referenced by buttons.
  */
-export function getAllowedImageEntries(_tree) {
-    return new Set();
+export function getAllowedImageEntries(tree) {
+    const out = new Set();
+    Object.values(tree.pages).forEach((page) => {
+        page.buttons.forEach((btn) => {
+            // Extract image_id from parameters if it exists
+            if (btn.parameters?.image_id && typeof btn.parameters.image_id === 'string') {
+                out.add(btn.parameters.image_id);
+            }
+            // Also add resolvedImageEntry if it's a symbol identifier
+            if (btn.resolvedImageEntry && typeof btn.resolvedImageEntry === 'string') {
+                const entry = btn.resolvedImageEntry;
+                if (entry.startsWith('SYM:')) {
+                    out.add(entry);
+                }
+            }
+        });
+    });
+    return out;
 }
 /**
  * Read a binary asset from a Snap pageset.
- * Not implemented yet; provided for API symmetry with other processors.
+ * @param dbOrFile Path to Snap .sps/.spb file or Buffer containing the file data
+ * @param entryPath Symbol identifier (e.g., "SYM:12345")
+ * @returns Image data buffer or null if not found
  */
-export function openImage(_dbOrFile, _entryPath) {
-    return null;
+export function openImage(dbOrFile, entryPath) {
+    let dbPath;
+    let cleanupNeeded = false;
+    // Handle Buffer input by writing to temp file
+    if (Buffer.isBuffer(dbOrFile)) {
+        if (typeof fs.mkdtempSync !== 'function') {
+            return null; // Not in Node environment
+        }
+        const tempDir = fs.mkdtempSync(path.join(process.cwd(), 'snap-'));
+        dbPath = path.join(tempDir, 'temp.sps');
+        fs.writeFileSync(dbPath, dbOrFile);
+        cleanupNeeded = true;
+    }
+    else if (typeof dbOrFile === 'string') {
+        dbPath = dbOrFile;
+    }
+    else {
+        return null;
+    }
+    let db = null;
+    try {
+        db = new Database(dbPath, { readonly: true });
+        // Query PageSetData for the symbol
+        const row = db
+            .prepare('SELECT Id, Identifier, Data FROM PageSetData WHERE Identifier = ?')
+            .get(entryPath);
+        if (row && row.Data && row.Data.length > 0) {
+            return row.Data;
+        }
+        return null;
+    }
+    catch (error) {
+        console.warn(`[Snap helpers] Failed to open image ${entryPath}:`, error);
+        return null;
+    }
+    finally {
+        if (db) {
+            db.close();
+        }
+        if (cleanupNeeded && dbPath) {
+            try {
+                fs.unlinkSync(dbPath);
+                const dir = path.dirname(dbPath);
+                fs.rmdirSync(dir);
+            }
+            catch (e) {
+                // Ignore cleanup errors
+            }
+        }
+    }
 }
 /**
  * Find Tobii Communicator Snap package paths

package/dist/browser/processors/snapProcessor.js

@@ -15,6 +15,41 @@ function mapSnapVisibility(visible) {
     }
     return visible === 0 ? 'Hidden' : 'Visible';
 }
+/**
+ * Detect image MIME type from binary data using magic bytes
+ * @param buffer Image data buffer
+ * @returns MIME type string (defaults to 'image/png' if unknown)
+ */
+function detectImageMimeType(buffer) {
+    if (!buffer || buffer.length < 8) {
+        return 'image/png';
+    }
+    // Check for PNG: 89 50 4E 47 0D 0A 1A 0A
+    if (buffer[0] === 0x89 && buffer[1] === 0x50 && buffer[2] === 0x4e && buffer[3] === 0x47) {
+        return 'image/png';
+    }
+    // Check for JPEG: FF D8 FF
+    if (buffer[0] === 0xff && buffer[1] === 0xd8 && buffer[2] === 0xff) {
+        return 'image/jpeg';
+    }
+    // Check for GIF: 47 49 46 38 (GIF8)
+    if (buffer[0] === 0x47 && buffer[1] === 0x49 && buffer[2] === 0x46 && buffer[3] === 0x38) {
+        return 'image/gif';
+    }
+    // Check for WebP: 52 49 46 46 ... 57 45 42 50 (RIFF...WEBP)
+    if (buffer[0] === 0x52 &&
+        buffer[1] === 0x49 &&
+        buffer[2] === 0x46 &&
+        buffer[3] === 0x46 &&
+        buffer[8] === 0x57 &&
+        buffer[9] === 0x45 &&
+        buffer[10] === 0x42 &&
+        buffer[11] === 0x50) {
+        return 'image/webp';
+    }
+    // Default to PNG
+    return 'image/png';
+}
 class SnapProcessor extends BaseProcessor {
     constructor(symbolResolver = null, options = {}) {
         super(options);
@@ -417,6 +452,30 @@ class SnapProcessor extends BaseProcessor {
                             console.warn(`[SnapProcessor] Failed to load audio for button ${btnRow.Id}:`, e);
                         }
                     }
+                    // Load symbol image if available
+                    // Note: PageSetImageId references embedded images in PageSetData table
+                    // LibrarySymbolId references external symbol libraries (SymbolStix, etc.)
+                    let buttonImage;
+                    const buttonParameters = {};
+                    if (btnRow.PageSetImageId && btnRow.PageSetImageId > 0) {
+                        try {
+                            const imageData = db
+                                .prepare(`
+                  SELECT Id, Identifier, Data FROM PageSetData WHERE Id = ?
+                `)
+                                .get(btnRow.PageSetImageId);
+                            if (imageData && imageData.Data && imageData.Data.length > 0) {
+                                const mimeType = detectImageMimeType(imageData.Data);
+                                const base64 = imageData.Data.toString('base64');
+                                buttonImage = `data:${mimeType};base64,${base64}`;
+                                buttonParameters.image_id = imageData.Identifier;
+                                buttonParameters.imageData = imageData.Data;
+                            }
+                        }
+                        catch (e) {
+                            console.warn(`[SnapProcessor] Failed to load image for button ${btnRow.Id} (PageSetImageId: ${btnRow.PageSetImageId}):`, e);
+                        }
+                    }
                     // Create semantic action for Snap button
                     let semanticAction;
                     if (targetPageUniqueId) {
@@ -465,6 +524,9 @@ class SnapProcessor extends BaseProcessor {
                         semantic_id: btnRow.LibrarySymbolId
                             ? `snap_symbol_${btnRow.LibrarySymbolId}`
                             : undefined, // Extract semantic_id from LibrarySymbolId
+                        image: buttonImage,
+                        resolvedImageEntry: buttonImage,
+                        parameters: Object.keys(buttonParameters).length > 0 ? buttonParameters : undefined,
                         style: {
                             backgroundColor: btnRow.BackgroundColor
                                 ? `#${btnRow.BackgroundColor.toString(16)}`
@@ -855,11 +917,54 @@ class SnapProcessor extends BaseProcessor {
                         serializedMetadata = audio.metadata || null;
                         useMessageRecording = 1;
                     }
+                    // Handle image data from button.parameters.imageData or button.image (data URL)
+                    let pageSetImageId = null;
+                    if (button.parameters?.imageData && Buffer.isBuffer(button.parameters.imageData)) {
+                        // Use existing image data buffer
+                        const imageIdentifier = button.parameters.image_id || `IMG_${buttonIdCounter}`;
+                        let imageId = pageSetDataIdentifierMap.get(imageIdentifier);
+                        if (!imageId) {
+                            imageId = pageSetDataIdCounter++;
+                            insertPageSetData.run(imageId, imageIdentifier, button.parameters.imageData, 1);
+                            pageSetDataIdentifierMap.set(imageIdentifier, imageId);
+                        }
+                        else {
+                            incrementRefCount.run(imageId);
+                        }
+                        pageSetImageId = imageId;
+                    }
+                    else if (button.image &&
+                        typeof button.image === 'string' &&
+                        button.image.startsWith('data:image')) {
+                        // Convert data URL to buffer
+                        try {
+                            const matches = button.image.match(/^data:image\/(\w+);base64,(.+)$/);
+                            if (matches && matches[2]) {
+                                const imageData = Buffer.from(matches[2], 'base64');
+                                const imageIdentifier = button.parameters?.image_id || `IMG_${buttonIdCounter}`;
+                                let imageId = pageSetDataIdentifierMap.get(imageIdentifier);
+                                if (!imageId) {
+                                    imageId = pageSetDataIdCounter++;
+                                    insertPageSetData.run(imageId, imageIdentifier, imageData, 1);
+                                    pageSetDataIdentifierMap.set(imageIdentifier, imageId);
+                                }
+                                else {
+                                    incrementRefCount.run(imageId);
+                                }
+                                pageSetImageId = imageId;
+                            }
+                        }
+                        catch (err) {
+                            console.warn(`[SnapProcessor] Failed to convert data URL to Buffer for button ${button.id}:`, err);
+                        }
+                    }
                     // Retry logic for SQLite operations
                     let retries = 3;
                     while (retries > 0) {
                         try {
-                            insertButton.run(buttonIdCounter++, button.label || '', button.message || button.label || '', navigatePageId, elementRefId, null, null, messageRecordingId, serializedMetadata, useMessageRecording, button.style?.fontColor
+                            insertButton.run(buttonIdCounter++, button.label || '', button.message || button.label || '', navigatePageId, elementRefId, null, // LibrarySymbolId - not used for embedded images
+                            pageSetImageId, // PageSetImageId - references embedded image in PageSetData
+                            messageRecordingId, serializedMetadata, useMessageRecording, button.style?.fontColor
                                 ? parseInt(button.style.fontColor.replace('#', ''), 16)
                                 : null, button.style?.backgroundColor
                                 ? parseInt(button.style.backgroundColor.replace('#', ''), 16)

package/dist/browser/validation/touchChatValidator.js

@@ -65,7 +65,8 @@ export class TouchChatValidator extends BaseValidator {
                 this.warn('filename should end with .ce');
             }
         });
-        const zipped = await this.tryValidateZipSqlite(content);
+        const looksLikeXml = this.isXmlBuffer(content);
+        const zipped = looksLikeXml ? false : await this.tryValidateZipSqlite(content);
         if (!zipped) {
             let xmlObj = null;
             await this.add_check('xml_parse', 'valid XML', async () => {
@@ -228,6 +229,23 @@ export class TouchChatValidator extends BaseValidator {
         }
         return true;
     }
+    isXmlBuffer(content) {
+        const bytes = content instanceof Uint8Array ? content : new Uint8Array(content);
+        const max = Math.min(bytes.length, 256);
+        let start = 0;
+        while (start < max) {
+            const ch = bytes[start];
+            if (ch === 0x20 || ch === 0x0a || ch === 0x0d || ch === 0x09) {
+                start += 1;
+                continue;
+            }
+            break;
+        }
+        if (start >= max) {
+            return false;
+        }
+        return bytes[start] === 0x3c; // '<'
+    }
     async tryValidateZipSqlite(content) {
         let usedZip = false;
         await this.add_check('zip', 'TouchChat ZIP package', async () => {

package/dist/processors/gridsetProcessor.js

@@ -539,6 +539,29 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
         if (gridEntries.length > 0) {
             console.log('[Gridset] First few grid entries:', gridEntries.slice(0, 3).map((e) => e.entryName));
         }
+        // Pre-load all image data for conversion to other formats (e.g., Snap)
+        const imageDataCache = new Map();
+        const imageEntries = entries.filter((e) => {
+            const name = e.entryName.toLowerCase();
+            return (name.endsWith('.png') ||
+                name.endsWith('.jpg') ||
+                name.endsWith('.jpeg') ||
+                name.endsWith('.gif') ||
+                name.endsWith('.svg'));
+        });
+        for (const imageEntry of imageEntries) {
+            try {
+                const raw = await imageEntry.getData();
+                const data = isEncryptedArchive
+                    ? (0, crypto_1.decryptGridsetEntry)(Buffer.from(raw), encryptedContentPassword)
+                    : Buffer.from(raw);
+                const normalizedEntry = imageEntry.entryName.replace(/\\/g, '/');
+                imageDataCache.set(normalizedEntry, data);
+            }
+            catch (err) {
+                // Silently fail - individual image loading failures shouldn't break the entire load
+            }
+        }
         // First pass: collect all grid names and IDs for navigation resolution
         const gridNameToIdMap = new Map();
         const gridIdToNameMap = new Map();
@@ -969,6 +992,10 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                         else if (declaredImageName && !resolvedImageEntry) {
                             console.log(`[GridsetProcessor] Cell (${cellX + 1},${cellY + 1}) [XML coords]: ${declaredImageName} -> NOT FOUND`);
                         }
+                        // Load binary image data from cache for conversion to other formats (e.g., Snap)
+                        const imageData = resolvedImageEntry
+                            ? imageDataCache.get(resolvedImageEntry)
+                            : undefined;
                         // Check if image is a symbol library reference
                         let symbolLibraryRef = null;
                         if (declaredImageName && (0, resolver_2.isSymbolLibraryReference)(declaredImageName)) {
@@ -1524,6 +1551,8 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                                     !isMoreButton
                                     ? wordListCellIndex - 1
                                     : undefined,
+                                // Store binary image data for conversion to other formats
+                                ...(imageData ? { imageData, image_id: resolvedImageEntry } : {}),
                             },
                         });
                         // Add button to page

package/dist/processors/snap/helpers.d.ts

@@ -1,4 +1,5 @@
 import { AACTree, AACSemanticCategory, AACSemanticIntent } from '../../core/treeStructure';
+import { ProcessorInput } from '../../utils/io';
 /**
  * Build a map of button IDs to resolved image entries for a specific page.
  * Mirrors the Grid helper for consumers that expect image reference data.
@@ -6,14 +7,16 @@ import { AACTree, AACSemanticCategory, AACSemanticIntent } from '../../core/tree
 export declare function getPageTokenImageMap(tree: AACTree, pageId: string): Map<string, string>;
 /**
  * Collect all image entry paths referenced in a Snap tree.
- * Currently empty until resolvedImageEntry is populated by the processor.
+ * Returns the set of symbol identifiers (e.g., "SYM:12345") that are referenced by buttons.
  */
-export declare function getAllowedImageEntries(_tree: AACTree): Set<string>;
+export declare function getAllowedImageEntries(tree: AACTree): Set<string>;
 /**
  * Read a binary asset from a Snap pageset.
- * Not implemented yet; provided for API symmetry with other processors.
+ * @param dbOrFile Path to Snap .sps/.spb file or Buffer containing the file data
+ * @param entryPath Symbol identifier (e.g., "SYM:12345")
+ * @returns Image data buffer or null if not found
  */
-export declare function openImage(_dbOrFile: string | Buffer, _entryPath: string): Buffer | null;
+export declare function openImage(dbOrFile: ProcessorInput, entryPath: string): Buffer | null;
 /**
  * Snap package path information
  */

package/dist/processors/snap/helpers.js

@@ -90,17 +90,83 @@ function getPageTokenImageMap(tree, pageId) {
 }
 /**
  * Collect all image entry paths referenced in a Snap tree.
- * Currently empty until resolvedImageEntry is populated by the processor.
+ * Returns the set of symbol identifiers (e.g., "SYM:12345") that are referenced by buttons.
  */
-function getAllowedImageEntries(_tree) {
-    return new Set();
+function getAllowedImageEntries(tree) {
+    const out = new Set();
+    Object.values(tree.pages).forEach((page) => {
+        page.buttons.forEach((btn) => {
+            // Extract image_id from parameters if it exists
+            if (btn.parameters?.image_id && typeof btn.parameters.image_id === 'string') {
+                out.add(btn.parameters.image_id);
+            }
+            // Also add resolvedImageEntry if it's a symbol identifier
+            if (btn.resolvedImageEntry && typeof btn.resolvedImageEntry === 'string') {
+                const entry = btn.resolvedImageEntry;
+                if (entry.startsWith('SYM:')) {
+                    out.add(entry);
+                }
+            }
+        });
+    });
+    return out;
 }
 /**
  * Read a binary asset from a Snap pageset.
- * Not implemented yet; provided for API symmetry with other processors.
+ * @param dbOrFile Path to Snap .sps/.spb file or Buffer containing the file data
+ * @param entryPath Symbol identifier (e.g., "SYM:12345")
+ * @returns Image data buffer or null if not found
  */
-function openImage(_dbOrFile, _entryPath) {
-    return null;
+function openImage(dbOrFile, entryPath) {
+    let dbPath;
+    let cleanupNeeded = false;
+    // Handle Buffer input by writing to temp file
+    if (Buffer.isBuffer(dbOrFile)) {
+        if (typeof fs.mkdtempSync !== 'function') {
+            return null; // Not in Node environment
+        }
+        const tempDir = fs.mkdtempSync(path.join(process.cwd(), 'snap-'));
+        dbPath = path.join(tempDir, 'temp.sps');
+        fs.writeFileSync(dbPath, dbOrFile);
+        cleanupNeeded = true;
+    }
+    else if (typeof dbOrFile === 'string') {
+        dbPath = dbOrFile;
+    }
+    else {
+        return null;
+    }
+    let db = null;
+    try {
+        db = new better_sqlite3_1.default(dbPath, { readonly: true });
+        // Query PageSetData for the symbol
+        const row = db
+            .prepare('SELECT Id, Identifier, Data FROM PageSetData WHERE Identifier = ?')
+            .get(entryPath);
+        if (row && row.Data && row.Data.length > 0) {
+            return row.Data;
+        }
+        return null;
+    }
+    catch (error) {
+        console.warn(`[Snap helpers] Failed to open image ${entryPath}:`, error);
+        return null;
+    }
+    finally {
+        if (db) {
+            db.close();
+        }
+        if (cleanupNeeded && dbPath) {
+            try {
+                fs.unlinkSync(dbPath);
+                const dir = path.dirname(dbPath);
+                fs.rmdirSync(dir);
+            }
+            catch (e) {
+                // Ignore cleanup errors
+            }
+        }
+    }
 }
 /**
  * Find Tobii Communicator Snap package paths

package/dist/processors/snapProcessor.js

@@ -18,6 +18,41 @@ function mapSnapVisibility(visible) {
     }
     return visible === 0 ? 'Hidden' : 'Visible';
 }
+/**
+ * Detect image MIME type from binary data using magic bytes
+ * @param buffer Image data buffer
+ * @returns MIME type string (defaults to 'image/png' if unknown)
+ */
+function detectImageMimeType(buffer) {
+    if (!buffer || buffer.length < 8) {
+        return 'image/png';
+    }
+    // Check for PNG: 89 50 4E 47 0D 0A 1A 0A
+    if (buffer[0] === 0x89 && buffer[1] === 0x50 && buffer[2] === 0x4e && buffer[3] === 0x47) {
+        return 'image/png';
+    }
+    // Check for JPEG: FF D8 FF
+    if (buffer[0] === 0xff && buffer[1] === 0xd8 && buffer[2] === 0xff) {
+        return 'image/jpeg';
+    }
+    // Check for GIF: 47 49 46 38 (GIF8)
+    if (buffer[0] === 0x47 && buffer[1] === 0x49 && buffer[2] === 0x46 && buffer[3] === 0x38) {
+        return 'image/gif';
+    }
+    // Check for WebP: 52 49 46 46 ... 57 45 42 50 (RIFF...WEBP)
+    if (buffer[0] === 0x52 &&
+        buffer[1] === 0x49 &&
+        buffer[2] === 0x46 &&
+        buffer[3] === 0x46 &&
+        buffer[8] === 0x57 &&
+        buffer[9] === 0x45 &&
+        buffer[10] === 0x42 &&
+        buffer[11] === 0x50) {
+        return 'image/webp';
+    }
+    // Default to PNG
+    return 'image/png';
+}
 class SnapProcessor extends baseProcessor_1.BaseProcessor {
     constructor(symbolResolver = null, options = {}) {
         super(options);
@@ -420,6 +455,30 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
                             console.warn(`[SnapProcessor] Failed to load audio for button ${btnRow.Id}:`, e);
                         }
                     }
+                    // Load symbol image if available
+                    // Note: PageSetImageId references embedded images in PageSetData table
+                    // LibrarySymbolId references external symbol libraries (SymbolStix, etc.)
+                    let buttonImage;
+                    const buttonParameters = {};
+                    if (btnRow.PageSetImageId && btnRow.PageSetImageId > 0) {
+                        try {
+                            const imageData = db
+                                .prepare(`
+                  SELECT Id, Identifier, Data FROM PageSetData WHERE Id = ?
+                `)
+                                .get(btnRow.PageSetImageId);
+                            if (imageData && imageData.Data && imageData.Data.length > 0) {
+                                const mimeType = detectImageMimeType(imageData.Data);
+                                const base64 = imageData.Data.toString('base64');
+                                buttonImage = `data:${mimeType};base64,${base64}`;
+                                buttonParameters.image_id = imageData.Identifier;
+                                buttonParameters.imageData = imageData.Data;
+                            }
+                        }
+                        catch (e) {
+                            console.warn(`[SnapProcessor] Failed to load image for button ${btnRow.Id} (PageSetImageId: ${btnRow.PageSetImageId}):`, e);
+                        }
+                    }
                     // Create semantic action for Snap button
                     let semanticAction;
                     if (targetPageUniqueId) {
@@ -468,6 +527,9 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
                         semantic_id: btnRow.LibrarySymbolId
                             ? `snap_symbol_${btnRow.LibrarySymbolId}`
                             : undefined, // Extract semantic_id from LibrarySymbolId
+                        image: buttonImage,
+                        resolvedImageEntry: buttonImage,
+                        parameters: Object.keys(buttonParameters).length > 0 ? buttonParameters : undefined,
                         style: {
                             backgroundColor: btnRow.BackgroundColor
                                 ? `#${btnRow.BackgroundColor.toString(16)}`
@@ -858,11 +920,54 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
                         serializedMetadata = audio.metadata || null;
                         useMessageRecording = 1;
                     }
+                    // Handle image data from button.parameters.imageData or button.image (data URL)
+                    let pageSetImageId = null;
+                    if (button.parameters?.imageData && Buffer.isBuffer(button.parameters.imageData)) {
+                        // Use existing image data buffer
+                        const imageIdentifier = button.parameters.image_id || `IMG_${buttonIdCounter}`;
+                        let imageId = pageSetDataIdentifierMap.get(imageIdentifier);
+                        if (!imageId) {
+                            imageId = pageSetDataIdCounter++;
+                            insertPageSetData.run(imageId, imageIdentifier, button.parameters.imageData, 1);
+                            pageSetDataIdentifierMap.set(imageIdentifier, imageId);
+                        }
+                        else {
+                            incrementRefCount.run(imageId);
+                        }
+                        pageSetImageId = imageId;
+                    }
+                    else if (button.image &&
+                        typeof button.image === 'string' &&
+                        button.image.startsWith('data:image')) {
+                        // Convert data URL to buffer
+                        try {
+                            const matches = button.image.match(/^data:image\/(\w+);base64,(.+)$/);
+                            if (matches && matches[2]) {
+                                const imageData = Buffer.from(matches[2], 'base64');
+                                const imageIdentifier = button.parameters?.image_id || `IMG_${buttonIdCounter}`;
+                                let imageId = pageSetDataIdentifierMap.get(imageIdentifier);
+                                if (!imageId) {
+                                    imageId = pageSetDataIdCounter++;
+                                    insertPageSetData.run(imageId, imageIdentifier, imageData, 1);
+                                    pageSetDataIdentifierMap.set(imageIdentifier, imageId);
+                                }
+                                else {
+                                    incrementRefCount.run(imageId);
+                                }
+                                pageSetImageId = imageId;
+                            }
+                        }
+                        catch (err) {
+                            console.warn(`[SnapProcessor] Failed to convert data URL to Buffer for button ${button.id}:`, err);
+                        }
+                    }
                     // Retry logic for SQLite operations
                     let retries = 3;
                     while (retries > 0) {
                         try {
-                            insertButton.run(buttonIdCounter++, button.label || '', button.message || button.label || '', navigatePageId, elementRefId, null, null, messageRecordingId, serializedMetadata, useMessageRecording, button.style?.fontColor
+                            insertButton.run(buttonIdCounter++, button.label || '', button.message || button.label || '', navigatePageId, elementRefId, null, // LibrarySymbolId - not used for embedded images
+                            pageSetImageId, // PageSetImageId - references embedded image in PageSetData
+                            messageRecordingId, serializedMetadata, useMessageRecording, button.style?.fontColor
                                 ? parseInt(button.style.fontColor.replace('#', ''), 16)
                                 : null, button.style?.backgroundColor
                                 ? parseInt(button.style.backgroundColor.replace('#', ''), 16)

package/dist/validation/touchChatValidator.d.ts

@@ -32,6 +32,7 @@ export declare class TouchChatValidator extends BaseValidator {
      */
     private validateButton;
     private isSQLiteBuffer;
+    private isXmlBuffer;
     private tryValidateZipSqlite;
     private validateSqliteStructure;
 }

package/dist/validation/touchChatValidator.js

@@ -91,7 +91,8 @@ class TouchChatValidator extends baseValidator_1.BaseValidator {
                 this.warn('filename should end with .ce');
             }
         });
-        const zipped = await this.tryValidateZipSqlite(content);
+        const looksLikeXml = this.isXmlBuffer(content);
+        const zipped = looksLikeXml ? false : await this.tryValidateZipSqlite(content);
         if (!zipped) {
             let xmlObj = null;
             await this.add_check('xml_parse', 'valid XML', async () => {
@@ -254,6 +255,23 @@ class TouchChatValidator extends baseValidator_1.BaseValidator {
         }
         return true;
     }
+    isXmlBuffer(content) {
+        const bytes = content instanceof Uint8Array ? content : new Uint8Array(content);
+        const max = Math.min(bytes.length, 256);
+        let start = 0;
+        while (start < max) {
+            const ch = bytes[start];
+            if (ch === 0x20 || ch === 0x0a || ch === 0x0d || ch === 0x09) {
+                start += 1;
+                continue;
+            }
+            break;
+        }
+        if (start >= max) {
+            return false;
+        }
+        return bytes[start] === 0x3c; // '<'
+    }
     async tryValidateZipSqlite(content) {
         let usedZip = false;
         await this.add_check('zip', 'TouchChat ZIP package', async () => {

package/package.json

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