@willwade/aac-processors 0.2.15 → 0.2.16

package/dist/browser/processors/gridsetProcessor.js

@@ -2227,9 +2227,8 @@ class GridsetProcessor extends BaseProcessor {
             await writeBinaryToPath(outputPath, originalBuffer);
             return;
         }
-        const AdmZip = (await import('adm-zip')).default;
-        const originalZip = new AdmZip(originalPath);
-        const outputZip = new AdmZip();
+        const originalZip = await this.options.zipAdapter(originalPath);
+        const outputZip = await this.options.zipAdapter();
         // Check if any page has pending mutations
         const hasPendingMutations = Object.values(tree.pages).some((page) => page.pendingMutations.length > 0);
         if (hasPendingMutations) {
@@ -2246,15 +2245,13 @@ class GridsetProcessor extends BaseProcessor {
                 suppressBooleanAttributes: false,
             });
             GridsetSaveHandler.saveWithMutations(tree, originalZip, outputZip, parser, gridBuilder, (page) => this.createBasicGridXml(page));
-            // Copy remaining files
-            for (const entry of originalZip.getEntries()) {
-                if (entry.isDirectory)
-                    continue;
-                if (!outputZip.getEntry(entry.entryName)) {
-                    outputZip.addFile(entry.entryName, entry.getData());
-                }
+            // Copy files
+            const outputFiles = [];
+            for (const name of originalZip.listFiles()) {
+                const data = await originalZip.readFile(name);
+                outputFiles.push({ name, data });
             }
-            const outputBuffer = outputZip.toBuffer();
+            const outputBuffer = await outputZip.writeFiles(outputFiles);
             await writeBinaryToPath(outputPath, outputBuffer);
             return;
         }
@@ -2285,15 +2282,15 @@ class GridsetProcessor extends BaseProcessor {
             const gridPath = `Grids/${page.name}/grid.xml`;
             modifiedGridFiles.add(gridPath);
             // Try to get the original grid.xml file
-            const originalEntry = originalZip.getEntry(gridPath);
-            if (!originalEntry) {
+            const originalEntries = originalZip.listFiles();
+            if (!originalEntries.includes(gridPath)) {
                 // If original doesn't exist, create a new basic grid
                 const basicGrid = this.createBasicGridXml(page);
                 newGridFiles.set(gridPath, basicGrid);
                 continue;
             }
             // Parse the original grid XML
-            const originalContent = originalEntry.getData().toString('utf-8');
+            const originalContent = (await originalZip.readFile(gridPath)).toString();
             const originalGrid = parser.parse(originalContent);
             if (!originalGrid.Grid) {
                 // Invalid grid structure, create a basic one
@@ -2458,22 +2455,22 @@ class GridsetProcessor extends BaseProcessor {
             newGridFiles.set(gridPath, builtXml);
         }
         // Copy all files from original zip, replacing modified grid files
-        for (const entry of originalZip.getEntries()) {
-            if (entry.isDirectory)
-                continue;
+        const outputFiles = [];
+        for (const entry of originalZip.listFiles()) {
             // Skip grid.xml files that we're modifying
-            if (modifiedGridFiles.has(entry.entryName)) {
-                const newContent = newGridFiles.get(entry.entryName);
+            if (modifiedGridFiles.has(entry)) {
+                const newContent = newGridFiles.get(entry);
                 if (newContent) {
-                    outputZip.addFile(entry.entryName, Buffer.from(newContent, 'utf8'));
+                    outputFiles.push({ name: entry, data: Buffer.from(newContent, 'utf8') });
                 }
                 continue;
             }
             // Copy all other files as-is
-            outputZip.addFile(entry.entryName, entry.getData());
+            const data = await originalZip.readFile(entry);
+            outputFiles.push({ name: entry, data });
         }
         // Write the output ZIP
-        const outputBuffer = outputZip.toBuffer();
+        const outputBuffer = await outputZip.writeFiles(outputFiles);
         await writeBinaryToPath(outputPath, outputBuffer);
     }
     /**

package/dist/browser/processors/obfProcessor.js

@@ -741,24 +741,18 @@ class ObfProcessor extends BaseProcessor {
             await writeBinaryToPath(outputPath, originalBuffer);
             return;
         }
-        const AdmZip = (await import('adm-zip')).default;
-        const originalZip = new AdmZip(originalPath);
-        const outputZip = new AdmZip();
-        // Track which .obf files we're modifying
-        const modifiedObfFiles = new Set();
-        // Generate new .obf files for pages in the tree
-        const newObfFiles = new Map();
+        const originalZip = await this.options.zipAdapter(originalPath);
+        const outputZip = await this.options.zipAdapter();
+        const outputFiles = [];
         for (const page of Object.values(tree.pages)) {
-            const obfFilename = this.getPageFilename(page.id, tree.metadata);
-            modifiedObfFiles.add(obfFilename);
+            const name = this.getPageFilename(page.id, tree.metadata);
             // createObfBoardFromPage will automatically apply mutations if present
             const obfBoard = this.createObfBoardFromPage(page, 'Board', tree.metadata);
-            const obfContent = JSON.stringify(obfBoard, null, 2);
-            newObfFiles.set(obfFilename, obfContent);
+            const data = JSON.stringify(obfBoard, null, 2);
+            outputFiles.push({ name, data });
         }
         // Generate updated manifest if we have pages
         if (Object.keys(tree.pages).length > 0) {
-            modifiedObfFiles.add('manifest.json');
             const manifest = {
                 format: OBF_FORMAT_VERSION,
                 root: tree.metadata.defaultHomePageId,
@@ -771,25 +765,18 @@ class ObfProcessor extends BaseProcessor {
                     sounds: {},
                 },
             };
-            newObfFiles.set('manifest.json', JSON.stringify(manifest));
-        }
-        // Copy all files from original zip, replacing modified .obf files
-        for (const entry of originalZip.getEntries()) {
-            if (entry.isDirectory)
-                continue;
-            // Skip .obf files that we're modifying
-            if (modifiedObfFiles.has(entry.entryName)) {
-                const newContent = newObfFiles.get(entry.entryName);
-                if (newContent) {
-                    outputZip.addFile(entry.entryName, Buffer.from(newContent, 'utf8'));
-                }
-                continue;
+            const data = Buffer.from(JSON.stringify(manifest), 'utf8');
+            outputFiles.push({ name: 'manifest.json', data });
+        }
+        // Add remaining .obf from original zip
+        for (const entry of originalZip.listFiles()) {
+            if (!outputFiles.find((file) => file.name === entry)) {
+                const data = await originalZip.readFile(entry);
+                outputFiles.push({ name: entry, data });
             }
-            // Copy all other files as-is (preserves images, sounds, etc.)
-            outputZip.addFile(entry.entryName, entry.getData());
         }
         // Write the output ZIP
-        const outputBuffer = outputZip.toBuffer();
+        const outputBuffer = await outputZip.writeFiles(outputFiles);
         await writeBinaryToPath(outputPath, outputBuffer);
     }
     /**

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");
@@ -2253,9 +2230,8 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
             await writeBinaryToPath(outputPath, originalBuffer);
             return;
         }
-        const AdmZip = (await Promise.resolve().then(() => __importStar(require('adm-zip')))).default;
-        const originalZip = new AdmZip(originalPath);
-        const outputZip = new AdmZip();
+        const originalZip = await this.options.zipAdapter(originalPath);
+        const outputZip = await this.options.zipAdapter();
         // Check if any page has pending mutations
         const hasPendingMutations = Object.values(tree.pages).some((page) => page.pendingMutations.length > 0);
         if (hasPendingMutations) {
@@ -2272,15 +2248,13 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
                 suppressBooleanAttributes: false,
             });
             saveMutations_1.GridsetSaveHandler.saveWithMutations(tree, originalZip, outputZip, parser, gridBuilder, (page) => this.createBasicGridXml(page));
-            // Copy remaining files
-            for (const entry of originalZip.getEntries()) {
-                if (entry.isDirectory)
-                    continue;
-                if (!outputZip.getEntry(entry.entryName)) {
-                    outputZip.addFile(entry.entryName, entry.getData());
-                }
+            // Copy files
+            const outputFiles = [];
+            for (const name of originalZip.listFiles()) {
+                const data = await originalZip.readFile(name);
+                outputFiles.push({ name, data });
             }
-            const outputBuffer = outputZip.toBuffer();
+            const outputBuffer = await outputZip.writeFiles(outputFiles);
             await writeBinaryToPath(outputPath, outputBuffer);
             return;
         }
@@ -2311,15 +2285,15 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
             const gridPath = `Grids/${page.name}/grid.xml`;
             modifiedGridFiles.add(gridPath);
             // Try to get the original grid.xml file
-            const originalEntry = originalZip.getEntry(gridPath);
-            if (!originalEntry) {
+            const originalEntries = originalZip.listFiles();
+            if (!originalEntries.includes(gridPath)) {
                 // If original doesn't exist, create a new basic grid
                 const basicGrid = this.createBasicGridXml(page);
                 newGridFiles.set(gridPath, basicGrid);
                 continue;
             }
             // Parse the original grid XML
-            const originalContent = originalEntry.getData().toString('utf-8');
+            const originalContent = (await originalZip.readFile(gridPath)).toString();
             const originalGrid = parser.parse(originalContent);
             if (!originalGrid.Grid) {
                 // Invalid grid structure, create a basic one
@@ -2484,22 +2458,22 @@ class GridsetProcessor extends baseProcessor_1.BaseProcessor {
             newGridFiles.set(gridPath, builtXml);
         }
         // Copy all files from original zip, replacing modified grid files
-        for (const entry of originalZip.getEntries()) {
-            if (entry.isDirectory)
-                continue;
+        const outputFiles = [];
+        for (const entry of originalZip.listFiles()) {
             // Skip grid.xml files that we're modifying
-            if (modifiedGridFiles.has(entry.entryName)) {
-                const newContent = newGridFiles.get(entry.entryName);
+            if (modifiedGridFiles.has(entry)) {
+                const newContent = newGridFiles.get(entry);
                 if (newContent) {
-                    outputZip.addFile(entry.entryName, Buffer.from(newContent, 'utf8'));
+                    outputFiles.push({ name: entry, data: Buffer.from(newContent, 'utf8') });
                 }
                 continue;
             }
             // Copy all other files as-is
-            outputZip.addFile(entry.entryName, entry.getData());
+            const data = await originalZip.readFile(entry);
+            outputFiles.push({ name: entry, data });
         }
         // Write the output ZIP
-        const outputBuffer = outputZip.toBuffer();
+        const outputBuffer = await outputZip.writeFiles(outputFiles);
         await writeBinaryToPath(outputPath, outputBuffer);
     }
     /**

package/dist/processors/obfProcessor.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.ObfProcessor = void 0;
 const baseProcessor_1 = require("../core/baseProcessor");
@@ -767,24 +744,18 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
             await writeBinaryToPath(outputPath, originalBuffer);
             return;
         }
-        const AdmZip = (await Promise.resolve().then(() => __importStar(require('adm-zip')))).default;
-        const originalZip = new AdmZip(originalPath);
-        const outputZip = new AdmZip();
-        // Track which .obf files we're modifying
-        const modifiedObfFiles = new Set();
-        // Generate new .obf files for pages in the tree
-        const newObfFiles = new Map();
+        const originalZip = await this.options.zipAdapter(originalPath);
+        const outputZip = await this.options.zipAdapter();
+        const outputFiles = [];
         for (const page of Object.values(tree.pages)) {
-            const obfFilename = this.getPageFilename(page.id, tree.metadata);
-            modifiedObfFiles.add(obfFilename);
+            const name = this.getPageFilename(page.id, tree.metadata);
             // createObfBoardFromPage will automatically apply mutations if present
             const obfBoard = this.createObfBoardFromPage(page, 'Board', tree.metadata);
-            const obfContent = JSON.stringify(obfBoard, null, 2);
-            newObfFiles.set(obfFilename, obfContent);
+            const data = JSON.stringify(obfBoard, null, 2);
+            outputFiles.push({ name, data });
         }
         // Generate updated manifest if we have pages
         if (Object.keys(tree.pages).length > 0) {
-            modifiedObfFiles.add('manifest.json');
             const manifest = {
                 format: OBF_FORMAT_VERSION,
                 root: tree.metadata.defaultHomePageId,
@@ -797,25 +768,18 @@ class ObfProcessor extends baseProcessor_1.BaseProcessor {
                     sounds: {},
                 },
             };
-            newObfFiles.set('manifest.json', JSON.stringify(manifest));
-        }
-        // Copy all files from original zip, replacing modified .obf files
-        for (const entry of originalZip.getEntries()) {
-            if (entry.isDirectory)
-                continue;
-            // Skip .obf files that we're modifying
-            if (modifiedObfFiles.has(entry.entryName)) {
-                const newContent = newObfFiles.get(entry.entryName);
-                if (newContent) {
-                    outputZip.addFile(entry.entryName, Buffer.from(newContent, 'utf8'));
-                }
-                continue;
+            const data = Buffer.from(JSON.stringify(manifest), 'utf8');
+            outputFiles.push({ name: 'manifest.json', data });
+        }
+        // Add remaining .obf from original zip
+        for (const entry of originalZip.listFiles()) {
+            if (!outputFiles.find((file) => file.name === entry)) {
+                const data = await originalZip.readFile(entry);
+                outputFiles.push({ name: entry, data });
             }
-            // Copy all other files as-is (preserves images, sounds, etc.)
-            outputZip.addFile(entry.entryName, entry.getData());
         }
         // Write the output ZIP
-        const outputBuffer = outputZip.toBuffer();
+        const outputBuffer = await outputZip.writeFiles(outputFiles);
         await writeBinaryToPath(outputPath, outputBuffer);
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willwade/aac-processors",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "A comprehensive TypeScript library for processing AAC (Augmentative and Alternative Communication) file formats with translation support",
   "main": "dist/index.js",
   "browser": "dist/browser/index.browser.js",