objdiff-wasm 2.0.0-beta.8 → 2.0.0

package/dist/main.d.ts

@@ -620,98 +620,36 @@ interface DiffResult {
  */
 declare const DiffResult: DiffResult$Type;
 
-/**
-*/
-declare enum ArmR9Usage {
-  GeneralPurpose = 0,
-  Sb = 1,
-  Tr = 2,
-}
-/**
-*/
-declare enum ArmArchVersion {
-  Auto = 0,
-  V4T = 1,
-  V5TE = 2,
-  V6K = 3,
-}
-/**
-*/
-declare enum X86Formatter {
-  Intel = 0,
-  Gas = 1,
-  Nasm = 2,
-  Masm = 3,
-}
-/**
-*/
-declare enum MipsAbi {
-  Auto = 0,
-  O32 = 1,
-  N32 = 2,
-  N64 = 3,
-}
-/**
-*/
-declare enum MipsInstrCategory {
-  Auto = 0,
-  Cpu = 1,
-  Rsp = 2,
-  R3000Gte = 3,
-  R4000Allegrex = 4,
-  R5900 = 5,
-}
-/**
-*/
-declare class DiffObjConfig$1 {
-  free(): void;
-/**
-*/
-  arm_arch_version: ArmArchVersion;
-/**
-*/
-  arm_av_registers: boolean;
-/**
-*/
-  arm_fp_usage: boolean;
-/**
-*/
-  arm_ip_usage: boolean;
-/**
-*/
-  arm_r9_usage: ArmR9Usage;
-/**
-*/
-  arm_sl_usage: boolean;
-/**
-*/
-  arm_unified_syntax: boolean;
-/**
-*/
-  combine_data_sections: boolean;
-/**
-*/
-  mips_abi: MipsAbi;
-/**
-*/
-  mips_instr_category: MipsInstrCategory;
-/**
-*/
-  relax_reloc_diffs: boolean;
-/**
-*/
-  space_between_args: boolean;
-/**
-*/
-  x86_formatter: X86Formatter;
+interface DiffObjConfig {
+    relax_reloc_diffs?: boolean;
+    space_between_args?: boolean;
+    combine_data_sections?: boolean;
+    x86_formatter?: X86Formatter;
+    mips_abi?: MipsAbi;
+    mips_instr_category?: MipsInstrCategory;
+    arm_arch_version?: ArmArchVersion;
+    arm_unified_syntax?: boolean;
+    arm_av_registers?: boolean;
+    arm_r9_usage?: ArmR9Usage;
+    arm_sl_usage?: boolean;
+    arm_fp_usage?: boolean;
+    arm_ip_usage?: boolean;
 }
 
-type DiffObjConfig = Omit<Partial<DiffObjConfig$1>, 'free'>;
+type ArmR9Usage = "GeneralPurpose" | "Sb" | "Tr";
+
+type ArmArchVersion = "Auto" | "V4T" | "V5TE" | "V6K";
+
+type MipsInstrCategory = "Auto" | "Cpu" | "Rsp" | "R3000Gte" | "R4000Allegrex" | "R5900";
+
+type MipsAbi = "Auto" | "O32" | "N32" | "N64";
+
+type X86Formatter = "Intel" | "Gas" | "Nasm" | "Masm";
 
 declare function initialize(data?: {
     workerUrl?: string | URL;
     wasmUrl?: string | URL;
-}): Promise<void>;
+}): Promise<Worker>;
 declare function runDiff(left: Uint8Array | undefined, right: Uint8Array | undefined, config?: DiffObjConfig): Promise<DiffResult>;
 type DiffText = DiffTextBasic | DiffTextBasicColor | DiffTextAddress | DiffTextLine | DiffTextOpcode | DiffTextArgument | DiffTextSymbol | DiffTextBranchDest | DiffTextSpacing;
 type DiffTextBase = {
@@ -755,11 +693,6 @@ type DiffTextSpacing = DiffTextBase & {
     type: 'spacing';
     count: number;
 };
-declare function oneof<T extends {
-    oneofKind: string;
-}>(type: T): T & {
-    oneofKind: string;
-};
 declare function displayDiff(diff: InstructionDiff, baseAddr: bigint, cb: (text: DiffText) => void): void;
 
-export { Argument, ArgumentDiff, ArgumentRelocation, ArgumentValue, ArmArchVersion, ArmR9Usage, DataDiff, DiffKind, type DiffObjConfig, DiffResult, type DiffText, type DiffTextAddress, type DiffTextArgument, type DiffTextBasic, type DiffTextBasicColor, type DiffTextBranchDest, type DiffTextLine, type DiffTextOpcode, type DiffTextSpacing, type DiffTextSymbol, FunctionDiff, Instruction, InstructionBranchFrom, InstructionBranchTo, InstructionDiff, MipsAbi, MipsInstrCategory, ObjectDiff, Relocation, RelocationTarget, SectionDiff, SectionKind, Symbol, SymbolFlag, X86Formatter, displayDiff, initialize, oneof, runDiff };
+export { Argument, ArgumentDiff, ArgumentRelocation, ArgumentValue, type ArmArchVersion, type ArmR9Usage, DataDiff, DiffKind, type DiffObjConfig, DiffResult, type DiffText, type DiffTextAddress, type DiffTextArgument, type DiffTextBasic, type DiffTextBasicColor, type DiffTextBranchDest, type DiffTextLine, type DiffTextOpcode, type DiffTextSpacing, type DiffTextSymbol, FunctionDiff, Instruction, InstructionBranchFrom, InstructionBranchTo, InstructionDiff, type MipsAbi, type MipsInstrCategory, ObjectDiff, Relocation, RelocationTarget, SectionDiff, SectionKind, Symbol, SymbolFlag, type X86Formatter, displayDiff, initialize, runDiff };

package/dist/main.js

@@ -1245,29 +1245,40 @@ var DiffResult = new DiffResult$Type();
 
 // src/main.ts
 var workerInit = false;
-var workerCallbacks = null;
+var workerCallbacks;
 var workerReady = new Promise((resolve, reject) => {
   workerCallbacks = { start: performance.now(), resolve, reject };
 });
 async function initialize(data) {
   if (workerInit) {
-    return;
+    return workerReady;
   }
   workerInit = true;
   let { workerUrl, wasmUrl } = data || {};
   if (!workerUrl) {
-    workerUrl = new URL("./worker.js", import.meta.url);
+    try {
+      workerUrl = new URL("./worker.js", import.meta.url);
+    } catch (_) {
+      workerUrl = "worker.js";
+    }
   }
   if (!wasmUrl) {
-    wasmUrl = new URL("./objdiff_core_bg.wasm", import.meta.url);
+    try {
+      wasmUrl = new URL("./objdiff_core_bg.wasm", import.meta.url);
+    } catch (_) {
+      wasmUrl = "objdiff_core_bg.js";
+    }
   }
-  const worker = new Worker(workerUrl, { type: "module" });
+  const worker = new Worker(workerUrl, {
+    name: "objdiff",
+    type: "module"
+  });
   worker.onmessage = onMessage;
   worker.onerror = (event) => {
     console.error("Worker error", event);
-    workerCallbacks.reject(event);
+    workerCallbacks.reject("Worker failed to initialize, wrong URL?");
   };
-  await defer({
+  defer({
     type: "init",
     // URL can't be sent directly
     wasmUrl: wasmUrl.toString()
@@ -1275,8 +1286,8 @@ async function initialize(data) {
     workerCallbacks.resolve(worker);
   }, (e) => {
     workerCallbacks.reject(e);
-    throw e;
   });
+  return workerReady;
 }
 var globalMessageId = 0;
 var messageCallbacks = /* @__PURE__ */ new Map();
@@ -1302,12 +1313,7 @@ function onMessage(event) {
   }
 }
 async function defer(message, worker) {
-  if (worker == null) {
-    if (!workerInit) {
-      throw new Error("Worker not initialized");
-    }
-    worker = await workerReady;
-  }
+  worker = worker || await initialize();
   const messageId = globalMessageId++;
   const promise = new Promise((resolve, reject) => {
     messageCallbacks.set(messageId, { start: performance.now(), resolve, reject });
@@ -1331,9 +1337,6 @@ async function runDiff(left, right, config) {
   console.debug(`Parsing message took ${end - parseStart}ms`);
   return result;
 }
-function oneof(type) {
-  return type;
-}
 function displayDiff(diff, baseAddr, cb) {
   const ins = diff.instruction;
   if (!ins) {
@@ -1353,7 +1356,7 @@ function displayDiff(diff, baseAddr, cb) {
     if (i === 0) {
       cb({ type: "spacing", count: 1 });
     }
-    const arg = oneof(ins.arguments[i].value);
+    const arg = ins.arguments[i].value;
     const diff_index = diff.arg_diff[i]?.diff_index;
     switch (arg.oneofKind) {
       case "plain_text":
@@ -1402,7 +1405,6 @@ export {
   SymbolFlag,
   displayDiff,
   initialize,
-  oneof,
   runDiff
 };
 //# sourceMappingURL=main.js.map