@willwade/aac-processors 0.0.5 → 0.0.6

package/dist/cli/index.js

@@ -142,7 +142,7 @@ commander_1.program
     .option('--no-exclude-navigation', "Don't exclude navigation buttons (Home, Back)")
     .option('--no-exclude-system', "Don't exclude system buttons (Delete, Clear, etc.)")
     .option('--exclude-buttons <list>', 'Comma-separated list of button labels/terms to exclude')
-    .action((input, output, options) => {
+    .action(async (input, output, options) => {
     try {
         if (!options.format) {
             console.error('Error: --format option is required for convert command');
@@ -157,7 +157,7 @@ commander_1.program
         const tree = inputProcessor.loadIntoTree(input);
         // Save using output format with same filtering options
         const outputProcessor = (0, analyze_1.getProcessor)(options.format, filteringOptions);
-        outputProcessor.saveFromTree(tree, output);
+        await outputProcessor.saveFromTree(tree, output);
         // Show filtering summary
         let filteringSummary = '';
         if (filteringOptions.preserveAllButtons) {

package/dist/core/treeStructure.d.ts

@@ -163,7 +163,11 @@ export declare class AACPage implements IAACPage {
     buttons: AACButton[];
     parentId: string | null;
     style?: AACStyle;
-    constructor({ id, name, grid, buttons, parentId, style, }: {
+    locale?: string;
+    descriptionHtml?: string;
+    images?: any[];
+    sounds?: any[];
+    constructor({ id, name, grid, buttons, parentId, style, locale, descriptionHtml, images, sounds, }: {
         id: string;
         name?: string;
         grid?: Array<Array<AACButton | null>> | {
@@ -173,6 +177,10 @@ export declare class AACPage implements IAACPage {
         buttons?: AACButton[];
         parentId?: string | null;
         style?: AACStyle;
+        locale?: string;
+        descriptionHtml?: string;
+        images?: any[];
+        sounds?: any[];
     });
     addButton(button: AACButton): void;
 }

package/dist/core/treeStructure.js

@@ -152,7 +152,7 @@ class AACButton {
 }
 exports.AACButton = AACButton;
 class AACPage {
-    constructor({ id, name = '', grid = [], buttons = [], parentId = null, style, }) {
+    constructor({ id, name = '', grid = [], buttons = [], parentId = null, style, locale, descriptionHtml, images, sounds, }) {
         this.id = id;
         this.name = name;
         if (Array.isArray(grid)) {
@@ -169,6 +169,10 @@ class AACPage {
         this.buttons = buttons;
         this.parentId = parentId;
         this.style = style;
+        this.locale = locale;
+        this.descriptionHtml = descriptionHtml;
+        this.images = images;
+        this.sounds = sounds;
     }
     addButton(button) {
         this.buttons.push(button);

package/dist/processors/applePanelsProcessor.js

@@ -10,6 +10,45 @@ const treeStructure_1 = require("../core/treeStructure");
 const plist_1 = __importDefault(require("plist"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+function isNormalizedPanel(panel) {
+    return typeof panel.id === 'string';
+}
+function normalizePanel(panel, fallbackId) {
+    const rawId = panel.ID || fallbackId;
+    const buttons = Array.isArray(panel.PanelObjects)
+        ? panel.PanelObjects.filter((obj) => obj.PanelObjectType === 'Button')
+        : [];
+    const normalizedButtons = buttons.map((btn) => {
+        const firstAction = Array.isArray(btn.Actions) && btn.Actions.length > 0 ? btn.Actions[0] : undefined;
+        const isCharSequence = firstAction &&
+            (firstAction.ActionType === 'ActionPressKeyCharSequence' ||
+                firstAction.ActionType === 'ActionSendKeys');
+        const charString = isCharSequence ? firstAction?.ActionParam?.CharString : undefined;
+        const targetPanel = firstAction && firstAction.ActionType === 'ActionOpenPanel'
+            ? firstAction.ActionParam?.PanelID?.replace(/^USER\./, '')
+            : undefined;
+        return {
+            label: btn.DisplayText || 'Button',
+            message: charString || btn.DisplayText || 'Button',
+            DisplayColor: btn.DisplayColor,
+            DisplayImageWeight: btn.DisplayImageWeight,
+            FontSize: btn.FontSize,
+            Rect: btn.Rect,
+            targetPanel,
+        };
+    });
+    return {
+        id: rawId.replace(/^USER\./, ''),
+        name: panel.Name || 'Panel',
+        buttons: normalizedButtons,
+    };
+}
+function normalizeActionParameters(input) {
+    if (typeof input === 'object' && input !== null) {
+        return { ...input };
+    }
+    return {};
+}
 class ApplePanelsProcessor extends baseProcessor_1.BaseProcessor {
     constructor(options) {
         super(options);
@@ -81,41 +120,21 @@ class ApplePanelsProcessor extends baseProcessor_1.BaseProcessor {
         // Handle both old format (panels array) and new Apple Panels format (Panels dict)
         let panelsData = [];
         if (Array.isArray(parsedData.panels)) {
-            // Old format
-            panelsData = parsedData.panels;
+            panelsData = parsedData.panels.map((panel, index) => {
+                if (isNormalizedPanel(panel)) {
+                    return panel;
+                }
+                const panelData = panel || {
+                    PanelObjects: [],
+                };
+                return normalizePanel(panelData, `panel_${index}`);
+            });
         }
         else if (parsedData.Panels) {
-            // Apple Panels format: convert Panels dict to array
             const panelsDict = parsedData.Panels;
             panelsData = Object.keys(panelsDict).map((panelId) => {
-                const panel = panelsDict[panelId];
-                return {
-                    id: (panel.ID || panelId).replace(/^USER\./, ''), // Strip USER. prefix to maintain original IDs
-                    name: panel.Name || 'Panel',
-                    buttons: (panel.PanelObjects || [])
-                        .filter((obj) => obj.PanelObjectType === 'Button')
-                        .map((btn) => {
-                        const firstAction = Array.isArray(btn.Actions) && btn.Actions.length > 0 ? btn.Actions[0] : undefined;
-                        const isCharSequence = firstAction &&
-                            (firstAction.ActionType === 'ActionPressKeyCharSequence' ||
-                                firstAction.ActionType === 'ActionSendKeys');
-                        const charString = isCharSequence
-                            ? (firstAction.ActionParam?.CharString ?? undefined)
-                            : undefined;
-                        const targetPanel = firstAction && firstAction.ActionType === 'ActionOpenPanel'
-                            ? firstAction.ActionParam?.PanelID?.replace(/^USER\./, '')
-                            : undefined;
-                        return {
-                            label: btn.DisplayText || 'Button',
-                            message: charString || btn.DisplayText || 'Button',
-                            DisplayColor: btn.DisplayColor,
-                            DisplayImageWeight: btn.DisplayImageWeight,
-                            FontSize: btn.FontSize,
-                            Rect: btn.Rect,
-                            targetPanel,
-                        };
-                    }),
-                };
+                const rawPanel = panelsDict[panelId] || { PanelObjects: [] };
+                return normalizePanel(rawPanel, panelId);
             });
         }
         const data = { panels: panelsData };
@@ -219,15 +238,24 @@ class ApplePanelsProcessor 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;
+                    }
                 }
                 if (button.semanticAction) {
                     const intentStr = String(button.semanticAction.intent);
@@ -304,10 +332,8 @@ class ApplePanelsProcessor extends baseProcessor_1.BaseProcessor {
             const panelId = `USER.${page.id}`;
             // Detect actual grid dimensions from the source data
             let gridCols = 4; // Default fallback
-            let gridRows = Math.ceil(page.buttons.length / gridCols);
             if (page.grid && page.grid.length > 0) {
                 // Use actual grid dimensions from source
-                gridRows = page.grid.length;
                 gridCols = page.grid[0] ? page.grid[0].length : 4;
                 // Find the actual used area to avoid empty space
                 let maxUsedX = 0, maxUsedY = 0;
@@ -322,7 +348,6 @@ class ApplePanelsProcessor extends baseProcessor_1.BaseProcessor {
                 // Use the actual used dimensions if they're reasonable
                 if (maxUsedX > 0 && maxUsedY > 0) {
                     gridCols = maxUsedX + 1;
-                    gridRows = maxUsedY + 1;
                 }
             }
             else {
@@ -340,7 +365,6 @@ class ApplePanelsProcessor extends baseProcessor_1.BaseProcessor {
                 else {
                     gridCols = 8; // 8 columns for very large sets
                 }
-                gridRows = Math.ceil(buttonCount / gridCols);
             }
             const panelObjects = page.buttons.map((button, buttonIndex) => {
                 // Find button position in grid layout and convert to Rect format
@@ -379,7 +403,8 @@ class ApplePanelsProcessor extends baseProcessor_1.BaseProcessor {
                     FontSize: button.style?.fontSize || 12,
                     ID: `Button.${button.id}`,
                     PanelObjectType: 'Button',
-                    Rect: rect,
+                    Rect: rect ?? '{{0, 0}, {100, 25}}',
+                    Actions: [],
                 };
                 if (button.style?.backgroundColor) {
                     buttonObj.DisplayColor = button.style.backgroundColor;
@@ -414,8 +439,9 @@ class ApplePanelsProcessor extends baseProcessor_1.BaseProcessor {
                 UsesPinnedResizing: false,
             };
         });
+        const panelsValue = Object.fromEntries(Object.entries(panelsDict).map(([key, value]) => [key, value]));
         const panelDefinitions = {
-            Panels: panelsDict,
+            Panels: panelsValue,
             ToolbarOrdering: {
                 ToolbarIdentifiersAfterBasePanel: [],
                 ToolbarIdentifiersPriorToBasePanel: [],
@@ -439,7 +465,7 @@ class ApplePanelsProcessor extends baseProcessor_1.BaseProcessor {
         if (button.semanticAction?.platformData?.applePanels) {
             const applePanelsData = button.semanticAction.platformData.applePanels;
             return {
-                ActionParam: applePanelsData.parameters,
+                ActionParam: normalizeActionParameters(applePanelsData.parameters),
                 ActionRecordedOffset: 0.0,
                 ActionType: applePanelsData.actionType,
                 ID: `Action.${button.id}`,