@willwade/aac-processors 0.0.15 → 0.0.17

package/dist/processors/snapProcessor.js

@@ -12,6 +12,17 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const crypto_1 = __importDefault(require("crypto"));
 const snapValidator_1 = require("../validation/snapValidator");
+/**
+ * Map Snap Visible value to AAC standard visibility
+ * Snap: 0 = hidden, 1 (or non-zero) = visible
+ * Maps to: 'Hidden' | 'Visible' | undefined
+ */
+function mapSnapVisibility(visible) {
+    if (visible === null || visible === undefined) {
+        return undefined; // Default to visible
+    }
+    return visible === 0 ? 'Hidden' : 'Visible';
+}
 class SnapProcessor extends baseProcessor_1.BaseProcessor {
     constructor(symbolResolver = null, options = {}) {
         super(options);
@@ -63,6 +74,40 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
             };
             // Load pages first, using UniqueId as canonical id
             const pages = db.prepare('SELECT * FROM Page').all();
+            // Load PageSetProperties to find default Keyboard and Home pages
+            let defaultKeyboardPageId;
+            let defaultHomePageId;
+            let dashboardPageId;
+            try {
+                const properties = db.prepare('SELECT * FROM PageSetProperties').get();
+                if (properties) {
+                    defaultKeyboardPageId = properties.DefaultKeyboardPageUniqueId;
+                    defaultHomePageId = properties.DefaultHomePageUniqueId;
+                    dashboardPageId = properties.DashboardUniqueId;
+                    const toolbarId = properties.ToolBarUniqueId;
+                    const hasGlobalToolbar = toolbarId && toolbarId !== '00000000-0000-0000-0000-000000000000';
+                    if (hasGlobalToolbar) {
+                        tree.rootId = toolbarId;
+                    }
+                    else if (defaultHomePageId) {
+                        tree.rootId = defaultHomePageId;
+                    }
+                }
+            }
+            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 (!tree.rootId && pages.length > 0) {
+                tree.rootId = String(pages[0].UniqueId || pages[0].Id);
+            }
             // Map from numeric Id -> UniqueId for later lookup
             const idToUniqueId = {};
             pages.forEach((pageRow) => {
@@ -219,6 +264,7 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
                         buttonColumns.has('LabelColor') ? 'b.LabelColor' : 'NULL AS LabelColor',
                         buttonColumns.has('BackgroundColor') ? 'b.BackgroundColor' : 'NULL AS BackgroundColor',
                         buttonColumns.has('NavigatePageId') ? 'b.NavigatePageId' : 'NULL AS NavigatePageId',
+                        buttonColumns.has('ContentType') ? 'b.ContentType' : 'NULL AS ContentType',
                     ];
                     if (this.loadAudio) {
                         selectFields.push(buttonColumns.has('MessageRecordingId')
@@ -232,14 +278,30 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
                             : 'NULL AS SerializedMessageSoundMetadata');
                     }
                     const placementColumns = getTableColumns('ElementPlacement');
-                    selectFields.push(placementColumns.has('GridPosition') ? 'ep.GridPosition' : 'NULL AS GridPosition', placementColumns.has('PageLayoutId') ? 'ep.PageLayoutId' : 'NULL AS PageLayoutId', 'er.PageId as ButtonPageId');
+                    const hasButtonPageLink = getTableColumns('ButtonPageLink').size > 0;
+                    selectFields.push(placementColumns.has('GridPosition') ? 'ep.GridPosition' : 'NULL AS GridPosition', placementColumns.has('PageLayoutId') ? 'ep.PageLayoutId' : 'NULL AS PageLayoutId', placementColumns.has('Visible') ? 'ep.Visible' : 'NULL AS Visible', 'er.PageId as ButtonPageId');
+                    if (hasButtonPageLink) {
+                        selectFields.push('bpl.PageUniqueId AS LinkedPageUniqueId');
+                    }
+                    else {
+                        selectFields.push('NULL AS LinkedPageUniqueId');
+                    }
+                    const hasCommandSequence = getTableColumns('CommandSequence').size > 0;
+                    if (hasCommandSequence) {
+                        selectFields.push('cs.SerializedCommands');
+                    }
+                    else {
+                        selectFields.push('NULL AS SerializedCommands');
+                    }
                     const buttonQuery = `
-            SELECT ${selectFields.join(', ')}
-            FROM Button b
-            INNER JOIN ElementReference er ON b.ElementReferenceId = er.Id
-            LEFT JOIN ElementPlacement ep ON ep.ElementReferenceId = er.Id
-            WHERE er.PageId = ? ${selectedPageLayoutId ? 'AND ep.PageLayoutId = ?' : ''}
-          `;
+             SELECT ${selectFields.join(', ')}
+             FROM Button b
+             INNER JOIN ElementReference er ON b.ElementReferenceId = er.Id
+             LEFT JOIN ElementPlacement ep ON ep.ElementReferenceId = er.Id
+             ${hasButtonPageLink ? 'LEFT JOIN ButtonPageLink bpl ON b.Id = bpl.ButtonId' : ''}
+             ${hasCommandSequence ? 'LEFT JOIN CommandSequence cs ON b.Id = cs.ButtonId' : ''}
+             WHERE er.PageId = ? ${selectedPageLayoutId ? 'AND ep.PageLayoutId = ?' : ''}
+           `;
                     const queryParams = selectedPageLayoutId
                         ? [pageRow.Id, selectedPageLayoutId]
                         : [pageRow.Id];
@@ -279,9 +341,40 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
                     if (btnRow.NavigatePageId && idToUniqueId[String(btnRow.NavigatePageId)]) {
                         targetPageUniqueId = idToUniqueId[String(btnRow.NavigatePageId)];
                     }
+                    else if (btnRow.LinkedPageUniqueId) {
+                        targetPageUniqueId = String(btnRow.LinkedPageUniqueId);
+                    }
                     else if (btnRow.PageUniqueId) {
                         targetPageUniqueId = String(btnRow.PageUniqueId);
                     }
+                    // Parse CommandSequence for navigation targets if not found yet
+                    if (btnRow.SerializedCommands) {
+                        try {
+                            const commands = JSON.parse(btnRow.SerializedCommands);
+                            const values = commands.$values || [];
+                            for (const cmd of values) {
+                                if (cmd.$type === '2' && cmd.LinkedPageId) {
+                                    // Normal Navigation
+                                    targetPageUniqueId = String(cmd.LinkedPageId);
+                                }
+                                else if (cmd.$type === '16') {
+                                    // Go to Home
+                                    targetPageUniqueId = defaultHomePageId;
+                                }
+                                else if (cmd.$type === '17') {
+                                    // Go to Keyboard
+                                    targetPageUniqueId = defaultKeyboardPageId;
+                                }
+                                else if (cmd.$type === '18') {
+                                    // Go to Dashboard
+                                    targetPageUniqueId = dashboardPageId;
+                                }
+                            }
+                        }
+                        catch (e) {
+                            // Ignore JSON parse errors in commands
+                        }
+                    }
                     // Determine parent page association for this button
                     const parentPageId = btnRow.ButtonPageId ? String(btnRow.ButtonPageId) : undefined;
                     const parentUniqueId = parentPageId && idToUniqueId[parentPageId] ? idToUniqueId[parentPageId] : uniqueId;
@@ -344,11 +437,14 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
                     }
                     const button = new treeStructure_1.AACButton({
                         id: String(btnRow.Id),
-                        label: btnRow.Label || '',
-                        message: btnRow.Message || btnRow.Label || '',
+                        label: btnRow.Label || (btnRow.ContentType === 1 ? '[Prediction]' : ''),
+                        message: btnRow.Message || (btnRow.ContentType === 1 ? '[Prediction]' : btnRow.Label || ''),
                         targetPageId: targetPageUniqueId,
                         semanticAction: semanticAction,
+                        contentType: btnRow.ContentType === 1 ? 'AutoContent' : undefined,
+                        contentSubType: btnRow.ContentType === 1 ? 'Prediction' : undefined,
                         audioRecording: audioRecording,
+                        visibility: mapSnapVisibility(btnRow.Visible),
                         semantic_id: btnRow.LibrarySymbolId
                             ? `snap_symbol_${btnRow.LibrarySymbolId}`
                             : undefined, // Extract semantic_id from LibrarySymbolId

package/dist/processors/touchchatProcessor.js

@@ -85,8 +85,20 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
             const tree = new treeStructure_1.AACTree();
             // Set root ID to the first page ID (will be updated if we find a better root)
             let rootPageId = null;
+            const getTableColumns = (tableName) => {
+                if (!db)
+                    return new Set();
+                try {
+                    const rows = db.prepare(`PRAGMA table_info(${tableName})`).all();
+                    return new Set(rows.map((row) => row.name));
+                }
+                catch {
+                    return new Set();
+                }
+            };
             // Load ID mappings first
             const idMappings = new Map();
+            const numericToRid = new Map();
             try {
                 const mappingQuery = 'SELECT numeric_id, string_id FROM page_id_mapping';
                 const mappings = db.prepare(mappingQuery).all();
@@ -116,15 +128,18 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                 // console.log('No styles found:', e);
             }
             // First, load all pages and get their names from resources
+            const resourceColumns = getTableColumns('resources');
+            const hasRid = resourceColumns.has('rid');
             const pageQuery = `
-        SELECT p.*, r.name
+        SELECT p.*, r.name${hasRid ? ', r.rid' : ''}
         FROM pages p
         JOIN resources r ON r.id = p.resource_id
       `;
             const pages = db.prepare(pageQuery).all();
             pages.forEach((pageRow) => {
-                // Use mapped string ID if available, otherwise use numeric ID as string
-                const pageId = idMappings.get(pageRow.id) || String(pageRow.id);
+                // Use resource RID (UUID) if available, otherwise mapped string ID, then numeric ID
+                const pageId = (hasRid ? pageRow.rid : null) || idMappings.get(pageRow.id) || String(pageRow.id);
+                numericToRid.set(pageRow.id, pageId);
                 const style = pageStyles.get(pageRow.page_style_id);
                 const page = new treeStructure_1.AACPage({
                     id: pageId,
@@ -166,6 +181,7 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                             touchChat: {
                                 actionCode: 0, // Default speak action
                                 actionData: cell.message || cell.label || '',
+                                resourceId: cell.resource_id,
                             },
                         },
                         fallback: {
@@ -210,7 +226,7 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                 const pageGrids = new Map();
                 boxInstances.forEach((instance) => {
                     // Use mapped string ID if available, otherwise use numeric ID as string
-                    const pageId = idMappings.get(instance.page_id) || String(instance.page_id);
+                    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) {
@@ -341,7 +357,7 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
                         },
                     });
                     // Find the page that references this resource
-                    const page = Object.values(tree.pages).find((p) => p.id === String(btnRow.id));
+                    const page = Object.values(tree.pages).find((p) => p.id === (numericToRid.get(btnRow.id) || String(btnRow.id)));
                     if (page)
                         page.addButton(button);
                 });
@@ -351,23 +367,27 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
             }
             // Load navigation actions
             const navActionsQuery = `
-        SELECT b.id as button_id, ad.value as target_page_id
-        FROM buttons b
-        JOIN actions a ON a.resource_id = b.resource_id
+        SELECT a.resource_id, COALESCE(${hasRid ? 'r_rid.rid, r_id.rid, ' : ''}r_id.id, ad.value) as target_page_id
+        FROM actions a
         JOIN action_data ad ON ad.action_id = a.id
-        WHERE a.code = 1
+        ${hasRid ? 'LEFT JOIN resources r_rid ON r_rid.rid = ad.value AND r_rid.type = 7' : ''}
+        LEFT JOIN resources r_id ON (CASE WHEN ad.value GLOB '[0-9]*' THEN CAST(ad.value AS INTEGER) ELSE -1 END) = r_id.id AND r_id.type = 7
+        WHERE a.code IN (1, 8, 9)
       `;
             try {
                 const navActions = db.prepare(navActionsQuery).all();
                 navActions.forEach((nav) => {
-                    // Find button in any page
+                    // Find button in any page by its resourceId
                     for (const pageId in tree.pages) {
                         const page = tree.pages[pageId];
-                        const button = page.buttons.find((b) => b.id === String(nav.button_id));
+                        const button = page.buttons.find((b) => b.semanticAction?.platformData?.touchChat?.resourceId === nav.resource_id);
                         if (button) {
                             // Use mapped string ID for target page if available
-                            const targetPageId = idMappings.get(parseInt(nav.target_page_id)) || nav.target_page_id;
-                            button.targetPageId = String(targetPageId);
+                            const numericTargetId = parseInt(String(nav.target_page_id));
+                            const targetPageId = !isNaN(numericTargetId)
+                                ? numericToRid.get(numericTargetId) || String(numericTargetId)
+                                : String(nav.target_page_id);
+                            button.targetPageId = targetPageId;
                             // Create semantic action for navigation
                             button.semanticAction = {
                                 category: treeStructure_1.AACSemanticCategory.NAVIGATION,

package/dist/types/aac.d.ts

@@ -4,7 +4,7 @@ import { AACSemanticAction } from '../core/treeStructure';
  * Determines how the scanning advances through items
  */
 export declare enum ScanningSelectionMethod {
-    /** Automatically advance through items at timed intervals */
+    /** Automatically advance through items at timed intervals (1 Switch) */
     AutoScan = "AutoScan",
     /** Automatic scanning with overscan (two-stage scanning) */
     AutoScanWithOverscan = "AutoScanWithOverscan",
@@ -12,8 +12,12 @@ export declare enum ScanningSelectionMethod {
     HoldToAdvance = "HoldToAdvance",
     /** Hold to advance with overscan */
     HoldToAdvanceWithOverscan = "HoldToAdvanceWithOverscan",
-    /** Tap switch to advance, tap again to select */
-    TapToAdvance = "TapToAdvance"
+    /** Tap switch to advance, tap again to select (Automatic) */
+    TapToAdvance = "TapToAdvance",
+    /** Tap switch to advance, another switch to select (2 Switch Step Scan) */
+    StepScan2Switch = "StepScan2Switch",
+    /** Tap switch 1 to advance, tap switch 1 again to select (1 Switch Step Scan) */
+    StepScan1Switch = "StepScan1Switch"
 }
 /**
  * Cell scanning order patterns
@@ -48,6 +52,12 @@ export interface ScanningConfig {
     dwellTime?: number;
     /** How the selection is accepted */
     acceptScanMethod?: 'Switch' | 'Timeout' | 'Hold';
+    /** Whether to factor in error correction effort (e.g., missed hits) */
+    errorCorrectionEnabled?: boolean;
+    /** Maximum number of loops before the scan times out */
+    maxLoops?: number;
+    /** Estimated probability of missing a target (0.0 to 1.0) */
+    errorRate?: number;
 }
 export interface AACStyle {
     backgroundColor?: string;

package/dist/types/aac.js

@@ -7,7 +7,7 @@ exports.CellScanningOrder = exports.ScanningSelectionMethod = void 0;
  */
 var ScanningSelectionMethod;
 (function (ScanningSelectionMethod) {
-    /** Automatically advance through items at timed intervals */
+    /** Automatically advance through items at timed intervals (1 Switch) */
     ScanningSelectionMethod["AutoScan"] = "AutoScan";
     /** Automatic scanning with overscan (two-stage scanning) */
     ScanningSelectionMethod["AutoScanWithOverscan"] = "AutoScanWithOverscan";
@@ -15,8 +15,12 @@ var ScanningSelectionMethod;
     ScanningSelectionMethod["HoldToAdvance"] = "HoldToAdvance";
     /** Hold to advance with overscan */
     ScanningSelectionMethod["HoldToAdvanceWithOverscan"] = "HoldToAdvanceWithOverscan";
-    /** Tap switch to advance, tap again to select */
+    /** Tap switch to advance, tap again to select (Automatic) */
     ScanningSelectionMethod["TapToAdvance"] = "TapToAdvance";
+    /** Tap switch to advance, another switch to select (2 Switch Step Scan) */
+    ScanningSelectionMethod["StepScan2Switch"] = "StepScan2Switch";
+    /** Tap switch 1 to advance, tap switch 1 again to select (1 Switch Step Scan) */
+    ScanningSelectionMethod["StepScan1Switch"] = "StepScan1Switch";
 })(ScanningSelectionMethod || (exports.ScanningSelectionMethod = ScanningSelectionMethod = {}));
 /**
  * Cell scanning order patterns

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

@@ -5,18 +5,20 @@
  * analyze vocabulary differences, and generate CARE component scores.
  */
 import { MetricsResult, ComparisonResult } from './types';
+import { MetricsOptions } from './types';
 export declare class ComparisonAnalyzer {
     private vocabAnalyzer;
     private sentenceAnalyzer;
     private referenceLoader;
     constructor();
+    private normalize;
     /**
      * Compare two board sets
      */
     compare(targetResult: MetricsResult, compareResult: MetricsResult, options?: {
         includeSentences?: boolean;
         locale?: string;
-    }): ComparisonResult;
+    } & Partial<MetricsOptions>): ComparisonResult;
     /**
      * Calculate CARE component scores
      */