@willwade/aac-processors 0.0.21 → 0.0.23

package/dist/processors/snapProcessor.js

@@ -104,7 +104,8 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
                     // Set toolbarId if there's a global toolbar
                     if (hasGlobalToolbar) {
                         tree.toolbarId = toolbarId || null;
-                        tree.rootId = toolbarId || defaultHomePageId || null;
+                        // Use defaultHomePageId as root (the content pageset), not the toolbar
+                        tree.rootId = defaultHomePageId || null;
                     }
                     else if (defaultHomePageId) {
                         tree.rootId = defaultHomePageId;
@@ -114,14 +115,7 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
             catch (e) {
                 console.warn('[SnapProcessor] Failed to load PageSetProperties:', e);
             }
-            // If still no root, look for a page titled "Tool Bar" or similar
-            if (!tree.rootId || tree.rootId === defaultHomePageId) {
-                const toolbarPage = pages.find((p) => p.Title === 'Tool Bar' || p.Name === 'Tool Bar');
-                if (toolbarPage) {
-                    tree.rootId = String(toolbarPage.UniqueId || toolbarPage.Id);
-                }
-            }
-            // If still no root, fallback to first page
+            // If still no root, fallback to first page (but don't override a valid defaultHomePageId)
             if (!tree.rootId && pages.length > 0) {
                 tree.rootId = String(pages[0].UniqueId || pages[0].Id);
             }
@@ -144,6 +138,22 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
                 });
                 tree.addPage(page);
             });
+            // Try to find toolbar page even if not set in PageSetProperties
+            // Some SNAP files have a toolbar page but don't set ToolBarUniqueId
+            // This must be done AFTER pages are added to the tree
+            if (!tree.toolbarId || tree.toolbarId === '00000000-0000-0000-0000-000000000000') {
+                const toolbarPage = Object.values(tree.pages).find((p) => {
+                    const name = (p.name || '').toLowerCase();
+                    return name === 'tool bar' || name === 'toolbar';
+                });
+                if (toolbarPage) {
+                    tree.toolbarId = toolbarPage.id;
+                    // Update metadata to reflect toolbar detection
+                    if (tree.metadata) {
+                        tree.metadata.hasGlobalToolbar = true;
+                    }
+                }
+            }
             const scanGroupsByPageLayout = new Map();
             try {
                 const scanGroupRows = db

package/dist/processors/touchchatProcessor.js

@@ -159,7 +159,7 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
             });
             // Load button boxes and their cells
             const buttonBoxQuery = `
-        SELECT bbc.*, b.*, bb.id as box_id
+        SELECT bbc.*, b.*, bb.id as box_id, bb.layout_x, bb.layout_y
         FROM button_box_cells bbc
         JOIN buttons b ON b.resource_id = bbc.resource_id
         JOIN button_boxes bb ON bb.id = bbc.button_box_id
@@ -168,8 +168,14 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                 const buttonBoxCells = db.prepare(buttonBoxQuery).all();
                 const buttonBoxes = new Map();
                 buttonBoxCells.forEach((cell) => {
-                    if (!buttonBoxes.has(cell.box_id)) {
-                        buttonBoxes.set(cell.box_id, []);
+                    let boxData = buttonBoxes.get(cell.box_id);
+                    if (!boxData) {
+                        boxData = {
+                            layoutX: cell.layout_x || 10,
+                            layoutY: cell.layout_y || 6,
+                            buttons: [],
+                        };
+                        buttonBoxes.set(cell.box_id, boxData);
                     }
                     const style = buttonStyles.get(cell.button_style_id);
                     // Create semantic action for TouchChat button
@@ -213,7 +219,7 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                             labelOnTop: toBooleanOrUndefined(style?.label_on_top),
                         },
                     });
-                    buttonBoxes.get(cell.box_id)?.push({
+                    boxData.buttons.push({
                         button,
                         location: cell.location || 0,
                         spanX: cell.span_x || 1,
@@ -228,8 +234,8 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                     // Use mapped string ID if available, otherwise use numeric ID as string
                     const pageId = numericToRid.get(instance.page_id) || String(instance.page_id);
                     const page = tree.getPage(pageId);
-                    const buttons = buttonBoxes.get(instance.button_box_id);
-                    if (page && buttons) {
+                    const boxData = buttonBoxes.get(instance.button_box_id);
+                    if (page && boxData) {
                         // Initialize page grid if not exists (assume max 10x10 grid)
                         if (!pageGrids.has(pageId)) {
                             const grid = [];
@@ -243,15 +249,13 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                             return;
                         const boxX = Number(instance.position_x) || 0;
                         const boxY = Number(instance.position_y) || 0;
-                        const boxWidth = Number(instance.size_x) || 1;
+                        const boxWidth = boxData.layoutX; // Use layout_x from button_boxes, not size_x from instance
                         // boxHeight not currently used but kept for future span calculations
-                        // const boxHeight = Number(instance.size_y) || 1;
-                        buttons.forEach(({ button, location, spanX, spanY }) => {
+                        // const boxHeight = boxData.layoutY;
+                        boxData.buttons.forEach(({ button, location, spanX, spanY }) => {
                             const safeLocation = Number(location) || 0;
                             const safeSpanX = Number(spanX) || 1;
                             const safeSpanY = Number(spanY) || 1;
-                            // Add button to page
-                            page.addButton(button);
                             // Calculate button position within the button box
                             // location is a linear index, convert to grid coordinates
                             const buttonX = safeLocation % boxWidth;
@@ -259,6 +263,11 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                             // Calculate absolute position on page
                             const absoluteX = boxX + buttonX;
                             const absoluteY = boxY + buttonY;
+                            // Set button's x and y coordinates
+                            button.x = absoluteX;
+                            button.y = absoluteY;
+                            // Add button to page
+                            page.addButton(button);
                             // Place button in grid (handle span)
                             for (let r = absoluteY; r < absoluteY + safeSpanY && r < 10; r++) {
                                 for (let c = absoluteX; c < absoluteX + safeSpanX && c < 10; c++) {
@@ -412,21 +421,49 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
             catch (e) {
                 // console.log('No navigation actions found:', e);
             }
-            // Try to load root ID from metadata, fallback to first page
+            // Try to load root ID from multiple sources in order of priority
             try {
-                const metadataQuery = "SELECT value FROM tree_metadata WHERE key = 'rootId'";
-                const rootIdRow = db.prepare(metadataQuery).get();
-                if (rootIdRow && tree.getPage(rootIdRow.value)) {
-                    tree.rootId = rootIdRow.value;
+                // First, try to get HOME page from special_pages table (TouchChat specific)
+                const specialPagesQuery = "SELECT page_id FROM special_pages WHERE name = 'HOME'";
+                const homePageRow = db.prepare(specialPagesQuery).get();
+                if (homePageRow) {
+                    // The page_id is the page's id (not resource_id), need to get the RID
+                    const homePageIdQuery = `
+            SELECT p.id, r.rid
+            FROM pages p
+            JOIN resources r ON r.id = p.resource_id
+            WHERE p.id = ?
+            LIMIT 1
+          `;
+                    const homePage = db.prepare(homePageIdQuery).get(homePageRow.page_id);
+                    if (homePage) {
+                        const homePageUUID = homePage.rid || String(homePage.id);
+                        if (tree.getPage(homePageUUID)) {
+                            tree.rootId = homePageUUID;
+                            tree.metadata.defaultHomePageId = homePageUUID;
+                        }
+                    }
+                }
+                // If no HOME page found, try tree_metadata table (general fallback)
+                if (!tree.rootId) {
+                    const metadataQuery = "SELECT value FROM tree_metadata WHERE key = 'rootId'";
+                    const rootIdRow = db.prepare(metadataQuery).get();
+                    if (rootIdRow && tree.getPage(rootIdRow.value)) {
+                        tree.rootId = rootIdRow.value;
+                        tree.metadata.defaultHomePageId = rootIdRow.value;
+                    }
                 }
-                else if (rootPageId) {
+                // Final fallback: first page
+                if (!tree.rootId && rootPageId) {
                     tree.rootId = rootPageId;
+                    tree.metadata.defaultHomePageId = rootPageId;
                 }
             }
             catch (e) {
-                // No metadata table, use first page as root
+                // No metadata table or other error, use first page as root
                 if (rootPageId) {
                     tree.rootId = rootPageId;
+                    tree.metadata.defaultHomePageId = rootPageId;
                 }
             }
             // Set metadata for TouchChat files
@@ -519,7 +556,14 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
         );
 
         CREATE TABLE IF NOT EXISTS button_boxes (
-          id INTEGER PRIMARY KEY
+          id INTEGER PRIMARY KEY,
+          resource_id INTEGER,
+          layout_x INTEGER DEFAULT 10,
+          layout_y INTEGER DEFAULT 6,
+          init_size_x INTEGER DEFAULT 10000,
+          init_size_y INTEGER DEFAULT 10000,
+          scan_pattern_id INTEGER DEFAULT 0,
+          FOREIGN KEY (resource_id) REFERENCES resources (id)
         );
 
         CREATE TABLE IF NOT EXISTS button_box_cells (
@@ -677,8 +721,15 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                     }
                     // Create a button box for this page's buttons
                     const buttonBoxId = buttonBoxIdCounter++;
-                    const insertButtonBox = db.prepare('INSERT INTO button_boxes (id) VALUES (?)');
-                    insertButtonBox.run(buttonBoxId);
+                    // Create a resource for the button box
+                    const buttonBoxResourceId = resourceIdCounter++;
+                    const insertButtonBoxResource = db.prepare('INSERT INTO resources (id, name, type) VALUES (?, ?, ?)');
+                    insertButtonBoxResource.run(buttonBoxResourceId, page.name || 'ButtonBox', 0);
+                    // Insert button box with layout dimensions
+                    const insertButtonBox = db.prepare('INSERT INTO button_boxes (id, resource_id, layout_x, layout_y, init_size_x, init_size_y) VALUES (?, ?, ?, ?, ?, ?)');
+                    insertButtonBox.run(buttonBoxId, buttonBoxResourceId, gridWidth, gridHeight, 10000, // init_size_x in internal units
+                    10000 // init_size_y in internal units
+                    );
                     // Create button box instance with calculated dimensions
                     const insertButtonBoxInstance = db.prepare('INSERT INTO button_box_instances (id, page_id, button_box_id, position_x, position_y, size_x, size_y) VALUES (?, ?, ?, ?, ?, ?, ?)');
                     insertButtonBoxInstance.run(buttonBoxInstanceIdCounter++, numericPageId, buttonBoxId, 0, // Box starts at origin

package/dist/utilities/analytics/metrics/core.d.ts

@@ -30,7 +30,7 @@ export declare class MetricsCalculator {
      * Count scan items for visual scanning effort
      * When block scanning is enabled, count unique scan blocks instead of individual buttons
      */
-    private countScanItems;
+    private countScanBlocks;
     /**
      * Analyze starting from a specific board
      */