taglib-wasm 0.2.7 → 0.2.8

package/src/types.ts

@@ -3,9 +3,14 @@
  */
 
 // Re-export commonly used classes from other modules
-export type { TagLibModule } from "./wasm-jsr.ts";
+export type { TagLibModule } from "./wasm.ts";
 // Note: AudioFile is not needed for JSR exports
 
+/**
+ * Supported file types
+ */
+export type FileType = "MP3" | "MP4" | "FLAC" | "OGG" | "OPUS" | "WAV" | "AIFF" | "UNKNOWN";
+
 /**
  * Audio format types supported by TagLib
  */
@@ -40,8 +45,6 @@ export interface AudioProperties {
   readonly sampleRate: number;
   /** Number of audio channels */
   readonly channels: number;
-  /** Audio format */
-  readonly format: AudioFormat;
 }
 
 /**

package/src/wasm-jsr.ts

@@ -1,280 +1,13 @@
 /**
- * @fileoverview JSR-compatible WASM loading for TagLib
- *
- * This version loads the WASM file directly without relying on Emscripten's JS file,
- * making it compatible with JSR publishing requirements.
- */
-
-import type { TagLibConfig } from "./types.ts";
-
-/**
- * JSR-compatible TagLib module interface
- */
-export interface TagLibModule {
-  // Standard Emscripten memory arrays
-  HEAPU8: Uint8Array;
-  HEAP8: Int8Array;
-  HEAP16: Int16Array;
-  HEAP32: Int32Array;
-  HEAPU16: Uint16Array;
-  HEAPU32: Uint32Array;
-  HEAPF32: Float32Array;
-  HEAPF64: Float64Array;
-
-  // Standard functions
-  _malloc: (size: number) => number;
-  _free: (ptr: number) => void;
-  allocate: (array: Uint8Array, type: number) => number;
-
-  // Allocation constants
-  ALLOC_NORMAL: number;
-  ALLOC_STACK: number;
-  ALLOC_STATIC: number;
-  ALLOC_DYNAMIC: number;
-  ALLOC_NONE: number;
-
-  // TagLib-specific functions
-  _taglib_file_new_from_buffer: (data: number, size: number) => number;
-  _taglib_file_delete: (fileId: number) => void;
-  _taglib_file_save: (fileId: number) => number;
-  _taglib_file_is_valid: (fileId: number) => number;
-  _taglib_file_format: (fileId: number) => number;
-  _taglib_file_tag: (fileId: number) => number;
-  _taglib_tag_title: (tag: number) => number;
-  _taglib_tag_artist: (tag: number) => number;
-  _taglib_tag_album: (tag: number) => number;
-  _taglib_tag_comment: (tag: number) => number;
-  _taglib_tag_genre: (tag: number) => number;
-  _taglib_tag_year: (tag: number) => number;
-  _taglib_tag_track: (tag: number) => number;
-  _taglib_tag_set_title: (tag: number, title: number) => void;
-  _taglib_tag_set_artist: (tag: number, artist: number) => void;
-  _taglib_tag_set_album: (tag: number, album: number) => void;
-  _taglib_tag_set_comment: (tag: number, comment: number) => void;
-  _taglib_tag_set_genre: (tag: number, genre: number) => void;
-  _taglib_tag_set_year: (tag: number, year: number) => void;
-  _taglib_tag_set_track: (tag: number, track: number) => void;
-  _taglib_file_audioproperties: (fileId: number) => number;
-  _taglib_audioproperties_length: (props: number) => number;
-  _taglib_audioproperties_bitrate: (props: number) => number;
-  _taglib_audioproperties_samplerate: (props: number) => number;
-  _taglib_audioproperties_channels: (props: number) => number;
-
-  // PropertyMap operations
-  _taglib_file_properties_json: (fileId: number) => number;
-  _taglib_file_set_properties_json: (fileId: number, json: number) => number;
-  _taglib_file_get_property: (fileId: number, key: number) => number;
-  _taglib_file_set_property: (fileId: number, key: number, value: number) => number;
-
-  // MP4-specific operations
-  _taglib_file_is_mp4: (fileId: number) => number;
-  _taglib_mp4_get_item: (fileId: number, key: number) => number;
-  _taglib_mp4_set_item: (fileId: number, key: number, value: number) => number;
-  _taglib_mp4_remove_item: (fileId: number, key: number) => number;
-}
-
-/**
- * Load taglib-wasm module for JSR
- */
-export async function loadTagLibModuleJSR(
-  config?: TagLibConfig,
-): Promise<TagLibModule> {
-  // Load WASM file as bytes (same file for all platforms)
-  const wasmUrl = new URL("../build/taglib.wasm", import.meta.url);
-  const wasmBytes = await fetch(wasmUrl).then((r) => r.arrayBuffer());
-
-  // Create memory
-  const memory = new WebAssembly.Memory({ initial: 256, maximum: 4096 });
-  
-  // Create heap views (initialized after memory is created)
-  let HEAP8!: Int8Array;
-  let HEAPU8!: Uint8Array;
-  let HEAP16!: Int16Array;
-  let HEAPU16!: Uint16Array;
-  let HEAP32!: Int32Array;
-  let HEAPU32!: Uint32Array;
-  let HEAPF32!: Float32Array;
-  let HEAPF64!: Float64Array;
-  
-  function updateMemoryViews() {
-    const buffer = memory.buffer;
-    HEAP8 = new Int8Array(buffer);
-    HEAPU8 = new Uint8Array(buffer);
-    HEAP16 = new Int16Array(buffer);
-    HEAPU16 = new Uint16Array(buffer);
-    HEAP32 = new Int32Array(buffer);
-    HEAPU32 = new Uint32Array(buffer);
-    HEAPF32 = new Float32Array(buffer);
-    HEAPF64 = new Float64Array(buffer);
-  }
-  
-  updateMemoryViews();
-  
-  // Import functions expected by the WASM module (still minified with -O3)
-  const wasmImports = {
-    a: {
-      // a: ___cxa_throw
-      a: (ptr: number, type: number, destructor: number) => {
-        throw new Error('Exception thrown from WASM');
-      },
-      // e: __abort_js  
-      e: () => {
-        throw new Error('Abort called from WASM');
-      },
-      // b: __tzset_js
-      b: (timezone: number, daylight: number, std_name: number, dst_name: number) => {
-        // Minimal timezone implementation
-      },
-      // f: _emscripten_resize_heap
-      f: (requestedSize: number) => {
-        const oldSize = HEAPU8.length;
-        const newSize = Math.max(oldSize, requestedSize);
-        const pages = Math.ceil((newSize - memory.buffer.byteLength) / 65536);
-        try {
-          memory.grow(pages);
-          updateMemoryViews();
-          return 1;
-        } catch (e) {
-          return 0;
-        }
-      },
-      // c: _environ_get
-      c: (__environ: number, environ_buf: number) => 0,
-      // d: _environ_sizes_get
-      d: (penviron_count: number, penviron_buf_size: number) => {
-        HEAPU32[penviron_count >> 2] = 0;
-        HEAPU32[penviron_buf_size >> 2] = 0;
-        return 0;
-      },
-      // g: memory
-      g: memory,
-    },
-  };
-  
-  // Instantiate WASM with the expected imports
-  const wasmModule = await WebAssembly.instantiate(wasmBytes, wasmImports);
-
-  const exports = wasmModule.instance.exports as any;
-  
-  // Update memory reference from exports (g is memory in minified version)
-  if (exports.g) {
-    updateMemoryViews();
-  }
-  
-  // Initialize runtime (h is the init function in minified version)
-  if (exports.h) {
-    exports.h();
-  }
-
-  // Build the module interface
-  const module: TagLibModule = {
-    // Memory arrays
-    HEAPU8,
-    HEAP8,
-    HEAP16,
-    HEAP32,
-    HEAPU16,
-    HEAPU32,
-    HEAPF32,
-    HEAPF64,
-
-    // Standard functions (minified with -O3)
-    _malloc: exports.P || (() => {
-      throw new Error("malloc not available");
-    }),
-    _free: exports.Q || (() => {}),
-    allocate: (array: Uint8Array, type: number) => {
-      const ptr = module._malloc(array.length);
-      // Ensure we have the latest memory view
-      if (memory.buffer !== module.HEAPU8.buffer) {
-        updateMemoryViews();
-        module.HEAPU8 = HEAPU8;
-        module.HEAP8 = HEAP8;
-        module.HEAP16 = HEAP16;
-        module.HEAP32 = HEAP32;
-        module.HEAPU16 = HEAPU16;
-        module.HEAPU32 = HEAPU32;
-        module.HEAPF32 = HEAPF32;
-        module.HEAPF64 = HEAPF64;
-      }
-      module.HEAPU8.set(array, ptr);
-      return ptr;
-    },
-
-    // Allocation constants
-    ALLOC_NORMAL: 0,
-    ALLOC_STACK: 1,
-    ALLOC_STATIC: 2,
-    ALLOC_DYNAMIC: 3,
-    ALLOC_NONE: 4,
-
-    // TagLib functions - map from minified WASM exports (with -O3)
-    _taglib_file_new_from_buffer: exports.i,
-    _taglib_file_delete: exports.j,
-    _taglib_file_save: exports.k,
-    _taglib_file_is_valid: exports.l,
-    _taglib_file_format: exports.m,
-    _taglib_file_tag: exports.n,
-    _taglib_tag_title: exports.o,
-    _taglib_tag_artist: exports.p,
-    _taglib_tag_album: exports.q,
-    _taglib_tag_comment: exports.r,
-    _taglib_tag_genre: exports.s,
-    _taglib_tag_year: exports.t,
-    _taglib_tag_track: exports.u,
-    _taglib_tag_set_title: exports.v,
-    _taglib_tag_set_artist: exports.w,
-    _taglib_tag_set_album: exports.x,
-    _taglib_tag_set_comment: exports.y,
-    _taglib_tag_set_genre: exports.z,
-    _taglib_tag_set_year: exports.A,
-    _taglib_tag_set_track: exports.B,
-    _taglib_file_audioproperties: exports.C,
-    _taglib_audioproperties_length: exports.D,
-    _taglib_audioproperties_bitrate: exports.E,
-    _taglib_audioproperties_samplerate: exports.F,
-    _taglib_audioproperties_channels: exports.G,
-
-    // PropertyMap operations
-    _taglib_file_properties_json: exports.H,
-    _taglib_file_set_properties_json: exports.I,
-    _taglib_file_get_property: exports.J,
-    _taglib_file_set_property: exports.K,
-
-    // MP4-specific operations
-    _taglib_file_is_mp4: exports.L,
-    _taglib_mp4_get_item: exports.M,
-    _taglib_mp4_set_item: exports.N,
-    _taglib_mp4_remove_item: exports.O,
-  };
-
-  return module;
-}
-
-/**
- * Convert JavaScript string to C string pointer
- */
-export function jsToCStringJSR(module: TagLibModule, str: string): number {
-  const encoder = new TextEncoder();
-  const bytes = encoder.encode(str + "\0");
-  return module.allocate(bytes, module.ALLOC_NORMAL);
-}
-
-/**
- * Convert C string pointer to JavaScript string
- */
-export function cStringToJSJSR(module: TagLibModule, ptr: number): string {
-  if (ptr === 0) return "";
-
-  const bytes: number[] = [];
-  let i = 0;
-  while (true) {
-    const byte = module.HEAPU8[ptr + i];
-    if (byte === undefined || byte === 0) break;
-    bytes.push(byte);
-    i++;
-  }
-
-  const decoder = new TextDecoder();
-  return decoder.decode(new Uint8Array(bytes));
-}
+ * @fileoverview JSR-compatible WASM module interface (no Node.js dependencies)
+ */
+
+// Re-export types only (no implementation imports)
+export type {
+  EmscriptenModule,
+  FileHandle,
+  TagWrapper,
+  AudioPropertiesWrapper,
+  TagLibModule,
+  WasmModule,
+} from "./wasm.ts";

package/src/wasm.ts

@@ -1,263 +1,94 @@
 /**
- * @fileoverview WebAssembly module interface and loading utilities
+ * @fileoverview WebAssembly module interface types for Emscripten
  */
 
-import type { TagLibConfig } from "./types.ts";
-
-/**
- * Emscripten module interface for taglib-wasm
- */
-export interface TagLibModule {
-  // Emscripten standard properties
-  HEAPU8: Uint8Array;
+// Basic Emscripten module interface
+export interface EmscriptenModule {
+  // Memory
   HEAP8: Int8Array;
   HEAP16: Int16Array;
   HEAP32: Int32Array;
+  HEAPU8: Uint8Array;
   HEAPU16: Uint16Array;
   HEAPU32: Uint32Array;
   HEAPF32: Float32Array;
   HEAPF64: Float64Array;
-
-  // Standard Emscripten functions
-  cwrap: (ident: string, returnType: string, argTypes: string[]) => any;
-  ccall: (
-    ident: string,
-    returnType: string,
-    argTypes: string[],
-    args: any[],
-  ) => any;
-  getValue: (ptr: number, type: string) => number;
-  setValue: (ptr: number, value: number, type: string) => void;
-  addFunction: (func: Function, signature: string) => number;
-  removeFunction: (funcPtr: number) => void;
-
-  // Memory allocation functions
-  _malloc: (size: number) => number;
-  _free: (ptr: number) => void;
-  allocate: (array: Uint8Array, type: number) => number;
-
-  // Allocation types
-  ALLOC_NORMAL: number;
-  ALLOC_STACK: number;
-  ALLOC_STATIC: number;
-  ALLOC_DYNAMIC: number;
-  ALLOC_NONE: number;
-
-  // File operations
-  _taglib_file_new_from_buffer: (data: number, size: number) => number;
-  _taglib_file_delete: (fileId: number) => void;
-  _taglib_file_save: (fileId: number) => number;
-  _taglib_file_is_valid: (fileId: number) => number;
-  _taglib_file_format: (fileId: number) => number;
-
-  // Tag operations
-  _taglib_file_tag: (fileId: number) => number;
-  _taglib_tag_title: (tag: number) => number;
-  _taglib_tag_artist: (tag: number) => number;
-  _taglib_tag_album: (tag: number) => number;
-  _taglib_tag_comment: (tag: number) => number;
-  _taglib_tag_genre: (tag: number) => number;
-  _taglib_tag_year: (tag: number) => number;
-  _taglib_tag_track: (tag: number) => number;
-
-  _taglib_tag_set_title: (tag: number, title: number) => void;
-  _taglib_tag_set_artist: (tag: number, artist: number) => void;
-  _taglib_tag_set_album: (tag: number, album: number) => void;
-  _taglib_tag_set_comment: (tag: number, comment: number) => void;
-  _taglib_tag_set_genre: (tag: number, genre: number) => void;
-  _taglib_tag_set_year: (tag: number, year: number) => void;
-  _taglib_tag_set_track: (tag: number, track: number) => void;
-
-  // Audio properties
-  _taglib_file_audioproperties: (fileId: number) => number;
-  _taglib_audioproperties_length: (props: number) => number;
-  _taglib_audioproperties_bitrate: (props: number) => number;
-  _taglib_audioproperties_samplerate: (props: number) => number;
-  _taglib_audioproperties_channels: (props: number) => number;
-
-  // PropertyMap operations
-  _taglib_file_properties_json: (fileId: number) => number;
-  _taglib_file_set_properties_json: (fileId: number, json: number) => number;
-  _taglib_file_get_property: (fileId: number, key: number) => number;
-  _taglib_file_set_property: (fileId: number, key: number, value: number) => number;
-
-  // MP4-specific operations
-  _taglib_file_is_mp4: (fileId: number) => number;
-  _taglib_mp4_get_item: (fileId: number, key: number) => number;
-  _taglib_mp4_set_item: (fileId: number, key: number, value: number) => number;
-  _taglib_mp4_remove_item: (fileId: number, key: number) => number;
-
-  // String utilities
-  _taglib_string_new: (str: number) => number;
-  _taglib_string_delete: (str: number) => void;
-  _taglib_string_to_cstring: (str: number) => number;
-
-  // Memory management functions already defined above
+  
+  // Memory management
+  _malloc(size: number): number;
+  _free(ptr: number): void;
+  allocate?(data: number[] | Uint8Array, allocator: number): number;
+  ALLOC_NORMAL?: number;
+  
+  // String conversion
+  ccall?(ident: string, returnType: string, argTypes: string[], args: any[]): any;
+  cwrap?(ident: string, returnType: string, argTypes: string[]): (...args: any[]) => any;
+  
+  // File system (if enabled)
+  FS?: any;
+  
+  // Runtime
+  then?(callback: (module: EmscriptenModule) => void): void;
+  onRuntimeInitialized?: () => void;
 }
 
-/**
- * Default configuration for taglib-wasm module
- */
-const DEFAULT_CONFIG: Required<TagLibConfig> = {
-  memory: {
-    initial: 16 * 1024 * 1024, // 16MB
-    maximum: 256 * 1024 * 1024, // 256MB
-  },
-  debug: false,
-};
-
-/**
- * Load and initialize the TagLib WebAssembly module
- */
-export async function loadTagLibModule(
-  config: TagLibConfig = {},
-): Promise<TagLibModule> {
-  const mergedConfig = { ...DEFAULT_CONFIG, ...config };
-
-  // Detect runtime environment
-  const isNode = typeof (globalThis as any).process !== "undefined" && (globalThis as any).process.versions?.node;
-  const isDeno = typeof (globalThis as any).Deno !== "undefined";
-
-  let wasmPath: string;
-
-  if (isDeno) {
-    // Deno: Use file system path
-    wasmPath = new URL("../build/taglib.wasm", import.meta.url).pathname;
-  } else if (isNode) {
-    // Node.js: Use require.resolve or fs path
-    wasmPath = new URL("../build/taglib.wasm", import.meta.url).pathname;
-  } else {
-    // Browser: Relative path
-    wasmPath = "./taglib.wasm";
-  }
-
-  // Load WASM binary
-  let wasmBinary: Uint8Array;
-
-  if (isDeno) {
-    wasmBinary = await (globalThis as any).Deno.readFile(wasmPath);
-  } else if (isNode) {
-    const fs = await import("node:fs");
-    wasmBinary = await fs.promises.readFile(wasmPath);
-  } else {
-    // Browser
-    const response = await fetch(wasmPath);
-    wasmBinary = new Uint8Array(await response.arrayBuffer());
-  }
-
-  // Create Emscripten module configuration
-  const moduleConfig = {
-    wasmBinary,
-    wasmMemory: new WebAssembly.Memory({
-      initial: mergedConfig.memory.initial! / (64 * 1024),
-      maximum: mergedConfig.memory.maximum! / (64 * 1024),
-    }),
-    print: mergedConfig.debug ? console.log : () => {},
-    printErr: mergedConfig.debug ? console.error : () => {},
-    onRuntimeInitialized: () => {
-      if (mergedConfig.debug) {
-        console.log("taglib-wasm module initialized");
-      }
-    },
-  };
-
-  // Load the Emscripten-generated module
-  try {
-    // For Deno, we need to handle the CommonJS-style export
-    let TagLibWASM: any;
-
-    if (isDeno) {
-      // In Deno, read and evaluate the JS file
-      const jsContent = await (globalThis as any).Deno.readTextFile(
-        new URL("../build/taglib.js", import.meta.url).pathname,
-      );
-
-      // Create a minimal CommonJS environment
-      const exports = {} as any;
-      const module = { exports } as any;
-      const define = undefined;
-      const require = (name: string) => {
-        if (name === "fs") {
-          return {
-            readFileSync: (path: string) => (globalThis as any).Deno.readFileSync(path),
-          };
-        }
-        throw new Error(`Module ${name} not found`);
-      };
-
-      // Add a minimal process object for Node.js compatibility
-      const process = {
-        versions: {},
-        argv: [],
-        type: "deno",
-      };
-
-      // Execute the WASM JS with the proper context
-      const func = new Function(
-        "exports",
-        "module",
-        "define",
-        "require",
-        "process",
-        "__dirname",
-        "__filename",
-        jsContent +
-          '\nreturn typeof TagLibWASM !== "undefined" ? TagLibWASM : module.exports;',
-      );
-
-      TagLibWASM = func(exports, module, define, require, process, "", "");
-    } else {
-      // For Node.js and browsers, use normal import
-      const wasmModule = await import("../build/taglib.js");
-      TagLibWASM = wasmModule.default || wasmModule;
-    }
-
-    if (typeof TagLibWASM !== "function") {
-      throw new Error("Failed to load taglib-wasm module");
-    }
-
-    const wasmInstance = await TagLibWASM(moduleConfig);
-
-    // Ensure proper memory arrays are set up
-    if (!wasmInstance.HEAPU8) {
-      // Manual setup if not automatically created
-      const buffer = wasmInstance.buffer || wasmInstance.wasmMemory?.buffer;
-      if (buffer) {
-        wasmInstance.HEAPU8 = new Uint8Array(buffer);
-        wasmInstance.HEAP8 = new Int8Array(buffer);
-        wasmInstance.HEAP16 = new Int16Array(buffer);
-        wasmInstance.HEAP32 = new Int32Array(buffer);
-        wasmInstance.HEAPU16 = new Uint16Array(buffer);
-        wasmInstance.HEAPU32 = new Uint32Array(buffer);
-        wasmInstance.HEAPF32 = new Float32Array(buffer);
-        wasmInstance.HEAPF64 = new Float64Array(buffer);
-      }
-    }
-
-    return wasmInstance as TagLibModule;
-  } catch (error) {
-    throw new Error(`Failed to load taglib-wasm: ${(error as Error).message}`);
-  }
+// Embind class interfaces
+export interface FileHandle {
+  loadFromBuffer(data: Uint8Array): boolean;
+  isValid(): boolean;
+  save(): boolean;
+  getFormat(): string;
+  getProperties(): any;
+  setProperties(props: any): void;
+  getProperty(key: string): string;
+  setProperty(key: string, value: string): void;
+  isMP4(): boolean;
+  getMP4Item(key: string): string;
+  setMP4Item(key: string, value: string): void;
+  removeMP4Item(key: string): void;
+  getTag(): TagWrapper;
+  getAudioProperties(): AudioPropertiesWrapper;
 }
 
-/**
- * Convert a C string pointer to JavaScript string
- */
-export function cStringToJS(module: TagLibModule, ptr: number): string {
-  if (ptr === 0) return "";
+export interface TagWrapper {
+  title(): string;
+  artist(): string;
+  album(): string;
+  comment(): string;
+  genre(): string;
+  year(): number;
+  track(): number;
+  setTitle(value: string): void;
+  setArtist(value: string): void;
+  setAlbum(value: string): void;
+  setComment(value: string): void;
+  setGenre(value: string): void;
+  setYear(value: number): void;
+  setTrack(value: number): void;
+}
 
-  const view = new Uint8Array(module.HEAPU8.buffer, ptr);
-  let length = 0;
-  while (view[length] !== 0) length++;
+export interface AudioPropertiesWrapper {
+  lengthInSeconds(): number;
+  lengthInMilliseconds(): number;
+  bitrate(): number;
+  sampleRate(): number;
+  channels(): number;
+}
 
-  return new TextDecoder().decode(view.subarray(0, length));
+export interface TagLibModule extends EmscriptenModule {
+  // Embind classes
+  FileHandle: new () => FileHandle;
+  TagWrapper: new () => TagWrapper;
+  AudioPropertiesWrapper: new () => AudioPropertiesWrapper;
+  
+  // Embind functions
+  createFileHandle(): FileHandle;
 }
 
-/**
- * Convert JavaScript string to C string
- */
-export function jsToCString(module: TagLibModule, str: string): number {
-  const encoder = new TextEncoder();
-  const bytes = encoder.encode(str + "\0");
-  return module.allocate(bytes, module.ALLOC_NORMAL);
+export interface WasmModule extends EmscriptenModule {
+  // Alias for compatibility
+  FileHandle?: new () => FileHandle;
+  createFileHandle?(): FileHandle;
 }
+
+// Module loading function removed for modular imports