@willwade/aac-processors 0.1.20 → 0.1.21

package/dist/processors/gridset/symbols.js

@@ -34,6 +34,7 @@ exports.symbolReferenceToFilename = symbolReferenceToFilename;
 exports.getSymbolsDir = getSymbolsDir;
 exports.getSymbolSearchDir = getSymbolSearchDir;
 const io_1 = require("../../utils/io");
+const zip_1 = require("../../utils/zip");
 /**
  * Default Grid 3 installation paths by platform
  */
@@ -76,38 +77,6 @@ exports.SYMBOL_LIBRARIES = {
  * Default locale to use
  */
 exports.DEFAULT_LOCALE = 'en-GB';
-function getNodeFs() {
-    try {
-        return (0, io_1.getFs)();
-    }
-    catch {
-        throw new Error('Symbol library access is not available in this environment.');
-    }
-}
-function getNodePath() {
-    try {
-        return (0, io_1.getPath)();
-    }
-    catch {
-        throw new Error('Path utilities are not available in this environment.');
-    }
-}
-let cachedAdmZip = null;
-function getAdmZip() {
-    if (cachedAdmZip)
-        return cachedAdmZip;
-    try {
-        const nodeRequire = (0, io_1.getNodeRequire)();
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const module = nodeRequire('adm-zip');
-        const resolved = module.default || module;
-        cachedAdmZip = resolved;
-        return resolved;
-    }
-    catch {
-        throw new Error('Symbol library access requires AdmZip in this environment.');
-    }
-}
 /**
  * Parse a symbol reference string
  * @param reference - Symbol reference like "[widgit]/food/apple.png"
@@ -145,12 +114,12 @@ function isSymbolReference(reference) {
  * Get the default Grid 3 installation path for the current platform
  * @returns Default Grid 3 path or empty string if not found
  */
-function getDefaultGrid3Path() {
+function getDefaultGrid3Path(fileAdapter) {
+    const { pathExists } = fileAdapter ?? io_1.defaultFileAdapter;
     const platform = (typeof process !== 'undefined' && process.platform ? process.platform : 'unknown');
     const defaultPath = DEFAULT_GRID3_PATHS[platform] || '';
     try {
-        const fs = getNodeFs();
-        if (defaultPath && fs.existsSync(defaultPath)) {
+        if (defaultPath && pathExists(defaultPath)) {
             return defaultPath;
         }
         // Try to find Grid 3 in common locations
@@ -162,7 +131,7 @@ function getDefaultGrid3Path() {
             '/opt/smartbox/grid3',
         ];
         for (const testPath of commonPaths) {
-            if (fs.existsSync(testPath)) {
+            if (pathExists(testPath)) {
                 return testPath;
             }
         }
@@ -178,9 +147,9 @@ function getDefaultGrid3Path() {
  * @param grid3Path - Grid 3 installation path
  * @returns Path to Symbol Libraries directory (e.g., "C:\...\Grid 3\Resources\Symbols")
  */
-function getSymbolLibrariesDir(grid3Path) {
-    const path = getNodePath();
-    return path.join(grid3Path, SYMBOLS_SUBDIR);
+function getSymbolLibrariesDir(grid3Path, fileAdapter = io_1.defaultFileAdapter) {
+    const { join } = fileAdapter;
+    return join(grid3Path, SYMBOLS_SUBDIR);
 }
 /**
  * Get the symbol search indexes directory path for a given locale
@@ -189,38 +158,37 @@ function getSymbolLibrariesDir(grid3Path) {
  * @param locale - Locale code (e.g., 'en-GB')
  * @returns Path to symbol search indexes directory (e.g., "C:\...\Grid 3\Locale\en-GB\symbolsearch")
  */
-function getSymbolSearchIndexesDir(grid3Path, locale = exports.DEFAULT_LOCALE) {
-    const path = getNodePath();
-    return path.join(grid3Path, SYMBOLSEARCH_SUBDIR, locale, 'symbolsearch');
+function getSymbolSearchIndexesDir(grid3Path, locale = exports.DEFAULT_LOCALE, fileAdapter = io_1.defaultFileAdapter) {
+    const { join } = fileAdapter;
+    return join(grid3Path, SYMBOLSEARCH_SUBDIR, locale, 'symbolsearch');
 }
 /**
  * Get all available symbol libraries in the Grid 3 installation
  * @param options - Resolution options
  * @returns Array of symbol library information
  */
-function getAvailableSymbolLibraries(options = {}) {
+function getAvailableSymbolLibraries(options = {}, fileAdapter) {
+    const { pathExists, getFileSize, listDir, join, basename } = fileAdapter ?? io_1.defaultFileAdapter;
     const grid3Path = options.grid3Path || options.symbolDir || getDefaultGrid3Path();
     if (!grid3Path) {
         return [];
     }
-    const symbolsDir = getSymbolLibrariesDir(grid3Path);
-    const fs = getNodeFs();
-    if (!fs.existsSync(symbolsDir)) {
+    const symbolsDir = getSymbolLibrariesDir(grid3Path, fileAdapter);
+    if (!pathExists(symbolsDir)) {
         return [];
     }
     const libraries = [];
-    const files = fs.readdirSync(symbolsDir);
+    const files = listDir(symbolsDir);
     for (const file of files) {
         if (file.endsWith('.symbols')) {
-            const path = getNodePath();
-            const fullPath = path.join(symbolsDir, file);
-            const stats = fs.statSync(fullPath);
-            const libraryName = path.basename(file, '.symbols');
+            const fullPath = join(symbolsDir, file);
+            const size = getFileSize(fullPath);
+            const libraryName = basename(file, '.symbols');
             libraries.push({
                 name: libraryName,
                 pixFile: fullPath, // Reuse this field for the .symbols file path
                 exists: true,
-                size: stats.size,
+                size,
                 locale: 'global', // .symbols files are not locale-specific
             });
         }
@@ -233,12 +201,13 @@ function getAvailableSymbolLibraries(options = {}) {
  * @param options - Resolution options
  * @returns Symbol library info or undefined if not found
  */
-function getSymbolLibraryInfo(libraryName, options = {}) {
+function getSymbolLibraryInfo(libraryName, options = {}, fileAdapter) {
+    const { pathExists, getFileSize, join } = fileAdapter ?? io_1.defaultFileAdapter;
     const grid3Path = options.grid3Path || options.symbolDir || getDefaultGrid3Path();
     if (!grid3Path) {
         return undefined;
     }
-    const symbolsDir = getSymbolLibrariesDir(grid3Path);
+    const symbolsDir = getSymbolLibrariesDir(grid3Path, fileAdapter);
     const normalizedLibName = libraryName.toLowerCase();
     // Try different case variations
     const variations = [
@@ -247,16 +216,14 @@ function getSymbolLibraryInfo(libraryName, options = {}) {
         libraryName + '.symbols',
     ];
     for (const file of variations) {
-        const path = getNodePath();
-        const fullPath = path.join(symbolsDir, file);
-        const fs = getNodeFs();
-        if (fs.existsSync(fullPath)) {
-            const stats = fs.statSync(fullPath);
+        const fullPath = join(symbolsDir, file);
+        if (pathExists(fullPath)) {
+            const size = getFileSize(fullPath);
             return {
                 name: libraryName,
                 pixFile: fullPath,
                 exists: true,
-                size: stats.size,
+                size,
                 locale: 'global',
             };
         }
@@ -269,7 +236,7 @@ function getSymbolLibraryInfo(libraryName, options = {}) {
  * @param options - Resolution options
  * @returns Resolution result with image data if found
  */
-function resolveSymbolReference(reference, options = {}) {
+async function resolveSymbolReference(reference, options = {}, fileAdapter = io_1.defaultFileAdapter, zipAdapter) {
     const parsed = parseSymbolReference(reference);
     if (!parsed.isValid) {
         return {
@@ -296,16 +263,16 @@ function resolveSymbolReference(reference, options = {}) {
     }
     try {
         // .symbols files are ZIP archives
-        const AdmZip = getAdmZip();
-        const zip = new AdmZip(libraryInfo.pixFile);
+        const zipFile = libraryInfo.pixFile;
+        const zip = zipAdapter ? await zipAdapter(zipFile) : await (0, zip_1.getZipAdapter)(zipFile, fileAdapter);
         // The path in the symbol reference becomes the path within the symbols/ folder
         // e.g., [tawasl]/above bw.png becomes symbols/above bw.png
         const symbolPath = `symbols/${parsed.path}`;
-        const entry = zip.getEntry(symbolPath);
+        const entry = await zip.readFile(symbolPath);
         if (!entry) {
             // Try without the symbols/ prefix (in case reference already includes it)
             const altPath = parsed.path.startsWith('symbols/') ? parsed.path : `symbols/${parsed.path}`;
-            const altEntry = zip.getEntry(altPath);
+            const altEntry = await zip.readFile(altPath);
             if (!altEntry) {
                 return {
                     reference: parsed,
@@ -316,7 +283,7 @@ function resolveSymbolReference(reference, options = {}) {
                 };
             }
             // Found with alternate path
-            const data = altEntry.getData();
+            const data = Buffer.from(altEntry);
             return {
                 reference: parsed,
                 found: true,
@@ -326,7 +293,7 @@ function resolveSymbolReference(reference, options = {}) {
             };
         }
         // Found the symbol!
-        const data = entry.getData();
+        const data = Buffer.from(entry);
         return {
             reference: parsed,
             found: true,

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

@@ -8,8 +8,8 @@
  * Note: Wordlists are only supported in Grid3 format. Other AAC formats
  * do not have equivalent wordlist functionality.
  */
-import { type ZipAdapter } from '../../utils/zip';
-import { type ProcessorInput } from '../../utils/io';
+import { FileAdapter, type ProcessorInput } from '../../utils/io';
+import { ZipAdapter } from '../../utils/zip';
 /**
  * Represents a single item in a wordlist
  */
@@ -66,9 +66,7 @@ export declare function wordlistToXml(wordlist: WordList): string;
  *   console.log(`Grid "${gridName}" has ${wordlist.items.length} items`);
  * });
  */
-export declare function extractWordlists(gridsetBuffer: Uint8Array, password?: string | undefined, zipAdapter?: (input: ProcessorInput) => Promise<{
-    zip: ZipAdapter;
-}>): Promise<Map<string, WordList>>;
+export declare function extractWordlists(gridsetBuffer: Uint8Array, password?: string | undefined, fileAdapter?: FileAdapter, zipAdapter?: (input: ProcessorInput) => Promise<ZipAdapter>): Promise<Map<string, WordList>>;
 /**
  * Updates or adds a wordlist to a specific grid in a gridset
  *
@@ -83,4 +81,4 @@ export declare function extractWordlists(gridsetBuffer: Uint8Array, password?: s
  * const updatedGridset = updateWordlist(gridsetBuffer, 'Greetings', newWordlist);
  * fs.writeFileSync('updated-gridset.gridset', updatedGridset);
  */
-export declare function updateWordlist(gridsetBuffer: Uint8Array, gridName: string, wordlist: WordList, password?: string | undefined): Promise<Uint8Array>;
+export declare function updateWordlist(gridsetBuffer: Uint8Array, gridName: string, wordlist: WordList, password?: string | undefined, fileAdapter?: FileAdapter, zipAdapter?: (input: ProcessorInput) => Promise<ZipAdapter>): Promise<Uint8Array>;

package/dist/processors/gridset/wordlistHelpers.js

@@ -9,29 +9,6 @@
  * Note: Wordlists are only supported in Grid3 format. Other AAC formats
  * do not have equivalent wordlist functionality.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWordlist = createWordlist;
 exports.wordlistToXml = wordlistToXml;
@@ -39,9 +16,9 @@ exports.extractWordlists = extractWordlists;
 exports.updateWordlist = updateWordlist;
 const fast_xml_parser_1 = require("fast-xml-parser");
 const password_1 = require("./password");
-const zip_1 = require("../../utils/zip");
 const io_1 = require("../../utils/io");
 const io_2 = require("../../utils/io");
+const zip_1 = require("../../utils/zip");
 /**
  * Creates a WordList object from an array of words/phrases or a dictionary
  *
@@ -127,13 +104,13 @@ function wordlistToXml(wordlist) {
  *   console.log(`Grid "${gridName}" has ${wordlist.items.length} items`);
  * });
  */
-async function extractWordlists(gridsetBuffer, password = (0, password_1.resolveGridsetPasswordFromEnv)(), zipAdapter) {
+async function extractWordlists(gridsetBuffer, password = (0, password_1.resolveGridsetPasswordFromEnv)(), fileAdapter = io_1.defaultFileAdapter, zipAdapter) {
     const wordlists = new Map();
     const parser = new fast_xml_parser_1.XMLParser();
     try {
-        const { zip } = zipAdapter
+        const zip = zipAdapter
             ? await zipAdapter(gridsetBuffer)
-            : await (0, zip_1.openZipFromInput)(gridsetBuffer);
+            : await (0, zip_1.getZipAdapter)(gridsetBuffer, fileAdapter);
         const entries = (0, password_1.getZipEntriesFromAdapter)(zip, password);
         // Process each grid file
         for (const entry of entries) {
@@ -194,7 +171,7 @@ async function extractWordlists(gridsetBuffer, password = (0, password_1.resolve
  * const updatedGridset = updateWordlist(gridsetBuffer, 'Greetings', newWordlist);
  * fs.writeFileSync('updated-gridset.gridset', updatedGridset);
  */
-async function updateWordlist(gridsetBuffer, gridName, wordlist, password = (0, password_1.resolveGridsetPasswordFromEnv)()) {
+async function updateWordlist(gridsetBuffer, gridName, wordlist, password = (0, password_1.resolveGridsetPasswordFromEnv)(), fileAdapter = io_1.defaultFileAdapter, zipAdapter) {
     const parser = new fast_xml_parser_1.XMLParser();
     const builder = new fast_xml_parser_1.XMLBuilder({
         ignoreAttributes: false,
@@ -202,45 +179,11 @@ async function updateWordlist(gridsetBuffer, gridName, wordlist, password = (0,
         indentBy: '  ',
         suppressEmptyNode: false,
     });
-    let entries;
-    let saveZip = null;
-    let updateEntry = null;
-    try {
-        if ((0, io_1.isNodeRuntime)()) {
-            const AdmZip = (0, io_1.getNodeRequire)()('adm-zip');
-            const zip = new AdmZip(Buffer.from(gridsetBuffer));
-            entries = zip.getEntries().map((entry) => ({
-                entryName: entry.entryName,
-                getData: () => Promise.resolve(entry.getData()),
-            }));
-            updateEntry = (entryName, xml) => {
-                zip.addFile(entryName, Buffer.from(xml, 'utf8'));
-            };
-            saveZip = () => Promise.resolve(zip.toBuffer());
-        }
-        else {
-            const module = await Promise.resolve().then(() => __importStar(require('jszip')));
-            const JSZip = module.default || module;
-            const zip = await JSZip.loadAsync(gridsetBuffer);
-            entries = (0, password_1.getZipEntriesFromAdapter)({
-                listFiles: () => Object.keys(zip.files),
-                readFile: async (name) => {
-                    const file = zip.file(name);
-                    if (!file) {
-                        throw new Error(`Zip entry not found: ${name}`);
-                    }
-                    return file.async('uint8array');
-                },
-            }, password);
-            updateEntry = (entryName, xml) => {
-                zip.file(entryName, xml, { binary: false });
-            };
-            saveZip = async () => zip.generateAsync({ type: 'uint8array' });
-        }
-    }
-    catch (error) {
-        throw new Error(`Invalid gridset buffer: ${error.message}`);
-    }
+    const updatedEntries = [];
+    const zip = zipAdapter
+        ? await zipAdapter(gridsetBuffer)
+        : await (0, zip_1.getZipAdapter)(gridsetBuffer, fileAdapter);
+    const entries = (0, password_1.getZipEntriesFromAdapter)(zip, password);
     let found = false;
     // Find and update the grid
     for (const entry of entries) {
@@ -275,9 +218,10 @@ async function updateWordlist(gridsetBuffer, gridName, wordlist, password = (0,
                     };
                     // Rebuild the XML
                     const updatedXml = builder.build(data);
-                    if (updateEntry) {
-                        updateEntry(entry.entryName, updatedXml);
-                    }
+                    updatedEntries.push({
+                        name: entry.entryName,
+                        data: updatedXml,
+                    });
                     found = true;
                 }
                 catch (error) {
@@ -290,8 +234,5 @@ async function updateWordlist(gridsetBuffer, gridName, wordlist, password = (0,
     if (!found) {
         throw new Error(`Grid "${gridName}" not found in gridset`);
     }
-    if (!saveZip) {
-        throw new Error('Failed to serialize updated gridset.');
-    }
-    return await saveZip();
+    return await zip.writeFiles(updatedEntries);
 }

package/dist/processors/gridsetProcessor.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GridsetProcessor = void 0;
 const baseProcessor_1 = require("../core/baseProcessor");
@@ -40,7 +17,6 @@ const resolver_2 = require("./gridset/resolver");
 const idGenerator_1 = require("../utilities/analytics/utils/idGenerator");
 const symbolAlignment_1 = require("./gridset/symbolAlignment");
 const io_1 = require("../utils/io");
-const zip_1 = require("../utils/zip");
 class GridsetProcessor extends baseProcessor_1.BaseProcessor {
     constructor(options) {
         super(options);
@@ -421,19 +397,18 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
         return texts;
     }
     async loadIntoTree(filePathOrBuffer) {
+        const { readBinaryFromInput } = this.options.fileAdapter;
         const tree = new treeStructure_1.AACTree();
         let zipResult;
         try {
-            const zipInput = (0, io_1.readBinaryFromInput)(filePathOrBuffer);
-            zipResult = this.options.zipAdapter
-                ? await this.options.zipAdapter(zipInput)
-                : await (0, zip_1.openZipFromInput)(zipInput);
+            const zipInput = readBinaryFromInput(filePathOrBuffer);
+            zipResult = await this.options.zipAdapter(zipInput);
         }
         catch (error) {
             throw new Error(`Invalid ZIP file format: ${error.message}`);
         }
         const password = this.getGridsetPassword(filePathOrBuffer);
-        const entries = (0, password_1.getZipEntriesFromAdapter)(zipResult.zip, password);
+        const entries = (0, password_1.getZipEntriesFromAdapter)(zipResult, password);
         const options = {
             ignoreAttributes: false,
             ignoreDeclaration: true,
@@ -1709,6 +1684,7 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
         return tree;
     }
     async processTexts(filePathOrBuffer, translations, outputPath) {
+        const { readBinaryFromInput } = this.options.fileAdapter;
         // Load the tree, apply translations, and save to new file
         const tree = await this.loadIntoTree(filePathOrBuffer);
         // Apply translations to all text content
@@ -1769,7 +1745,7 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
         });
         // Save the translated tree and return its content
         await this.saveFromTree(tree, outputPath);
-        return (0, io_1.readBinaryFromInput)(outputPath);
+        return readBinaryFromInput(outputPath);
     }
     /**
      * Extract symbol information from a gridset for LLM-based translation.
@@ -1811,6 +1787,7 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
      * @returns Buffer of the translated gridset
      */
     async processLLMTranslations(filePathOrBuffer, llmTranslations, outputPath, options) {
+        const { readBinaryFromInput } = this.options.fileAdapter;
         const tree = await this.loadIntoTree(filePathOrBuffer);
         // Validate translations using shared utility
         const buttonIds = Object.values(tree.pages).flatMap((page) => page.buttons.map((b) => b.id));
@@ -1849,40 +1826,16 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
         });
         // Save and return
         await this.saveFromTree(tree, outputPath);
-        return (0, io_1.readBinaryFromInput)(outputPath);
+        return readBinaryFromInput(outputPath);
     }
     async saveFromTree(tree, outputPath) {
-        const useNodeZip = (0, io_1.isNodeRuntime)();
-        let addText;
-        let addBinary;
-        let finalizeZip;
-        if (useNodeZip) {
-            const AdmZip = (0, io_1.getNodeRequire)()('adm-zip');
-            const zip = new AdmZip();
-            addText = (entryPath, content) => {
-                zip.addFile(entryPath, Buffer.from(content, 'utf8'));
-            };
-            addBinary = (entryPath, content) => {
-                zip.addFile(entryPath, Buffer.from(content));
-            };
-            finalizeZip = () => Promise.resolve(zip.toBuffer());
-        }
-        else {
-            const module = await Promise.resolve().then(() => __importStar(require('jszip')));
-            const JSZip = module.default || module;
-            const zip = new JSZip();
-            addText = (entryPath, content) => {
-                zip.file(entryPath, content, { binary: false });
-            };
-            addBinary = (entryPath, content) => {
-                zip.file(entryPath, content);
-            };
-            finalizeZip = async () => zip.generateAsync({ type: 'uint8array' });
-        }
+        const files = [];
+        const { writeBinaryToPath } = this.options.fileAdapter;
+        const zip = await this.options.zipAdapter();
         if (Object.keys(tree.pages).length === 0) {
             // Create empty zip for empty tree
-            const zipBuffer = await finalizeZip();
-            (0, io_1.writeBinaryToPath)(outputPath, zipBuffer);
+            const zipBuffer = await zip.writeFiles([]);
+            writeBinaryToPath(outputPath, zipBuffer);
             return;
         }
         // Collect all unique styles from pages and buttons
@@ -1954,7 +1907,10 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
             suppressEmptyNode: true,
         });
         const settingsXmlContent = settingsBuilder.build(settingsData);
-        addText('Settings0/settings.xml', settingsXmlContent);
+        files.push({
+            name: 'Settings0/settings.xml',
+            data: settingsXmlContent,
+        });
         // Create Settings0/Styles/style.xml if there are styles
         if (uniqueStyles.size > 0) {
             const stylesArray = Array.from(uniqueStyles.values()).map(({ id, style }) => {
@@ -1987,7 +1943,10 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                 indentBy: '  ',
             });
             const styleXmlContent = styleBuilder.build(styleData);
-            addText('Settings0/Styles/styles.xml', styleXmlContent);
+            files.push({
+                name: 'Settings0/Styles/styles.xml',
+                data: styleXmlContent,
+            });
         }
         // Collect grid file paths for FileMap.xml
         const gridFilePaths = [];
@@ -2128,14 +2087,20 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
             // Add to zip in Grids folder with proper Grid3 naming
             const gridPath = `Grids/${page.name || page.id}/grid.xml`;
             gridFilePaths.push(gridPath);
-            addText(gridPath, xmlContent);
+            files.push({
+                name: gridPath,
+                data: xmlContent,
+            });
         });
         // Write image files to ZIP
         buttonImages.forEach((imgData) => {
             if (imgData.imageData && imgData.imageData.length > 0) {
                 // Create image path in the grid's directory
                 const imagePath = `Grids/${imgData.pageName}/${imgData.x}-${imgData.y}-0-text-0.${imgData.ext}`;
-                addBinary(imagePath, imgData.imageData);
+                files.push({
+                    name: imagePath,
+                    data: imgData.imageData,
+                });
             }
         });
         // Create FileMap.xml to map all grid files with their dynamic image files
@@ -2174,10 +2139,13 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
             indentBy: '  ',
         });
         const fileMapXmlContent = fileMapBuilder.build(fileMapData);
-        addText('FileMap.xml', fileMapXmlContent);
+        files.push({
+            name: 'FileMap.xml',
+            data: fileMapXmlContent,
+        });
         // Write the zip file
-        const zipBuffer = await finalizeZip();
-        (0, io_1.writeBinaryToPath)(outputPath, zipBuffer);
+        const zipBuffer = await zip.writeFiles(files);
+        writeBinaryToPath(outputPath, zipBuffer);
     }
     // Helper method to calculate column definitions based on page layout
     calculateColumnDefinitions(page) {
@@ -2274,7 +2242,7 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
      * @returns Promise with validation result
      */
     async validate(filePath) {
-        return gridsetValidator_1.GridsetValidator.validateFile(filePath);
+        return gridsetValidator_1.GridsetValidator.validateFile(filePath, this.options.fileAdapter);
     }
 }
 exports.GridsetProcessor = GridsetProcessor;