@willwade/aac-processors 0.2.9 → 0.2.11

package/dist/processors/gridset/xmlFormatter.d.ts

@@ -0,0 +1,43 @@
+/**
+ * Grid3 XML Formatter
+ *
+ * Utilities for formatting XML to match Grid 3's specific requirements.
+ * Grid 3 has strict formatting requirements including line endings, self-closing
+ * tag spacing, and specific tag expansion rules.
+ */
+/**
+ * Format XML string to match Grid 3's requirements
+ *
+ * Grid 3 requires specific formatting:
+ * - Windows line endings (\r\n)
+ * - Space before /> in self-closing tags: <Element /> not <Element/>
+ * - Plain apostrophes instead of &apos;
+ * - Specific tags expanded to full opening/closing format
+ * - CDATA for empty/whitespace captions and <r> tags
+ *
+ * @param xml - The XML string to format
+ * @returns Formatted XML string compatible with Grid 3
+ *
+ * @example
+ * const formatted = formatGrid3Xml('<Grid><Cell X="0"/></Grid>');
+ * // Returns: '<Grid>\r\n<Cell X="0" />\r\n</Grid>'
+ */
+export declare function formatGrid3Xml(xml: string): string;
+/**
+ * Format empty/whitespace captions with CDATA for Grid 3 compatibility
+ *
+ * Grid 3 requires <![CDATA[ ]]> for empty captions, not plain text.
+ * Also handles <r> tags which need CDATA for spaces to prevent stripping.
+ *
+ * @param xml - The XML string to format
+ * @returns XML string with CDATA-wrapped empty content
+ */
+export declare function formatEmptyCaptionsWithCdata(xml: string): string;
+/**
+ * Complete XML formatting for Grid 3 compatibility
+ * Combines all Grid 3 XML formatting requirements
+ *
+ * @param xml - The XML string to format
+ * @returns Fully formatted XML string compatible with Grid 3
+ */
+export declare function formatGrid3XmlComplete(xml: string): string;

package/dist/processors/gridset/xmlFormatter.js

@@ -0,0 +1,89 @@
+"use strict";
+/**
+ * Grid3 XML Formatter
+ *
+ * Utilities for formatting XML to match Grid 3's specific requirements.
+ * Grid 3 has strict formatting requirements including line endings, self-closing
+ * tag spacing, and specific tag expansion rules.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatGrid3Xml = formatGrid3Xml;
+exports.formatEmptyCaptionsWithCdata = formatEmptyCaptionsWithCdata;
+exports.formatGrid3XmlComplete = formatGrid3XmlComplete;
+/**
+ * Tags that Grid 3 requires in full opening/closing format instead of self-closing
+ * Grid 3 cannot parse <AudioDescription /> - it requires <AudioDescription></AudioDescription>
+ */
+const TAGS_NEEDING_EXPANSION = ['AudioDescription', 'VideoDescription'];
+/**
+ * Format XML string to match Grid 3's requirements
+ *
+ * Grid 3 requires specific formatting:
+ * - Windows line endings (\r\n)
+ * - Space before /> in self-closing tags: <Element /> not <Element/>
+ * - Plain apostrophes instead of &apos;
+ * - Specific tags expanded to full opening/closing format
+ * - CDATA for empty/whitespace captions and <r> tags
+ *
+ * @param xml - The XML string to format
+ * @returns Formatted XML string compatible with Grid 3
+ *
+ * @example
+ * const formatted = formatGrid3Xml('<Grid><Cell X="0"/></Grid>');
+ * // Returns: '<Grid>\r\n<Cell X="0" />\r\n</Grid>'
+ */
+function formatGrid3Xml(xml) {
+    let formatted = xml;
+    // Convert Unix line endings to Windows (\r\n) for Grid 3 compatibility
+    formatted = formatted.replace(/\n/g, '\r\n');
+    // Add space before /> in self-closing tags to match Grid 3's expected format
+    // Grid 3 original files use <Element /> not <Element/>
+    formatted = formatted.replace(/<(\w+)([^>]*)\/>/g, '<$1$2 />');
+    // Decode XML entities back to plain text to match Grid 3's expected format
+    // Grid 3 expects plain apostrophes, not &apos;
+    formatted = formatted.replace(/&apos;/g, "'");
+    formatted = formatted.replace(/&quot;/g, '"');
+    formatted = formatted.replace(/&lt;/g, '<');
+    formatted = formatted.replace(/&gt;/g, '>');
+    // Expand only specific self-closing tags that Grid 3 requires in full opening/closing format
+    // This must be done AFTER adding spaces, so we need to match the format with spaces
+    for (const tag of TAGS_NEEDING_EXPANSION) {
+        formatted = formatted.replace(new RegExp(`<${tag}(\\s+[^>]*)? />`, 'g'), `<${tag}$1></${tag}>`);
+    }
+    return formatted;
+}
+/**
+ * Format empty/whitespace captions with CDATA for Grid 3 compatibility
+ *
+ * Grid 3 requires <![CDATA[ ]]> for empty captions, not plain text.
+ * Also handles <r> tags which need CDATA for spaces to prevent stripping.
+ *
+ * @param xml - The XML string to format
+ * @returns XML string with CDATA-wrapped empty content
+ */
+function formatEmptyCaptionsWithCdata(xml) {
+    let formatted = xml;
+    // Convert empty/whitespace captions to CDATA format for Grid 3 compatibility
+    // Grid 3 requires <![CDATA[ ]]> for empty captions, not plain text
+    formatted = formatted.replace(/<Caption><\/Caption>/g, '<Caption><![CDATA[ ]]></Caption>');
+    formatted = formatted.replace(/<Caption> <\/Caption>/g, '<Caption><![CDATA[ ]]></Caption>');
+    formatted = formatted.replace(/<Caption> {2}<\/Caption>/g, '<Caption><![CDATA[ ]]></Caption>');
+    // Preserve CDATA in <r> tags for text parameters
+    // Spaces in <r> tags must use CDATA or they get stripped during rendering
+    // e.g., <r> </r> becomes <r><![CDATA[ ]]></r>
+    formatted = formatted.replace(/<r> <\/r>/g, '<r><![CDATA[ ]]></r>');
+    formatted = formatted.replace(/<r> {2}<\/r>/g, '<r><![CDATA[  ]]></r>');
+    return formatted;
+}
+/**
+ * Complete XML formatting for Grid 3 compatibility
+ * Combines all Grid 3 XML formatting requirements
+ *
+ * @param xml - The XML string to format
+ * @returns Fully formatted XML string compatible with Grid 3
+ */
+function formatGrid3XmlComplete(xml) {
+    let formatted = formatGrid3Xml(xml);
+    formatted = formatEmptyCaptionsWithCdata(formatted);
+    return formatted;
+}

package/dist/processors/gridsetProcessor.js

@@ -31,6 +31,9 @@ const resolver_1 = require("./gridset/resolver");
 const translationProcessor_1 = require("../utilities/translation/translationProcessor");
 const password_1 = require("./gridset/password");
 const crypto_1 = require("./gridset/crypto");
+const xmlFormatter_1 = require("./gridset/xmlFormatter");
+const gridCalculations_1 = require("./gridset/gridCalculations");
+const cellHelpers_1 = require("./gridset/cellHelpers");
 const gridsetValidator_1 = require("../validation/gridsetValidator");
 // New imports for enhanced Grid 3 support
 const pluginTypes_1 = require("./gridset/pluginTypes");
@@ -2221,33 +2224,11 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
     }
     // Helper method to calculate column definitions based on page layout
     calculateColumnDefinitions(page) {
-        let maxCols = 4; // Default minimum
-        if (page.grid && page.grid.length > 0) {
-            maxCols = Math.max(maxCols, page.grid[0]?.length || 0);
-        }
-        else {
-            // Fallback: estimate from button count
-            maxCols = Math.max(4, Math.ceil(Math.sqrt(page.buttons.length)));
-        }
-        return {
-            ColumnDefinition: Array(maxCols).fill({}),
-        };
+        return (0, gridCalculations_1.calculateColumnDefinitions)(page);
     }
     // Helper method to calculate row definitions based on page layout
     calculateRowDefinitions(page, addWorkspaceOffset = false) {
-        let maxRows = 4; // Default minimum
-        const offset = addWorkspaceOffset ? 1 : 0;
-        if (page.grid && page.grid.length > 0) {
-            maxRows = Math.max(maxRows, page.grid.length + offset);
-        }
-        else {
-            // Fallback: estimate from button count
-            const estimatedCols = Math.ceil(Math.sqrt(page.buttons.length));
-            maxRows = Math.max(4, Math.ceil(page.buttons.length / estimatedCols)) + offset;
-        }
-        return {
-            RowDefinition: Array(maxRows).fill({}),
-        };
+        return (0, gridCalculations_1.calculateRowDefinitions)(page, addWorkspaceOffset);
     }
     /**
      * Save a modified tree while preserving all original files (settings, images, assets)
@@ -2393,6 +2374,9 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                     }
                 }
             }
+            // DO NOT create new cells - the system should only modify existing content
+            // Personalized vocabulary is added to WordList cells via the WordList.Items array
+            // Creating new cells would corrupt the grid structure
             // Update the page's WordList with new words from modified buttons
             // Collect all modified buttons that should be added to the WordList
             const newWordListItems = [];
@@ -2405,9 +2389,18 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                         ? [originalGrid.Grid.Cells.Cell]
                         : [];
                 const cell = cellArray.find((c) => {
-                    const cellX = parseInt(String(c['@_X'] || '0'), 10);
-                    const cellY = parseInt(String(c['@_Y'] || '0'), 10);
-                    return cellX === pos.x && cellY === pos.y;
+                    const cellY = parseInt(String(c['@_Y'] || c['@_Row'] || '0'), 10);
+                    // Check Y position first
+                    if (cellY !== pos.y) {
+                        return false;
+                    }
+                    const cellX = c['@_X'] !== undefined ? parseInt(String(c['@_X']), 10) : undefined;
+                    // If cell has no X attribute (full-width cell), it matches any button at this Y
+                    if (cellX === undefined) {
+                        return true;
+                    }
+                    // Otherwise, check exact X match
+                    return cellX === pos.x;
                 });
                 if (cell) {
                     const contentType = cell.Content?.ContentType || cell.Content?.contentType;
@@ -2416,11 +2409,14 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                     // Note: Prediction cells are already skipped earlier, so they won't reach here
                     if (isWordListCell) {
                         // Add this button to the WordList with proper Grid 3 format
-                        // Format: <Text><s><r>label</r></s></Text>
+                        // Format: <Text><p><s><r>label</r></s></p></Text>
+                        // Note: <p> wrapper is required by Grid 3's WordList format
                         newWordListItems.push({
                             Text: {
-                                s: {
-                                    r: button.label,
+                                p: {
+                                    s: {
+                                        r: button.label,
+                                    },
                                 },
                             },
                             Image: '', // No image for user-added words
@@ -2447,23 +2443,9 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                     originalGrid.Grid.WordList.Items.WordListItem = allItems;
                 }
             }
-            // Build the updated grid XML and convert to Windows line endings
+            // Build the updated grid XML and format for Grid 3 compatibility
             let builtXml = gridBuilder.build(originalGrid);
-            // Convert Unix line endings to Windows (\r\n) for Grid 3 compatibility
-            builtXml = builtXml.replace(/\n/g, '\r\n');
-            // Expand self-closing tags to full opening/closing tags for Grid 3 compatibility
-            // Grid 3 cannot parse <AudioDescription /> - it requires <AudioDescription></AudioDescription>
-            builtXml = builtXml.replace(/<(\w+)(\s+[^>]*)?\s*\/>/g, '<$1$2></$1>');
-            // Convert empty/whitespace captions to CDATA format for Grid 3 compatibility
-            // Grid 3 requires <![CDATA[ ]]> for empty captions, not plain text
-            builtXml = builtXml.replace(/<Caption><\/Caption>/g, '<Caption><![CDATA[ ]]></Caption>');
-            builtXml = builtXml.replace(/<Caption> <\/Caption>/g, '<Caption><![CDATA[ ]]></Caption>');
-            builtXml = builtXml.replace(/<Caption> {2}<\/Caption>/g, '<Caption><![CDATA[ ]]></Caption>');
-            // Preserve CDATA in <r> tags for text parameters
-            // Spaces in <r> tags must use CDATA or they get stripped during rendering
-            // e.g., <r> </r> becomes <r><![CDATA[ ]]></r>
-            builtXml = builtXml.replace(/<r> <\/r>/g, '<r><![CDATA[ ]]></r>');
-            builtXml = builtXml.replace(/<r> {2}<\/r>/g, '<r><![CDATA[  ]]></r>');
+            builtXml = (0, xmlFormatter_1.formatGrid3XmlComplete)(builtXml);
             newGridFiles.set(gridPath, builtXml);
         }
         // Copy all files from original zip, replacing modified grid files
@@ -2532,57 +2514,14 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
             // Preserve Grid 3 XML formatting requirements
             suppressBooleanAttributes: false,
         });
-        // Build the grid XML and convert to Windows line endings for Grid 3 compatibility
+        // Build the grid XML and format for Grid 3 compatibility
         let builtXml = gridBuilder.build(gridData);
-        builtXml = builtXml.replace(/\n/g, '\r\n');
-        // Expand self-closing tags to full opening/closing tags for Grid 3 compatibility
-        builtXml = builtXml.replace(/<(\w+)(\s+[^>]*)?\s*\/>/g, '<$1$2></$1>');
+        builtXml = (0, xmlFormatter_1.formatGrid3XmlComplete)(builtXml);
         return builtXml;
     }
     // Helper method to find button position with span information
     findButtonPosition(page, button, fallbackIndex) {
-        if (page.grid && page.grid.length > 0) {
-            // Search for button in grid layout and calculate span
-            for (let y = 0; y < page.grid.length; y++) {
-                for (let x = 0; x < page.grid[y].length; x++) {
-                    const current = page.grid[y][x];
-                    if (current && current.id === button.id) {
-                        // Calculate span by checking how far the same button extends
-                        let columnSpan = 1;
-                        let rowSpan = 1;
-                        // Check column span (rightward)
-                        while (x + columnSpan < page.grid[y].length) {
-                            const right = page.grid[y][x + columnSpan];
-                            if (right && right.id === button.id) {
-                                columnSpan++;
-                            }
-                            else {
-                                break;
-                            }
-                        }
-                        // Check row span (downward)
-                        while (y + rowSpan < page.grid.length) {
-                            const below = page.grid[y + rowSpan][x];
-                            if (below && below.id === button.id) {
-                                rowSpan++;
-                            }
-                            else {
-                                break;
-                            }
-                        }
-                        return { x, y, columnSpan, rowSpan };
-                    }
-                }
-            }
-        }
-        // Fallback positioning
-        const gridCols = page.grid?.[0]?.length || Math.ceil(Math.sqrt(page.buttons.length));
-        return {
-            x: fallbackIndex % gridCols,
-            y: Math.floor(fallbackIndex / gridCols),
-            columnSpan: 1,
-            rowSpan: 1,
-        };
+        return (0, cellHelpers_1.findButtonPosition)(page, button, fallbackIndex);
     }
     /**
      * Extract strings with metadata for aac-tools-platform compatibility

package/dist/processors/obfProcessor.d.ts

@@ -16,13 +16,14 @@ declare class ObfProcessor extends BaseProcessor {
      */
     private extractImageAsDataUrl;
     private getMimeTypeFromFilename;
+    private getPageFilename;
     private processBoard;
     extractTexts(filePathOrBuffer: ProcessorInput): Promise<string[]>;
     loadIntoTree(filePathOrBuffer: ProcessorInput): Promise<AACTree>;
     private buildGridMetadata;
     private createObfBoardFromPage;
     processTexts(filePathOrBuffer: ProcessorInput, translations: Map<string, string>, outputPath: string): Promise<Uint8Array>;
-    saveFromTree(tree: AACTree, outputPath: string): Promise<void>;
+    saveFromTree(tree: AACTree, outputPath: string, embedData?: boolean): Promise<void>;
     /**
      * Save a modified tree while preserving all original files (images, sounds, assets)
      * This method only updates the .obf files for pages in the tree, keeping everything else intact.

package/dist/processors/obfProcessor.js

@@ -106,7 +106,7 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
             // Images are typically stored in an 'images' folder or root
             const possiblePaths = [
                 imageData.path, // Explicit path if provided
-                `images/${imageData.filename || imageId}`, // Standard images folder
+                `images/${imageData.path || imageId}`, // Standard images folder
                 imageData.id, // Just the ID
             ].filter(Boolean);
             for (const imagePath of possiblePaths) {
@@ -152,14 +152,18 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                 return 'image/png';
         }
     }
-    async processBoard(boardData, _boardPath, isZipEntry) {
+    getPageFilename(id, metadata) {
+        if (metadata._obfPagePaths && id in metadata._obfPagePaths)
+            return metadata._obfPagePaths[id];
+        if (id.endsWith('.obf'))
+            return id;
+        return `${id}.obf`;
+    }
+    async processBoard(boardData, _boardPath) {
         const sourceButtons = boardData.buttons || [];
         // Calculate page ID first (used to make button IDs unique)
-        const pageId = isZipEntry
-            ? _boardPath // Zip entry - use filename to match navigation paths
-            : boardData?.id
-                ? String(boardData.id)
-                : _boardPath?.split(/[/\\]/).pop() || '';
+        const pageId = boardData?.id ? String(boardData.id) : _boardPath?.split(/[/\\]/).pop() || '';
+        const images = boardData.images;
         const buttons = await Promise.all(sourceButtons.map(async (btn) => {
             const semanticAction = btn.load_board
                 ? {
@@ -183,11 +187,16 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
             // Resolve image if image_id is present
             let resolvedImage;
             let imageBuffer;
-            if (btn.image_id && boardData.images) {
-                resolvedImage =
-                    (await this.extractImageAsDataUrl(btn.image_id, boardData.images)) || undefined;
-                imageBuffer =
-                    (await this.extractImageAsBuffer(btn.image_id, boardData.images)) || undefined;
+            if (btn.image_id && images) {
+                resolvedImage = (await this.extractImageAsDataUrl(btn.image_id, images)) || undefined;
+                imageBuffer = (await this.extractImageAsBuffer(btn.image_id, images)) || undefined;
+                // save image data
+                if (images) {
+                    const imageIndex = images?.findIndex((img) => img.id === btn.image_id);
+                    if (imageIndex !== -1) {
+                        images[imageIndex].data = resolvedImage;
+                    }
+                }
             }
             // Build parameters object for Grid3 export compatibility
             const buttonParameters = {};
@@ -224,7 +233,7 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
             parentId: null,
             locale: boardData.locale,
             descriptionHtml: boardData.description_html,
-            images: boardData.images,
+            images,
             sounds: boardData.sounds,
         });
         // Process grid layout if available
@@ -314,7 +323,7 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
         return texts;
     }
     async loadIntoTree(filePathOrBuffer) {
-        const { readBinaryFromInput, readTextFromInput } = this.options.fileAdapter;
+        const { readBinaryFromInput, readTextFromInput, listDir, join, isDirectory } = this.options.fileAdapter;
         // Detailed logging for debugging input
         const bufferLength = typeof filePathOrBuffer === 'string'
             ? null
@@ -356,7 +365,7 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                 const boardData = await tryParseObfJson(content);
                 if (boardData) {
                     console.log('[OBF] Detected .obf file, parsed as JSON');
-                    const page = await this.processBoard(boardData, filePathOrBuffer, false);
+                    const page = await this.processBoard(boardData, filePathOrBuffer);
                     tree.addPage(page);
                     // Set metadata from root board
                     tree.metadata.format = 'obf';
@@ -380,22 +389,30 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                 throw err;
             }
         }
-        // Detect likely zip signature first
-        async function isLikelyZip(input) {
-            if (typeof input === 'string') {
-                const lowered = input.toLowerCase();
-                return lowered.endsWith('.zip') || lowered.endsWith('.obz');
+        // Determine if input is ZIP, directory, or OBF JSON string/buffer
+        let fileType = 'obf';
+        if (typeof filePathOrBuffer !== 'string') {
+            const bytes = await readBinaryFromInput(filePathOrBuffer);
+            if (bytes.length >= 2 && bytes[0] === 0x50 && bytes[1] === 0x4b)
+                fileType = 'zip';
+        }
+        else {
+            if (await isDirectory(filePathOrBuffer)) {
+                fileType = 'dir';
+            }
+            else {
+                const lowered = filePathOrBuffer.toLowerCase();
+                if (lowered.endsWith('.zip') || lowered.endsWith('.obz'))
+                    fileType = 'zip';
             }
-            const bytes = await readBinaryFromInput(input);
-            return bytes.length >= 2 && bytes[0] === 0x50 && bytes[1] === 0x4b;
         }
         // Check if input is a buffer or string that parses as OBF JSON; throw if neither JSON nor ZIP
-        if (!(await isLikelyZip(filePathOrBuffer))) {
+        if (fileType === 'obf') {
             const asJson = await tryParseObfJson(filePathOrBuffer);
             if (!asJson)
                 throw new Error('Invalid OBF content: not JSON and not ZIP');
             console.log('[OBF] Detected buffer/string as OBF JSON');
-            const page = await this.processBoard(asJson, '[bufferOrString]', false);
+            const page = await this.processBoard(asJson, '[bufferOrString]');
             tree.addPage(page);
             // Set metadata from root board
             tree.metadata.format = 'obf';
@@ -411,18 +428,31 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
             tree.rootId = page.id;
             return tree;
         }
-        try {
-            this.zipFile = await this.options.zipAdapter(filePathOrBuffer);
-        }
-        catch (err) {
-            console.error('[OBF] Error loading ZIP:', err);
-            throw err;
+        this.zipFile = {
+            readFile: async (name) => {
+                return await readBinaryFromInput(join(filePathOrBuffer, name));
+            },
+            listFiles: () => {
+                throw new Error('Not implemented for directory input');
+            },
+            writeFiles: () => {
+                throw new Error('Not implemented for directory input');
+            },
+        };
+        if (fileType === 'zip') {
+            try {
+                this.zipFile = await this.options.zipAdapter(filePathOrBuffer);
+            }
+            catch (err) {
+                console.error('[OBF] Error loading ZIP:', err);
+                throw err;
+            }
         }
         // Store the ZIP file reference for image extraction
         this.imageCache.clear(); // Clear cache for new file
-        console.log('[OBF] Detected zip archive, extracting .obf files');
+        console.log('[OBF] Detected zip archive or directory, extracting .obf files');
         // List manifest and OBF files
-        const filesInZip = this.zipFile.listFiles();
+        const filesInZip = fileType === 'zip' ? this.zipFile.listFiles() : await listDir(filePathOrBuffer);
         const manifestFile = filesInZip.filter((name) => name.toLowerCase() === 'manifest.json');
         let obfEntries = filesInZip.filter((name) => name.toLowerCase().endsWith('.obf'));
         // Attempt to read manifest
@@ -456,7 +486,7 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                 const content = await this.zipFile.readFile(entryName);
                 const boardData = await tryParseObfJson((0, io_1.decodeText)(content));
                 if (boardData) {
-                    const page = await this.processBoard(boardData, entryName, true);
+                    const page = await this.processBoard(boardData, entryName);
                     tree.addPage(page);
                     // Set metadata if not already set (use first board as reference)
                     if (!tree.metadata.format) {
@@ -465,12 +495,16 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                         tree.metadata.description = boardData.description_html;
                         tree.metadata.locale = boardData.locale;
                         tree.metadata.id = boardData.id;
+                        tree.metadata._obfPagePaths = { [page.id]: entryName };
                         if (boardData.url)
                             tree.metadata.url = boardData.url;
                         if (boardData.locale)
                             tree.metadata.languages = [boardData.locale];
                         tree.rootId = page.id;
                     }
+                    else {
+                        tree.metadata._obfPagePaths[page.id] = entryName;
+                    }
                 }
                 else {
                     console.warn('[OBF] Skipped entry (not valid OBF JSON):', entryName);
@@ -523,11 +557,18 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
         }
         return { rows: totalRows, columns: totalColumns, order, buttonPositions };
     }
-    createObfBoardFromPage(page, fallbackName, metadata) {
+    createObfBoardFromPage(page, fallbackName, metadata, embedData = false) {
         const { rows, columns, order, buttonPositions } = this.buildGridMetadata(page);
         const boardName = metadata?.name && page.id === metadata?.defaultHomePageId
             ? metadata.name
             : page.name || fallbackName;
+        let images = Array.isArray(page.images) ? page.images : [];
+        if (!embedData) {
+            images = images.map((image) => {
+                delete image.data;
+                return image;
+            });
+        }
         return {
             format: OBF_FORMAT_VERSION,
             id: page.id,
@@ -564,7 +605,7 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                     hidden: button.visibility === 'Hidden' || false,
                 };
             }),
-            images: Array.isArray(page.images) ? page.images : [],
+            images,
             sounds: Array.isArray(page.sounds) ? page.sounds : [],
         };
     }
@@ -601,23 +642,22 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
         await this.saveFromTree(tree, outputPath);
         return await readBinaryFromInput(outputPath);
     }
-    async saveFromTree(tree, outputPath) {
-        const { writeTextToPath, writeBinaryToPath, pathExists } = this.options.fileAdapter;
+    async saveFromTree(tree, outputPath, embedData = false) {
+        const { writeTextToPath, writeBinaryToPath, pathExists, mkDir, join } = this.options.fileAdapter;
         if (outputPath.endsWith('.obf')) {
             // Save as single OBF JSON file
             const rootPage = tree.rootId ? tree.getPage(tree.rootId) : Object.values(tree.pages)[0];
             if (!rootPage) {
                 throw new Error('No pages to save');
             }
-            const obfBoard = this.createObfBoardFromPage(rootPage, 'Exported Board', tree.metadata);
+            const obfBoard = this.createObfBoardFromPage(rootPage, 'Exported Board', tree.metadata, embedData);
             await writeTextToPath(outputPath, JSON.stringify(obfBoard, null, 2));
         }
         else {
-            const getPageFilename = (id) => (id.endsWith('.obf') ? id : `${id}.obf`);
             const files = Object.values(tree.pages).map((page) => {
-                const obfBoard = this.createObfBoardFromPage(page, 'Board', tree.metadata);
+                const obfBoard = this.createObfBoardFromPage(page, 'Board', tree.metadata, embedData);
                 const obfContent = JSON.stringify(obfBoard, null, 2);
-                const name = getPageFilename(page.id);
+                const name = this.getPageFilename(page.id, tree.metadata);
                 return {
                     name,
                     data: new TextEncoder().encode(obfContent),
@@ -627,7 +667,10 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                 format: OBF_FORMAT_VERSION,
                 root: tree.metadata.defaultHomePageId,
                 paths: {
-                    boards: Object.fromEntries(Object.entries(tree.pages).map(([id, page]) => [id, getPageFilename(page.id)])),
+                    boards: Object.fromEntries(Object.entries(tree.pages).map(([id, page]) => [
+                        id,
+                        this.getPageFilename(page.id, tree.metadata),
+                    ])),
                     images: {}, //TODO Add support for saving images as files
                     sounds: {}, //TODO Add support for saving sounds as files
                 },
@@ -636,10 +679,22 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                 name: 'manifest.json',
                 data: new TextEncoder().encode(JSON.stringify(manifest)),
             });
-            const fileExists = await pathExists(outputPath);
-            this.zipFile = await this.options.zipAdapter(fileExists ? outputPath : undefined, this.options.fileAdapter);
-            const zipData = await this.zipFile.writeFiles(files);
-            await writeBinaryToPath(outputPath, zipData);
+            if (outputPath.endsWith('.obz') || outputPath.endsWith('.zip')) {
+                console.log('[OBF] Saving to ZIP file:', outputPath);
+                const fileExists = await pathExists(outputPath);
+                this.zipFile = await this.options.zipAdapter(fileExists ? outputPath : undefined, this.options.fileAdapter);
+                const zipData = await this.zipFile.writeFiles(files);
+                await writeBinaryToPath(outputPath, zipData);
+            }
+            else {
+                console.log('[OBF] Saving to directory:', outputPath);
+                if (!(await pathExists(outputPath)))
+                    await mkDir(outputPath);
+                for (const file of files) {
+                    const filePath = join(outputPath, file.name);
+                    await writeBinaryToPath(filePath, file.data);
+                }
+            }
         }
     }
     /**
@@ -666,13 +721,12 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
         const AdmZip = (await Promise.resolve().then(() => __importStar(require('adm-zip')))).default;
         const originalZip = new AdmZip(originalPath);
         const outputZip = new AdmZip();
-        const getPageFilename = (id) => (id.endsWith('.obf') ? id : `${id}.obf`);
         // Track which .obf files we're modifying
         const modifiedObfFiles = new Set();
         // Generate new .obf files for pages in the tree
         const newObfFiles = new Map();
         for (const page of Object.values(tree.pages)) {
-            const obfFilename = getPageFilename(page.id);
+            const obfFilename = this.getPageFilename(page.id, tree.metadata);
             modifiedObfFiles.add(obfFilename);
             const obfBoard = this.createObfBoardFromPage(page, 'Board', tree.metadata);
             const obfContent = JSON.stringify(obfBoard, null, 2);
@@ -685,7 +739,10 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                 format: OBF_FORMAT_VERSION,
                 root: tree.metadata.defaultHomePageId,
                 paths: {
-                    boards: Object.fromEntries(Object.entries(tree.pages).map(([id, page]) => [id, getPageFilename(page.id)])),
+                    boards: Object.fromEntries(Object.entries(tree.pages).map(([id, page]) => [
+                        id,
+                        this.getPageFilename(page.id, tree.metadata),
+                    ])),
                     images: {},
                     sounds: {},
                 },

package/dist/utilities/analytics/morphology/index.d.ts

@@ -1,5 +1,4 @@
 export { MorphologyEngine } from './engine';
-export { Grid3VerbsParser } from './grid3VerbsParser';
 export { WordFormGenerator } from './wordFormGenerator';
 export type { MorphRuleSet, MorphRule, MorphWordForms, AstericsWordForm, VerbFormWithConditions, Grid3VerbFormsDetailed, } from './types';
 export type { Grid3VerbForms } from './grid3VerbsParser';