@willwade/aac-processors 0.1.20 → 0.2.0

package/dist/validation/touchChatValidator.js

@@ -30,8 +30,8 @@ exports.TouchChatValidator = void 0;
 const xml2js = __importStar(require("xml2js"));
 const baseValidator_1 = require("./baseValidator");
 const io_1 = require("../utils/io");
-const zip_1 = require("../utils/zip");
 const sqlite_1 = require("../utils/sqlite");
+const zip_1 = require("../utils/zip");
 /**
  * Validator for TouchChat files (.ce)
  * TouchChat files are ZIP archives that contain a .c4v SQLite database.
@@ -44,23 +44,26 @@ class TouchChatValidator extends baseValidator_1.BaseValidator {
     /**
      * Validate a TouchChat file from disk
      */
-    static async validateFile(filePath) {
+    static async validateFile(filePath, fileAdapter) {
+        const { readBinaryFromInput, getFileSize } = fileAdapter ?? io_1.defaultFileAdapter;
         const validator = new TouchChatValidator();
-        const content = (0, io_1.readBinaryFromInput)(filePath);
-        const stats = (0, io_1.getFs)().statSync(filePath);
-        return validator.validate(content, (0, io_1.getBasename)(filePath), stats.size);
+        const content = await readBinaryFromInput(filePath);
+        const size = await getFileSize(filePath);
+        return validator.validate(content, (0, io_1.getBasename)(filePath), size);
     }
     /**
      * Check if content is TouchChat format
      */
-    static async identifyFormat(content, filename, zipAdapter) {
+    static async identifyFormat(content, filename, fileAdapter = io_1.defaultFileAdapter, zipAdapter) {
         const name = filename.toLowerCase();
         if (name.endsWith('.ce')) {
             return true;
         }
         // Try to parse as ZIP and check for .c4v database
         try {
-            const { zip } = zipAdapter ? await zipAdapter(content) : await (0, zip_1.openZipFromInput)(content);
+            const zip = zipAdapter
+                ? await zipAdapter(content)
+                : await (0, zip_1.getZipAdapter)(content, fileAdapter);
             const entries = zip.listFiles();
             if (entries.some((entry) => entry.toLowerCase().endsWith('.c4v'))) {
                 return true;
@@ -92,7 +95,9 @@ class TouchChatValidator extends baseValidator_1.BaseValidator {
             }
         });
         const looksLikeXml = this.isXmlBuffer(content);
-        const zipped = looksLikeXml ? false : await this.tryValidateZipSqlite(content);
+        const zipped = looksLikeXml
+            ? false
+            : await this.tryValidateZipSqlite(content, this._options.fileAdapter, this._options.zipAdapter);
         if (!zipped) {
             let xmlObj = null;
             await this.add_check('xml_parse', 'valid XML', async () => {
@@ -272,11 +277,13 @@ class TouchChatValidator extends baseValidator_1.BaseValidator {
         }
         return bytes[start] === 0x3c; // '<'
     }
-    async tryValidateZipSqlite(content) {
+    async tryValidateZipSqlite(content, fileAdapter = io_1.defaultFileAdapter, zipAdapter) {
         let usedZip = false;
         await this.add_check('zip', 'TouchChat ZIP package', async () => {
             try {
-                const { zip } = await (0, zip_1.openZipFromInput)(content);
+                const zip = zipAdapter
+                    ? await zipAdapter(content)
+                    : await (0, zip_1.getZipAdapter)(content, fileAdapter);
                 const entries = zip.listFiles();
                 const vocabEntry = entries.find((name) => name.toLowerCase().endsWith('.c4v'));
                 if (!vocabEntry) {
@@ -301,7 +308,10 @@ class TouchChatValidator extends baseValidator_1.BaseValidator {
         await this.add_check('sqlite', 'valid TouchChat SQLite database', async () => {
             let cleanup;
             try {
-                const result = await (0, sqlite_1.openSqliteDatabase)(content, { readonly: true });
+                const result = await (0, sqlite_1.openSqliteDatabase)(content, {
+                    readonly: true,
+                    fileAdapter: this._options.fileAdapter,
+                });
                 const db = result.db;
                 cleanup = result.cleanup;
                 const tableRows = db
@@ -351,7 +361,7 @@ class TouchChatValidator extends baseValidator_1.BaseValidator {
             }
             finally {
                 if (cleanup) {
-                    cleanup();
+                    await cleanup();
                 }
             }
         });

package/dist/validation/validationTypes.d.ts

@@ -1,3 +1,5 @@
+import { FileAdapter, ProcessorInput } from '../utils/io';
+import { ZipAdapter } from '../utils/zip';
 /**
  * Custom error class for validation errors
  * Can be marked as a blocker to stop validation immediately
@@ -45,14 +47,19 @@ export interface ValidationResult {
 /**
  * Options for validation behavior
  */
-export interface ValidationOptions {
+export interface ValidationConfig {
     /** Whether to include warnings in validation (default: true) */
     includeWarnings?: boolean;
     /** Whether to stop on first blocker error (default: true) */
     stopOnBlocker?: boolean;
     /** Custom validation rules to apply */
     customRules?: ValidationRule[];
+    /** Adapter for handling file IO (optional) */
+    fileAdapter: FileAdapter;
+    /** Adapter for handling ZIP files (optional) */
+    zipAdapter: (input: ProcessorInput) => Promise<ZipAdapter>;
 }
+export type ValidationOptions = Partial<ValidationConfig>;
 /**
  * Custom validation rule that can be added
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willwade/aac-processors",
-  "version": "0.1.20",
+  "version": "0.2.0",
   "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",

package/dist/core/fileProcessor.d.ts

@@ -1,7 +0,0 @@
-type FileFormat = 'gridset' | 'coughdrop' | 'touchchat' | 'snap' | 'dot' | 'opml' | 'excel' | 'unknown';
-declare class FileProcessor {
-    static readFile(filePath: string): Buffer;
-    static writeFile(filePath: string, data: Buffer | string): void;
-    static detectFormat(filePathOrBuffer: string | Buffer): FileFormat;
-}
-export default FileProcessor;

package/dist/core/fileProcessor.js

@@ -1,57 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-class FileProcessor {
-    // Read a file and return its contents as a Buffer
-    static readFile(filePath) {
-        return fs_1.default.readFileSync(filePath);
-    }
-    // Write data (Buffer or string) to a file
-    static writeFile(filePath, data) {
-        fs_1.default.writeFileSync(filePath, data);
-    }
-    // Detect file format based on extension or magic bytes
-    static detectFormat(filePathOrBuffer) {
-        if (typeof filePathOrBuffer === 'string') {
-            const ext = path_1.default.extname(filePathOrBuffer).toLowerCase();
-            const fileName = path_1.default.basename(filePathOrBuffer).toLowerCase();
-            // Handle double extensions like .sub.zip
-            if (fileName.endsWith('.sub.zip') || ext === '.sub') {
-                return 'snap';
-            }
-            switch (ext) {
-                case '.gridset':
-                case '.gridsetx':
-                    return 'gridset';
-                case '.obf':
-                case '.obz':
-                    return 'coughdrop';
-                case '.ce':
-                case '.wfl':
-                case '.touchchat':
-                    return 'touchchat';
-                case '.sps':
-                case '.spb':
-                    return 'snap';
-                case '.dot':
-                    return 'dot';
-                case '.opml':
-                    return 'opml';
-                case '.xlsx':
-                    return 'excel';
-                default:
-                    return 'unknown';
-            }
-        }
-        else if (Buffer.isBuffer(filePathOrBuffer)) {
-            // Optionally: inspect magic bytes here
-            return 'unknown';
-        }
-        return 'unknown';
-    }
-}
-exports.default = FileProcessor;