@willwade/aac-processors 0.0.30 → 0.1.0

package/dist/processors/snapProcessor.d.ts

@@ -1,6 +1,7 @@
 import { BaseProcessor, ProcessorOptions, ExtractStringsResult, TranslatedString, SourceString } from '../core/baseProcessor';
 import { AACTree } from '../core/treeStructure';
 import { ValidationResult } from '../validation/validationTypes';
+import { ProcessorInput } from '../utils/io';
 declare class SnapProcessor extends BaseProcessor {
     private symbolResolver;
     private loadAudio;
@@ -9,21 +10,21 @@ declare class SnapProcessor extends BaseProcessor {
         loadAudio?: boolean;
         pageLayoutPreference?: 'largest' | 'smallest' | 'scanning' | number;
     });
-    extractTexts(filePathOrBuffer: string | Buffer): string[];
-    loadIntoTree(filePathOrBuffer: string | Buffer): AACTree;
-    processTexts(filePathOrBuffer: string | Buffer, translations: Map<string, string>, outputPath: string): Buffer;
-    saveFromTree(tree: AACTree, outputPath: string): void;
+    extractTexts(filePathOrBuffer: ProcessorInput): Promise<string[]>;
+    loadIntoTree(filePathOrBuffer: ProcessorInput): Promise<AACTree>;
+    processTexts(filePathOrBuffer: ProcessorInput, translations: Map<string, string>, outputPath: string): Promise<Uint8Array>;
+    saveFromTree(tree: AACTree, outputPath: string): Promise<void>;
     /**
      * Add audio recording to a button in the database
      */
-    addAudioToButton(dbPath: string, buttonId: number, audioData: Buffer, metadata?: string): number;
+    addAudioToButton(dbPath: string, buttonId: number, audioData: Uint8Array, metadata?: string): Promise<number>;
     /**
      * Create a copy of the pageset with audio recordings added
      */
     createAudioEnhancedPageset(sourceDbPath: string, targetDbPath: string, audioMappings: Map<number, {
-        audioData: Buffer;
+        audioData: Uint8Array;
         metadata?: string;
-    }>): void;
+    }>): Promise<void>;
     /**
      * Extract buttons from a specific page that need audio recordings
      */

package/dist/processors/snapProcessor.js

@@ -34,8 +34,8 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
         this.pageLayoutPreference =
             options.pageLayoutPreference !== undefined ? options.pageLayoutPreference : 'scanning'; // Default to scanning
     }
-    extractTexts(filePathOrBuffer) {
-        const tree = this.loadIntoTree(filePathOrBuffer);
+    async extractTexts(filePathOrBuffer) {
+        const tree = await this.loadIntoTree(filePathOrBuffer);
         const texts = [];
         for (const pageId in tree.pages) {
             const page = tree.pages[pageId];
@@ -52,7 +52,8 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
         }
         return texts;
     }
-    loadIntoTree(filePathOrBuffer) {
+    async loadIntoTree(filePathOrBuffer) {
+        await Promise.resolve();
         const tree = new treeStructure_1.AACTree();
         const filePath = typeof filePathOrBuffer === 'string'
             ? filePathOrBuffer
@@ -612,9 +613,9 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
             }
         }
     }
-    processTexts(filePathOrBuffer, translations, outputPath) {
+    async processTexts(filePathOrBuffer, translations, outputPath) {
         // Load the tree, apply translations, and save to new file
-        const tree = this.loadIntoTree(filePathOrBuffer);
+        const tree = await this.loadIntoTree(filePathOrBuffer);
         // Apply translations to all text content
         Object.values(tree.pages).forEach((page) => {
             // Translate page names
@@ -641,10 +642,11 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
             });
         });
         // Save the translated tree and return its content
-        this.saveFromTree(tree, outputPath);
+        await this.saveFromTree(tree, outputPath);
         return fs_1.default.readFileSync(outputPath);
     }
-    saveFromTree(tree, outputPath) {
+    async saveFromTree(tree, outputPath) {
+        await Promise.resolve();
         const outputDir = path_1.default.dirname(outputPath);
         if (!fs_1.default.existsSync(outputDir)) {
             fs_1.default.mkdirSync(outputDir, { recursive: true });
@@ -840,7 +842,8 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
     /**
      * Add audio recording to a button in the database
      */
-    addAudioToButton(dbPath, buttonId, audioData, metadata) {
+    async addAudioToButton(dbPath, buttonId, audioData, metadata) {
+        await Promise.resolve();
         const db = new better_sqlite3_1.default(dbPath, { fileMustExist: true });
         try {
             // Ensure PageSetData table exists
@@ -882,13 +885,13 @@ class SnapProcessor extends baseProcessor_1.BaseProcessor {
     /**
      * Create a copy of the pageset with audio recordings added
      */
-    createAudioEnhancedPageset(sourceDbPath, targetDbPath, audioMappings) {
+    async createAudioEnhancedPageset(sourceDbPath, targetDbPath, audioMappings) {
         // Copy the source database to target
         fs_1.default.copyFileSync(sourceDbPath, targetDbPath);
         // Add audio recordings to the copy
-        audioMappings.forEach((audioInfo, buttonId) => {
-            this.addAudioToButton(targetDbPath, buttonId, audioInfo.audioData, audioInfo.metadata);
-        });
+        for (const [buttonId, audioInfo] of audioMappings.entries()) {
+            await this.addAudioToButton(targetDbPath, buttonId, audioInfo.audioData, audioInfo.metadata);
+        }
     }
     /**
      * Extract buttons from a specific page that need audio recordings

package/dist/processors/touchchatProcessor.d.ts

@@ -1,15 +1,16 @@
 import { BaseProcessor, ProcessorOptions, ExtractStringsResult, TranslatedString, SourceString } from '../core/baseProcessor';
 import { AACTree } from '../core/treeStructure';
 import { ValidationResult } from '../validation/validationTypes';
+import { ProcessorInput } from '../utils/io';
 import { type ButtonForTranslation, type LLMLTranslationResult } from '../utilities/translation/translationProcessor';
 declare class TouchChatProcessor extends BaseProcessor {
     private tree;
     private sourceFile;
     constructor(options?: ProcessorOptions);
-    extractTexts(filePathOrBuffer: string | Buffer): string[];
-    loadIntoTree(filePathOrBuffer: string | Buffer): AACTree;
-    processTexts(filePathOrBuffer: string | Buffer, translations: Map<string, string>, outputPath: string): Buffer;
-    saveFromTree(tree: AACTree, outputPath: string): void;
+    extractTexts(filePathOrBuffer: ProcessorInput): Promise<string[]>;
+    loadIntoTree(filePathOrBuffer: ProcessorInput): Promise<AACTree>;
+    processTexts(filePathOrBuffer: ProcessorInput, translations: Map<string, string>, outputPath: string): Promise<Uint8Array>;
+    saveFromTree(tree: AACTree, outputPath: string): Promise<void>;
     /**
      * Alias method for aac-tools-platform compatibility
      * Extracts strings with TouchChat-specific metadata required for database storage
@@ -40,7 +41,7 @@ declare class TouchChatProcessor extends BaseProcessor {
      * @param filePathOrBuffer - Path to TouchChat .ce file or buffer
      * @returns Array of symbol information for LLM processing
      */
-    extractSymbolsForLLM(filePathOrBuffer: string | Buffer): ButtonForTranslation[];
+    extractSymbolsForLLM(filePathOrBuffer: string | Buffer): Promise<ButtonForTranslation[]>;
     /**
      * Apply LLM translations with symbol information.
      * The LLM should provide translations with symbol attachments in the correct positions.
@@ -53,8 +54,8 @@ declare class TouchChatProcessor extends BaseProcessor {
      * @param options - Translation options (e.g., allowPartial for testing)
      * @returns Buffer of the translated TouchChat file
      */
-    processLLMTranslations(filePathOrBuffer: string | Buffer, llmTranslations: LLMLTranslationResult[], outputPath: string, options?: {
+    processLLMTranslations(filePathOrBuffer: string | Uint8Array, llmTranslations: LLMLTranslationResult[], outputPath: string, options?: {
         allowPartial?: boolean;
-    }): Buffer;
+    }): Promise<Uint8Array>;
 }
 export { TouchChatProcessor };

package/dist/processors/touchchatProcessor.js

@@ -14,6 +14,7 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const touchChatValidator_1 = require("../validation/touchChatValidator");
+const io_1 = require("../utils/io");
 const translationProcessor_1 = require("../utilities/translation/translationProcessor");
 const toNumberOrUndefined = (value) => typeof value === 'number' ? value : undefined;
 const toStringOrUndefined = (value) => typeof value === 'string' && value.length > 0 ? value : undefined;
@@ -42,10 +43,10 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
         this.tree = null;
         this.sourceFile = null;
     }
-    extractTexts(filePathOrBuffer) {
+    async extractTexts(filePathOrBuffer) {
         // Extracts all button labels/texts from TouchChat .ce file
         if (!this.tree && filePathOrBuffer) {
-            this.tree = this.loadIntoTree(filePathOrBuffer);
+            this.tree = await this.loadIntoTree(filePathOrBuffer);
         }
         if (!this.tree) {
             throw new Error('No tree available - call loadIntoTree first');
@@ -62,7 +63,8 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
         }
         return texts;
     }
-    loadIntoTree(filePathOrBuffer) {
+    async loadIntoTree(filePathOrBuffer) {
+        await Promise.resolve();
         // Unzip .ce file, extract the .c4v SQLite DB, and parse pages/buttons
         let tmpDir = null;
         let db = null;
@@ -71,7 +73,9 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
             this.sourceFile = filePathOrBuffer;
             // Step 1: Unzip
             tmpDir = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'touchchat-'));
-            const zip = new adm_zip_1.default(typeof filePathOrBuffer === 'string' ? filePathOrBuffer : Buffer.from(filePathOrBuffer));
+            const zipInput = (0, io_1.readBinaryFromInput)(filePathOrBuffer);
+            const zipBuffer = Buffer.isBuffer(zipInput) ? zipInput : Buffer.from(zipInput);
+            const zip = new adm_zip_1.default(zipBuffer);
             zip.extractAllTo(tmpDir, true);
             // Step 2: Find and open SQLite DB
             const files = fs_1.default.readdirSync(tmpDir);
@@ -485,9 +489,9 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
             }
         }
     }
-    processTexts(filePathOrBuffer, translations, outputPath) {
+    async processTexts(filePathOrBuffer, translations, outputPath) {
         // Load the tree, apply translations, and save to new file
-        const tree = this.loadIntoTree(filePathOrBuffer);
+        const tree = await this.loadIntoTree(filePathOrBuffer);
         // Apply translations to all text content
         Object.values(tree.pages).forEach((page) => {
             // Translate page names
@@ -514,10 +518,11 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
             });
         });
         // Save the translated tree and return its content
-        this.saveFromTree(tree, outputPath);
+        await this.saveFromTree(tree, outputPath);
         return fs_1.default.readFileSync(outputPath);
     }
-    saveFromTree(tree, outputPath) {
+    async saveFromTree(tree, outputPath) {
+        await Promise.resolve();
         // Create a TouchChat database that matches the expected schema for loading
         const tmpDir = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'touchchat-export-'));
         const dbPath = path_1.default.join(tmpDir, 'vocab.c4v');
@@ -829,9 +834,9 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
      * @param filePath - Path to the TouchChat .ce file
      * @returns Promise with extracted strings and any errors
      */
-    extractStringsWithMetadata(filePath) {
+    async extractStringsWithMetadata(filePath) {
         try {
-            const tree = this.loadIntoTree(filePath);
+            const tree = await this.loadIntoTree(filePath);
             const extractedMap = new Map();
             // Process all pages and buttons with TouchChat-specific logic
             Object.values(tree.pages).forEach((page) => {
@@ -885,7 +890,7 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
      * @param sourceStrings - Array of source string data with metadata
      * @returns Promise with path to the generated translated file
      */
-    generateTranslatedDownload(filePath, translatedStrings, sourceStrings) {
+    async generateTranslatedDownload(filePath, translatedStrings, sourceStrings) {
         try {
             // Build translation map from the provided data
             const translations = new Map();
@@ -901,7 +906,7 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
             // Generate output path for TouchChat files
             const outputPath = filePath.replace(/\.ce$/, '_translated.ce');
             // Use existing processTexts method
-            this.processTexts(filePath, translations, outputPath);
+            await this.processTexts(filePath, translations, outputPath);
             return Promise.resolve(outputPath);
         }
         catch (error) {
@@ -925,8 +930,8 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
      * @param filePathOrBuffer - Path to TouchChat .ce file or buffer
      * @returns Array of symbol information for LLM processing
      */
-    extractSymbolsForLLM(filePathOrBuffer) {
-        const tree = this.loadIntoTree(filePathOrBuffer);
+    async extractSymbolsForLLM(filePathOrBuffer) {
+        const tree = await this.loadIntoTree(filePathOrBuffer);
         // Collect all buttons from all pages
         const allButtons = [];
         Object.values(tree.pages).forEach((page) => {
@@ -955,8 +960,8 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
      * @param options - Translation options (e.g., allowPartial for testing)
      * @returns Buffer of the translated TouchChat file
      */
-    processLLMTranslations(filePathOrBuffer, llmTranslations, outputPath, options) {
-        const tree = this.loadIntoTree(filePathOrBuffer);
+    async processLLMTranslations(filePathOrBuffer, llmTranslations, outputPath, options) {
+        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));
         (0, translationProcessor_1.validateTranslationResults)(llmTranslations, buttonIds, options);
@@ -993,7 +998,7 @@ class TouchChatProcessor extends baseProcessor_1.BaseProcessor {
             });
         });
         // Save and return
-        this.saveFromTree(tree, outputPath);
+        await this.saveFromTree(tree, outputPath);
         return fs_1.default.readFileSync(outputPath);
     }
 }

package/dist/types/aac.d.ts

@@ -1,4 +1,3 @@
-import { AACSemanticAction } from '../core/treeStructure';
 /**
  * Scanning selection methods for switch access
  * Determines how the scanning advances through items
@@ -76,7 +75,6 @@ export interface AACButton {
     id: string;
     label: string;
     message: string;
-    semanticAction?: AACSemanticAction;
     targetPageId?: string;
     style?: AACStyle;
     audioRecording?: {

package/dist/types/aac.js

@@ -1,4 +1,6 @@
 "use strict";
+// Note: AACSemanticAction is defined in core/treeStructure.ts to avoid circular dependency
+// Import it directly if needed: import { AACSemanticAction } from '../core/treeStructure';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CellScanningOrder = exports.ScanningSelectionMethod = void 0;
 /**

package/dist/utils/io.d.ts

@@ -0,0 +1,12 @@
+export type ProcessorInput = string | Buffer | ArrayBuffer | Uint8Array;
+export type BinaryOutput = Buffer | Uint8Array;
+export declare function getFs(): typeof import('fs');
+export declare function getPath(): typeof import('path');
+export declare function getBasename(filePath: string): string;
+export declare function decodeText(input: Uint8Array): string;
+export declare function encodeBase64(input: Uint8Array): string;
+export declare function encodeText(text: string): BinaryOutput;
+export declare function readBinaryFromInput(input: ProcessorInput): Uint8Array;
+export declare function readTextFromInput(input: ProcessorInput, encoding?: BufferEncoding): string;
+export declare function writeBinaryToPath(outputPath: string, data: BinaryOutput): void;
+export declare function writeTextToPath(outputPath: string, text: string): void;

package/dist/utils/io.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFs = getFs;
+exports.getPath = getPath;
+exports.getBasename = getBasename;
+exports.decodeText = decodeText;
+exports.encodeBase64 = encodeBase64;
+exports.encodeText = encodeText;
+exports.readBinaryFromInput = readBinaryFromInput;
+exports.readTextFromInput = readTextFromInput;
+exports.writeBinaryToPath = writeBinaryToPath;
+exports.writeTextToPath = writeTextToPath;
+let cachedFs = null;
+let cachedPath = null;
+function getFs() {
+    if (!cachedFs) {
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            cachedFs = require('fs');
+        }
+        catch {
+            throw new Error('File system access is not available in this environment.');
+        }
+    }
+    if (!cachedFs) {
+        throw new Error('File system access is not available in this environment.');
+    }
+    return cachedFs;
+}
+function getPath() {
+    if (!cachedPath) {
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            cachedPath = require('path');
+        }
+        catch {
+            throw new Error('Path utilities are not available in this environment.');
+        }
+    }
+    if (!cachedPath) {
+        throw new Error('Path utilities are not available in this environment.');
+    }
+    return cachedPath;
+}
+function getBasename(filePath) {
+    const parts = filePath.split(/[/\\]/);
+    return parts[parts.length - 1] || filePath;
+}
+function decodeText(input) {
+    if (typeof Buffer !== 'undefined' && Buffer.isBuffer(input)) {
+        return input.toString('utf8');
+    }
+    const decoder = new TextDecoder('utf-8');
+    return decoder.decode(input);
+}
+function encodeBase64(input) {
+    if (typeof Buffer !== 'undefined' && Buffer.isBuffer(input)) {
+        return input.toString('base64');
+    }
+    // Browser fallback using btoa
+    let binary = '';
+    const len = input.byteLength;
+    for (let i = 0; i < len; i++) {
+        binary += String.fromCharCode(input[i]);
+    }
+    return btoa(binary);
+}
+function encodeText(text) {
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(text, 'utf8');
+    }
+    return new TextEncoder().encode(text);
+}
+function readBinaryFromInput(input) {
+    if (typeof input === 'string') {
+        const fs = getFs();
+        return fs.readFileSync(input);
+    }
+    if (typeof Buffer !== 'undefined' && Buffer.isBuffer(input)) {
+        return input;
+    }
+    if (input instanceof ArrayBuffer) {
+        return new Uint8Array(input);
+    }
+    return input;
+}
+function readTextFromInput(input, encoding = 'utf8') {
+    if (typeof input === 'string') {
+        const fs = getFs();
+        return fs.readFileSync(input, encoding);
+    }
+    if (typeof Buffer !== 'undefined' && Buffer.isBuffer(input)) {
+        return input.toString(encoding);
+    }
+    if (input instanceof ArrayBuffer) {
+        return decodeText(new Uint8Array(input));
+    }
+    return decodeText(input);
+}
+function writeBinaryToPath(outputPath, data) {
+    const fs = getFs();
+    fs.writeFileSync(outputPath, data);
+}
+function writeTextToPath(outputPath, text) {
+    const fs = getFs();
+    fs.writeFileSync(outputPath, text, 'utf8');
+}

package/dist/validation/gridsetValidator.js

@@ -33,7 +33,7 @@ exports.GridsetValidator = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const xml2js = __importStar(require("xml2js"));
-const adm_zip_1 = __importDefault(require("adm-zip"));
+const jszip_1 = __importDefault(require("jszip"));
 const baseValidator_1 = require("./baseValidator");
 /**
  * Validator for Grid3/Smartbox Gridset files (.gridset, .gridsetx)
@@ -140,22 +140,22 @@ class GridsetValidator extends baseValidator_1.BaseValidator {
     async validateZipArchive(content, filename, _filesize) {
         let zip;
         try {
-            zip = new adm_zip_1.default(Buffer.from(content));
+            zip = await jszip_1.default.loadAsync(Buffer.from(content));
         }
         catch (e) {
             this.err(`Failed to open ZIP archive: ${e.message}`, true);
             return;
         }
-        const entries = zip.getEntries();
+        const entries = Object.values(zip.files).filter((entry) => !entry.dir);
         // Check for gridset.xml (required)
         await this.add_check('gridset_xml_presence', 'gridset.xml presence', async () => {
-            const gridsetEntry = entries.find((e) => e.entryName.toLowerCase() === 'gridset.xml');
+            const gridsetEntry = entries.find((e) => e.name.toLowerCase() === 'gridset.xml');
             if (!gridsetEntry) {
                 this.err('Missing gridset.xml in archive', true);
             }
             else {
                 try {
-                    const gridsetXml = gridsetEntry.getData().toString('utf-8');
+                    const gridsetXml = await gridsetEntry.async('string');
                     const parser = new xml2js.Parser();
                     const xmlObj = await parser.parseStringPromise(gridsetXml);
                     const gridset = xmlObj.gridset || xmlObj.Gridset;
@@ -173,13 +173,13 @@ class GridsetValidator extends baseValidator_1.BaseValidator {
         });
         // Check for settings.xml (highly recommended/required for metadata)
         await this.add_check('settings_xml_presence', 'settings.xml presence', async () => {
-            const settingsEntry = entries.find((e) => e.entryName.toLowerCase() === 'settings.xml');
+            const settingsEntry = entries.find((e) => e.name.toLowerCase() === 'settings.xml');
             if (!settingsEntry) {
                 this.warn('Missing settings.xml in archive (required for full metadata)');
             }
             else {
                 try {
-                    const settingsXml = settingsEntry.getData().toString('utf-8');
+                    const settingsXml = await settingsEntry.async('string');
                     const parser = new xml2js.Parser();
                     const xmlObj = await parser.parseStringPromise(settingsXml);
                     const settings = xmlObj.GridSetSettings || xmlObj.gridSetSettings || xmlObj.GridsetSettings;

package/dist/validation/snapValidator.js

@@ -32,7 +32,7 @@ exports.SnapValidator = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const xml2js = __importStar(require("xml2js"));
-const adm_zip_1 = __importDefault(require("adm-zip"));
+const jszip_1 = __importDefault(require("jszip"));
 const baseValidator_1 = require("./baseValidator");
 /**
  * Validator for Snap files (.spb, .sps)
@@ -62,10 +62,10 @@ class SnapValidator extends baseValidator_1.BaseValidator {
         }
         // Try to parse as ZIP and check for Snap structure
         try {
-            const zip = new adm_zip_1.default(content);
-            const entries = zip.getEntries();
-            // Snap packages typically have settings.xml or similar
-            return entries.some((e) => e.entryName.includes('settings') || e.entryName.includes('.xml'));
+            const buffer = Buffer.isBuffer(content) ? content : Buffer.from(content);
+            const zip = await jszip_1.default.loadAsync(buffer);
+            const entries = Object.values(zip.files).filter((entry) => !entry.dir);
+            return entries.some((entry) => entry.name.includes('settings') || entry.name.includes('.xml'));
         }
         catch {
             return false;
@@ -85,10 +85,9 @@ class SnapValidator extends baseValidator_1.BaseValidator {
         let validZip = false;
         await this.add_check('zip', 'valid zip package', async () => {
             try {
-                // Ensure content is a Buffer for AdmZip
                 const buffer = Buffer.isBuffer(content) ? content : Buffer.from(content);
-                zip = new adm_zip_1.default(buffer);
-                const entries = zip.getEntries();
+                zip = await jszip_1.default.loadAsync(buffer);
+                const entries = Object.values(zip.files);
                 validZip = entries.length > 0;
             }
             catch (e) {
@@ -107,8 +106,8 @@ class SnapValidator extends baseValidator_1.BaseValidator {
     async validateSnapStructure(zip, _filename) {
         // Check for required files
         await this.add_check('required_files', 'required package files', async () => {
-            const entries = zip.getEntries();
-            const entryNames = entries.map((e) => e.entryName);
+            const entries = Object.values(zip.files);
+            const entryNames = entries.map((e) => e.name);
             // Look for common Snap files
             const hasSettings = entryNames.some((n) => n.toLowerCase().includes('settings'));
             const hasXml = entryNames.some((n) => n.toLowerCase().endsWith('.xml'));
@@ -120,14 +119,12 @@ class SnapValidator extends baseValidator_1.BaseValidator {
             }
         });
         // Try to parse and validate the main settings file
-        const settingsEntry = zip
-            .getEntries()
-            .find((e) => e.entryName.toLowerCase().includes('settings'));
+        const settingsEntry = Object.values(zip.files).find((entry) => !entry.dir && entry.name.toLowerCase().includes('settings'));
         if (settingsEntry) {
-            await this.validateSettingsFile(zip, settingsEntry);
+            await this.validateSettingsFile(settingsEntry);
         }
         // Check for pages
-        const pageEntries = zip.getEntries().filter((e) => e.entryName.toLowerCase().includes('page'));
+        const pageEntries = Object.values(zip.files).filter((entry) => !entry.dir && entry.name.toLowerCase().includes('page'));
         await this.add_check('pages', 'pages in package', async () => {
             if (pageEntries.length === 0) {
                 this.warn('Snap package should contain at least one page file');
@@ -136,21 +133,17 @@ class SnapValidator extends baseValidator_1.BaseValidator {
         // Validate a sample of pages
         const samplePages = pageEntries.slice(0, 5); // Limit to first 5 pages
         for (let i = 0; i < samplePages.length; i++) {
-            await this.validatePageFile(zip, samplePages[i], i);
+            await this.validatePageFile(samplePages[i], i);
         }
         // Check for images
-        const imageEntries = zip
-            .getEntries()
-            .filter((e) => e.entryName.toLowerCase().match(/\.(png|jpg|jpeg|gif|bmp)$/i));
+        const imageEntries = Object.values(zip.files).filter((entry) => !entry.dir && entry.name.toLowerCase().match(/\.(png|jpg|jpeg|gif|bmp)$/i));
         await this.add_check('images', 'image files', async () => {
             if (imageEntries.length === 0) {
                 this.warn('Snap package should contain image files for buttons');
             }
         });
         // Check for audio files
-        const audioEntries = zip
-            .getEntries()
-            .filter((e) => e.entryName.toLowerCase().match(/\.(wav|mp3|m4a|ogg)$/i));
+        const audioEntries = Object.values(zip.files).filter((entry) => !entry.dir && entry.name.toLowerCase().match(/\.(wav|mp3|m4a|ogg)$/i));
         await this.add_check('audio', 'audio files', async () => {
             // Audio files are optional, so just warn if missing
             if (audioEntries.length === 0) {
@@ -159,9 +152,9 @@ class SnapValidator extends baseValidator_1.BaseValidator {
         });
         // Check for unexpected files
         await this.add_check('unexpected_files', 'unexpected file types', async () => {
-            const entries = zip.getEntries();
-            const unexpectedFiles = entries.filter((e) => {
-                const name = e.entryName.toLowerCase();
+            const entries = Object.values(zip.files).filter((entry) => !entry.dir);
+            const unexpectedFiles = entries.filter((entry) => {
+                const name = entry.name.toLowerCase();
                 // Skip common system files and directories
                 if (name.startsWith('__macosx') || name.startsWith('.ds_store')) {
                     return false;
@@ -170,7 +163,7 @@ class SnapValidator extends baseValidator_1.BaseValidator {
                 return !name.match(/\.(xml|png|jpg|jpeg|gif|bmp|wav|mp3|m4a|ogg|json)$/i);
             });
             if (unexpectedFiles.length > 0) {
-                const unexpectedNames = unexpectedFiles.map((f) => f.entryName).slice(0, 5);
+                const unexpectedNames = unexpectedFiles.map((f) => f.name).slice(0, 5);
                 this.warn(`Package contains unexpected file types: ${unexpectedNames.join(', ')}`);
             }
         });
@@ -178,10 +171,10 @@ class SnapValidator extends baseValidator_1.BaseValidator {
     /**
      * Validate the main settings file
      */
-    async validateSettingsFile(zip, entry) {
+    async validateSettingsFile(entry) {
         await this.add_check('settings_format', 'settings file format', async () => {
             try {
-                const content = zip.readAsText(entry.entryName);
+                const content = await entry.async('string');
                 const parser = new xml2js.Parser();
                 const xml = await parser.parseStringPromise(content);
                 // Check for expected root element
@@ -206,30 +199,30 @@ class SnapValidator extends baseValidator_1.BaseValidator {
     /**
      * Validate a page file
      */
-    async validatePageFile(zip, entry, index) {
-        await this.add_check(`page[${index}]`, `page file ${index}: ${entry.entryName}`, async () => {
+    async validatePageFile(entry, index) {
+        await this.add_check(`page[${index}]`, `page file ${index}: ${entry.name}`, async () => {
             try {
-                const content = zip.readAsText(entry.entryName);
+                const content = await entry.async('string');
                 const parser = new xml2js.Parser();
                 const xml = await parser.parseStringPromise(content);
                 const page = xml.page || xml.Page;
                 if (!page) {
-                    this.err(`Page file ${entry.entryName} does not contain a page element`);
+                    this.err(`Page file ${entry.name} does not contain a page element`);
                     return;
                 }
                 // Check page attributes
                 const pageId = page.$?.id || page.$?.Id;
                 if (!pageId) {
-                    this.warn(`Page ${entry.entryName} is missing an id attribute`);
+                    this.warn(`Page ${entry.name} is missing an id attribute`);
                 }
                 // Check for cells/buttons
                 const cells = page.cells || page.Cells || page.button || page.Button;
                 if (!cells || (Array.isArray(cells) && cells.length === 0)) {
-                    this.warn(`Page ${entry.entryName} has no cells or buttons`);
+                    this.warn(`Page ${entry.name} has no cells or buttons`);
                 }
             }
             catch (e) {
-                this.err(`Failed to parse page file ${entry.entryName}: ${e.message}`);
+                this.err(`Failed to parse page file ${entry.name}: ${e.message}`);
             }
         });
     }